summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/xetexdir
diff options
context:
space:
mode:
authorJonathan Kew <jfkthame@googlemail.com>2006-12-13 17:28:44 +0000
committerJonathan Kew <jfkthame@googlemail.com>2006-12-13 17:28:44 +0000
commitf13f8721c654df3690ee72d7731585cc598665b0 (patch)
treef6b3f3dfc189cdf2509a06183b61228bdc6141b1 /Build/source/texk/web2c/xetexdir
parentdf58afb116258c01bab91a87a10837a2767a5942 (diff)
support --with-fontconfig=DIR for compiling xetex
git-svn-id: svn://tug.org/texlive/trunk@2716 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/xetexdir')
-rw-r--r--Build/source/texk/web2c/xetexdir/tests.ac36
-rw-r--r--Build/source/texk/web2c/xetexdir/withenable.ac3
-rw-r--r--Build/source/texk/web2c/xetexdir/xetex.mk19
3 files changed, 49 insertions, 9 deletions
diff --git a/Build/source/texk/web2c/xetexdir/tests.ac b/Build/source/texk/web2c/xetexdir/tests.ac
index 552aea23dc0..505a7fada03 100644
--- a/Build/source/texk/web2c/xetexdir/tests.ac
+++ b/Build/source/texk/web2c/xetexdir/tests.ac
@@ -47,3 +47,39 @@ ImageDescriptionHandle h;
]
)
])
+
+AC_DEFUN([AC_HAS_LIBFONTCONFIG], [
+#
+# Check for libfontconfig
+#
+ _cppflags=$CPPFLAGS _ldflags=$LDFLAGS
+ AC_ARG_WITH(fontconfig,
+ [ --with-fontconfig=DIR use fontconfig include/library files from DIR],
+ [
+if test -d "$withval"; then
+ FONTCONFIGCPPFLAGS="-I$withval/include"
+ LDFONTCONFIG="-L$withval/lib"
+ CPPFLAGS="$CPPFLAGS $FONTCONFIGCPPFLAGS"
+ LDFLAGS="$LDFLAGS $LDFONTCONFIG"
+fi
+ ]
+ )
+ AC_MSG_CHECKING([for fontconfig header files])
+ AC_TRY_COMPILE(
+ [
+#include <fontconfig/fontconfig.h>
+ ], [
+FcObjectSet *os;
+ ],
+ [ AC_MSG_RESULT(yes)
+ AC_CHECK_LIB(fontconfig, FcInit, [
+ AC_DEFINE(HAVE_LIBFONTCONFIG, 1, [Define if you have libfontconfig])
+ LDFONTCONFIG="$LDFONTCONFIG -lfontconfig"
+ ])
+ ],
+ [ AC_MSG_RESULT(no)
+ FONTCONFIGCPPFLAGS=
+ LDFONTCONFIG=
+ ]
+ )
+])
diff --git a/Build/source/texk/web2c/xetexdir/withenable.ac b/Build/source/texk/web2c/xetexdir/withenable.ac
new file mode 100644
index 00000000000..8d05ab0cd00
--- /dev/null
+++ b/Build/source/texk/web2c/xetexdir/withenable.ac
@@ -0,0 +1,3 @@
+AC_ARG_WITH(fontconfig,
+[ --with-fontconfig=DIR Specify dir prefix where fontconfig is installed
+ (e.g., /usr/X11R6).])
diff --git a/Build/source/texk/web2c/xetexdir/xetex.mk b/Build/source/texk/web2c/xetexdir/xetex.mk
index 1b343756715..4fdf07a1ba8 100644
--- a/Build/source/texk/web2c/xetexdir/xetex.mk
+++ b/Build/source/texk/web2c/xetexdir/xetex.mk
@@ -29,8 +29,7 @@ xetex = @XETEX@ xetex
@XETEX_GENERIC@ XETEX_DEFINES = -DXETEX_OTHER
-@XETEX_GENERIC@ # FIXME: FontConfig not yet handled by configure
-@XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ -lfontconfig
+@XETEX_GENERIC@ EXTRALIBS = @LDLIBXPDF@ @LDLIBPNG@ @LDFONTCONFIG@
@XETEX_GENERIC@ EXTRADEPS = @LIBXPDFDEP@ @LIBPNGDEP@
@@ -79,6 +78,8 @@ LDZLIB = @LDZLIB@
ZLIBDIR = ../../libs/zlib
ZLIBSRCDIR = $(srcdir)/$(ZLIBDIR)
+FONTCONFIGCPPFLAGS = @FONTCONFIGCPPFLAGS@
+
xetexlibs = $(LDICU) $(LDTECKIT) $(LDFREETYPE2) $(LDZLIB)
# Font-related headers
@@ -156,14 +157,14 @@ xetex_ot_layout_o = \
$(xetex_platform_layout_o)
XeTeXLayoutInterface.o: $(srcdir)/xetexdir/XeTeXLayoutInterface.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+ $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
XeTeXOTLayoutEngine.o: $(srcdir)/xetexdir/XeTeXOTLayoutEngine.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+ $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
XeTeXFontMgr.o: $(srcdir)/xetexdir/XeTeXFontMgr.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+ $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
XeTeXFontMgr_FC.o: $(srcdir)/xetexdir/XeTeXFontMgr_FC.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+ $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
XeTeXFontMgr_Mac.o: $(srcdir)/xetexdir/XeTeXFontMgr_Mac.mm $(XeTeXFontHdrs)
gcc -ObjC++ $(ICUCFLAGS) $(FTFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
@@ -174,14 +175,14 @@ FontTableCache.o: $(srcdir)/xetexdir/FontTableCache.cpp
$(CXX) $(ICUCFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
XeTeXFontInst.o: $(srcdir)/xetexdir/XeTeXFontInst.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+ $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
XeTeXFontInst_Mac.o: $(srcdir)/xetexdir/XeTeXFontInst_Mac.cpp $(XeTeXFontHdrs)
$(CXX) $(ICUCFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
XeTeXFontInst_FT2.o: $(srcdir)/xetexdir/XeTeXFontInst_FT2.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+ $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
XeTeXOTMath.o: $(srcdir)/xetexdir/XeTeXOTMath.cpp $(XeTeXFontHdrs)
- $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
+ $(CXX) $(ICUCFLAGS) $(FTFLAGS) $(FONTCONFIGCPPFLAGS) $(ALL_CXXFLAGS) $(XETEX_DEFINES) -c $< -o $@
# special rules for files that need the TECkit headers as well
XeTeX_ext.o: $(srcdir)/xetexdir/XeTeX_ext.c xetexd.h