summaryrefslogtreecommitdiff
path: root/Build/source/texk
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/texk
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/texk')
-rw-r--r--Build/source/texk/Makefile.in2
-rw-r--r--Build/source/texk/aclocal.m41
-rw-r--r--Build/source/texk/bibtexu/Makefile.in8
-rwxr-xr-xBuild/source/texk/bibtexu/configure56
-rwxr-xr-xBuild/source/texk/configure43
-rwxr-xr-xBuild/source/texk/dvipng/configure2
-rw-r--r--Build/source/texk/dvisvgm/Makefile.in8
-rwxr-xr-xBuild/source/texk/dvisvgm/configure56
-rw-r--r--Build/source/texk/lcdf-typetools/Makefile.in8
-rw-r--r--Build/source/texk/lcdf-typetools/cfftot1/Makefile.in2
-rwxr-xr-xBuild/source/texk/lcdf-typetools/configure54
-rw-r--r--Build/source/texk/lcdf-typetools/libefont/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/liblcdf/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/mmafm/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/mmpfb/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/otfinfo/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/otftotfm/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/t1lint/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/t1rawafm/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/t1reencode/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/t1testpage/Makefile.in2
-rw-r--r--Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in2
-rw-r--r--Build/source/texk/web2c/ChangeLog6
-rw-r--r--Build/source/texk/web2c/Makefile.am5
-rw-r--r--Build/source/texk/web2c/Makefile.in279
-rw-r--r--Build/source/texk/web2c/ac/web2c.ac2
-rw-r--r--Build/source/texk/web2c/aclocal.m41
-rwxr-xr-xBuild/source/texk/web2c/configure97
-rw-r--r--Build/source/texk/web2c/configure.ac3
-rw-r--r--Build/source/texk/web2c/doc/Makefile.in6
-rw-r--r--Build/source/texk/web2c/lib/Makefile.in6
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog8
-rw-r--r--Build/source/texk/web2c/luatexdir/am/luafontforge.am4
-rw-r--r--Build/source/texk/web2c/luatexdir/am/luamisc.am6
-rw-r--r--Build/source/texk/web2c/luatexdir/am/luatex.am4
-rw-r--r--Build/source/texk/web2c/man/Makefile.in6
-rw-r--r--Build/source/texk/web2c/omegafonts/Makefile.in6
-rw-r--r--Build/source/texk/web2c/otps/Makefile.in6
-rw-r--r--Build/source/texk/web2c/window/Makefile.in6
-rwxr-xr-xBuild/source/texk/xdvipdfmx/configure2
41 files changed, 264 insertions, 453 deletions
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index ec1ab56bc13..ab0f4c73a89 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/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/texk/aclocal.m4 b/Build/source/texk/aclocal.m4
index da53d4c25aa..88c8fdc27e7 100644
--- a/Build/source/texk/aclocal.m4
+++ b/Build/source/texk/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/texk/bibtexu/Makefile.in b/Build/source/texk/bibtexu/Makefile.in
index 018f8572f90..d334f39f7e0 100644
--- a/Build/source/texk/bibtexu/Makefile.in
+++ b/Build/source/texk/bibtexu/Makefile.in
@@ -44,7 +44,7 @@ DIST_COMMON = README $(am__configure_deps) $(dist_btdoc_DATA) \
$(srcdir)/../../build-aux/install-sh \
$(srcdir)/../../build-aux/ltmain.sh \
$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/README $(srcdir)/config.h.in \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure ../../build-aux/config.guess \
../../build-aux/config.sub ../../build-aux/depcomp \
../../build-aux/install-sh ../../build-aux/ltmain.sh \
@@ -68,7 +68,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = CXXLD.sh
+CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(btdocdir)" \
"$(DESTDIR)$(csfdir)"
@@ -155,8 +155,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -378,8 +376,6 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
-CXXLD.sh: $(top_builddir)/config.status $(srcdir)/README
- cd $(top_builddir) && $(SHELL) ./config.status $@
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
diff --git a/Build/source/texk/bibtexu/configure b/Build/source/texk/bibtexu/configure
index 961e753468f..aa7e54d6e37 100755
--- a/Build/source/texk/bibtexu/configure
+++ b/Build/source/texk/bibtexu/configure
@@ -756,8 +756,6 @@ KPATHSEA_RULE
KPATHSEA_DEPEND
KPATHSEA_LIBS
KPATHSEA_INCLUDES
-CXX_HACK_LIBS
-CXX_HACK_DEPS
CXXLD
CXXCPP
WARNING_CXXFLAGS
@@ -4728,13 +4726,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4731: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4729: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4734: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4732: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4737: output\"" >&5)
+ (eval echo "\"\$as_me:4735: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5940,7 +5938,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5943 "configure"' > conftest.$ac_ext
+ echo '#line 5941 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7563,11 +7561,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7566: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7564: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7570: \$? = $ac_status" >&5
+ echo "$as_me:7568: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7902,11 +7900,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7905: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7903: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7909: \$? = $ac_status" >&5
+ echo "$as_me:7907: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8007,11 +8005,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8010: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8008: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8014: \$? = $ac_status" >&5
+ echo "$as_me:8012: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8062,11 +8060,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8065: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8063: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8069: \$? = $ac_status" >&5
+ echo "$as_me:8067: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10429,7 +10427,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10432 "configure"
+#line 10430 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10525,7 +10523,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10528 "configure"
+#line 10526 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14313,11 +14311,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14316: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14314: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14320: \$? = $ac_status" >&5
+ echo "$as_me:14318: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14412,11 +14410,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14415: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14413: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14419: \$? = $ac_status" >&5
+ echo "$as_me:14417: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14464,11 +14462,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14467: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14465: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14471: \$? = $ac_status" >&5
+ echo "$as_me:14469: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15494,14 +15492,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
if test "x$kpse_cv_cxx_hack" = xok; then
CXXLD='$(top_builddir)/CXXLD.sh'
- CXX_HACK_DEPS=$CXXLD
- CXX_HACK_LIBS=$kpse_cv_cxx_flags
cxxld_sh="#! ${CONFIG_SHELL-/bin/sh}
# CXXLD.sh. Generated by configure.
-set -- $CXX \"\$@\" $CXX_HACK_LIBS
+set -- $CXX \"\$@\" $kpse_cv_cxx_flags
echo \"\$0:\" \"\$@\"
exec \"\$@\""
- ac_config_files="$ac_config_files CXXLD.sh:README"
+ ac_config_commands="$ac_config_commands CXXLD.sh"
else
CXXLD='$(CXX)'
@@ -15509,8 +15505,6 @@ fi
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pow" >&5
$as_echo_n "checking for library containing pow... " >&6; }
if test "${ac_cv_search_pow+set}" = set; then :
@@ -17345,7 +17339,7 @@ if test "x$with_system_icu" = xyes; then
if $ICU_CONFIG --version >/dev/null 2>&1; then
ICU_INCLUDES=`$ICU_CONFIG --cppflags`
ICU_LIBS=`$ICU_CONFIG --ldflags-searchpath --ldflags-icuio --ldflags-libsonly --ldflags-system`
-elif test "x$need_icu:$with_system_icu" = 'xyes:yes'; then
+elif test "x$need_icu:$with_system_icu" = xyes:yes; then
as_fn_error "did not find icu-config required for system icu libraries" "$LINENO" 5
fi
else
@@ -18446,7 +18440,7 @@ do
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "CXXLD.sh") CONFIG_FILES="$CONFIG_FILES CXXLD.sh:README" ;;
+ "CXXLD.sh") CONFIG_COMMANDS="$CONFIG_COMMANDS CXXLD.sh" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@@ -19929,7 +19923,7 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
_LT_EOF
;;
- "CXXLD.sh":F) echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh ;;
+ "CXXLD.sh":C) echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh ;;
esac
done # for ac_tag
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 14d0583319e..6244a87c760 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/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
@@ -1563,6 +1564,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
@@ -2597,6 +2600,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 :
@@ -3682,6 +3686,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
@@ -3703,7 +3742,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.
@@ -3858,7 +3897,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.
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index c7d87bd9176..c273462525d 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -14943,7 +14943,7 @@ if test "x$with_system_freetype2" = xyes; then
if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
FREETYPE2_LIBS=`$FT2_CONFIG --libs`
-elif test "x$need_freetype2:$with_system_freetype2" = 'xyes:yes'; then
+elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
as_fn_error "did not find freetype-config required for system freetype2 library" "$LINENO" 5
fi
else
diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in
index f948f68a51e..ee75db5e6f6 100644
--- a/Build/source/texk/dvisvgm/Makefile.in
+++ b/Build/source/texk/dvisvgm/Makefile.in
@@ -47,7 +47,7 @@ DIST_COMMON = README $(am__configure_deps) \
$(srcdir)/../../build-aux/install-sh \
$(srcdir)/../../build-aux/ltmain.sh \
$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/README $(srcdir)/config.h.in \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure ../../build-aux/config.guess \
../../build-aux/config.sub ../../build-aux/depcomp \
../../build-aux/install-sh ../../build-aux/ltmain.sh \
@@ -72,7 +72,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = CXXLD.sh
+CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru
@@ -193,8 +193,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -447,8 +445,6 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
-CXXLD.sh: $(top_builddir)/config.status $(srcdir)/README
- cd $(top_builddir) && $(SHELL) ./config.status $@
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 71147569d5e..ac44b2e5690 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/dvisvgm/configure
@@ -765,8 +765,6 @@ KPATHSEA_RULE
KPATHSEA_DEPEND
KPATHSEA_LIBS
KPATHSEA_INCLUDES
-CXX_HACK_LIBS
-CXX_HACK_DEPS
CXXLD
CXXCPP
WARNING_CXXFLAGS
@@ -4752,13 +4750,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4755: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4753: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4758: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4756: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4761: output\"" >&5)
+ (eval echo "\"\$as_me:4759: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5964,7 +5962,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5967 "configure"' > conftest.$ac_ext
+ echo '#line 5965 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7596,11 +7594,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7599: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7597: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7603: \$? = $ac_status" >&5
+ echo "$as_me:7601: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7935,11 +7933,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7938: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7936: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7942: \$? = $ac_status" >&5
+ echo "$as_me:7940: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8040,11 +8038,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8043: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8041: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8047: \$? = $ac_status" >&5
+ echo "$as_me:8045: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8095,11 +8093,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8098: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8096: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8102: \$? = $ac_status" >&5
+ echo "$as_me:8100: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10462,7 +10460,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10465 "configure"
+#line 10463 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10558,7 +10556,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10561 "configure"
+#line 10559 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14368,11 +14366,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14371: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14369: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14375: \$? = $ac_status" >&5
+ echo "$as_me:14373: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14467,11 +14465,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14470: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14468: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14474: \$? = $ac_status" >&5
+ echo "$as_me:14472: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14519,11 +14517,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14522: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14520: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14526: \$? = $ac_status" >&5
+ echo "$as_me:14524: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15682,14 +15680,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
if test "x$kpse_cv_cxx_hack" = xok; then
CXXLD='$(top_builddir)/CXXLD.sh'
- CXX_HACK_DEPS=$CXXLD
- CXX_HACK_LIBS=$kpse_cv_cxx_flags
cxxld_sh="#! ${CONFIG_SHELL-/bin/sh}
# CXXLD.sh. Generated by configure.
-set -- $CXX \"\$@\" $CXX_HACK_LIBS
+set -- $CXX \"\$@\" $kpse_cv_cxx_flags
echo \"\$0:\" \"\$@\"
exec \"\$@\""
- ac_config_files="$ac_config_files CXXLD.sh:README"
+ ac_config_commands="$ac_config_commands CXXLD.sh"
else
CXXLD='$(CXX)'
@@ -15698,8 +15694,6 @@ fi
-
-
cat >>confdefs.h <<_ACEOF
#define TARGET_SYSTEM "$target"
_ACEOF
@@ -17607,7 +17601,7 @@ if test "x$with_system_freetype2" = xyes; then
if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
FREETYPE2_LIBS=`$FT2_CONFIG --libs`
-elif test "x$need_freetype2:$with_system_freetype2" = 'xyes:yes'; then
+elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
as_fn_error "did not find freetype-config required for system freetype2 library" "$LINENO" 5
fi
else
@@ -18871,7 +18865,7 @@ do
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "CXXLD.sh") CONFIG_FILES="$CONFIG_FILES CXXLD.sh:README" ;;
+ "CXXLD.sh") CONFIG_COMMANDS="$CONFIG_COMMANDS CXXLD.sh" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@@ -20354,7 +20348,7 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
_LT_EOF
;;
- "CXXLD.sh":F) echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh ;;
+ "CXXLD.sh":C) echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh ;;
esac
done # for ac_tag
diff --git a/Build/source/texk/lcdf-typetools/Makefile.in b/Build/source/texk/lcdf-typetools/Makefile.in
index e97e82256db..8cc5ba87ee2 100644
--- a/Build/source/texk/lcdf-typetools/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/Makefile.in
@@ -41,7 +41,7 @@ DIST_COMMON = README $(am__configure_deps) \
$(srcdir)/../../build-aux/install-sh \
$(srcdir)/../../build-aux/ltmain.sh \
$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/README $(srcdir)/config.h.in \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure ../../build-aux/config.guess \
../../build-aux/config.sub ../../build-aux/depcomp \
../../build-aux/install-sh ../../build-aux/ltmain.sh \
@@ -65,7 +65,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = CXXLD.sh
+CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
SOURCES =
DIST_SOURCES =
@@ -160,8 +160,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -362,8 +360,6 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
-CXXLD.sh: $(top_builddir)/config.status $(srcdir)/README
- cd $(top_builddir) && $(SHELL) ./config.status $@
mostlyclean-libtool:
-rm -f *.lo
diff --git a/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in b/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in
index 18fe1c3ce76..a48246f4d74 100644
--- a/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/cfftot1/Makefile.in
@@ -127,8 +127,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/configure b/Build/source/texk/lcdf-typetools/configure
index c92f620d8e2..4c7516b9fb6 100755
--- a/Build/source/texk/lcdf-typetools/configure
+++ b/Build/source/texk/lcdf-typetools/configure
@@ -756,8 +756,6 @@ KPATHSEA_INCLUDES
texlive_build_FALSE
texlive_build_TRUE
SELECTED_SUBDIRS
-CXX_HACK_LIBS
-CXX_HACK_DEPS
CXXLD
TEMPLATE_OBJS
CXXCPP
@@ -5029,13 +5027,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5032: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5030: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5035: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5033: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5038: output\"" >&5)
+ (eval echo "\"\$as_me:5036: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6241,7 +6239,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6244 "configure"' > conftest.$ac_ext
+ echo '#line 6242 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7873,11 +7871,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7876: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7874: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7880: \$? = $ac_status" >&5
+ echo "$as_me:7878: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8212,11 +8210,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8215: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8213: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8219: \$? = $ac_status" >&5
+ echo "$as_me:8217: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8317,11 +8315,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8320: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8318: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8324: \$? = $ac_status" >&5
+ echo "$as_me:8322: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8372,11 +8370,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8375: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8373: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8379: \$? = $ac_status" >&5
+ echo "$as_me:8377: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10739,7 +10737,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10742 "configure"
+#line 10740 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10835,7 +10833,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10838 "configure"
+#line 10836 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14623,11 +14621,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14626: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14624: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14630: \$? = $ac_status" >&5
+ echo "$as_me:14628: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14722,11 +14720,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14725: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14723: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14729: \$? = $ac_status" >&5
+ echo "$as_me:14727: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14774,11 +14772,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14777: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14775: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14781: \$? = $ac_status" >&5
+ echo "$as_me:14779: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16011,14 +16009,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
if test "x$kpse_cv_cxx_hack" = xok; then
CXXLD='$(top_builddir)/CXXLD.sh'
- CXX_HACK_DEPS=$CXXLD
- CXX_HACK_LIBS=$kpse_cv_cxx_flags
cxxld_sh="#! ${CONFIG_SHELL-/bin/sh}
# CXXLD.sh. Generated by configure.
-set -- $CXX \"\$@\" $CXX_HACK_LIBS
+set -- $CXX \"\$@\" $kpse_cv_cxx_flags
echo \"\$0:\" \"\$@\"
exec \"\$@\""
- ac_config_files="$ac_config_files CXXLD.sh:README"
+ ac_config_commands="$ac_config_commands CXXLD.sh"
else
CXXLD='$(CXX)'
@@ -16028,8 +16024,6 @@ fi
-
-
ac_header_dirent=no
for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -19891,7 +19885,7 @@ do
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "CXXLD.sh") CONFIG_FILES="$CONFIG_FILES CXXLD.sh:README" ;;
+ "CXXLD.sh") CONFIG_COMMANDS="$CONFIG_COMMANDS CXXLD.sh" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"liblcdf/Makefile") CONFIG_FILES="$CONFIG_FILES liblcdf/Makefile" ;;
"libefont/Makefile") CONFIG_FILES="$CONFIG_FILES libefont/Makefile" ;;
@@ -21387,7 +21381,7 @@ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
_LT_EOF
;;
- "CXXLD.sh":F) echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh ;;
+ "CXXLD.sh":C) echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh ;;
esac
done # for ac_tag
diff --git a/Build/source/texk/lcdf-typetools/libefont/Makefile.in b/Build/source/texk/lcdf-typetools/libefont/Makefile.in
index 81c3b72933b..7e543dde07d 100644
--- a/Build/source/texk/lcdf-typetools/libefont/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/libefont/Makefile.in
@@ -104,8 +104,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/liblcdf/Makefile.in b/Build/source/texk/lcdf-typetools/liblcdf/Makefile.in
index 31bf61d1309..e5fceb9353a 100644
--- a/Build/source/texk/lcdf-typetools/liblcdf/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/liblcdf/Makefile.in
@@ -108,8 +108,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/mmafm/Makefile.in b/Build/source/texk/lcdf-typetools/mmafm/Makefile.in
index 8f7d6e495cc..b07b7a2857a 100644
--- a/Build/source/texk/lcdf-typetools/mmafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/mmafm/Makefile.in
@@ -118,8 +118,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in b/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in
index e34fad11c94..f4c40fcf9b6 100644
--- a/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/mmpfb/Makefile.in
@@ -128,8 +128,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in b/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in
index 1a257cdb3a4..4e385855b14 100644
--- a/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/otfinfo/Makefile.in
@@ -117,8 +117,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in b/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in
index 07501c2af2a..934edfef17a 100644
--- a/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/otftotfm/Makefile.in
@@ -141,8 +141,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in b/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in
index dbcee68e343..6830ee4e038 100644
--- a/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1dotlessj/Makefile.in
@@ -118,8 +118,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/t1lint/Makefile.in b/Build/source/texk/lcdf-typetools/t1lint/Makefile.in
index d8f25f3b0b0..27e2891b7d1 100644
--- a/Build/source/texk/lcdf-typetools/t1lint/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1lint/Makefile.in
@@ -127,8 +127,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/t1rawafm/Makefile.in b/Build/source/texk/lcdf-typetools/t1rawafm/Makefile.in
index 3a2575fcb1b..4b4845eb173 100644
--- a/Build/source/texk/lcdf-typetools/t1rawafm/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1rawafm/Makefile.in
@@ -118,8 +118,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in b/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
index 5f0779fda12..5676e457516 100644
--- a/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1reencode/Makefile.in
@@ -128,8 +128,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in b/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in
index 484d7c3a7e9..65e93511895 100644
--- a/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/t1testpage/Makefile.in
@@ -118,8 +118,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in b/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in
index 3d80c068967..3a2754a00c8 100644
--- a/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in
+++ b/Build/source/texk/lcdf-typetools/ttftotype42/Makefile.in
@@ -118,8 +118,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index aa07d56040c..a4e14d8ab21 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-31 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Moved luatexdir/zziplib/ to ../../libs/zziplib.
+ * configure.ac: Add KPSE_ZZIPLIB_FLAGS.
+ * Makefile.am: Add ZZIPLIB_RULE, remove luatexdir/am/libzzip.am.
+
2010-01-24 Peter Breitenlohner <peb@mppmu.mpg.de>
* texmfmp.h (mk_shellcmdlist): Declare string param as const.
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index ec501107382..503d530848f 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -1,6 +1,6 @@
## Makefile.am for the TeX Live subdirectory texk/web2c/
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4 -I m4
@@ -88,6 +88,8 @@ $(proglib): ${srcdir}/lib/*.c
@XPDF_RULE@
## Rebuild libopenbsd-compat
@OBSDCOMPAT_RULE@
+## Rebuild libzzip
+@ZZIPLIB_RULE@
## Rebuild libgraphite
@GRAPHITE_RULE@
## Rebuild libfreetype
@@ -160,7 +162,6 @@ include $(srcdir)/pdftexdir/am/pdftosrc.am
include $(srcdir)/luatexdir/am/luatex.am
include $(srcdir)/luatexdir/am/luatangle.am
include $(srcdir)/luatexdir/am/liblua51.am
-include $(srcdir)/luatexdir/am/libzzip.am
include $(srcdir)/luatexdir/am/luasocket.am
include $(srcdir)/luatexdir/am/luamisc.am
include $(srcdir)/luatexdir/am/luafontforge.am
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index ec335cb2739..b1c1f671ce9 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -60,14 +60,12 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
$(srcdir)/../../build-aux/install-sh \
$(srcdir)/../../build-aux/ltmain.sh \
$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/README \
- $(srcdir)/alephdir/am/aleph.am $(srcdir)/am/bootstrap.am \
- $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/am/web.am \
- $(srcdir)/c-auto.in $(srcdir)/ctangleboot-sh.in \
- $(srcdir)/etexdir/am/etex.am $(srcdir)/libmd5/am/md5.am \
- $(srcdir)/luatexdir/am/liblua51.am \
+ $(srcdir)/Makefile.in $(srcdir)/alephdir/am/aleph.am \
+ $(srcdir)/am/bootstrap.am $(srcdir)/am/cweb.am \
+ $(srcdir)/am/texmf.am $(srcdir)/am/web.am $(srcdir)/c-auto.in \
+ $(srcdir)/ctangleboot-sh.in $(srcdir)/etexdir/am/etex.am \
+ $(srcdir)/libmd5/am/md5.am $(srcdir)/luatexdir/am/liblua51.am \
$(srcdir)/luatexdir/am/libluatex.am \
- $(srcdir)/luatexdir/am/libzzip.am \
$(srcdir)/luatexdir/am/luafontforge.am \
$(srcdir)/luatexdir/am/luamisc.am \
$(srcdir)/luatexdir/am/luasocket.am \
@@ -202,6 +200,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \
$(top_srcdir)/../../m4/libtool.m4 \
$(top_srcdir)/../../m4/ltoptions.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
@@ -214,7 +213,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = c-auto.h ff-config.h
-CONFIG_CLEAN_FILES = CXXLD.sh web2c-sh tangle-sh ctangleboot-sh
+CONFIG_CLEAN_FILES = web2c-sh tangle-sh ctangleboot-sh
CONFIG_CLEAN_VPATH_FILES =
ARFLAGS = cru
libff_a_AR = $(AR) $(ARFLAGS)
@@ -439,15 +438,6 @@ libxetexmm_a_AR = $(AR) $(ARFLAGS)
libxetexmm_a_LIBADD =
am_libxetexmm_a_OBJECTS = libxetexmm_a-XeTeXFontMgr_Mac.$(OBJEXT)
libxetexmm_a_OBJECTS = $(am_libxetexmm_a_OBJECTS)
-libzzip_a_AR = $(AR) $(ARFLAGS)
-libzzip_a_LIBADD =
-am_libzzip_a_OBJECTS = libzzip_a-dir.$(OBJEXT) libzzip_a-err.$(OBJEXT) \
- libzzip_a-fetch.$(OBJEXT) libzzip_a-file.$(OBJEXT) \
- libzzip_a-info.$(OBJEXT) libzzip_a-memdisk.$(OBJEXT) \
- libzzip_a-mmapped.$(OBJEXT) libzzip_a-plugin.$(OBJEXT) \
- libzzip_a-stat.$(OBJEXT) libzzip_a-write.$(OBJEXT) \
- libzzip_a-zip.$(OBJEXT)
-libzzip_a_OBJECTS = $(am_libzzip_a_OBJECTS)
am__EXEEXT_1 = bibtex$(EXEEXT) dvicopy$(EXEEXT) dvitype$(EXEEXT) \
gftodvi$(EXEEXT) gftopk$(EXEEXT) gftype$(EXEEXT) mft$(EXEEXT) \
patgen$(EXEEXT) pktogf$(EXEEXT) pktype$(EXEEXT) \
@@ -563,8 +553,8 @@ am__objects_14 = luatex-luatexini.$(OBJEXT) luatex-luatex0.$(OBJEXT)
nodist_luatex_OBJECTS = $(am__objects_14) luatex-luatex-pool.$(OBJEXT) \
luatex-luatexextra.$(OBJEXT)
luatex_OBJECTS = $(nodist_luatex_OBJECTS)
-am__DEPENDENCIES_4 = libluatex.a libff.a libluamisc.a libzzip.a \
- libluasocket.a liblua51.a $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_4 = libluatex.a libff.a libluamisc.a libluasocket.a \
+ liblua51.a $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) libmd5.a libmplib.a
luatex_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -775,7 +765,7 @@ SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \
$(nodist_libmf_a_SOURCES) $(libmplib_a_SOURCES) \
$(nodist_libmplib_a_SOURCES) $(libpdftex_a_SOURCES) \
$(EXTRA_libpdftex_a_SOURCES) $(libxetex_a_SOURCES) \
- $(libxetexmm_a_SOURCES) $(libzzip_a_SOURCES) $(aleph_SOURCES) \
+ $(libxetexmm_a_SOURCES) $(aleph_SOURCES) \
$(nodist_aleph_SOURCES) $(nodist_bibtex_SOURCES) \
$(nodist_ctangle_SOURCES) $(nodist_ctangleboot_SOURCES) \
$(nodist_ctie_SOURCES) $(nodist_cweave_SOURCES) \
@@ -809,7 +799,7 @@ DIST_SOURCES = $(libff_a_SOURCES) $(liblua51_a_SOURCES) \
$(EXTRA_libluatex_a_SOURCES) $(libmd5_a_SOURCES) \
$(libmplib_a_SOURCES) $(am__libpdftex_a_SOURCES_DIST) \
$(EXTRA_libpdftex_a_SOURCES) $(am__libxetex_a_SOURCES_DIST) \
- $(libxetexmm_a_SOURCES) $(libzzip_a_SOURCES) $(aleph_SOURCES) \
+ $(libxetexmm_a_SOURCES) $(aleph_SOURCES) \
$(am__dist_etex_SOURCES_DIST) $(gftodvi_SOURCES) \
$(md5main_SOURCES) $(am__dist_pdftex_SOURCES_DIST) \
$(pdftosrc_SOURCES) $(synctex_SOURCES) \
@@ -918,8 +908,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -1022,6 +1010,9 @@ YFLAGS = @YFLAGS@
ZLIB_DEPEND = @ZLIB_DEPEND@
ZLIB_INCLUDES = @ZLIB_INCLUDES@
ZLIB_LIBS = @ZLIB_LIBS@
+ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@
+ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@
+ZZIPLIB_LIBS = @ZZIPLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -1096,7 +1087,7 @@ SUBDIRS = doc lib man web2c . window omegafonts otps
proglib = lib/lib.a
dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
nodist_man_MANS = ctiedir/ctie.1 tiedir/tie.1
-EXTRA_LIBRARIES = libmf.a libmplib.a libpdftex.a liblua51.a libzzip.a \
+EXTRA_LIBRARIES = libmf.a libmplib.a libpdftex.a liblua51.a \
libluasocket.a libluamisc.a libff.a libluatex.a libxetex.a \
libxetexmm.a libmd5.a
EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \
@@ -1164,26 +1155,6 @@ EXTRA_DIST = PROJECTS cftests config.h cpascal.h help.h tangle.web \
luatexdir/luatangle.test luatexdir/lua51/Makefile \
luatexdir/lua51/liolib.c luatexdir/lua51/lua.c \
luatexdir/lua51/luac.c luatexdir/lua51/print.c \
- luatexdir/zziplib/COPYING.LIB luatexdir/zziplib/ChangeLog \
- luatexdir/zziplib/README luatexdir/zziplib/TODO \
- luatexdir/zziplib/zziplib.spec luatexdir/zziplib/Makefile.am \
- luatexdir/zziplib/Makefile.in luatexdir/zziplib/Makefile.mk \
- luatexdir/zziplib/SDL luatexdir/zziplib/aclocal.m4 \
- luatexdir/zziplib/bins luatexdir/zziplib/config.h.in \
- luatexdir/zziplib/configure luatexdir/zziplib/configure.ac \
- luatexdir/zziplib/docs luatexdir/zziplib/m4 \
- luatexdir/zziplib/msvc6 luatexdir/zziplib/msvc7 \
- luatexdir/zziplib/msvc8 luatexdir/zziplib/test \
- luatexdir/zziplib/zzip/Makefile \
- luatexdir/zziplib/zzip/Makefile.am \
- luatexdir/zziplib/zzip/Makefile.in \
- luatexdir/zziplib/zzip/_msvc.h \
- luatexdir/zziplib/zzip/_msvc.sed \
- luatexdir/zziplib/zzip/autoconf.h \
- luatexdir/zziplib/zzip/fseeko.c \
- luatexdir/zziplib/zzip/fseeko.h \
- luatexdir/zziplib/zzip/zziplib.wpj \
- luatexdir/zziplib/zzipback.sed luatexdir/zziplib/zzipwrap \
luatexdir/luasocket/src/socket_lua.c \
luatexdir/luasocket/src/ftp_lua.c \
luatexdir/luasocket/src/http_lua.c \
@@ -1623,8 +1594,8 @@ luatex_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES) \
-I$(srcdir)/mplibdir -Dextra_version_info=`date +-%Y%m%d%H`
luatex_CFLAGS = $(WARNING_CFLAGS)
luatex_CXXFLAGS = $(WARNING_CXXFLAGS)
-luatex_ldadd = libluatex.a libff.a libluamisc.a libzzip.a \
- libluasocket.a liblua51.a $(LIBPNG_LIBS) $(ZLIB_LIBS) \
+luatex_ldadd = libluatex.a libff.a libluamisc.a libluasocket.a \
+ liblua51.a $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) \
$(XPDF_LIBS) $(OBSDCOMPAT_LIBS) libmd5.a libmplib.a
luatex_LDADD = $(luatex_ldadd) $(LDADD) $(lua_socketlibs)
luatex_DEPENDENCIES = $(proglib) $(KPATHSEA_DEPEND) libluatex.a \
@@ -1692,42 +1663,6 @@ liblua51_a_SOURCES = \
luatexdir/lua51/lzio.c \
luatexdir/lua51/lzio.h
-libzzip_a_CPPFLAGS = \
- $(ZLIB_INCLUDES) \
- -I$(top_srcdir)/luatexdir/zziplib
-
-libzzip_a_CFLAGS = $(WARNING_CFLAGS)
-libzzip_a_SOURCES = \
- luatexdir/zziplib/zzip/__debug.h \
- luatexdir/zziplib/zzip/__dirent.h \
- luatexdir/zziplib/zzip/__fnmatch.h \
- luatexdir/zziplib/zzip/__hints.h \
- luatexdir/zziplib/zzip/__mmap.h \
- luatexdir/zziplib/zzip/_config.h \
- luatexdir/zziplib/zzip/conf.h \
- luatexdir/zziplib/zzip/dir.c \
- luatexdir/zziplib/zzip/err.c \
- luatexdir/zziplib/zzip/fetch.c \
- luatexdir/zziplib/zzip/fetch.h \
- luatexdir/zziplib/zzip/file.c \
- luatexdir/zziplib/zzip/file.h \
- luatexdir/zziplib/zzip/format.h \
- luatexdir/zziplib/zzip/info.c \
- luatexdir/zziplib/zzip/info.h \
- luatexdir/zziplib/zzip/lib.h \
- luatexdir/zziplib/zzip/memdisk.c \
- luatexdir/zziplib/zzip/memdisk.h \
- luatexdir/zziplib/zzip/mmapped.c \
- luatexdir/zziplib/zzip/mmapped.h \
- luatexdir/zziplib/zzip/plugin.c \
- luatexdir/zziplib/zzip/plugin.h \
- luatexdir/zziplib/zzip/stdint.h \
- luatexdir/zziplib/zzip/stat.c \
- luatexdir/zziplib/zzip/types.h \
- luatexdir/zziplib/zzip/write.c \
- luatexdir/zziplib/zzip/zip.c \
- luatexdir/zziplib/zzip/zzip.h
-
libluasocket_a_DEPENDENCIES = $(ZLIB_DEPEND) liblua51.a
libluasocket_a_CPPFLAGS = \
-DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket -I$(srcdir)/luatexdir/lua51
@@ -1763,7 +1698,7 @@ libluasocket_a_SOURCES = \
luatexdir/luasocket/src/udp.h \
luatexdir/luasocket/src/usocket.h
-libluamisc_a_DEPENDENCIES = libzzip.a libluasocket.a
+libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a
libluamisc_a_CPPFLAGS = \
$(ZLIB_INCLUDES) \
-I$(top_srcdir)/luatexdir/lua51 \
@@ -2198,7 +2133,7 @@ all: c-auto.h ff-config.h
.SUFFIXES: .c .cc .cpp .cxx .lo .o .obj
am--refresh:
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luatangle.am $(srcdir)/luatexdir/am/liblua51.am $(srcdir)/luatexdir/am/libzzip.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luatangle.am $(srcdir)/luatexdir/am/liblua51.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -2256,8 +2191,6 @@ stamp-h2: $(top_srcdir)/luatexdir/luafontloader/ff-config.in $(top_builddir)/con
distclean-hdr:
-rm -f c-auto.h stamp-h1 ff-config.h stamp-h2
-CXXLD.sh: $(top_builddir)/config.status $(srcdir)/README
- cd $(top_builddir) && $(SHELL) ./config.status $@
web2c-sh: $(top_builddir)/config.status $(srcdir)/web2c-sh.in
cd $(top_builddir) && $(SHELL) ./config.status $@
tangle-sh: $(top_builddir)/config.status $(srcdir)/tangle-sh.in
@@ -2308,10 +2241,6 @@ libxetexmm.a: $(libxetexmm_a_OBJECTS) $(libxetexmm_a_DEPENDENCIES)
-rm -f libxetexmm.a
$(libxetexmm_a_AR) libxetexmm.a $(libxetexmm_a_OBJECTS) $(libxetexmm_a_LIBADD)
$(RANLIB) libxetexmm.a
-libzzip.a: $(libzzip_a_OBJECTS) $(libzzip_a_DEPENDENCIES)
- -rm -f libzzip.a
- $(libzzip_a_AR) libzzip.a $(libzzip_a_OBJECTS) $(libzzip_a_LIBADD)
- $(RANLIB) libzzip.a
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@@ -2781,17 +2710,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-pngimage.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetex_a-trans.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libxetexmm_a-XeTeXFontMgr_Mac.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzzip_a-dir.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzzip_a-err.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzzip_a-fetch.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzzip_a-file.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzzip_a-info.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzzip_a-memdisk.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzzip_a-mmapped.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzzip_a-plugin.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzzip_a-stat.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzzip_a-write.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libzzip_a-zip.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luatangle.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luatex-dummy.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/luatex-luatex-pool.Po@am__quote@
@@ -6089,160 +6007,6 @@ libxetex_a-pngimage.obj: xetexdir/pngimage.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libxetex_a_CPPFLAGS) $(CPPFLAGS) $(libxetex_a_CFLAGS) $(CFLAGS) -c -o libxetex_a-pngimage.obj `if test -f 'xetexdir/pngimage.c'; then $(CYGPATH_W) 'xetexdir/pngimage.c'; else $(CYGPATH_W) '$(srcdir)/xetexdir/pngimage.c'; fi`
-libzzip_a-dir.o: luatexdir/zziplib/zzip/dir.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-dir.o -MD -MP -MF $(DEPDIR)/libzzip_a-dir.Tpo -c -o libzzip_a-dir.o `test -f 'luatexdir/zziplib/zzip/dir.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/dir.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-dir.Tpo $(DEPDIR)/libzzip_a-dir.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/dir.c' object='libzzip_a-dir.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-dir.o `test -f 'luatexdir/zziplib/zzip/dir.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/dir.c
-
-libzzip_a-dir.obj: luatexdir/zziplib/zzip/dir.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-dir.obj -MD -MP -MF $(DEPDIR)/libzzip_a-dir.Tpo -c -o libzzip_a-dir.obj `if test -f 'luatexdir/zziplib/zzip/dir.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/dir.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/dir.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-dir.Tpo $(DEPDIR)/libzzip_a-dir.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/dir.c' object='libzzip_a-dir.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-dir.obj `if test -f 'luatexdir/zziplib/zzip/dir.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/dir.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/dir.c'; fi`
-
-libzzip_a-err.o: luatexdir/zziplib/zzip/err.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-err.o -MD -MP -MF $(DEPDIR)/libzzip_a-err.Tpo -c -o libzzip_a-err.o `test -f 'luatexdir/zziplib/zzip/err.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/err.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-err.Tpo $(DEPDIR)/libzzip_a-err.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/err.c' object='libzzip_a-err.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-err.o `test -f 'luatexdir/zziplib/zzip/err.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/err.c
-
-libzzip_a-err.obj: luatexdir/zziplib/zzip/err.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-err.obj -MD -MP -MF $(DEPDIR)/libzzip_a-err.Tpo -c -o libzzip_a-err.obj `if test -f 'luatexdir/zziplib/zzip/err.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/err.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/err.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-err.Tpo $(DEPDIR)/libzzip_a-err.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/err.c' object='libzzip_a-err.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-err.obj `if test -f 'luatexdir/zziplib/zzip/err.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/err.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/err.c'; fi`
-
-libzzip_a-fetch.o: luatexdir/zziplib/zzip/fetch.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-fetch.o -MD -MP -MF $(DEPDIR)/libzzip_a-fetch.Tpo -c -o libzzip_a-fetch.o `test -f 'luatexdir/zziplib/zzip/fetch.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/fetch.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-fetch.Tpo $(DEPDIR)/libzzip_a-fetch.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/fetch.c' object='libzzip_a-fetch.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-fetch.o `test -f 'luatexdir/zziplib/zzip/fetch.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/fetch.c
-
-libzzip_a-fetch.obj: luatexdir/zziplib/zzip/fetch.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-fetch.obj -MD -MP -MF $(DEPDIR)/libzzip_a-fetch.Tpo -c -o libzzip_a-fetch.obj `if test -f 'luatexdir/zziplib/zzip/fetch.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/fetch.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/fetch.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-fetch.Tpo $(DEPDIR)/libzzip_a-fetch.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/fetch.c' object='libzzip_a-fetch.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-fetch.obj `if test -f 'luatexdir/zziplib/zzip/fetch.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/fetch.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/fetch.c'; fi`
-
-libzzip_a-file.o: luatexdir/zziplib/zzip/file.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-file.o -MD -MP -MF $(DEPDIR)/libzzip_a-file.Tpo -c -o libzzip_a-file.o `test -f 'luatexdir/zziplib/zzip/file.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/file.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-file.Tpo $(DEPDIR)/libzzip_a-file.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/file.c' object='libzzip_a-file.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-file.o `test -f 'luatexdir/zziplib/zzip/file.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/file.c
-
-libzzip_a-file.obj: luatexdir/zziplib/zzip/file.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-file.obj -MD -MP -MF $(DEPDIR)/libzzip_a-file.Tpo -c -o libzzip_a-file.obj `if test -f 'luatexdir/zziplib/zzip/file.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/file.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/file.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-file.Tpo $(DEPDIR)/libzzip_a-file.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/file.c' object='libzzip_a-file.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-file.obj `if test -f 'luatexdir/zziplib/zzip/file.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/file.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/file.c'; fi`
-
-libzzip_a-info.o: luatexdir/zziplib/zzip/info.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-info.o -MD -MP -MF $(DEPDIR)/libzzip_a-info.Tpo -c -o libzzip_a-info.o `test -f 'luatexdir/zziplib/zzip/info.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/info.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-info.Tpo $(DEPDIR)/libzzip_a-info.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/info.c' object='libzzip_a-info.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-info.o `test -f 'luatexdir/zziplib/zzip/info.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/info.c
-
-libzzip_a-info.obj: luatexdir/zziplib/zzip/info.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-info.obj -MD -MP -MF $(DEPDIR)/libzzip_a-info.Tpo -c -o libzzip_a-info.obj `if test -f 'luatexdir/zziplib/zzip/info.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/info.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/info.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-info.Tpo $(DEPDIR)/libzzip_a-info.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/info.c' object='libzzip_a-info.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-info.obj `if test -f 'luatexdir/zziplib/zzip/info.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/info.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/info.c'; fi`
-
-libzzip_a-memdisk.o: luatexdir/zziplib/zzip/memdisk.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-memdisk.o -MD -MP -MF $(DEPDIR)/libzzip_a-memdisk.Tpo -c -o libzzip_a-memdisk.o `test -f 'luatexdir/zziplib/zzip/memdisk.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/memdisk.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-memdisk.Tpo $(DEPDIR)/libzzip_a-memdisk.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/memdisk.c' object='libzzip_a-memdisk.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-memdisk.o `test -f 'luatexdir/zziplib/zzip/memdisk.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/memdisk.c
-
-libzzip_a-memdisk.obj: luatexdir/zziplib/zzip/memdisk.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-memdisk.obj -MD -MP -MF $(DEPDIR)/libzzip_a-memdisk.Tpo -c -o libzzip_a-memdisk.obj `if test -f 'luatexdir/zziplib/zzip/memdisk.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/memdisk.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/memdisk.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-memdisk.Tpo $(DEPDIR)/libzzip_a-memdisk.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/memdisk.c' object='libzzip_a-memdisk.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-memdisk.obj `if test -f 'luatexdir/zziplib/zzip/memdisk.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/memdisk.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/memdisk.c'; fi`
-
-libzzip_a-mmapped.o: luatexdir/zziplib/zzip/mmapped.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-mmapped.o -MD -MP -MF $(DEPDIR)/libzzip_a-mmapped.Tpo -c -o libzzip_a-mmapped.o `test -f 'luatexdir/zziplib/zzip/mmapped.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/mmapped.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-mmapped.Tpo $(DEPDIR)/libzzip_a-mmapped.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/mmapped.c' object='libzzip_a-mmapped.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-mmapped.o `test -f 'luatexdir/zziplib/zzip/mmapped.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/mmapped.c
-
-libzzip_a-mmapped.obj: luatexdir/zziplib/zzip/mmapped.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-mmapped.obj -MD -MP -MF $(DEPDIR)/libzzip_a-mmapped.Tpo -c -o libzzip_a-mmapped.obj `if test -f 'luatexdir/zziplib/zzip/mmapped.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/mmapped.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/mmapped.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-mmapped.Tpo $(DEPDIR)/libzzip_a-mmapped.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/mmapped.c' object='libzzip_a-mmapped.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-mmapped.obj `if test -f 'luatexdir/zziplib/zzip/mmapped.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/mmapped.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/mmapped.c'; fi`
-
-libzzip_a-plugin.o: luatexdir/zziplib/zzip/plugin.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-plugin.o -MD -MP -MF $(DEPDIR)/libzzip_a-plugin.Tpo -c -o libzzip_a-plugin.o `test -f 'luatexdir/zziplib/zzip/plugin.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/plugin.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-plugin.Tpo $(DEPDIR)/libzzip_a-plugin.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/plugin.c' object='libzzip_a-plugin.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-plugin.o `test -f 'luatexdir/zziplib/zzip/plugin.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/plugin.c
-
-libzzip_a-plugin.obj: luatexdir/zziplib/zzip/plugin.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-plugin.obj -MD -MP -MF $(DEPDIR)/libzzip_a-plugin.Tpo -c -o libzzip_a-plugin.obj `if test -f 'luatexdir/zziplib/zzip/plugin.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/plugin.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/plugin.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-plugin.Tpo $(DEPDIR)/libzzip_a-plugin.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/plugin.c' object='libzzip_a-plugin.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-plugin.obj `if test -f 'luatexdir/zziplib/zzip/plugin.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/plugin.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/plugin.c'; fi`
-
-libzzip_a-stat.o: luatexdir/zziplib/zzip/stat.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-stat.o -MD -MP -MF $(DEPDIR)/libzzip_a-stat.Tpo -c -o libzzip_a-stat.o `test -f 'luatexdir/zziplib/zzip/stat.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/stat.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-stat.Tpo $(DEPDIR)/libzzip_a-stat.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/stat.c' object='libzzip_a-stat.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-stat.o `test -f 'luatexdir/zziplib/zzip/stat.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/stat.c
-
-libzzip_a-stat.obj: luatexdir/zziplib/zzip/stat.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-stat.obj -MD -MP -MF $(DEPDIR)/libzzip_a-stat.Tpo -c -o libzzip_a-stat.obj `if test -f 'luatexdir/zziplib/zzip/stat.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/stat.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/stat.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-stat.Tpo $(DEPDIR)/libzzip_a-stat.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/stat.c' object='libzzip_a-stat.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-stat.obj `if test -f 'luatexdir/zziplib/zzip/stat.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/stat.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/stat.c'; fi`
-
-libzzip_a-write.o: luatexdir/zziplib/zzip/write.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-write.o -MD -MP -MF $(DEPDIR)/libzzip_a-write.Tpo -c -o libzzip_a-write.o `test -f 'luatexdir/zziplib/zzip/write.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/write.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-write.Tpo $(DEPDIR)/libzzip_a-write.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/write.c' object='libzzip_a-write.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-write.o `test -f 'luatexdir/zziplib/zzip/write.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/write.c
-
-libzzip_a-write.obj: luatexdir/zziplib/zzip/write.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-write.obj -MD -MP -MF $(DEPDIR)/libzzip_a-write.Tpo -c -o libzzip_a-write.obj `if test -f 'luatexdir/zziplib/zzip/write.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/write.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/write.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-write.Tpo $(DEPDIR)/libzzip_a-write.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/write.c' object='libzzip_a-write.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-write.obj `if test -f 'luatexdir/zziplib/zzip/write.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/write.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/write.c'; fi`
-
-libzzip_a-zip.o: luatexdir/zziplib/zzip/zip.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-zip.o -MD -MP -MF $(DEPDIR)/libzzip_a-zip.Tpo -c -o libzzip_a-zip.o `test -f 'luatexdir/zziplib/zzip/zip.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/zip.c
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-zip.Tpo $(DEPDIR)/libzzip_a-zip.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/zip.c' object='libzzip_a-zip.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-zip.o `test -f 'luatexdir/zziplib/zzip/zip.c' || echo '$(srcdir)/'`luatexdir/zziplib/zzip/zip.c
-
-libzzip_a-zip.obj: luatexdir/zziplib/zzip/zip.c
-@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -MT libzzip_a-zip.obj -MD -MP -MF $(DEPDIR)/libzzip_a-zip.Tpo -c -o libzzip_a-zip.obj `if test -f 'luatexdir/zziplib/zzip/zip.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/zip.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/zip.c'; fi`
-@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libzzip_a-zip.Tpo $(DEPDIR)/libzzip_a-zip.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='luatexdir/zziplib/zzip/zip.c' object='libzzip_a-zip.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libzzip_a_CPPFLAGS) $(CPPFLAGS) $(libzzip_a_CFLAGS) $(CFLAGS) -c -o libzzip_a-zip.obj `if test -f 'luatexdir/zziplib/zzip/zip.c'; then $(CYGPATH_W) 'luatexdir/zziplib/zzip/zip.c'; else $(CYGPATH_W) '$(srcdir)/luatexdir/zziplib/zzip/zip.c'; fi`
-
aleph-aleph.o: alephdir/aleph.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(aleph_CPPFLAGS) $(CPPFLAGS) $(aleph_CFLAGS) $(CFLAGS) -MT aleph-aleph.o -MD -MP -MF $(DEPDIR)/aleph-aleph.Tpo -c -o aleph-aleph.o `test -f 'alephdir/aleph.c' || echo '$(srcdir)/'`alephdir/aleph.c
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/aleph-aleph.Tpo $(DEPDIR)/aleph-aleph.Po
@@ -7902,6 +7666,7 @@ $(proglib): ${srcdir}/lib/*.c
@LIBPNG_RULE@
@XPDF_RULE@
@OBSDCOMPAT_RULE@
+@ZZIPLIB_RULE@
@GRAPHITE_RULE@
@FREETYPE2_RULE@
@TECKIT_RULE@
@@ -8297,9 +8062,9 @@ luatangle.p: tangle$(EXEEXT) $(luatangle_sources)
$(libluasocket_a_OBJECTS): liblua51.a
-$(libluamisc_a_OBJECTS): libzzip.a libluasocket.a
+$(libluamisc_a_OBJECTS): $(libluamisc_a_DEPENDENCIES)
-$(libff_a_OBJECTS): libluamisc.a
+$(libff_a_OBJECTS): $(libff_a_DEPENDENCIES)
# We must create libff.a and luatexd.h before building the libluatex_a_OBJECTS
$(libluatex_a_OBJECTS): libff.a luatexd.h luatexdir/luatexextra.h
diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac
index 2de700803c1..4bcb9cefebb 100644
--- a/Build/source/texk/web2c/ac/web2c.ac
+++ b/Build/source/texk/web2c/ac/web2c.ac
@@ -33,7 +33,7 @@ m4_define([kpse_tex_progs], [dnl
[[etex], [no], [yes], [e-TeX], []],
[[aleph], [yes], [no], [Aleph], []],
[[pdftex], [yes], [yes], [pdfTeX], [xpdf libpng obsdcompat]],
-[[luatex], [yes], [no], [luaTeX], [xpdf libpng obsdcompat]],
+[[luatex], [yes], [no], [luaTeX], [xpdf libpng obsdcompat zziplib]],
[[xetex], [yes], [yes], [XeTeX], [xpdf libpng freetype2 icu-xetex teckit graphite]],
])[]dnl
m4_foreach([Kpse_Prog], [kpse_tex_progs],
diff --git a/Build/source/texk/web2c/aclocal.m4 b/Build/source/texk/web2c/aclocal.m4
index af019bf2d34..7fe1e663592 100644
--- a/Build/source/texk/web2c/aclocal.m4
+++ b/Build/source/texk/web2c/aclocal.m4
@@ -1121,6 +1121,7 @@ m4_include([../../m4/kpse-web2c.m4])
m4_include([../../m4/kpse-win32.m4])
m4_include([../../m4/kpse-xpdf-flags.m4])
m4_include([../../m4/kpse-zlib-flags.m4])
+m4_include([../../m4/kpse-zziplib-flags.m4])
m4_include([../../m4/libtool.m4])
m4_include([../../m4/ltoptions.m4])
m4_include([../../m4/ltsugar.m4])
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index f89931f28f5..6c9ad7fa583 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -777,6 +777,10 @@ GRAPHITE_RULE
GRAPHITE_DEPEND
GRAPHITE_LIBS
GRAPHITE_INCLUDES
+ZZIPLIB_RULE
+ZZIPLIB_DEPEND
+ZZIPLIB_LIBS
+ZZIPLIB_INCLUDES
XPDF_RULE
XPDF_DEPEND
XPDF_LIBS
@@ -859,8 +863,6 @@ MINGW32_TRUE
WIN32_FALSE
WIN32_TRUE
KPSEWHICH
-CXX_HACK_LIBS
-CXX_HACK_DEPS
CXXLD
WARNING_OBJCXXFLAGS
ac_ct_OBJCXX
@@ -1038,6 +1040,7 @@ with_system_libpng
with_libpng_includes
with_libpng_libdir
with_system_xpdf
+with_system_zziplib
with_system_graphite
with_system_freetype2
with_system_teckit
@@ -1756,6 +1759,8 @@ Optional Packages:
libpng library installed in DIR
--with-system-xpdf use installed poppler headers and library instead of
xpdf (requires pkg-config)
+ --with-system-zziplib use installed zziplib headers and library (requires
+ pkg-config)
--with-system-graphite use installed silgraphite headers and library
(requires pkg-config)
--with-system-freetype2 use installed freetype2 headers and library
@@ -5164,13 +5169,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5167: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:5172: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5170: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:5175: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5173: output\"" >&5)
+ (eval echo "\"\$as_me:5178: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -6376,7 +6381,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6379 "configure"' > conftest.$ac_ext
+ echo '#line 6384 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8008,11 +8013,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8011: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8016: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8015: \$? = $ac_status" >&5
+ echo "$as_me:8020: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8347,11 +8352,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8350: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8355: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8354: \$? = $ac_status" >&5
+ echo "$as_me:8359: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -8452,11 +8457,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8455: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8460: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8459: \$? = $ac_status" >&5
+ echo "$as_me:8464: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8507,11 +8512,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8510: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8515: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8514: \$? = $ac_status" >&5
+ echo "$as_me:8519: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10874,7 +10879,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10877 "configure"
+#line 10882 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10970,7 +10975,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10973 "configure"
+#line 10978 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14760,11 +14765,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14763: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14768: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14767: \$? = $ac_status" >&5
+ echo "$as_me:14772: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14859,11 +14864,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14862: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14867: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14866: \$? = $ac_status" >&5
+ echo "$as_me:14871: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14911,11 +14916,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14914: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14919: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14918: \$? = $ac_status" >&5
+ echo "$as_me:14923: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16225,22 +16230,18 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
if test "x$kpse_cv_cxx_hack" = xok; then
CXXLD='$(top_builddir)/CXXLD.sh'
- CXX_HACK_DEPS=$CXXLD
- CXX_HACK_LIBS=$kpse_cv_cxx_flags
cxxld_sh="#! ${CONFIG_SHELL-/bin/sh}
# CXXLD.sh. Generated by configure.
-set -- $CXX \"\$@\" $CXX_HACK_LIBS
+set -- $CXX \"\$@\" $kpse_cv_cxx_flags
echo \"\$0:\" \"\$@\"
exec \"\$@\""
- ac_config_files="$ac_config_files CXXLD.sh:README"
+ ac_config_commands="$ac_config_commands CXXLD.sh"
else
CXXLD='$(CXX)'
fi
-
-
# Check whether --enable-libtool-hack was given.
if test "${enable_libtool_hack+set}" = set; then :
enableval=$enable_libtool_hack;
@@ -16342,6 +16343,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 :
@@ -20761,7 +20763,7 @@ if test "x$with_system_xpdf" = xyes; then
POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
XPDF_LIBS=`$PKG_CONFIG poppler --libs`
-elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then
+elif test "x$need_xpdf:$with_system_xpdf" = xyes:yes; then
as_fn_error "did not find poppler-0.10 or better" "$LINENO" 5
fi
else
@@ -20780,6 +20782,35 @@ ${top_builddir}/../../libs/xpdf/xpdf/Stream.h:
cd ${top_builddir}/../../libs/xpdf && $(MAKE) $(AM_MAKEFLAGS) rebuild'
fi
+## _KPSE_LIB_FLAGS: Setup zziplib (-lzzip) flags
+
+# 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" = xyes; then
+ if $PKG_CONFIG zziplib --atleast-version=0.12; then
+ ZZIPLIB_INCLUDES=`$PKG_CONFIG zziplib --cflags`
+ ZZIPLIB_LIBS=`$PKG_CONFIG zziplib --libs`
+elif test "x$need_zziplib:$with_system_zziplib" = xyes:yes; then
+ as_fn_error "did not find zziplib-0.12 or better" "$LINENO" 5
+fi
+else
+ ZZIPLIB_INCLUDES=`echo '-IBLD/libs/zziplib/include' | sed \
+ -e "s,SRC/,$kpse_SRC/,g" \
+ -e "s,BLD/,$kpse_BLD/,g"`
+ ZZIPLIB_LIBS=`echo 'BLD/libs/zziplib/libzzip.a' | sed \
+ -e "s,BLD/,$kpse_BLD/,g"`
+
+ ZZIPLIB_DEPEND=`echo 'BLD/libs/zziplib/libzzip.a' | sed \
+ -e 's,BLD/,${top_builddir}/../../,g'`
+ ZZIPLIB_RULE='# Rebuild libzzip
+$(ZZIPLIB_DEPEND): ${top_builddir}/../../libs/zziplib/include/zzip/zzip.h
+ cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild
+${top_builddir}/../../libs/zziplib/include/zzip/zzip.h:
+ cd ${top_builddir}/../../libs/zziplib && $(MAKE) $(AM_MAKEFLAGS) rebuild'
+fi
+
## _KPSE_LIB_FLAGS: Setup graphite (-lgraphite) flags
# Check whether --with-system-graphite was given.
@@ -20790,7 +20821,7 @@ if test "x$with_system_graphite" = xyes; then
if $PKG_CONFIG silgraphite --atleast-version=2.3; then
GRAPHITE_INCLUDES="`$PKG_CONFIG silgraphite --cflags`"
GRAPHITE_LIBS=`$PKG_CONFIG silgraphite --libs`
-elif test "x$need_graphite:$with_system_graphite" = 'xyes:yes'; then
+elif test "x$need_graphite:$with_system_graphite" = xyes:yes; then
as_fn_error "did not find silgraphite 2.3 or better" "$LINENO" 5
fi
else
@@ -20911,7 +20942,7 @@ if test "x$with_system_freetype2" = xyes; then
if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
FREETYPE2_LIBS=`$FT2_CONFIG --libs`
-elif test "x$need_freetype2:$with_system_freetype2" = 'xyes:yes'; then
+elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
as_fn_error "did not find freetype-config required for system freetype2 library" "$LINENO" 5
fi
else
@@ -22659,7 +22690,7 @@ do
case $ac_config_target in
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
- "CXXLD.sh") CONFIG_FILES="$CONFIG_FILES CXXLD.sh:README" ;;
+ "CXXLD.sh") CONFIG_COMMANDS="$CONFIG_COMMANDS CXXLD.sh" ;;
"c-auto.h") CONFIG_HEADERS="$CONFIG_HEADERS c-auto.h:c-auto.in" ;;
"ff-config.h") CONFIG_HEADERS="$CONFIG_HEADERS ff-config.h:luatexdir/luafontloader/ff-config.in" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
@@ -24160,7 +24191,7 @@ if test "x$enable_libtool_hack" = xyes; then
chmod +x "$ofile"
fi
;;
- "CXXLD.sh":F) echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh ;;
+ "CXXLD.sh":C) echo "$cxxld_sh" >CXXLD.sh; chmod +x CXXLD.sh ;;
"c-auto.h":H) sed -e 's/^#define PACKAGE/#define WEB2C_PACKAGE/' \
-e 's/^#define VERSION/#define WEB2C_VERSION/' c-auto.h >c-auto.tmp && mv -f c-auto.tmp c-auto.h ;;
"web2c-sh":F) chmod +x web2c-sh ;;
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index d83c13c693a..7c71bd78cd2 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with Autoconf to produce a configure script for Web2c.
dnl
-dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -235,6 +235,7 @@ KPSE_KPATHSEA_FLAGS
KPSE_ZLIB_FLAGS
KPSE_LIBPNG_FLAGS
KPSE_XPDF_FLAGS
+KPSE_ZZIPLIB_FLAGS
KPSE_GRAPHITE_FLAGS
KPSE_FREETYPE2_FLAGS
KPSE_TECKIT_FLAGS
diff --git a/Build/source/texk/web2c/doc/Makefile.in b/Build/source/texk/web2c/doc/Makefile.in
index 8f06ff91d05..069cea30a89 100644
--- a/Build/source/texk/web2c/doc/Makefile.in
+++ b/Build/source/texk/web2c/doc/Makefile.in
@@ -59,6 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \
$(top_srcdir)/../../m4/libtool.m4 \
$(top_srcdir)/../../m4/ltoptions.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
@@ -128,8 +129,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -232,6 +231,9 @@ YFLAGS = @YFLAGS@
ZLIB_DEPEND = @ZLIB_DEPEND@
ZLIB_INCLUDES = @ZLIB_INCLUDES@
ZLIB_LIBS = @ZLIB_LIBS@
+ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@
+ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@
+ZZIPLIB_LIBS = @ZZIPLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/texk/web2c/lib/Makefile.in b/Build/source/texk/web2c/lib/Makefile.in
index 5baf0602ed5..4f473047db6 100644
--- a/Build/source/texk/web2c/lib/Makefile.in
+++ b/Build/source/texk/web2c/lib/Makefile.in
@@ -60,6 +60,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \
$(top_srcdir)/../../m4/libtool.m4 \
$(top_srcdir)/../../m4/ltoptions.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
@@ -119,8 +120,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -223,6 +222,9 @@ YFLAGS = @YFLAGS@
ZLIB_DEPEND = @ZLIB_DEPEND@
ZLIB_INCLUDES = @ZLIB_INCLUDES@
ZLIB_LIBS = @ZLIB_LIBS@
+ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@
+ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@
+ZZIPLIB_LIBS = @ZZIPLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 3bf7e4657ec..d6e351b062c 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,7 +1,15 @@
+2010-01-31 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ Moved zziplib/ to ../../../libs/zziplib.
+ * am/luamisc.am (libluamisc_a_DEPENDENCIES): Adapt.
+ * am/luatex.am (luatex_ldadd): Adapt.
+
2010-01-29 Peter Breitenlohner <peb@mppmu.mpg.de>
Clarify dependencies between luaTeX libraries:
* am/libzzip.am: Remove dependency on liblua51.a.
+ Remove memdisk.[ch] and mmapped.[ch] from libzzip_a_SOURCES and
+ add them to EXTRA_DIST.
* am/luamisc.am: Add dependency on libzzip.a.
* am/luasocket.am: Replace dependency on libzzip.a by liblua51.a.
diff --git a/Build/source/texk/web2c/luatexdir/am/luafontforge.am b/Build/source/texk/web2c/luatexdir/am/luafontforge.am
index bfd3b8e5512..f137f43fe7f 100644
--- a/Build/source/texk/web2c/luatexdir/am/luafontforge.am
+++ b/Build/source/texk/web2c/luatexdir/am/luafontforge.am
@@ -1,6 +1,6 @@
## texk/web2c/luatexdir/am/luafontforge.am: Makefile fragment for libff.
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## luafontforge
@@ -9,7 +9,7 @@ EXTRA_LIBRARIES += libff.a
libff_a_DEPENDENCIES = libluamisc.a
-$(libff_a_OBJECTS): libluamisc.a
+$(libff_a_OBJECTS): $(libff_a_DEPENDENCIES)
libff_a_CPPFLAGS = \
-DFONTFORGE_CONFIG_NO_WINDOWING_UI=1 -DLUA_FF_LIB=1 \
diff --git a/Build/source/texk/web2c/luatexdir/am/luamisc.am b/Build/source/texk/web2c/luatexdir/am/luamisc.am
index f50e9a99cd0..7fada385fce 100644
--- a/Build/source/texk/web2c/luatexdir/am/luamisc.am
+++ b/Build/source/texk/web2c/luatexdir/am/luamisc.am
@@ -1,16 +1,16 @@
## texk/web2c/luatexdir/am/luamisc.am: Makefile fragment for libluamisc
## (luafilesystem, luamd5, luapeg, luazip, luazlib, luaprofiler, and slnunicode)
##
-## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## libluamisc (luafilesystem, luamd5, luapeg, luazip, luazlib, luaprofiler,
## and slnunicode)
EXTRA_LIBRARIES += libluamisc.a
-libluamisc_a_DEPENDENCIES = libzzip.a libluasocket.a
+libluamisc_a_DEPENDENCIES = $(ZZIPLIB_DEPEND) libluasocket.a
-$(libluamisc_a_OBJECTS): libzzip.a libluasocket.a
+$(libluamisc_a_OBJECTS): $(libluamisc_a_DEPENDENCIES)
libluamisc_a_CPPFLAGS = \
$(ZLIB_INCLUDES) \
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index 7c393936d5c..19f891fc7a6 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -22,8 +22,8 @@ luatex_CPPFLAGS += -Dextra_version_info=`date +-%Y%m%d%H`
luatex_CFLAGS = $(WARNING_CFLAGS)
luatex_CXXFLAGS = $(WARNING_CXXFLAGS)
-luatex_ldadd = libluatex.a libff.a libluamisc.a libzzip.a libluasocket.a liblua51.a
-luatex_ldadd += $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS)
+luatex_ldadd = libluatex.a libff.a libluamisc.a libluasocket.a liblua51.a
+luatex_ldadd += $(ZZIPLIB_LIBS) $(LIBPNG_LIBS) $(ZLIB_LIBS) $(XPDF_LIBS)
luatex_ldadd += $(OBSDCOMPAT_LIBS) libmd5.a libmplib.a
luatex_LDADD = $(luatex_ldadd) $(LDADD) $(lua_socketlibs)
diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in
index e1c96c5bb34..4e28c01db44 100644
--- a/Build/source/texk/web2c/man/Makefile.in
+++ b/Build/source/texk/web2c/man/Makefile.in
@@ -74,6 +74,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \
$(top_srcdir)/../../m4/libtool.m4 \
$(top_srcdir)/../../m4/ltoptions.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
@@ -133,8 +134,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -237,6 +236,9 @@ YFLAGS = @YFLAGS@
ZLIB_DEPEND = @ZLIB_DEPEND@
ZLIB_INCLUDES = @ZLIB_INCLUDES@
ZLIB_LIBS = @ZLIB_LIBS@
+ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@
+ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@
+ZZIPLIB_LIBS = @ZZIPLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/texk/web2c/omegafonts/Makefile.in b/Build/source/texk/web2c/omegafonts/Makefile.in
index bdc518ed6d9..92a51ee79cd 100644
--- a/Build/source/texk/web2c/omegafonts/Makefile.in
+++ b/Build/source/texk/web2c/omegafonts/Makefile.in
@@ -63,6 +63,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \
$(top_srcdir)/../../m4/libtool.m4 \
$(top_srcdir)/../../m4/ltoptions.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
@@ -137,8 +138,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -241,6 +240,9 @@ YFLAGS = @YFLAGS@
ZLIB_DEPEND = @ZLIB_DEPEND@
ZLIB_INCLUDES = @ZLIB_INCLUDES@
ZLIB_LIBS = @ZLIB_LIBS@
+ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@
+ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@
+ZZIPLIB_LIBS = @ZZIPLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/texk/web2c/otps/Makefile.in b/Build/source/texk/web2c/otps/Makefile.in
index 1f1bcf6f7ed..23ae68789ae 100644
--- a/Build/source/texk/web2c/otps/Makefile.in
+++ b/Build/source/texk/web2c/otps/Makefile.in
@@ -65,6 +65,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \
$(top_srcdir)/../../m4/libtool.m4 \
$(top_srcdir)/../../m4/ltoptions.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
@@ -163,8 +164,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -267,6 +266,9 @@ YFLAGS = @YFLAGS@
ZLIB_DEPEND = @ZLIB_DEPEND@
ZLIB_INCLUDES = @ZLIB_INCLUDES@
ZLIB_LIBS = @ZLIB_LIBS@
+ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@
+ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@
+ZZIPLIB_LIBS = @ZZIPLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/texk/web2c/window/Makefile.in b/Build/source/texk/web2c/window/Makefile.in
index 18e5a4349c1..7baaacba326 100644
--- a/Build/source/texk/web2c/window/Makefile.in
+++ b/Build/source/texk/web2c/window/Makefile.in
@@ -61,6 +61,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
$(top_srcdir)/../../m4/kpse-win32.m4 \
$(top_srcdir)/../../m4/kpse-xpdf-flags.m4 \
$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-zziplib-flags.m4 \
$(top_srcdir)/../../m4/libtool.m4 \
$(top_srcdir)/../../m4/ltoptions.m4 \
$(top_srcdir)/../../m4/ltsugar.m4 \
@@ -124,8 +125,6 @@ CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CXXLD = @CXXLD@
-CXX_HACK_DEPS = @CXX_HACK_DEPS@
-CXX_HACK_LIBS = @CXX_HACK_LIBS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
@@ -228,6 +227,9 @@ YFLAGS = @YFLAGS@
ZLIB_DEPEND = @ZLIB_DEPEND@
ZLIB_INCLUDES = @ZLIB_INCLUDES@
ZLIB_LIBS = @ZLIB_LIBS@
+ZZIPLIB_DEPEND = @ZZIPLIB_DEPEND@
+ZZIPLIB_INCLUDES = @ZZIPLIB_INCLUDES@
+ZZIPLIB_LIBS = @ZZIPLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/texk/xdvipdfmx/configure b/Build/source/texk/xdvipdfmx/configure
index 3a1bcd04628..4cbee2fcb77 100755
--- a/Build/source/texk/xdvipdfmx/configure
+++ b/Build/source/texk/xdvipdfmx/configure
@@ -14070,7 +14070,7 @@ if test "x$with_system_freetype2" = xyes; then
if $FT2_CONFIG --ftversion >/dev/null 2>&1; then
FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags`
FREETYPE2_LIBS=`$FT2_CONFIG --libs`
-elif test "x$need_freetype2:$with_system_freetype2" = 'xyes:yes'; then
+elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then
as_fn_error "did not find freetype-config required for system freetype2 library" "$LINENO" 5
fi
else