summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/xetexdir
diff options
context:
space:
mode:
authorJonathan Kew <jfkthame@googlemail.com>2006-12-15 16:41:36 +0000
committerJonathan Kew <jfkthame@googlemail.com>2006-12-15 16:41:36 +0000
commit2245bf86e7003e946a83553717ddba351c79a2d4 (patch)
tree8dfb8d0078ed2c39a66fe9876a998cf7b011a8e5 /Build/source/texk/web2c/xetexdir
parent093504a20ee3ac774c8ae449ca2505a1e8d3fbc1 (diff)
fixed --with-fontconfig=DIR option so both xetex and xdvipdfmx build with relocated libfontconfig
git-svn-id: svn://tug.org/texlive/trunk@2748 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/xetexdir')
-rw-r--r--Build/source/texk/web2c/xetexdir/tests.ac12
-rw-r--r--Build/source/texk/web2c/xetexdir/xetex.mk3
2 files changed, 7 insertions, 8 deletions
diff --git a/Build/source/texk/web2c/xetexdir/tests.ac b/Build/source/texk/web2c/xetexdir/tests.ac
index 505a7fada03..ee0c1e29382 100644
--- a/Build/source/texk/web2c/xetexdir/tests.ac
+++ b/Build/source/texk/web2c/xetexdir/tests.ac
@@ -4,7 +4,6 @@ AC_DEFUN([AC_HAS_CARBON], [
#
# Check for Carbon framework on Mac OS X
#
- _cppflags=$CPPFLAGS _ldflags=$LDFLAGS
AC_MSG_CHECKING([for Apple Carbon framework])
AC_TRY_COMPILE(
[
@@ -28,7 +27,6 @@ AC_DEFUN([AC_HAS_QUICKTIME], [
#
# Check for QuickTime framework on Mac OS X
#
- _cppflags=$CPPFLAGS _ldflags=$LDFLAGS
AC_MSG_CHECKING([for Apple QuickTime framework])
AC_TRY_COMPILE(
[
@@ -57,10 +55,10 @@ AC_DEFUN([AC_HAS_LIBFONTCONFIG], [
[ --with-fontconfig=DIR use fontconfig include/library files from DIR],
[
if test -d "$withval"; then
+ CPPFLAGS="$CPPFLAGS -I$withval/include"
+ LDFLAGS="$LDFLAGS -L$withval/lib"
FONTCONFIGCPPFLAGS="-I$withval/include"
- LDFONTCONFIG="-L$withval/lib"
- CPPFLAGS="$CPPFLAGS $FONTCONFIGCPPFLAGS"
- LDFLAGS="$LDFLAGS $LDFONTCONFIG"
+ FONTCONFIGLDFLAGS="-L$withval/lib"
fi
]
)
@@ -74,11 +72,11 @@ FcObjectSet *os;
[ AC_MSG_RESULT(yes)
AC_CHECK_LIB(fontconfig, FcInit, [
AC_DEFINE(HAVE_LIBFONTCONFIG, 1, [Define if you have libfontconfig])
- LDFONTCONFIG="$LDFONTCONFIG -lfontconfig"
+ LDFONTCONFIG="-lfontconfig"
])
],
[ AC_MSG_RESULT(no)
- FONTCONFIGCPPFLAGS=
+ CPPFLAGS=$_cppflags LDFLAGS=$_ldflags
LDFONTCONFIG=
]
)
diff --git a/Build/source/texk/web2c/xetexdir/xetex.mk b/Build/source/texk/web2c/xetexdir/xetex.mk
index 4fdf07a1ba8..b7590af0427 100644
--- a/Build/source/texk/web2c/xetexdir/xetex.mk
+++ b/Build/source/texk/web2c/xetexdir/xetex.mk
@@ -79,6 +79,7 @@ ZLIBDIR = ../../libs/zlib
ZLIBSRCDIR = $(srcdir)/$(ZLIBDIR)
FONTCONFIGCPPFLAGS = @FONTCONFIGCPPFLAGS@
+FONTCONFIGLDFLAGS = @FONTCONFIGLDFLAGS@
xetexlibs = $(LDICU) $(LDTECKIT) $(LDFREETYPE2) $(LDZLIB)
@@ -196,7 +197,7 @@ trans.o: $(srcdir)/xetexdir/trans.c
# Making xetex.
xetex: $(xetex_o) $(xetex_add_o) $(xetex_images_o) $(xetex_ot_layout_o) $(EXTRADEPS)
@CXXHACKLINK@ $(xetex_o) $(xetex_add_o) $(xetex_images_o) $(xetex_ot_layout_o) \
- $(socketlibs) $(xetexlibs) $(EXTRALIBS) \
+ $(FONTCONFIGLDFLAGS) $(socketlibs) $(xetexlibs) $(EXTRALIBS) \
@CXXHACKLDLIBS@ @CXXLDEXTRA@
# C file dependencies