summaryrefslogtreecommitdiff
path: root/Build/source/utils
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2011-04-12 14:17:47 +0000
committerTaco Hoekwater <taco@elvenkind.com>2011-04-12 14:17:47 +0000
commit307453997ef030ec4dfa1e876feaf0b8b8125bab (patch)
treeab2054693ba95e9ac8f6e3478b4d0175d893329f /Build/source/utils
parentd95b11a25d3d9e17cc4afb9c8713ef4037567527 (diff)
check in luatex 0.66.0
git-svn-id: svn://tug.org/texlive/trunk@22059 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/biber/configure4
-rwxr-xr-xBuild/source/utils/chktex/configure6
-rwxr-xr-xBuild/source/utils/configure30
-rwxr-xr-xBuild/source/utils/dialog/configure4
-rwxr-xr-xBuild/source/utils/ps2eps/configure4
-rwxr-xr-xBuild/source/utils/psutils/configure4
-rw-r--r--Build/source/utils/t1utils/aclocal.m44
-rwxr-xr-xBuild/source/utils/t1utils/configure9
-rwxr-xr-xBuild/source/utils/tpic2pdftex/configure4
-rw-r--r--Build/source/utils/vlna/aclocal.m44
-rwxr-xr-xBuild/source/utils/vlna/configure4
-rwxr-xr-xBuild/source/utils/xindy/configure4
-rw-r--r--Build/source/utils/xpdfopen/aclocal.m44
-rwxr-xr-xBuild/source/utils/xpdfopen/configure7
16 files changed, 60 insertions, 35 deletions
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index 6070e25731f..9addb04ab38 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -57,6 +57,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
$(top_srcdir)/../m4/kpse-lt-hack.m4 \
$(top_srcdir)/../m4/kpse-options.m4 \
$(top_srcdir)/../m4/kpse-pkgs.m4 \
+ $(top_srcdir)/../m4/kpse-poppler-flags.m4 \
$(top_srcdir)/../m4/kpse-ptexenc-flags.m4 \
$(top_srcdir)/../m4/kpse-setup.m4 \
$(top_srcdir)/../m4/kpse-t1lib-flags.m4 \
@@ -122,6 +123,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-common.m4 \
$(top_srcdir)/../libs/graphite/ac/withenable.ac \
$(top_srcdir)/../libs/zziplib/ac/withenable.ac \
$(top_srcdir)/../libs/xpdf/ac/withenable.ac \
+ $(top_srcdir)/../libs/poppler/ac/withenable.ac \
$(top_srcdir)/../libs/gd/ac/withenable.ac \
$(top_srcdir)/../libs/freetype2/ac/withenable.ac \
$(top_srcdir)/../libs/freetype/ac/withenable.ac \
diff --git a/Build/source/utils/aclocal.m4 b/Build/source/utils/aclocal.m4
index 9eb7b6d1a8d..86d2a2ce443 100644
--- a/Build/source/utils/aclocal.m4
+++ b/Build/source/utils/aclocal.m4
@@ -1001,6 +1001,7 @@ m4_include([../m4/kpse-libpng-flags.m4])
m4_include([../m4/kpse-lt-hack.m4])
m4_include([../m4/kpse-options.m4])
m4_include([../m4/kpse-pkgs.m4])
+m4_include([../m4/kpse-poppler-flags.m4])
m4_include([../m4/kpse-ptexenc-flags.m4])
m4_include([../m4/kpse-setup.m4])
m4_include([../m4/kpse-t1lib-flags.m4])
diff --git a/Build/source/utils/biber/configure b/Build/source/utils/biber/configure
index c3b56e3d6f7..31780e61931 100755
--- a/Build/source/utils/biber/configure
+++ b/Build/source/utils/biber/configure
@@ -4148,8 +4148,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
diff --git a/Build/source/utils/chktex/configure b/Build/source/utils/chktex/configure
index 70ddba111b2..949b996bad5 100755
--- a/Build/source/utils/chktex/configure
+++ b/Build/source/utils/chktex/configure
@@ -5251,9 +5251,9 @@ esac
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
+config_files="`echo $ac_config_files`"
+config_headers="`echo $ac_config_headers`"
+config_commands="`echo $ac_config_commands`"
_ACEOF
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index 24f4072a3b1..82b3a8e8784 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/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
@@ -1587,6 +1588,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
@@ -3546,7 +3549,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
@@ -4636,6 +4639,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
@@ -6415,8 +6439,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
diff --git a/Build/source/utils/dialog/configure b/Build/source/utils/dialog/configure
index 5a03ed8c047..0a5263d268c 100755
--- a/Build/source/utils/dialog/configure
+++ b/Build/source/utils/dialog/configure
@@ -3928,8 +3928,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
diff --git a/Build/source/utils/ps2eps/configure b/Build/source/utils/ps2eps/configure
index ecbd01046bb..3a53ca47d5c 100755
--- a/Build/source/utils/ps2eps/configure
+++ b/Build/source/utils/ps2eps/configure
@@ -4073,8 +4073,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
diff --git a/Build/source/utils/psutils/configure b/Build/source/utils/psutils/configure
index 9f139e1d48c..9f3f55fe5e3 100755
--- a/Build/source/utils/psutils/configure
+++ b/Build/source/utils/psutils/configure
@@ -4073,8 +4073,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
diff --git a/Build/source/utils/t1utils/aclocal.m4 b/Build/source/utils/t1utils/aclocal.m4
index 8cd538d37dc..f004a0e2d53 100644
--- a/Build/source/utils/t1utils/aclocal.m4
+++ b/Build/source/utils/t1utils/aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff --git a/Build/source/utils/t1utils/configure b/Build/source/utils/t1utils/configure
index 9b40b4a91c1..3fd6f706f61 100755
--- a/Build/source/utils/t1utils/configure
+++ b/Build/source/utils/t1utils/configure
@@ -706,8 +706,7 @@ CFLAGS
LDFLAGS
LIBS
CPPFLAGS
-CPP
-CPPFLAGS'
+CPP'
# Initialize some variables set by options.
@@ -5229,9 +5228,9 @@ esac
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
+config_files="`echo $ac_config_files`"
+config_headers="`echo $ac_config_headers`"
+config_commands="`echo $ac_config_commands`"
_ACEOF
diff --git a/Build/source/utils/tpic2pdftex/configure b/Build/source/utils/tpic2pdftex/configure
index b70f9e2786a..6e3d366110e 100755
--- a/Build/source/utils/tpic2pdftex/configure
+++ b/Build/source/utils/tpic2pdftex/configure
@@ -3938,8 +3938,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
diff --git a/Build/source/utils/vlna/aclocal.m4 b/Build/source/utils/vlna/aclocal.m4
index 8cd538d37dc..f004a0e2d53 100644
--- a/Build/source/utils/vlna/aclocal.m4
+++ b/Build/source/utils/vlna/aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff --git a/Build/source/utils/vlna/configure b/Build/source/utils/vlna/configure
index 483302afb37..b734e9e7d4b 100755
--- a/Build/source/utils/vlna/configure
+++ b/Build/source/utils/vlna/configure
@@ -4100,8 +4100,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
diff --git a/Build/source/utils/xindy/configure b/Build/source/utils/xindy/configure
index 998ca2ed658..13c1221bb0a 100755
--- a/Build/source/utils/xindy/configure
+++ b/Build/source/utils/xindy/configure
@@ -4824,8 +4824,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
diff --git a/Build/source/utils/xpdfopen/aclocal.m4 b/Build/source/utils/xpdfopen/aclocal.m4
index 8cd538d37dc..f004a0e2d53 100644
--- a/Build/source/utils/xpdfopen/aclocal.m4
+++ b/Build/source/utils/xpdfopen/aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff --git a/Build/source/utils/xpdfopen/configure b/Build/source/utils/xpdfopen/configure
index 05821a2f6c2..0934b265f0e 100755
--- a/Build/source/utils/xpdfopen/configure
+++ b/Build/source/utils/xpdfopen/configure
@@ -673,8 +673,7 @@ LDFLAGS
LIBS
CPPFLAGS
XMKMF
-CPP
-CPPFLAGS'
+CPP'
# Initialize some variables set by options.
@@ -4943,8 +4942,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