summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorsuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2010-08-31 18:32:03 +0900
committersuzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>2010-08-31 18:32:03 +0900
commitfd0cdb7b9e9a9bc19c710a601c3fd870e026304b (patch)
tree48c1d615883dcfbe7cc264ac183e5618f88bc5d9 /configure
parent0eb657b0aa2dedff861805311504dd16ea833f22 (diff)
downloadfreetype2-fd0cdb7b9e9a9bc19c710a601c3fd870e026304b.tar.gz
Ignore the environmental setting of LIBTOOL.
Patch is suggested by Adrian Bunk, to prevent unexpected reflection of environmental LIBTOOL. See: http://savannah.nongnu.org/patch/?7290 * builds/unix/unix-cc.in: LIBTOOL is unconditionally set to $(FT_LIBTOOL_DIR)/libtool. FT_LIBTOOL_DIR is set to $(BUILD_DIR) by default. * configure: When configured for the building out of source tee, FT_LIBTOOL_DIR is set to $(OBJ_DIR).
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 2efa26967..d05fd2997 100755
--- a/configure
+++ b/configure
@@ -91,7 +91,7 @@ if test "$abs_curr_dir" != "$abs_ft2_dir"; then
echo "OBJ_DIR := $abs_curr_dir" >> Makefile
echo "OBJ_BUILD := \$(OBJ_DIR)" >> Makefile
echo "DOC_DIR := \$(OBJ_DIR)/reference" >> Makefile
- echo "LIBTOOL := \$(OBJ_DIR)/libtool" >> Makefile
+ echo "FT_LIBTOOL_DIR := \$(OBJ_DIR)" >> Makefile
echo "ifndef FT2DEMOS" >> Makefile
echo " include \$(TOP_DIR)/Makefile" >> Makefile
echo "else" >> Makefile