ref: fd0cdb7b9e9a9bc19c710a601c3fd870e026304b
parent: 0eb657b0aa2dedff861805311504dd16ea833f22
author: suzuki toshiya <[email protected]>
date: Tue Aug 31 14:32:03 EDT 2010
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).
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2010-08-31 suzuki toshiya <[email protected]>
+ 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).
+
+2010-08-31 suzuki toshiya <[email protected]>
+
[truetype] Decrease the trace level catching the interpreter error.
* src/truetype/ttinterp.c (TT_RunIns): Decrease the trace level
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@@ -14,8 +14,9 @@
CC := @CC@
COMPILER_SEP := $(SEP)
+FT_LIBTOOL_DIR ?= $(BUILD_DIR)
-LIBTOOL ?= $(BUILD_DIR)/libtool
+LIBTOOL := $(FT_LIBTOOL_DIR)/libtool
# The object file extension (for standard and static libraries). This can be
--- a/configure
+++ b/configure
@@ -91,7 +91,7 @@
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