summaryrefslogtreecommitdiff
path: root/Build/source/configure
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-04-14 16:19:18 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-04-14 16:19:18 +0000
commit7a3c6f66dd4ba13faaf4bb6153984d435ca4d8f3 (patch)
tree20768b21cc4a6221eb7b672dd99c2f972c2cabb5 /Build/source/configure
parent7c3f181e032655af0a5e3dd571f5bf6b76722e80 (diff)
luaTeX and poppler build system updates
git-svn-id: svn://tug.org/texlive/trunk@22085 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/configure')
-rwxr-xr-xBuild/source/configure16
1 files changed, 15 insertions, 1 deletions
diff --git a/Build/source/configure b/Build/source/configure
index 3761a0bd9b6..c7f9151e231 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -5388,6 +5388,20 @@ $as_echo "$as_me: Using \`poppler' headers and library from TL tree" >&6;}
ac_configure_args="$ac_configure_args '--without-system-poppler'"
fi
fi
+if test "x$with_system_poppler" = 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-poppler' requires \`--with-system-zlib'" "$LINENO" 5
+ fi
+fi
+
+test "x$need_poppler" = xyes && {
+ need_zlib=yes
+}
## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
@@ -20184,7 +20198,7 @@ fi
## libs/poppler/ac/poppler.ac: configure.ac fragment for the TeX Live subdirectory libs/poppler/
-## basic check of system poppler (poppler)
+## basic check of system poppler
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'