summaryrefslogtreecommitdiff
path: root/Build/source/utils
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-01 10:37:11 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-01 10:37:11 +0000
commitde175a032d27b2f22d2394b1c4b42734a211271d (patch)
tree654b97dcc30fb6f033d65b57a2c1b660b7bd2ef3 /Build/source/utils
parenta01f17b2387fe42f2578c94d964f39a1e58a1e6f (diff)
zziplib-0.13.58, minor build system cleanup
git-svn-id: svn://tug.org/texlive/trunk@16892 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils')
-rw-r--r--Build/source/utils/Makefile.in2
-rw-r--r--Build/source/utils/aclocal.m41
-rwxr-xr-xBuild/source/utils/configure43
3 files changed, 44 insertions, 2 deletions
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index 989a935a4a5..d20f987225b 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
$(top_srcdir)/../m4/kpse-web2c.m4 \
$(top_srcdir)/../m4/kpse-xpdf-flags.m4 \
$(top_srcdir)/../m4/kpse-zlib-flags.m4 \
+ $(top_srcdir)/../m4/kpse-zziplib-flags.m4 \
$(top_srcdir)/../utils/dialog/ac/withenable.ac \
$(top_srcdir)/../utils/pdfopen/ac/withenable.ac \
$(top_srcdir)/../utils/ps2eps/ac/withenable.ac \
@@ -117,6 +118,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
$(top_srcdir)/../libs/icu/ac/withenable.ac \
$(top_srcdir)/../libs/teckit/ac/withenable.ac \
$(top_srcdir)/../libs/graphite/ac/withenable.ac \
+ $(top_srcdir)/../libs/zziplib/ac/withenable.ac \
$(top_srcdir)/../libs/xpdf/ac/withenable.ac \
$(top_srcdir)/../libs/gd/ac/withenable.ac \
$(top_srcdir)/../libs/freetype2/ac/withenable.ac \
diff --git a/Build/source/utils/aclocal.m4 b/Build/source/utils/aclocal.m4
index da53d4c25aa..88c8fdc27e7 100644
--- a/Build/source/utils/aclocal.m4
+++ b/Build/source/utils/aclocal.m4
@@ -693,3 +693,4 @@ 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])
+m4_include([../m4/kpse-zziplib-flags.m4])
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 3754159e51f..c5b5fc438b1 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -748,6 +748,7 @@ with_teckit_includes
with_teckit_libdir
with_graphite
with_system_graphite
+with_system_zziplib
with_system_xpdf
with_system_gd
with_gd_includes
@@ -1541,6 +1542,8 @@ Optional Packages:
--without-graphite build XeTeX without graphite support
--with-system-graphite use installed silgraphite headers and library
(requires pkg-config)
+ --with-system-zziplib use installed zziplib headers and library (requires
+ pkg-config)
--with-system-xpdf use installed poppler headers and library instead of
xpdf (requires pkg-config)
--with-system-gd use installed gd headers and library
@@ -2575,6 +2578,7 @@ test "x$enable_web2c:$enable_luatex" = xyes:yes && {
need_xpdf=yes
need_libpng=yes
need_obsdcompat=yes
+ need_zziplib=yes
}
# Check whether --enable-xetex was given.
if test "${enable_xetex+set}" = set; then :
@@ -3660,6 +3664,41 @@ $as_echo "$as_me: Assuming installed \`graphite' headers and library" >&6;}
fi
+## libs/zziplib/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/zziplib/
+## configure options and TL libraries required for zziplib
+
+# Check whether --with-system-zziplib was given.
+if test "${with_system_zziplib+set}" = set; then :
+ withval=$with_system_zziplib;
+fi
+if test "x$with_system_zziplib" = x; then
+ if test -f $srcdir/../libs/zziplib/configure; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`zziplib' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`zziplib' headers and library from TL tree" >&6;}
+ with_system_zziplib=no
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`zziplib' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`zziplib' headers and library" >&6;}
+ with_system_zziplib=yes
+ fi
+ ac_configure_args="$ac_configure_args '--with-system-zziplib=$with_system_zziplib'"
+fi
+if test "x$with_system_zziplib" = xyes; then
+ if test "x$with_system_zlib" = x; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: -> installed \`zlib' headers and library" >&5
+$as_echo "$as_me: -> installed \`zlib' headers and library" >&6;}
+ with_system_zlib=yes
+ ac_configure_args="$ac_configure_args '--with-system-zlib'"
+ elif test "x$with_system_zlib" != xyes; then
+ as_fn_error "Sorry, \`--with-system-zziplib' requires \`--with-system-zlib'" "$LINENO" 5
+ fi
+fi
+
+test "x$need_zziplib" = xyes && {
+ need_zlib=yes
+}
+
+
## libs/xpdf/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/xpdf/
## configure options and TL libraries required for xpdf
@@ -3681,7 +3720,7 @@ $as_echo "$as_me: Assuming installed \`xpdf' headers and library" >&6;}
fi
-## libs/gd/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
+## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
## configure options and TL libraries required for gd
# Check whether --with-system-gd was given.
@@ -3836,7 +3875,7 @@ fi
## configure options and TL libraries required for obsdcompat
-## libs/libpng/kpse/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/
+## libs/libpng/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/libpng/
## configure options and TL libraries required for libpng
# Check whether --with-system-libpng was given.