diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-05 11:04:36 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-05 11:04:36 +0000 |
commit | 30741871850b08bbd7eaee129e682b824630ff5f (patch) | |
tree | f82bfd85a7982a69cd68fc0c597bbdac8046a461 /Build/source/utils | |
parent | e6a729fda782c90689112b74d016a56eb7cd9c79 (diff) |
prepare for system-xpdf, i.e., poppler and fix system-freetype2
git-svn-id: svn://tug.org/texlive/trunk@12934 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
-rw-r--r-- | Build/source/utils/Makefile.in | 1 | ||||
-rw-r--r-- | Build/source/utils/aclocal.m4 | 1 | ||||
-rwxr-xr-x | Build/source/utils/configure | 20 |
3 files changed, 22 insertions, 0 deletions
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in index 9f9ee5fdc57..38e3eafad8c 100644 --- a/Build/source/utils/Makefile.in +++ b/Build/source/utils/Makefile.in @@ -58,6 +58,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \ $(top_srcdir)/../m4/kpse-t1lib-flags.m4 \ $(top_srcdir)/../m4/kpse-teckit-flags.m4 \ $(top_srcdir)/../m4/kpse-web2c.m4 \ + $(top_srcdir)/../m4/kpse-xpdf-flags.m4 \ $(top_srcdir)/../m4/kpse-zlib-flags.m4 \ $(top_srcdir)/../ac/withenable.ac \ $(top_srcdir)/../utils/ac/withenable.ac \ diff --git a/Build/source/utils/aclocal.m4 b/Build/source/utils/aclocal.m4 index 9fae18de399..238046dc260 100644 --- a/Build/source/utils/aclocal.m4 +++ b/Build/source/utils/aclocal.m4 @@ -630,4 +630,5 @@ m4_include([../m4/kpse-setup.m4]) m4_include([../m4/kpse-t1lib-flags.m4]) m4_include([../m4/kpse-teckit-flags.m4]) m4_include([../m4/kpse-web2c.m4]) +m4_include([../m4/kpse-xpdf-flags.m4]) m4_include([../m4/kpse-zlib-flags.m4]) diff --git a/Build/source/utils/configure b/Build/source/utils/configure index d1f18da8f67..efcfc2a5edd 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -779,6 +779,7 @@ with_graphite with_system_graphite with_graphite_includes with_graphite_libdir +with_system_xpdf with_system_gd with_gd_includes with_gd_libdir @@ -1556,6 +1557,8 @@ Optional Packages: graphite headers installed in DIR --with-graphite-libdir=DIR graphite library installed in DIR + --with-system-xpdf use installed poppler headers and library instead of + xpdf (requires pkg-config) --with-system-gd use installed gd headers and library --with-gd-includes=DIR gd headers installed in DIR --with-gd-libdir=DIR gd library installed in DIR @@ -3304,6 +3307,23 @@ fi ## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/ ## configure options and TL libraries required for xpdf +# Check whether --with-system-xpdf was given. +if test "${with_system_xpdf+set}" = set; then + withval=$with_system_xpdf; +fi +if test "x$with_system_xpdf" = x; then + if test -f $srcdir/../libs/xpdf/configure; then + { $as_echo "$as_me:$LINENO: Assuming \`xpdf' headers and library from TL tree" >&5 +$as_echo "$as_me: Assuming \`xpdf' headers and library from TL tree" >&6;} + with_system_xpdf=no + else + { $as_echo "$as_me:$LINENO: Assuming installed \`xpdf' headers and library" >&5 +$as_echo "$as_me: Assuming installed \`xpdf' headers and library" >&6;} + with_system_xpdf=yes + fi + ac_configure_args="$ac_configure_args '--with-system-xpdf=$with_system_xpdf'" +fi + ## libs/gd/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/ ## configure options and TL libraries required for gd |