summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-05 11:04:36 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-05-05 11:04:36 +0000
commit30741871850b08bbd7eaee129e682b824630ff5f (patch)
treef82bfd85a7982a69cd68fc0c597bbdac8046a461 /Build/source/libs
parente6a729fda782c90689112b74d016a56eb7cd9c79 (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/libs')
-rw-r--r--Build/source/libs/Makefile.in1
-rw-r--r--Build/source/libs/aclocal.m41
-rwxr-xr-xBuild/source/libs/configure20
-rw-r--r--Build/source/libs/xpdf/ac/withenable.ac2
-rw-r--r--Build/source/libs/xpdf/ac/xpdf.ac7
5 files changed, 30 insertions, 1 deletions
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in
index 762a58dafb5..a07d875ecb6 100644
--- a/Build/source/libs/Makefile.in
+++ b/Build/source/libs/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/libs/aclocal.m4 b/Build/source/libs/aclocal.m4
index 9fae18de399..238046dc260 100644
--- a/Build/source/libs/aclocal.m4
+++ b/Build/source/libs/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/libs/configure b/Build/source/libs/configure
index bf70dce517b..c40c14bc9c2 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/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
@@ -1560,6 +1561,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
@@ -3308,6 +3311,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
diff --git a/Build/source/libs/xpdf/ac/withenable.ac b/Build/source/libs/xpdf/ac/withenable.ac
index 1bb24c7b6d5..a1ac5c09b4e 100644
--- a/Build/source/libs/xpdf/ac/withenable.ac
+++ b/Build/source/libs/xpdf/ac/withenable.ac
@@ -4,4 +4,4 @@ dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
dnl You may freely use, modify and/or distribute this file.
dnl
## configure options and TL libraries required for xpdf
-KPSE_WITH_LIB([xpdf], , [tree])
+KPSE_WITH_LIB([xpdf])
diff --git a/Build/source/libs/xpdf/ac/xpdf.ac b/Build/source/libs/xpdf/ac/xpdf.ac
new file mode 100644
index 00000000000..e588ec794c5
--- /dev/null
+++ b/Build/source/libs/xpdf/ac/xpdf.ac
@@ -0,0 +1,7 @@
+## libs/xpdf/ac/xpdf.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
+## define required functions and headers from system xpdf
+KPSE_CHECK_LIB([xpdf], [free], [gtypes.h])