luaTeX and poppler build system updates

git-svn-id: svn://tug.org/texlive/trunk@22085 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 22 insertions, 4 deletions

diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index de6208b6f8f..af1e275bb0c 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -4681,6 +4681,20 @@ $as_echo "$as_me: Assuming installed \`poppler' headers and library" >&6;}
   fi
   ac_configure_args="$ac_configure_args '--with-system-poppler=$with_system_poppler'"
 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/
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index a34e1d3ed9b..0fdd9ed366c 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,5 +1,11 @@
 2011-04-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
+	* utils/utils.w (POPPLER_VERSION): Now defined in
+	poppler-config.h for poppler from the TeX Live tree, or in the
+	Makefile for an installed version.
+
+2011-04-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
 	* am/libluatex.am, am/txt2zlib.am: When cross compiling skip
 	txt2zlib and use installed luascripts/pdflua.c.
 
diff --git a/Build/source/texk/web2c/luatexdir/utils/utils.w b/Build/source/texk/web2c/luatexdir/utils/utils.w
index e3dc26bc6bf..4acb9f2d9dd 100644
--- a/Build/source/texk/web2c/luatexdir/utils/utils.w
+++ b/Build/source/texk/web2c/luatexdir/utils/utils.w
@@ -50,11 +50,9 @@ static const char _svn_version[] =
 
 #include "png.h"
 
+/* POPPLER_VERSION is defined in poppler-config.h for poppler from
+ * the TeX Live tree, or in the Makefile for an installed version.  */
 #include "poppler-config.h"
-#ifndef POPPLER_VERSION
-#  include "aconf.h"
-#  define POPPLER_VERSION POPPLER_PACKAGE_VERSION
-#endif
 
 @ @c
 #define check_nprintf(size_get, size_want) \