check in luatex 0.66.0

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

1 files changed, 27 insertions, 3 deletions

diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 6940f5d27ac..a8cf420e523 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -771,6 +771,7 @@ with_graphite
 with_system_graphite
 with_system_zziplib
 with_system_xpdf
+with_system_poppler
 with_system_gd
 with_gd_includes
 with_gd_libdir
@@ -1610,6 +1611,8 @@ Optional Packages:
                           pkg-config)
   --with-system-xpdf      use installed poppler headers and library instead of
                           xpdf (requires pkg-config)
+  --with-system-poppler   use installed poppler headers and library instead of
+                          poppler (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
@@ -3569,7 +3572,7 @@ case $enable_luatex in #(
 esac
 
 test "x$enable_web2c:$enable_luatex" = xyes:yes && {
-  need_xpdf=yes
+  need_poppler=yes
   need_libpng=yes
   need_obsdcompat=yes
   need_zziplib=yes
@@ -4659,6 +4662,27 @@ $as_echo "$as_me: Assuming installed \`xpdf' headers and library" >&6;}
 fi
 
 
+## libs/poppler/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/poppler/
+## configure options and TL libraries required for poppler
+
+# Check whether --with-system-poppler was given.
+if test "${with_system_poppler+set}" = set; then :
+  withval=$with_system_poppler;
+fi
+if test "x$with_system_poppler" = x; then
+  if test -f $srcdir/../libs/poppler/configure; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`poppler' headers and library from TL tree" >&5
+$as_echo "$as_me: Assuming \`poppler' headers and library from TL tree" >&6;}
+    with_system_poppler=no
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming installed \`poppler' headers and library" >&5
+$as_echo "$as_me: Assuming installed \`poppler' headers and library" >&6;}
+    with_system_poppler=yes
+  fi
+  ac_configure_args="$ac_configure_args '--with-system-poppler=$with_system_poppler'"
+fi
+
+
 ## libs/gd/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory libs/gd/
 ## configure options and TL libraries required for gd
 
@@ -6668,8 +6692,8 @@ esac
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
-config_files="$ac_config_files"
-config_commands="$ac_config_commands"
+config_files="`echo $ac_config_files`"
+config_commands="`echo $ac_config_commands`"
 
 _ACEOF