summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-13 09:00:06 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-13 09:00:06 +0000
commitc4d9d37c45b7531dd2e9df292a3cfe3090b3c537 (patch)
treee8a28885f86f8428259e8b98200101b01a948bfa /Build/source
parentbebca0d6808856477cb83e2e34c8ca26e8cb27c0 (diff)
fix freetype1/freetype2 problems in xetex build
git-svn-id: svn://tug.org/texlive/trunk@13073 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/web2c/Makefile.in4
-rw-r--r--Build/source/texk/web2c/xetexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/xetexdir/am/xetex.am5
3 files changed, 12 insertions, 3 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index a9ef999892c..bf3b9072f54 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -1823,8 +1823,8 @@ EXTRA_libluatex_a_SOURCES = luatexdir/font/macnames.c
nodist_EXTRA_xetex_SOURCES = dummy.cxx
libxetex = libxetex.a $(am__append_22)
xetex_cppflags = -DU_STATIC_IMPLEMENTATION -I$(srcdir)/xetexdir \
- $(ICU_INCLUDES) $(TECKIT_INCLUDES) $(am__append_21) \
- $(am__append_23) $(am__append_26) $(FREETYPE2_INCLUDES) \
+ $(FREETYPE2_INCLUDES) $(ICU_INCLUDES) $(TECKIT_INCLUDES) \
+ $(am__append_21) $(am__append_23) $(am__append_26) \
$(ZLIB_INCLUDES)
xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_24) \
$(am__append_27) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index b54123065a9..b21d5f2b106 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-13 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/xetex.am: Put FREETYPE2_INCLUDES as early as possible to
+ avoid freetype1/freetype2 problems when both are installed under
+ the same prefix.
+
2009-05-06 Karl Berry <karl@tug.org>
* jpegimage.c: #include <stdlib.h> and <string.h>
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index 836647f4b86..6cbdbaf910f 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -16,6 +16,9 @@ nodist_EXTRA_xetex_SOURCES = dummy.cxx
libxetex = libxetex.a
xetex_cppflags = -DU_STATIC_IMPLEMENTATION -I$(srcdir)/xetexdir
+## Must add freetype2 includes as early as possible to avoid
+## freetype1/freetype2 confusion -- what a mess.
+xetex_cppflags += $(FREETYPE2_INCLUDES)
xetex_cppflags += $(ICU_INCLUDES) $(TECKIT_INCLUDES)
xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS)
xetex_dependencies = $(proglib)
@@ -46,7 +49,7 @@ xetex_dependencies += $(GRAPHITE_DEPEND)
endif XETEX_GRAPHITE
-xetex_cppflags += $(FREETYPE2_INCLUDES) $(ZLIB_INCLUDES)
+xetex_cppflags += $(ZLIB_INCLUDES)
xetex_ldadd += $(FREETYPE2_LIBS) $(ZLIB_LIBS)
xetex_dependencies += $(FREETYPE2_DEPEND) $(ZLIB_DEPEND)