r768 - in branches/stable/source/src: . auxdir/auxsub build-aux doc libs libs/libpng libs/poppler libs/poppler/TLpatches libs/poppler/poppler-src libs/poppler/poppler-src/poppler libs/xpdf libs/zlib m4 texk texk/kpathsea texk/web2c texk/web2c/cwebdir texk/web2c/omegafonts texk/web2c/web2c utils
karl at freefriends.org
karl at freefriends.org
Tue Mar 7 19:21:58 CET 2017
Author: karl
Date: 2017-03-07 18:21:57 +0000 (Tue, 07 Mar 2017)
New Revision: 768
Modified:
branches/stable/source/src/Makefile.in
branches/stable/source/src/auxdir/auxsub/Makefile.in
branches/stable/source/src/build-aux/config.guess
branches/stable/source/src/configure
branches/stable/source/src/doc/Makefile.in
branches/stable/source/src/libs/Makefile.in
branches/stable/source/src/libs/README
branches/stable/source/src/libs/configure
branches/stable/source/src/libs/libpng/Makefile.in
branches/stable/source/src/libs/poppler/ChangeLog
branches/stable/source/src/libs/poppler/Makefile.in
branches/stable/source/src/libs/poppler/TLpatches/ChangeLog
branches/stable/source/src/libs/poppler/TLpatches/TL-Changes
branches/stable/source/src/libs/poppler/TLpatches/patch-02-LLONG_MAX
branches/stable/source/src/libs/poppler/TLpatches/patch-03-Object-functions
branches/stable/source/src/libs/poppler/configure
branches/stable/source/src/libs/poppler/poppler-src/CMakeLists.txt
branches/stable/source/src/libs/poppler/poppler-src/ChangeLog
branches/stable/source/src/libs/poppler/poppler-src/NEWS
branches/stable/source/src/libs/poppler/poppler-src/configure.ac
branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.cc
branches/stable/source/src/libs/poppler/poppler-src/poppler/OptionalContent.cc
branches/stable/source/src/libs/poppler/version.ac
branches/stable/source/src/libs/xpdf/Makefile.in
branches/stable/source/src/libs/zlib/Makefile.in
branches/stable/source/src/m4/ChangeLog
branches/stable/source/src/m4/README
branches/stable/source/src/m4/kpse-setup.m4
branches/stable/source/src/texk/ChangeLog
branches/stable/source/src/texk/Makefile.in
branches/stable/source/src/texk/README
branches/stable/source/src/texk/configure
branches/stable/source/src/texk/configure.ac
branches/stable/source/src/texk/kpathsea/ChangeLog
branches/stable/source/src/texk/kpathsea/Makefile.in
branches/stable/source/src/texk/kpathsea/texmf.cnf
branches/stable/source/src/texk/web2c/Makefile.in
branches/stable/source/src/texk/web2c/cwebdir/common.h
branches/stable/source/src/texk/web2c/cwebdir/ctangle.c
branches/stable/source/src/texk/web2c/cwebdir/ctangle.w
branches/stable/source/src/texk/web2c/omegafonts/Makefile.in
branches/stable/source/src/texk/web2c/web2c/Makefile.in
branches/stable/source/src/utils/Makefile.in
branches/stable/source/src/utils/README
branches/stable/source/src/utils/configure
Log:
sync with TL r43422
Modified: branches/stable/source/src/Makefile.in
===================================================================
--- branches/stable/source/src/Makefile.in 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/Makefile.in 2017-03-07 18:21:57 UTC (rev 768)
@@ -153,8 +153,6 @@
$(top_srcdir)/texk/dvipos/ac/withenable.ac \
$(top_srcdir)/texk/dvipsk/ac/withenable.ac \
$(top_srcdir)/texk/dvisvgm/ac/withenable.ac \
- $(top_srcdir)/texk/dvisvgm/ac/dvisvgm.ac \
- $(top_srcdir)/texk/dvisvgm/ac/libgs.ac \
$(top_srcdir)/texk/gregorio/ac/withenable.ac \
$(top_srcdir)/texk/gsftopk/ac/withenable.ac \
$(top_srcdir)/texk/lcdf-typetools/ac/withenable.ac \
@@ -287,9 +285,10 @@
$(top_srcdir)/build-aux/install-sh \
$(top_srcdir)/build-aux/ltmain.sh \
$(top_srcdir)/build-aux/missing ChangeLog README \
- build-aux/compile build-aux/config.guess build-aux/config.sub \
- build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \
- build-aux/missing build-aux/texinfo.tex build-aux/ylwrap
+ build-aux/ar-lib build-aux/compile build-aux/config.guess \
+ build-aux/config.sub build-aux/depcomp build-aux/install-sh \
+ build-aux/ltmain.sh build-aux/missing build-aux/texinfo.tex \
+ build-aux/ylwrap
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -494,11 +493,18 @@
recurse_this =
recurse_top =
-# We must configure all subdirs since 'make dist' needs the Makefile.
-# For those not required for the current set of configure options
+# $Id: Makefile.in 43263 2017-02-17 22:52:17Z karl $
+#
+# Requires $(recurse_this) and $(recurse_top).
+# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
+#
+# For subdirs not required for the current set of configure options
# we append '--disable-build' so they can skip tests that would
# fail because, e.g., some required libraries were not built.
+# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.)
+#
# Code inspired by automake's way to handle recursive targets.
+#
cf_silent = $(cf_silent_ at AM_V@)
cf_silent_ = $(cf_silent_ at AM_DEFAULT_V@)
cf_silent_0 = --silent
Modified: branches/stable/source/src/auxdir/auxsub/Makefile.in
===================================================================
--- branches/stable/source/src/auxdir/auxsub/Makefile.in 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/auxdir/auxsub/Makefile.in 2017-03-07 18:21:57 UTC (rev 768)
@@ -119,11 +119,12 @@
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in \
$(top_srcdir)/../../build-aux/install-sh \
- $(top_srcdir)/../../build-aux/missing ../../build-aux/compile \
- ../../build-aux/config.guess ../../build-aux/config.sub \
- ../../build-aux/depcomp ../../build-aux/install-sh \
- ../../build-aux/ltmain.sh ../../build-aux/missing \
- ../../build-aux/texinfo.tex ../../build-aux/ylwrap README
+ $(top_srcdir)/../../build-aux/missing ../../build-aux/ar-lib \
+ ../../build-aux/compile ../../build-aux/config.guess \
+ ../../build-aux/config.sub ../../build-aux/depcomp \
+ ../../build-aux/install-sh ../../build-aux/ltmain.sh \
+ ../../build-aux/missing ../../build-aux/texinfo.tex \
+ ../../build-aux/ylwrap README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
Modified: branches/stable/source/src/build-aux/config.guess
===================================================================
--- branches/stable/source/src/build-aux/config.guess 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/build-aux/config.guess 2017-03-07 18:21:57 UTC (rev 768)
@@ -2,7 +2,7 @@
# Attempt to guess a canonical system name.
# Copyright 1992-2017 Free Software Foundation, Inc.
-timestamp='2017-02-07'
+timestamp='2017-03-05'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -837,10 +837,11 @@
UNAME_PROCESSOR=`/usr/bin/uname -p`
case ${UNAME_PROCESSOR} in
amd64)
- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ UNAME_PROCESSOR=x86_64 ;;
+ i386)
+ UNAME_PROCESSOR=i586 ;;
esac
+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
Modified: branches/stable/source/src/configure
===================================================================
--- branches/stable/source/src/configure 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/configure 2017-03-07 18:21:57 UTC (rev 768)
@@ -637,14 +637,14 @@
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+subdirs
cross_FALSE
cross_TRUE
ICU_CONFIG
FT2_CONFIG
PKG_CONFIG
+MAKE_SUBDIRS
CONF_SUBDIRS
-MAKE_SUBDIRS
-subdirs
CXXCPP
WARNING_CXXFLAGS
am__fastdepCXX_FALSE
@@ -864,10 +864,6 @@
enable_dvipos
enable_dvipsk
enable_dvisvgm
-with_libgs
-with_system_libgs
-with_libgs_includes
-with_libgs_libdir
enable_gregorio
enable_gsftopk
enable_lcdf_typetools
@@ -967,9 +963,7 @@
CXXFLAGS
CCC
CXXCPP'
-ac_subdirs_all='texk/ptexenc
-texk/kpathsea
-auxdir/auxsub libs utils texk'
+ac_subdirs_all='auxdir/auxsub libs utils texk'
# Initialize some variables set by options.
ac_init_help=
@@ -1749,12 +1743,6 @@
[texworks --position=%d "%s"]
--with-mf-x-toolkit use X toolkit for METAFONT
--with-gs=/PATH/TO/gs Hard-wire the location of GhostScript
- --without-libgs build dvisvgm without PostScript support
- --with-system-libgs build dvisvgm with installed gs headers and library
- [default: no]
- --with-libgs-includes=DIR
- libgs headers installed in DIR
- --with-libgs-libdir=DIR libgs library installed in DIR
--with-xdvi-x-toolkit=KIT
Use toolkit KIT (motif/xaw/xaw3d/neXtaw) for xdvi
[default: Motif if available, else Xaw]
@@ -5221,7 +5209,7 @@
need_kpathsea=yes
}
-## texk/dvisvgm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
+# texk/dvisvgm/ac/withenable.ac: configure.ac fragment
## configure options and TL libraries required for dvisvgm
# Check whether --enable-dvisvgm was given.
if test "${enable_dvisvgm+set}" = set; then :
@@ -5246,39 +5234,6 @@
need_zlib=yes
}
-## texk/dvisvgm/ac/dvisvgm.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
-## configure options for dvisvgm
-
-# Check whether --with-libgs was given.
-if test "${with_libgs+set}" = set; then :
- withval=$with_libgs;
-fi
-
-
-# Check whether --with-system-libgs was given.
-if test "${with_system_libgs+set}" = set; then :
- withval=$with_system_libgs;
-fi
-
-
-# Check whether --with-libgs-includes was given.
-if test "${with_libgs_includes+set}" = set; then :
- withval=$with_libgs_includes;
-fi
-
-
-# Check whether --with-libgs-libdir was given.
-if test "${with_libgs_libdir+set}" = set; then :
- withval=$with_libgs_libdir;
-fi
-
-
-## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
-## configure checks for dvisvgm and libgs
-if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then
- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
-fi
-
## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/
## configure options and TL libraries required for gregorio
# Check whether --enable-gregorio was given.
@@ -21121,27 +21076,17 @@
fi
fi
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TeX specific libraries to build" >&5
$as_echo_n "checking for TeX specific libraries to build... " >&6; }
+CONF_SUBDIRS=
MAKE_SUBDIRS=
-CONF_SUBDIRS=
-if test -x $srcdir/texk/ptexenc/configure; then
- test "x$with_system_ptexenc" != xyes && test "x$need_ptexenc" = xyes && MAKE_SUBDIRS="texk/ptexenc $MAKE_SUBDIRS"
+if test -x $srcdir/texk/ptexenc/configure && test "x$with_system_ptexenc" != xyes && test "x$need_ptexenc" = xyes; then
CONF_SUBDIRS="texk/ptexenc $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs texk/ptexenc"
-
- fi
+ MAKE_SUBDIRS="texk/ptexenc $MAKE_SUBDIRS"
fi
-if test -x $srcdir/texk/kpathsea/configure; then
- test "x$with_system_kpathsea" != xyes && test "x$need_kpathsea" = xyes && MAKE_SUBDIRS="texk/kpathsea $MAKE_SUBDIRS"
+if test -x $srcdir/texk/kpathsea/configure && test "x$with_system_kpathsea" != xyes && test "x$need_kpathsea" = xyes; then
CONF_SUBDIRS="texk/kpathsea $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs texk/kpathsea"
-
- fi
+ MAKE_SUBDIRS="texk/kpathsea $MAKE_SUBDIRS"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
@@ -22197,6 +22142,8 @@
fi
+
+
subdirs="$subdirs auxdir/auxsub libs utils texk"
Modified: branches/stable/source/src/doc/Makefile.in
===================================================================
--- branches/stable/source/src/doc/Makefile.in 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/doc/Makefile.in 2017-03-07 18:21:57 UTC (rev 768)
@@ -153,8 +153,6 @@
$(top_srcdir)/texk/dvipos/ac/withenable.ac \
$(top_srcdir)/texk/dvipsk/ac/withenable.ac \
$(top_srcdir)/texk/dvisvgm/ac/withenable.ac \
- $(top_srcdir)/texk/dvisvgm/ac/dvisvgm.ac \
- $(top_srcdir)/texk/dvisvgm/ac/libgs.ac \
$(top_srcdir)/texk/gregorio/ac/withenable.ac \
$(top_srcdir)/texk/gsftopk/ac/withenable.ac \
$(top_srcdir)/texk/lcdf-typetools/ac/withenable.ac \
Modified: branches/stable/source/src/libs/Makefile.in
===================================================================
--- branches/stable/source/src/libs/Makefile.in 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/Makefile.in 2017-03-07 18:21:57 UTC (rev 768)
@@ -151,8 +151,6 @@
$(top_srcdir)/../texk/dvipos/ac/withenable.ac \
$(top_srcdir)/../texk/dvipsk/ac/withenable.ac \
$(top_srcdir)/../texk/dvisvgm/ac/withenable.ac \
- $(top_srcdir)/../texk/dvisvgm/ac/dvisvgm.ac \
- $(top_srcdir)/../texk/dvisvgm/ac/libgs.ac \
$(top_srcdir)/../texk/gregorio/ac/withenable.ac \
$(top_srcdir)/../texk/gsftopk/ac/withenable.ac \
$(top_srcdir)/../texk/lcdf-typetools/ac/withenable.ac \
@@ -265,11 +263,12 @@
$(top_srcdir)/../build-aux/config.guess \
$(top_srcdir)/../build-aux/config.sub \
$(top_srcdir)/../build-aux/install-sh \
- $(top_srcdir)/../build-aux/missing ../build-aux/compile \
- ../build-aux/config.guess ../build-aux/config.sub \
- ../build-aux/depcomp ../build-aux/install-sh \
- ../build-aux/ltmain.sh ../build-aux/missing \
- ../build-aux/texinfo.tex ../build-aux/ylwrap ChangeLog README
+ $(top_srcdir)/../build-aux/missing ../build-aux/ar-lib \
+ ../build-aux/compile ../build-aux/config.guess \
+ ../build-aux/config.sub ../build-aux/depcomp \
+ ../build-aux/install-sh ../build-aux/ltmain.sh \
+ ../build-aux/missing ../build-aux/texinfo.tex \
+ ../build-aux/ylwrap ChangeLog README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -403,7 +402,6 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
-subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
@@ -420,11 +418,18 @@
recurse_this = libs/
recurse_top = ../
-# We must configure all subdirs since 'make dist' needs the Makefile.
-# For those not required for the current set of configure options
+# $Id: recurse.am 43261 2017-02-17 22:37:44Z karl $
+#
+# Requires $(recurse_this) and $(recurse_top).
+# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
+#
+# For subdirs not required for the current set of configure options
# we append '--disable-build' so they can skip tests that would
# fail because, e.g., some required libraries were not built.
+# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.)
+#
# Code inspired by automake's way to handle recursive targets.
+#
cf_silent = $(cf_silent_ at AM_V@)
cf_silent_ = $(cf_silent_ at AM_DEFAULT_V@)
cf_silent_0 = --silent
Modified: branches/stable/source/src/libs/README
===================================================================
--- branches/stable/source/src/libs/README 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/README 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,4 +1,4 @@
-$Id: README 43048 2017-01-25 07:36:33Z kakuto $
+$Id: README 43412 2017-03-06 14:22:59Z kakuto $
Public domain. Originally created by Karl Berry, 2005.
Libraries we compile for TeX Live.
@@ -24,7 +24,7 @@
graphite2 1.3.9 - checked 13nov16
http://sourceforge.net/projects/silgraphite/files/graphite2/
-harfbuzz 1.4.2 - checked 25jan17
+harfbuzz 1.4.4 - checked 06mar17
http://www.freedesktop.org/software/harfbuzz/release/
icu 57.1 (release) - checked 27mar16
@@ -49,10 +49,10 @@
pixman 0.34.0 - checked 04feb16
http://cairographics.org/releases/
-poppler 0.51.0 - checked 15jan17
+poppler 0.52.0 - checked 17feb17
http://poppler.freedesktop.org/ - used by luatex and xetex
-potrace 1.13 - checked 28dec15
+potrace 1.14 - checked 22feb17
http://potrace.sourceforge.net
teckit 2.5.6 - checked 30dec16
Modified: branches/stable/source/src/libs/configure
===================================================================
--- branches/stable/source/src/libs/configure 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/configure 2017-03-07 18:21:57 UTC (rev 768)
@@ -585,14 +585,12 @@
PACKAGE_URL=''
ac_unique_file="../build-aux/missing"
-enable_option_checking=no
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+MAKE_SUBDIRS
CONF_SUBDIRS
-MAKE_SUBDIRS
-subdirs
WARNING_CFLAGS
MAINT
MAINTAINER_MODE_FALSE
@@ -775,10 +773,6 @@
enable_dvipos
enable_dvipsk
enable_dvisvgm
-with_libgs
-with_system_libgs
-with_libgs_includes
-with_libgs_libdir
enable_gregorio
enable_gsftopk
enable_lcdf_typetools
@@ -860,26 +854,8 @@
LDFLAGS
LIBS
CPPFLAGS'
-ac_subdirs_all='harfbuzz
-icu
-teckit
-graphite2
-zziplib
-xpdf
-poppler
-mpfr
-gmp
-cairo
-pixman
-potrace
-gd
-freetype2
-libpng
-libpaper
-luajit
-lua52
-zlib'
+
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
@@ -1648,12 +1624,6 @@
[texworks --position=%d "%s"]
--with-mf-x-toolkit use X toolkit for METAFONT
--with-gs=/PATH/TO/gs Hard-wire the location of GhostScript
- --without-libgs build dvisvgm without PostScript support
- --with-system-libgs build dvisvgm with installed gs headers and library
- [default: no]
- --with-libgs-includes=DIR
- libgs headers installed in DIR
- --with-libgs-libdir=DIR libgs library installed in DIR
--with-xdvi-x-toolkit=KIT
Use toolkit KIT (motif/xaw/xaw3d/neXtaw) for xdvi
[default: Motif if available, else Xaw]
@@ -4419,7 +4389,7 @@
need_kpathsea=yes
}
-## texk/dvisvgm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
+# texk/dvisvgm/ac/withenable.ac: configure.ac fragment
## configure options and TL libraries required for dvisvgm
# Check whether --enable-dvisvgm was given.
if test "${enable_dvisvgm+set}" = set; then :
@@ -4444,39 +4414,6 @@
need_zlib=yes
}
-## texk/dvisvgm/ac/dvisvgm.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
-## configure options for dvisvgm
-
-# Check whether --with-libgs was given.
-if test "${with_libgs+set}" = set; then :
- withval=$with_libgs;
-fi
-
-
-# Check whether --with-system-libgs was given.
-if test "${with_system_libgs+set}" = set; then :
- withval=$with_system_libgs;
-fi
-
-
-# Check whether --with-libgs-includes was given.
-if test "${with_libgs_includes+set}" = set; then :
- withval=$with_libgs_includes;
-fi
-
-
-# Check whether --with-libgs-libdir was given.
-if test "${with_libgs_libdir+set}" = set; then :
- withval=$with_libgs_libdir;
-fi
-
-
-## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
-## configure checks for dvisvgm and libgs
-if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then
- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
-fi
-
## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/
## configure options and TL libraries required for gregorio
# Check whether --enable-gregorio was given.
@@ -6457,163 +6394,85 @@
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for generic libraries to build" >&5
$as_echo_n "checking for generic libraries to build... " >&6; }
+CONF_SUBDIRS=
MAKE_SUBDIRS=
-CONF_SUBDIRS=
-if test -x $srcdir/harfbuzz/configure; then
- test "x$with_system_harfbuzz" != xyes && test "x$need_harfbuzz" = xyes && MAKE_SUBDIRS="harfbuzz $MAKE_SUBDIRS"
+if test -x $srcdir/harfbuzz/configure && test "x$with_system_harfbuzz" != xyes && test "x$need_harfbuzz" = xyes; then
CONF_SUBDIRS="harfbuzz $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs harfbuzz"
-
- fi
+ MAKE_SUBDIRS="harfbuzz $MAKE_SUBDIRS"
fi
-if test -x $srcdir/icu/configure; then
- test "x$with_system_icu" != xyes && test "x$need_icu" = xyes && MAKE_SUBDIRS="icu $MAKE_SUBDIRS"
+if test -x $srcdir/icu/configure && test "x$with_system_icu" != xyes && test "x$need_icu" = xyes; then
CONF_SUBDIRS="icu $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs icu"
-
- fi
+ MAKE_SUBDIRS="icu $MAKE_SUBDIRS"
fi
-if test -x $srcdir/teckit/configure; then
- test "x$with_system_teckit" != xyes && test "x$need_teckit" = xyes && MAKE_SUBDIRS="teckit $MAKE_SUBDIRS"
+if test -x $srcdir/teckit/configure && test "x$with_system_teckit" != xyes && test "x$need_teckit" = xyes; then
CONF_SUBDIRS="teckit $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs teckit"
-
- fi
+ MAKE_SUBDIRS="teckit $MAKE_SUBDIRS"
fi
-if test -x $srcdir/graphite2/configure; then
- test "x$with_system_graphite2" != xyes && test "x$need_graphite2" = xyes && MAKE_SUBDIRS="graphite2 $MAKE_SUBDIRS"
+if test -x $srcdir/graphite2/configure && test "x$with_system_graphite2" != xyes && test "x$need_graphite2" = xyes; then
CONF_SUBDIRS="graphite2 $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs graphite2"
-
- fi
+ MAKE_SUBDIRS="graphite2 $MAKE_SUBDIRS"
fi
-if test -x $srcdir/zziplib/configure; then
- test "x$with_system_zziplib" != xyes && test "x$need_zziplib" = xyes && MAKE_SUBDIRS="zziplib $MAKE_SUBDIRS"
+if test -x $srcdir/zziplib/configure && test "x$with_system_zziplib" != xyes && test "x$need_zziplib" = xyes; then
CONF_SUBDIRS="zziplib $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs zziplib"
-
- fi
+ MAKE_SUBDIRS="zziplib $MAKE_SUBDIRS"
fi
-if test -x $srcdir/xpdf/configure; then
- test "x$with_system_xpdf" != xyes && test "x$need_xpdf" = xyes && MAKE_SUBDIRS="xpdf $MAKE_SUBDIRS"
+if test -x $srcdir/xpdf/configure && test "x$with_system_xpdf" != xyes && test "x$need_xpdf" = xyes; then
CONF_SUBDIRS="xpdf $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs xpdf"
-
- fi
+ MAKE_SUBDIRS="xpdf $MAKE_SUBDIRS"
fi
-if test -x $srcdir/poppler/configure; then
- test "x$with_system_poppler" != xyes && test "x$need_poppler" = xyes && MAKE_SUBDIRS="poppler $MAKE_SUBDIRS"
+if test -x $srcdir/poppler/configure && test "x$with_system_poppler" != xyes && test "x$need_poppler" = xyes; then
CONF_SUBDIRS="poppler $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs poppler"
-
- fi
+ MAKE_SUBDIRS="poppler $MAKE_SUBDIRS"
fi
-if test -x $srcdir/mpfr/configure; then
- test "x$with_system_mpfr" != xyes && test "x$need_mpfr" = xyes && MAKE_SUBDIRS="mpfr $MAKE_SUBDIRS"
+if test -x $srcdir/mpfr/configure && test "x$with_system_mpfr" != xyes && test "x$need_mpfr" = xyes; then
CONF_SUBDIRS="mpfr $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs mpfr"
-
- fi
+ MAKE_SUBDIRS="mpfr $MAKE_SUBDIRS"
fi
-if test -x $srcdir/gmp/configure; then
- test "x$with_system_gmp" != xyes && test "x$need_gmp" = xyes && MAKE_SUBDIRS="gmp $MAKE_SUBDIRS"
+if test -x $srcdir/gmp/configure && test "x$with_system_gmp" != xyes && test "x$need_gmp" = xyes; then
CONF_SUBDIRS="gmp $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs gmp"
-
- fi
+ MAKE_SUBDIRS="gmp $MAKE_SUBDIRS"
fi
-if test -x $srcdir/cairo/configure; then
- test "x$with_system_cairo" != xyes && test "x$need_cairo" = xyes && MAKE_SUBDIRS="cairo $MAKE_SUBDIRS"
+if test -x $srcdir/cairo/configure && test "x$with_system_cairo" != xyes && test "x$need_cairo" = xyes; then
CONF_SUBDIRS="cairo $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs cairo"
-
- fi
+ MAKE_SUBDIRS="cairo $MAKE_SUBDIRS"
fi
-if test -x $srcdir/pixman/configure; then
- test "x$with_system_pixman" != xyes && test "x$need_pixman" = xyes && MAKE_SUBDIRS="pixman $MAKE_SUBDIRS"
+if test -x $srcdir/pixman/configure && test "x$with_system_pixman" != xyes && test "x$need_pixman" = xyes; then
CONF_SUBDIRS="pixman $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs pixman"
-
- fi
+ MAKE_SUBDIRS="pixman $MAKE_SUBDIRS"
fi
-if test -x $srcdir/potrace/configure; then
- test "x$with_system_potrace" != xyes && test "x$need_potrace" = xyes && MAKE_SUBDIRS="potrace $MAKE_SUBDIRS"
+if test -x $srcdir/potrace/configure && test "x$with_system_potrace" != xyes && test "x$need_potrace" = xyes; then
CONF_SUBDIRS="potrace $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs potrace"
-
- fi
+ MAKE_SUBDIRS="potrace $MAKE_SUBDIRS"
fi
-if test -x $srcdir/gd/configure; then
- test "x$with_system_gd" != xyes && test "x$need_gd" = xyes && MAKE_SUBDIRS="gd $MAKE_SUBDIRS"
+if test -x $srcdir/gd/configure && test "x$with_system_gd" != xyes && test "x$need_gd" = xyes; then
CONF_SUBDIRS="gd $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs gd"
-
- fi
+ MAKE_SUBDIRS="gd $MAKE_SUBDIRS"
fi
-if test -x $srcdir/freetype2/configure; then
- test "x$with_system_freetype2" != xyes && test "x$need_freetype2" = xyes && MAKE_SUBDIRS="freetype2 $MAKE_SUBDIRS"
+if test -x $srcdir/freetype2/configure && test "x$with_system_freetype2" != xyes && test "x$need_freetype2" = xyes; then
CONF_SUBDIRS="freetype2 $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs freetype2"
-
- fi
+ MAKE_SUBDIRS="freetype2 $MAKE_SUBDIRS"
fi
-if test -x $srcdir/libpng/configure; then
- test "x$with_system_libpng" != xyes && test "x$need_libpng" = xyes && MAKE_SUBDIRS="libpng $MAKE_SUBDIRS"
+if test -x $srcdir/libpng/configure && test "x$with_system_libpng" != xyes && test "x$need_libpng" = xyes; then
CONF_SUBDIRS="libpng $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs libpng"
-
- fi
+ MAKE_SUBDIRS="libpng $MAKE_SUBDIRS"
fi
-if test -x $srcdir/libpaper/configure; then
- test "x$with_system_libpaper" != xyes && test "x$need_libpaper" = xyes && MAKE_SUBDIRS="libpaper $MAKE_SUBDIRS"
+if test -x $srcdir/libpaper/configure && test "x$with_system_libpaper" != xyes && test "x$need_libpaper" = xyes; then
CONF_SUBDIRS="libpaper $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs libpaper"
-
- fi
+ MAKE_SUBDIRS="libpaper $MAKE_SUBDIRS"
fi
-if test -x $srcdir/luajit/configure; then
- test "x$with_system_luajit" != xyes && test "x$need_luajit" = xyes && MAKE_SUBDIRS="luajit $MAKE_SUBDIRS"
+if test -x $srcdir/luajit/configure && test "x$with_system_luajit" != xyes && test "x$need_luajit" = xyes; then
CONF_SUBDIRS="luajit $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs luajit"
-
- fi
+ MAKE_SUBDIRS="luajit $MAKE_SUBDIRS"
fi
-if test -x $srcdir/lua52/configure; then
- test "x$with_system_lua52" != xyes && test "x$need_lua52" = xyes && MAKE_SUBDIRS="lua52 $MAKE_SUBDIRS"
+if test -x $srcdir/lua52/configure && test "x$with_system_lua52" != xyes && test "x$need_lua52" = xyes; then
CONF_SUBDIRS="lua52 $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs lua52"
-
- fi
+ MAKE_SUBDIRS="lua52 $MAKE_SUBDIRS"
fi
-if test -x $srcdir/zlib/configure; then
- test "x$with_system_zlib" != xyes && test "x$need_zlib" = xyes && MAKE_SUBDIRS="zlib $MAKE_SUBDIRS"
+if test -x $srcdir/zlib/configure && test "x$with_system_zlib" != xyes && test "x$need_zlib" = xyes; then
CONF_SUBDIRS="zlib $CONF_SUBDIRS"
- if false; then
- subdirs="$subdirs zlib"
-
- fi
+ MAKE_SUBDIRS="zlib $MAKE_SUBDIRS"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
@@ -7924,151 +7783,6 @@
# would make configure fail if this is the last instruction.
$ac_cs_success || as_fn_exit 1
fi
-
-#
-# CONFIG_SUBDIRS section.
-#
-if test "$no_recursion" != yes; then
-
- # Remove --cache-file, --srcdir, and --disable-option-checking arguments
- # so they do not pile up.
- ac_sub_configure_args=
- ac_prev=
- eval "set x $ac_configure_args"
- shift
- for ac_arg
- do
- if test -n "$ac_prev"; then
- ac_prev=
- continue
- fi
- case $ac_arg in
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
- | --c=*)
- ;;
- --config-cache | -C)
- ;;
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- ;;
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- ;;
- --disable-option-checking)
- ;;
- *)
- case $ac_arg in
- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
- esac
- done
-
- # Always prepend --prefix to ensure using the same prefix
- # in subdir configurations.
- ac_arg="--prefix=$prefix"
- case $ac_arg in
- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
-
- # Pass --silent
- if test "$silent" = yes; then
- ac_sub_configure_args="--silent $ac_sub_configure_args"
- fi
-
- # Always prepend --disable-option-checking to silence warnings, since
- # different subdirs can have different --enable and --with options.
- ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
-
- ac_popdir=`pwd`
- for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
- # Do not complain, so a configure script can configure whichever
- # parts of a large source tree are present.
- test -d "$srcdir/$ac_dir" || continue
-
- ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
- $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
- $as_echo "$ac_msg" >&6
- as_dir="$ac_dir"; as_fn_mkdir_p
- ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
- cd "$ac_dir"
-
- # Check for guested configure; otherwise get Cygnus style configure.
- if test -f "$ac_srcdir/configure.gnu"; then
- ac_sub_configure=$ac_srcdir/configure.gnu
- elif test -f "$ac_srcdir/configure"; then
- ac_sub_configure=$ac_srcdir/configure
- elif test -f "$ac_srcdir/configure.in"; then
- # This should be Cygnus configure.
- ac_sub_configure=$ac_aux_dir/configure
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
-$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
- ac_sub_configure=
- fi
-
- # The recursion is here.
- if test -n "$ac_sub_configure"; then
- # Make the cache file name correct relative to the subdirectory.
- case $cache_file in
- [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
- *) # Relative name.
- ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
- esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
- # The eval makes quoting arguments work.
- eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
- --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
- as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
- fi
-
- cd "$ac_popdir"
- done
-fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
Modified: branches/stable/source/src/libs/libpng/Makefile.in
===================================================================
--- branches/stable/source/src/libs/libpng/Makefile.in 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/libpng/Makefile.in 2017-03-07 18:21:57 UTC (rev 768)
@@ -416,11 +416,12 @@
$(top_srcdir)/../../build-aux/install-sh \
$(top_srcdir)/../../build-aux/missing \
$(top_srcdir)/../../build-aux/test-driver \
- ../../build-aux/compile ../../build-aux/config.guess \
- ../../build-aux/config.sub ../../build-aux/depcomp \
- ../../build-aux/install-sh ../../build-aux/ltmain.sh \
- ../../build-aux/missing ../../build-aux/texinfo.tex \
- ../../build-aux/ylwrap ChangeLog README
+ ../../build-aux/ar-lib ../../build-aux/compile \
+ ../../build-aux/config.guess ../../build-aux/config.sub \
+ ../../build-aux/depcomp ../../build-aux/install-sh \
+ ../../build-aux/ltmain.sh ../../build-aux/missing \
+ ../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog \
+ README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
Modified: branches/stable/source/src/libs/poppler/ChangeLog
===================================================================
--- branches/stable/source/src/libs/poppler/ChangeLog 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/poppler/ChangeLog 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,3 +1,8 @@
+2017-02-17 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Import poppler-0.52.0.
+ * version.ac: Adjust.
+
2017-01-15 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
Import poppler-0.51.0.
Modified: branches/stable/source/src/libs/poppler/Makefile.in
===================================================================
--- branches/stable/source/src/libs/poppler/Makefile.in 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/poppler/Makefile.in 2017-03-07 18:21:57 UTC (rev 768)
@@ -279,11 +279,11 @@
$(top_srcdir)/../../build-aux/install-sh \
$(top_srcdir)/../../build-aux/missing \
$(top_srcdir)/poppler-src/poppler/poppler-config.h.in \
- ../../build-aux/compile ../../build-aux/config.guess \
- ../../build-aux/config.sub ../../build-aux/depcomp \
- ../../build-aux/install-sh ../../build-aux/ltmain.sh \
- ../../build-aux/missing ../../build-aux/texinfo.tex \
- ../../build-aux/ylwrap ChangeLog
+ ../../build-aux/ar-lib ../../build-aux/compile \
+ ../../build-aux/config.guess ../../build-aux/config.sub \
+ ../../build-aux/depcomp ../../build-aux/install-sh \
+ ../../build-aux/ltmain.sh ../../build-aux/missing \
+ ../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
Modified: branches/stable/source/src/libs/poppler/TLpatches/ChangeLog
===================================================================
--- branches/stable/source/src/libs/poppler/TLpatches/ChangeLog 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/poppler/TLpatches/ChangeLog 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,3 +1,9 @@
+2017-02-17 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
+
+ Imported poppler-0.52.0 source tree from:
+ http://poppler.freedesktop.org/
+ * patch-02-LLONG_MAX, patch-03-Object-functions: Adapted.
+
2017-01-15 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
Imported poppler-0.51.0 source tree from:
Modified: branches/stable/source/src/libs/poppler/TLpatches/TL-Changes
===================================================================
--- branches/stable/source/src/libs/poppler/TLpatches/TL-Changes 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/poppler/TLpatches/TL-Changes 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,4 +1,4 @@
-Changes applied to the poppler-0.51.0 tree as obtained from:
+Changes applied to the poppler-0.52.0 tree as obtained from:
http://poppler.freedesktop.org/
Removed:
Modified: branches/stable/source/src/libs/poppler/TLpatches/patch-02-LLONG_MAX
===================================================================
--- branches/stable/source/src/libs/poppler/TLpatches/patch-02-LLONG_MAX 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/poppler/TLpatches/patch-02-LLONG_MAX 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,6 +1,6 @@
-diff -ur poppler-0.51.0.orig/goo/GooString.h poppler-0.51.0/goo/GooString.h
---- poppler-0.51.0.orig/goo/GooString.h Fri Dec 16 04:08:06 2016
-+++ poppler-0.51.0/goo/GooString.h Mon Jan 16 08:28:38 2017
+diff -ur poppler-0.52.0.orig/goo/GooString.h poppler-0.52.0/goo/GooString.h
+--- poppler-0.52.0.orig/goo/GooString.h Tue Jan 17 06:36:57 2017
++++ poppler-0.52.0/goo/GooString.h Fri Feb 17 08:54:28 2017
@@ -36,6 +36,21 @@
#endif
Modified: branches/stable/source/src/libs/poppler/TLpatches/patch-03-Object-functions
===================================================================
--- branches/stable/source/src/libs/poppler/TLpatches/patch-03-Object-functions 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/poppler/TLpatches/patch-03-Object-functions 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,6 +1,6 @@
-diff -ur poppler-0.51.0.orig/poppler/Object.h poppler-0.51.0/poppler/Object.h
---- poppler-0.51.0.orig/poppler/Object.h Fri Dec 16 04:08:06 2016
-+++ poppler-0.51.0/poppler/Object.h Mon Jan 16 08:31:27 2017
+diff -ur poppler-0.52.0.orig/poppler/Object.h poppler-0.52.0/poppler/Object.h
+--- poppler-0.52.0.orig/poppler/Object.h Tue Jan 17 06:36:58 2017
++++ poppler-0.52.0/poppler/Object.h Fri Feb 17 08:57:36 2017
@@ -148,7 +148,7 @@
Object *initStream(Stream *streamA);
Object *initRef(int numA, int genA)
Modified: branches/stable/source/src/libs/poppler/configure
===================================================================
--- branches/stable/source/src/libs/poppler/configure 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/poppler/configure 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.51.0.
+# Generated by GNU Autoconf 2.69 for poppler (TeX Live) 0.52.0.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='poppler (TeX Live)'
PACKAGE_TARNAME='poppler--tex-live-'
-PACKAGE_VERSION='0.51.0'
-PACKAGE_STRING='poppler (TeX Live) 0.51.0'
+PACKAGE_VERSION='0.52.0'
+PACKAGE_STRING='poppler (TeX Live) 0.52.0'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -1306,7 +1306,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures poppler (TeX Live) 0.51.0 to adapt to many kinds of systems.
+\`configure' configures poppler (TeX Live) 0.52.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1373,7 +1373,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of poppler (TeX Live) 0.51.0:";;
+ short | recursive ) echo "Configuration of poppler (TeX Live) 0.52.0:";;
esac
cat <<\_ACEOF
@@ -1486,7 +1486,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-poppler (TeX Live) configure 0.51.0
+poppler (TeX Live) configure 0.52.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2076,7 +2076,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by poppler (TeX Live) $as_me 0.51.0, which was
+It was created by poppler (TeX Live) $as_me 0.52.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3999,7 +3999,7 @@
# Define the identity of the package.
PACKAGE='poppler--tex-live-'
- VERSION='0.51.0'
+ VERSION='0.52.0'
# Some tools Automake needs.
@@ -6578,7 +6578,7 @@
cat >>confdefs.h <<_ACEOF
-#define POPPLER_VERSION "0.51.0"
+#define POPPLER_VERSION "0.52.0"
_ACEOF
@@ -7272,7 +7272,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by poppler (TeX Live) $as_me 0.51.0, which was
+This file was extended by poppler (TeX Live) $as_me 0.52.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7338,7 +7338,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-poppler (TeX Live) config.status 0.51.0
+poppler (TeX Live) config.status 0.52.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/libs/poppler/poppler-src/CMakeLists.txt
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/CMakeLists.txt 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/poppler/poppler-src/CMakeLists.txt 2017-03-07 18:21:57 UTC (rev 768)
@@ -22,7 +22,7 @@
endif()
set(POPPLER_MAJOR_VERSION "0")
-set(POPPLER_MINOR_VERSION "51")
+set(POPPLER_MINOR_VERSION "52")
set(POPPLER_MICRO_VERSION "0")
set(POPPLER_VERSION "${POPPLER_MAJOR_VERSION}.${POPPLER_MINOR_VERSION}.${POPPLER_MICRO_VERSION}")
Modified: branches/stable/source/src/libs/poppler/poppler-src/ChangeLog
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/ChangeLog 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/poppler/poppler-src/ChangeLog 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,3 +1,65 @@
+commit baad9bd0406f63cffa8054c5831ccc3cb5d207e3
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Wed Feb 15 23:05:55 2017 +0100
+
+ Update C years
+
+ poppler/Annot.cc | 2 +-
+ poppler/OptionalContent.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+commit 83d4d3ee56b22ef4c0899514abcfc4c220fb4031
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Feb 13 20:47:05 2017 +0100
+
+ Properly initialize some RichMedia variables in corner cases
+
+ Bug #99767
+
+ poppler/Annot.cc | 31 ++++++++++++++-----------------
+ 1 file changed, 14 insertions(+), 17 deletions(-)
+
+commit 8de4b3595a80d8880b842599cb25ab5fd5367689
+Author: Albert Astals Cid <aacid at kde.org>
+Date: Mon Feb 13 01:15:04 2017 +0100
+
+ Fix assert on reading some OCGs
+
+ Check the object is a ref before calling getRef
+
+ Bug #99768
+
+ poppler/OptionalContent.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+commit 0b7c235c3ebe2a7a8d7bd6bfb22e605bf770a022
+Author: Adrian Johnson <ajohnson at redneon.com>
+Date: Thu Feb 9 21:23:04 2017 +1030
+
+ pdftocairo.1: typo
+
+ utils/pdftocairo.1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit e7aad35dcba3449bc8a56de070fea7e09cb64833
+Author: Hubert Figuière <hub at figuiere.net>
+Date: Tue Jan 17 23:58:00 2017 -0500
+
+ Qt: fix memory leaks found when running tests
+
+ -cleanup objects in tests to fix memory leaks.
+ -optcontent was leaking the headers items
+
+ Bug #99449
+
+ qt4/src/poppler-optcontent-private.h | 2 ++
+ qt4/src/poppler-optcontent.cc | 3 +++
+ qt4/tests/check_links.cpp | 2 ++
+ qt5/src/poppler-optcontent-private.h | 2 ++
+ qt5/src/poppler-optcontent.cc | 3 +++
+ qt5/tests/check_links.cpp | 2 ++
+ 6 files changed, 14 insertions(+)
+
commit dc8edecc437f33305257b6cb208dc2da367b7868
Author: Albert Astals Cid <aacid at kde.org>
Date: Sun Jan 15 18:27:49 2017 +0100
Modified: branches/stable/source/src/libs/poppler/poppler-src/NEWS
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/NEWS 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/poppler/poppler-src/NEWS 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,3 +1,19 @@
+Release 0.52.0
+ core:
+ * Fix assert on reading some OCGs. Bug #99768
+ * Properly initialize some RichMedia variables in corner cases. Bug #99767
+
+ qt4:
+ * optcontent structure was leaking the headers items. Bug #99449
+ * Cleanup objects in tests to fix memory leaks. Bug #99449
+
+ qt5:
+ * optcontent structure was leaking the headers items. Bug #99449
+ * Cleanup objects in tests to fix memory leaks. Bug #99449
+
+ utils:
+ * pdftocairo.1: Fix typo
+
Release 0.51.0
core:
* Check for error from NSS in SignatureHandler construct. Bug #99363
Modified: branches/stable/source/src/libs/poppler/poppler-src/configure.ac
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/configure.ac 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/poppler/poppler-src/configure.ac 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,5 +1,5 @@
m4_define([poppler_version_major],[0])
-m4_define([poppler_version_minor],[51])
+m4_define([poppler_version_minor],[52])
m4_define([poppler_version_micro],[0])
m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler_version_micro])
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.cc 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/Annot.cc 2017-03-07 18:21:57 UTC (rev 768)
@@ -15,7 +15,7 @@
//
// Copyright (C) 2006 Scott Turner <scotty1024 at mac.com>
// Copyright (C) 2007, 2008 Julien Rebetez <julienr at svn.gnome.org>
-// Copyright (C) 2007-2013, 2015, 2016 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2007-2013, 2015-2017 Albert Astals Cid <aacid at kde.org>
// Copyright (C) 2007-2013 Carlos Garcia Campos <carlosgc at gnome.org>
// Copyright (C) 2007, 2008 Iñigo Martínez <inigomartinez at gmail.com>
// Copyright (C) 2007 Jeff Muizelaar <jeff at infidigm.net>
@@ -6854,6 +6854,8 @@
}
obj1.free();
+ nAssets = 0;
+ assets = NULL;
if (dict->lookup("Assets", &obj1)->isDict()) {
Object obj2;
@@ -6878,10 +6880,6 @@
}
}
obj2.free();
-
- } else {
- nAssets = 0;
- assets = NULL;
}
obj1.free();
}
@@ -7044,20 +7042,19 @@
{
Object obj1;
- if (dict->lookup("Subtype", &obj1)->isName()) {
- const char *name = obj1.getName();
+ dict->lookup("Subtype", &obj1);
+ const char *name = obj1.isName() ? obj1.getName() : "";
- if (!strcmp(name, "3D")) {
- type = type3D;
- } else if (!strcmp(name, "Flash")) {
- type = typeFlash;
- } else if (!strcmp(name, "Sound")) {
- type = typeSound;
- } else if (!strcmp(name, "Video")) {
- type = typeVideo;
- } else {
- type = typeFlash;
- }
+ if (!strcmp(name, "3D")) {
+ type = type3D;
+ } else if (!strcmp(name, "Flash")) {
+ type = typeFlash;
+ } else if (!strcmp(name, "Sound")) {
+ type = typeSound;
+ } else if (!strcmp(name, "Video")) {
+ type = typeVideo;
+ } else {
+ type = typeFlash;
}
obj1.free();
Modified: branches/stable/source/src/libs/poppler/poppler-src/poppler/OptionalContent.cc
===================================================================
--- branches/stable/source/src/libs/poppler/poppler-src/poppler/OptionalContent.cc 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/poppler/poppler-src/poppler/OptionalContent.cc 2017-03-07 18:21:57 UTC (rev 768)
@@ -5,7 +5,7 @@
// Copyright 2007 Brad Hards <bradh at kde.org>
// Copyright 2008 Pino Toscano <pino at kde.org>
// Copyright 2008, 2010 Carlos Garcia Campos <carlosgc at gnome.org>
-// Copyright 2008, 2010, 2011 Albert Astals Cid <aacid at kde.org>
+// Copyright 2008, 2010, 2011, 2017 Albert Astals Cid <aacid at kde.org>
// Copyright 2008 Mark Kaplan <mkaplan at finjan.com>
//
// Released under the GPL (version 2, or later, at your option)
@@ -63,6 +63,10 @@
OptionalContentGroup *thisOptionalContentGroup = new OptionalContentGroup(ocg.getDict());
ocg.free();
ocgList.arrayGetNF(i, &ocg);
+ if (!ocg.isRef()) {
+ ocg.free();
+ break;
+ }
// TODO: we should create a lookup map from Ref to the OptionalContentGroup
thisOptionalContentGroup->setRef( ocg.getRef() );
ocg.free();
Modified: branches/stable/source/src/libs/poppler/version.ac
===================================================================
--- branches/stable/source/src/libs/poppler/version.ac 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/poppler/version.ac 2017-03-07 18:21:57 UTC (rev 768)
@@ -8,4 +8,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current poppler version
-m4_define([poppler_version], [0.51.0])
+m4_define([poppler_version], [0.52.0])
Modified: branches/stable/source/src/libs/xpdf/Makefile.in
===================================================================
--- branches/stable/source/src/libs/xpdf/Makefile.in 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/xpdf/Makefile.in 2017-03-07 18:21:57 UTC (rev 768)
@@ -245,11 +245,12 @@
$(srcdir)/aconf.h.in $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/install-sh \
- $(top_srcdir)/../../build-aux/missing ../../build-aux/compile \
- ../../build-aux/config.guess ../../build-aux/config.sub \
- ../../build-aux/depcomp ../../build-aux/install-sh \
- ../../build-aux/ltmain.sh ../../build-aux/missing \
- ../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
+ $(top_srcdir)/../../build-aux/missing ../../build-aux/ar-lib \
+ ../../build-aux/compile ../../build-aux/config.guess \
+ ../../build-aux/config.sub ../../build-aux/depcomp \
+ ../../build-aux/install-sh ../../build-aux/ltmain.sh \
+ ../../build-aux/missing ../../build-aux/texinfo.tex \
+ ../../build-aux/ylwrap ChangeLog
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
Modified: branches/stable/source/src/libs/zlib/Makefile.in
===================================================================
--- branches/stable/source/src/libs/zlib/Makefile.in 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/libs/zlib/Makefile.in 2017-03-07 18:21:57 UTC (rev 768)
@@ -416,11 +416,12 @@
$(top_srcdir)/../../build-aux/install-sh \
$(top_srcdir)/../../build-aux/missing \
$(top_srcdir)/../../build-aux/test-driver \
- ../../build-aux/compile ../../build-aux/config.guess \
- ../../build-aux/config.sub ../../build-aux/depcomp \
- ../../build-aux/install-sh ../../build-aux/ltmain.sh \
- ../../build-aux/missing ../../build-aux/texinfo.tex \
- ../../build-aux/ylwrap ChangeLog README
+ ../../build-aux/ar-lib ../../build-aux/compile \
+ ../../build-aux/config.guess ../../build-aux/config.sub \
+ ../../build-aux/depcomp ../../build-aux/install-sh \
+ ../../build-aux/ltmain.sh ../../build-aux/missing \
+ ../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog \
+ README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
Modified: branches/stable/source/src/m4/ChangeLog
===================================================================
--- branches/stable/source/src/m4/ChangeLog 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/m4/ChangeLog 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,3 +1,12 @@
+2017-02-17 Karl Berry <karl at freefriends.org>
+
+ * kpse-setup.m4 (_KPSE_RECURSE): do not add a package to
+ CONF_SUBDIRS if --disable-PKG was given. Thus, the directory for a
+ disabled package will no longer be descended into at all, as if it
+ were nonexistent. This way, if a package's configure causes
+ problems on some systems (like dvisvgm v2's new requirement for
+ C++11), --disable-PKG can be given and work can go on.
+
2016-03-07 Karl Berry <karl at tug.org>
* kpse-pkgs (KPSE_UTILS_PKGS): add autosp.
@@ -440,3 +449,5 @@
2009-08-17 Peter Breitenlohner <peb at mppmu.mpg.de>
* kpse-warnings.m4: Implement Objective C compiler warnings.
+
+(This file public domain.)
Modified: branches/stable/source/src/m4/README
===================================================================
--- branches/stable/source/src/m4/README 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/m4/README 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,8 +1,10 @@
-Copyright (C) 2009-2012 Peter Breitenlohner <tex-live at tug.org>
+$Id: README 43261 2017-02-17 22:37:44Z karl $
+Copyright 2009-2017 Karl Berry <tex-live at tug.org>
+Copyright 2009-2012 Peter Breitenlohner <tex-live at tug.org>
You may freely use, modify and/or distribute this file.
This directory is the central repository for Autoconf macros needed to build
-the TeX Live (TL) tree.
+the TeX Live (TL) tree. They are incorporated into the configure scripts.
(1) Public macros such as libtool.m4 used to build the libraries and
programs in the TL subdirectories libs/*/, utils/*/, and texk/*/ that are
@@ -25,7 +27,9 @@
kpse-pkgs.m4: defines lists of subdirectories libs/Lib/, utils/Util/, and
tex/Prog/ with libraries and programs that can be built as part of
the TL tree.
+
kpse-setup.m4: macros that walk through these lists to provide configure
options. They depend on configure fragments */*/ac/withenable.ac
defining the dependencies between these libraries and programs.
+See also the sibling top-level am/ directory.
Modified: branches/stable/source/src/m4/kpse-setup.m4
===================================================================
--- branches/stable/source/src/m4/kpse-setup.m4 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/m4/kpse-setup.m4 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,5 +1,7 @@
+# $Id: kpse-setup.m4 43262 2017-02-17 22:40:41Z karl $ (m4/kpse-setup.m4)
# Private macros for the TeX Live (TL) tree.
-# Copyright (C) 2009-2015 Peter Breitenlohner <tex-live at tug.org>
+# Copyright 2017 Karl Berry <tex-live at tug.org>
+# Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
@@ -8,12 +10,13 @@
# KPSE_SETUP(TOP-LEVEL)
# ---------------------
# Initialize path prefix kpse_TL to top-level TeX Live (TL) directory.
-# Sinclude all withenable.ac files providing:
-# configure options --with-system-LIB, --with-LIB-includes, and --with-LIB-libdir
-# for libraries
-# configure option --disable-PKG or --enable-PKG for programs
-# additional program specific configure options (if any)
-# library dependencies for programs and libraries
+# Sinclude all pkgdir/ac/withenable.ac files, which are supposed to provide:
+# configure options for libraries:
+# --with-system-LIB --with-LIB-includes --with-LIB-libdir
+# configure options for programs:
+# --disable-PROG --enable-PROG
+# additional package-specific configure options, if any
+# library dependencies for programs and libraries, if any
AC_DEFUN([KPSE_SETUP], [dnl
AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
AC_REQUIRE([_KPSE_MSG_WARN_PREPARE])[]dnl
@@ -262,25 +265,24 @@
# _KPSE_RECURSE(LIST, TEXT, COND, [PREFIX])
# -----------------------------------------
# Internal subroutine. Determine which of the libraries or programs in
-# kpse_LIST_pkgs to build, and set output variables MAKE_SUBDIRS and
-# CONF_SUBDIRS. Cause 'make dist', 'configure -hr', and 'autoreconf'
-# to recurse into all existing ones.
+# kpse_LIST_pkgs to build: if a package's source directory contains a
+# configure script, and COND is true, then add to the output variables
+# MAKE_SUBDIRS and CONF_SUBDIRS. Thus, if a package directory does not
+# exist at all, or if the package has been disabled, it will be ignored.
+#
m4_define([_KPSE_RECURSE], [dnl
AC_MSG_CHECKING([for $2 to build])
+CONF_SUBDIRS=
MAKE_SUBDIRS=
-CONF_SUBDIRS=
KPSE_FOR_PKGS([$1], [dnl
m4_ifdef([have_]Kpse_pkg, [dnl
-if test -x $srcdir/$4Kpse_Pkg/configure; then
- $3 && Kpse_add([MAKE_SUBDIRS])
+if test -x $srcdir/$4Kpse_Pkg/configure && $3; then
Kpse_add([CONF_SUBDIRS])
- if false; then
- AC_CONFIG_SUBDIRS($4Kpse_Pkg)
- fi
+ Kpse_add([MAKE_SUBDIRS])
fi
])[]dnl m4_ifdef
])
+AC_SUBST([CONF_SUBDIRS])[]dnl
AC_SUBST([MAKE_SUBDIRS])[]dnl
-AC_SUBST([CONF_SUBDIRS])[]dnl
AC_MSG_RESULT([$MAKE_SUBDIRS])[]dnl
]) # _KPSE_RECURSE
Modified: branches/stable/source/src/texk/ChangeLog
===================================================================
--- branches/stable/source/src/texk/ChangeLog 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/texk/ChangeLog 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,3 +1,7 @@
+2017-02-16 Karl Berry <karl at freefriends.org>
+
+ * configure.ac (AC_INIT): tex-live at tug.org instead of peb.
+
2016-01-16 Karl Berry <karl at tug.org>
(web2c/Makefile): do not try to make the nonexistent subtexk target.
@@ -1097,3 +1101,5 @@
* Makefile.in (*install*): Only do program directories.
(most targets): Add `else true' for stupid sh's.
* README: Update appropriately.
+
+(This ChangeLog file public domain.)
Modified: branches/stable/source/src/texk/Makefile.in
===================================================================
--- branches/stable/source/src/texk/Makefile.in 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/texk/Makefile.in 2017-03-07 18:21:57 UTC (rev 768)
@@ -151,8 +151,6 @@
$(top_srcdir)/../texk/dvipos/ac/withenable.ac \
$(top_srcdir)/../texk/dvipsk/ac/withenable.ac \
$(top_srcdir)/../texk/dvisvgm/ac/withenable.ac \
- $(top_srcdir)/../texk/dvisvgm/ac/dvisvgm.ac \
- $(top_srcdir)/../texk/dvisvgm/ac/libgs.ac \
$(top_srcdir)/../texk/gregorio/ac/withenable.ac \
$(top_srcdir)/../texk/gsftopk/ac/withenable.ac \
$(top_srcdir)/../texk/lcdf-typetools/ac/withenable.ac \
@@ -265,11 +263,12 @@
$(top_srcdir)/../build-aux/config.guess \
$(top_srcdir)/../build-aux/config.sub \
$(top_srcdir)/../build-aux/install-sh \
- $(top_srcdir)/../build-aux/missing ../build-aux/compile \
- ../build-aux/config.guess ../build-aux/config.sub \
- ../build-aux/depcomp ../build-aux/install-sh \
- ../build-aux/ltmain.sh ../build-aux/missing \
- ../build-aux/texinfo.tex ../build-aux/ylwrap ChangeLog README
+ $(top_srcdir)/../build-aux/missing ../build-aux/ar-lib \
+ ../build-aux/compile ../build-aux/config.guess \
+ ../build-aux/config.sub ../build-aux/depcomp \
+ ../build-aux/install-sh ../build-aux/ltmain.sh \
+ ../build-aux/missing ../build-aux/texinfo.tex \
+ ../build-aux/ylwrap ChangeLog README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -403,7 +402,6 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
-subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
@@ -420,11 +418,18 @@
recurse_this = texk/
recurse_top = ../
-# We must configure all subdirs since 'make dist' needs the Makefile.
-# For those not required for the current set of configure options
+# $Id: recurse.am 43261 2017-02-17 22:37:44Z karl $
+#
+# Requires $(recurse_this) and $(recurse_top).
+# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
+#
+# For subdirs not required for the current set of configure options
# we append '--disable-build' so they can skip tests that would
# fail because, e.g., some required libraries were not built.
+# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.)
+#
# Code inspired by automake's way to handle recursive targets.
+#
cf_silent = $(cf_silent_ at AM_V@)
cf_silent_ = $(cf_silent_ at AM_DEFAULT_V@)
cf_silent_0 = --silent
Modified: branches/stable/source/src/texk/README
===================================================================
--- branches/stable/source/src/texk/README 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/texk/README 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,4 +1,4 @@
-$Id: README 43213 2017-02-13 19:32:16Z karl $
+$Id: README 43293 2017-02-21 23:54:15Z karl $
Copyright 2006-2017 TeX Users Group.
You may freely use, modify and/or distribute this file.
@@ -58,7 +58,7 @@
dvipsk - maintained here, by us
-dvisvgm 2.1.2 - checked 13feb17
+dvisvgm 2.1.3 - checked 21feb17
http://dvisvgm.bplaced.net/Downloads
gregorio 4.2.0 - checked 25sep16
Modified: branches/stable/source/src/texk/configure
===================================================================
--- branches/stable/source/src/texk/configure 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/texk/configure 2017-03-07 18:21:57 UTC (rev 768)
@@ -2,7 +2,7 @@
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for TeX Live texk 2017/dev.
#
-# Report bugs to <peb at mppmu.mpg.de>.
+# Report bugs to <tex-live at tug.org>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -265,7 +265,7 @@
$as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
- $as_echo "$0: Please tell bug-autoconf at gnu.org and peb at mppmu.mpg.de
+ $as_echo "$0: Please tell bug-autoconf at gnu.org and tex-live at tug.org
$0: about your system, including any error possibly output
$0: before this message. Then install a modern shell, or
$0: manually run the script under such a shell if you do
@@ -581,18 +581,16 @@
PACKAGE_TARNAME='tex-live-texk'
PACKAGE_VERSION='2017/dev'
PACKAGE_STRING='TeX Live texk 2017/dev'
-PACKAGE_BUGREPORT='peb at mppmu.mpg.de'
+PACKAGE_BUGREPORT='tex-live at tug.org'
PACKAGE_URL=''
ac_unique_file="../build-aux/missing"
-enable_option_checking=no
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+MAKE_SUBDIRS
CONF_SUBDIRS
-MAKE_SUBDIRS
-subdirs
WARNING_CFLAGS
MAINT
MAINTAINER_MODE_FALSE
@@ -775,10 +773,6 @@
enable_dvipos
enable_dvipsk
enable_dvisvgm
-with_libgs
-with_system_libgs
-with_libgs_includes
-with_libgs_libdir
enable_gregorio
enable_gsftopk
enable_lcdf_typetools
@@ -860,38 +854,8 @@
LDFLAGS
LIBS
CPPFLAGS'
-ac_subdirs_all='web2c
-afm2pl
-bibtex-x
-chktex
-cjkutils
-detex
-dtl
-dvi2tty
-dvidvi
-dviljk
-dvipdfm-x
-dvipng
-dvipos
-dvipsk
-dvisvgm
-gregorio
-gsftopk
-lcdf-typetools
-makeindexk
-makejvf
-mendexk
-musixtnt
-ps2pk
-psutils
-seetexk
-tex4htk
-ttf2pk2
-ttfdump
-upmendex
-xdvik
-texlive'
+
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
@@ -1660,12 +1624,6 @@
[texworks --position=%d "%s"]
--with-mf-x-toolkit use X toolkit for METAFONT
--with-gs=/PATH/TO/gs Hard-wire the location of GhostScript
- --without-libgs build dvisvgm without PostScript support
- --with-system-libgs build dvisvgm with installed gs headers and library
- [default: no]
- --with-libgs-includes=DIR
- libgs headers installed in DIR
- --with-libgs-libdir=DIR libgs library installed in DIR
--with-xdvi-x-toolkit=KIT
Use toolkit KIT (motif/xaw/xaw3d/neXtaw) for xdvi
[default: Motif if available, else Xaw]
@@ -1732,7 +1690,7 @@
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
-Report bugs to <peb at mppmu.mpg.de>.
+Report bugs to <tex-live at tug.org>.
_ACEOF
ac_status=$?
fi
@@ -4431,7 +4389,7 @@
need_kpathsea=yes
}
-## texk/dvisvgm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
+# texk/dvisvgm/ac/withenable.ac: configure.ac fragment
## configure options and TL libraries required for dvisvgm
# Check whether --enable-dvisvgm was given.
if test "${enable_dvisvgm+set}" = set; then :
@@ -4456,39 +4414,6 @@
need_zlib=yes
}
-## texk/dvisvgm/ac/dvisvgm.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
-## configure options for dvisvgm
-
-# Check whether --with-libgs was given.
-if test "${with_libgs+set}" = set; then :
- withval=$with_libgs;
-fi
-
-
-# Check whether --with-system-libgs was given.
-if test "${with_system_libgs+set}" = set; then :
- withval=$with_system_libgs;
-fi
-
-
-# Check whether --with-libgs-includes was given.
-if test "${with_libgs_includes+set}" = set; then :
- withval=$with_libgs_includes;
-fi
-
-
-# Check whether --with-libgs-libdir was given.
-if test "${with_libgs_libdir+set}" = set; then :
- withval=$with_libgs_libdir;
-fi
-
-
-## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
-## configure checks for dvisvgm and libgs
-if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then
- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
-fi
-
## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/
## configure options and TL libraries required for gregorio
# Check whether --enable-gregorio was given.
@@ -6469,259 +6394,133 @@
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TeXk programs to build" >&5
$as_echo_n "checking for TeXk programs to build... " >&6; }
+CONF_SUBDIRS=
MAKE_SUBDIRS=
-CONF_SUBDIRS=
-if test -x $srcdir/web2c/configure; then
- test "x$enable_web2c" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS web2c"
+if test -x $srcdir/web2c/configure && test "x$enable_web2c" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS web2c"
- if false; then
- subdirs="$subdirs web2c"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS web2c"
fi
-if test -x $srcdir/afm2pl/configure; then
- test "x$enable_afm2pl" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS afm2pl"
+if test -x $srcdir/afm2pl/configure && test "x$enable_afm2pl" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS afm2pl"
- if false; then
- subdirs="$subdirs afm2pl"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS afm2pl"
fi
-if test -x $srcdir/bibtex-x/configure; then
- test "x$enable_bibtex_x" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS bibtex-x"
+if test -x $srcdir/bibtex-x/configure && test "x$enable_bibtex_x" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS bibtex-x"
- if false; then
- subdirs="$subdirs bibtex-x"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS bibtex-x"
fi
-if test -x $srcdir/chktex/configure; then
- test "x$enable_chktex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS chktex"
+if test -x $srcdir/chktex/configure && test "x$enable_chktex" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS chktex"
- if false; then
- subdirs="$subdirs chktex"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS chktex"
fi
-if test -x $srcdir/cjkutils/configure; then
- test "x$enable_cjkutils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS cjkutils"
+if test -x $srcdir/cjkutils/configure && test "x$enable_cjkutils" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS cjkutils"
- if false; then
- subdirs="$subdirs cjkutils"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS cjkutils"
fi
-if test -x $srcdir/detex/configure; then
- test "x$enable_detex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS detex"
+if test -x $srcdir/detex/configure && test "x$enable_detex" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS detex"
- if false; then
- subdirs="$subdirs detex"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS detex"
fi
-if test -x $srcdir/dtl/configure; then
- test "x$enable_dtl" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dtl"
+if test -x $srcdir/dtl/configure && test "x$enable_dtl" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS dtl"
- if false; then
- subdirs="$subdirs dtl"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS dtl"
fi
-if test -x $srcdir/dvi2tty/configure; then
- test "x$enable_dvi2tty" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvi2tty"
+if test -x $srcdir/dvi2tty/configure && test "x$enable_dvi2tty" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS dvi2tty"
- if false; then
- subdirs="$subdirs dvi2tty"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS dvi2tty"
fi
-if test -x $srcdir/dvidvi/configure; then
- test "x$enable_dvidvi" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvidvi"
+if test -x $srcdir/dvidvi/configure && test "x$enable_dvidvi" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS dvidvi"
- if false; then
- subdirs="$subdirs dvidvi"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS dvidvi"
fi
-if test -x $srcdir/dviljk/configure; then
- test "x$enable_dviljk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dviljk"
+if test -x $srcdir/dviljk/configure && test "x$enable_dviljk" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS dviljk"
- if false; then
- subdirs="$subdirs dviljk"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS dviljk"
fi
-if test -x $srcdir/dvipdfm-x/configure; then
- test "x$enable_dvipdfm_x" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipdfm-x"
+if test -x $srcdir/dvipdfm-x/configure && test "x$enable_dvipdfm_x" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS dvipdfm-x"
- if false; then
- subdirs="$subdirs dvipdfm-x"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS dvipdfm-x"
fi
-if test -x $srcdir/dvipng/configure; then
- test "x$enable_dvipng" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipng"
+if test -x $srcdir/dvipng/configure && test "x$enable_dvipng" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS dvipng"
- if false; then
- subdirs="$subdirs dvipng"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS dvipng"
fi
-if test -x $srcdir/dvipos/configure; then
- test "x$enable_dvipos" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipos"
+if test -x $srcdir/dvipos/configure && test "x$enable_dvipos" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS dvipos"
- if false; then
- subdirs="$subdirs dvipos"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS dvipos"
fi
-if test -x $srcdir/dvipsk/configure; then
- test "x$enable_dvipsk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvipsk"
+if test -x $srcdir/dvipsk/configure && test "x$enable_dvipsk" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS dvipsk"
- if false; then
- subdirs="$subdirs dvipsk"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS dvipsk"
fi
-if test -x $srcdir/dvisvgm/configure; then
- test "x$enable_dvisvgm" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dvisvgm"
+if test -x $srcdir/dvisvgm/configure && test "x$enable_dvisvgm" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS dvisvgm"
- if false; then
- subdirs="$subdirs dvisvgm"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS dvisvgm"
fi
-if test -x $srcdir/gregorio/configure; then
- test "x$enable_gregorio" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS gregorio"
+if test -x $srcdir/gregorio/configure && test "x$enable_gregorio" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS gregorio"
- if false; then
- subdirs="$subdirs gregorio"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS gregorio"
fi
-if test -x $srcdir/gsftopk/configure; then
- test "x$enable_gsftopk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS gsftopk"
+if test -x $srcdir/gsftopk/configure && test "x$enable_gsftopk" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS gsftopk"
- if false; then
- subdirs="$subdirs gsftopk"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS gsftopk"
fi
-if test -x $srcdir/lcdf-typetools/configure; then
- test "x$enable_lcdf_typetools" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS lcdf-typetools"
+if test -x $srcdir/lcdf-typetools/configure && test "x$enable_lcdf_typetools" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS lcdf-typetools"
- if false; then
- subdirs="$subdirs lcdf-typetools"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS lcdf-typetools"
fi
-if test -x $srcdir/makeindexk/configure; then
- test "x$enable_makeindexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS makeindexk"
+if test -x $srcdir/makeindexk/configure && test "x$enable_makeindexk" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS makeindexk"
- if false; then
- subdirs="$subdirs makeindexk"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS makeindexk"
fi
-if test -x $srcdir/makejvf/configure; then
- test "x$enable_makejvf" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS makejvf"
+if test -x $srcdir/makejvf/configure && test "x$enable_makejvf" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS makejvf"
- if false; then
- subdirs="$subdirs makejvf"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS makejvf"
fi
-if test -x $srcdir/mendexk/configure; then
- test "x$enable_mendexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS mendexk"
+if test -x $srcdir/mendexk/configure && test "x$enable_mendexk" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS mendexk"
- if false; then
- subdirs="$subdirs mendexk"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS mendexk"
fi
-if test -x $srcdir/musixtnt/configure; then
- test "x$enable_musixtnt" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS musixtnt"
+if test -x $srcdir/musixtnt/configure && test "x$enable_musixtnt" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS musixtnt"
- if false; then
- subdirs="$subdirs musixtnt"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS musixtnt"
fi
-if test -x $srcdir/ps2pk/configure; then
- test "x$enable_ps2pk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ps2pk"
+if test -x $srcdir/ps2pk/configure && test "x$enable_ps2pk" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS ps2pk"
- if false; then
- subdirs="$subdirs ps2pk"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS ps2pk"
fi
-if test -x $srcdir/psutils/configure; then
- test "x$enable_psutils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS psutils"
+if test -x $srcdir/psutils/configure && test "x$enable_psutils" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS psutils"
- if false; then
- subdirs="$subdirs psutils"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS psutils"
fi
-if test -x $srcdir/seetexk/configure; then
- test "x$enable_seetexk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS seetexk"
+if test -x $srcdir/seetexk/configure && test "x$enable_seetexk" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS seetexk"
- if false; then
- subdirs="$subdirs seetexk"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS seetexk"
fi
-if test -x $srcdir/tex4htk/configure; then
- test "x$enable_tex4htk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS tex4htk"
+if test -x $srcdir/tex4htk/configure && test "x$enable_tex4htk" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS tex4htk"
- if false; then
- subdirs="$subdirs tex4htk"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS tex4htk"
fi
-if test -x $srcdir/ttf2pk2/configure; then
- test "x$enable_ttf2pk2" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ttf2pk2"
+if test -x $srcdir/ttf2pk2/configure && test "x$enable_ttf2pk2" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS ttf2pk2"
- if false; then
- subdirs="$subdirs ttf2pk2"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS ttf2pk2"
fi
-if test -x $srcdir/ttfdump/configure; then
- test "x$enable_ttfdump" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ttfdump"
+if test -x $srcdir/ttfdump/configure && test "x$enable_ttfdump" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS ttfdump"
- if false; then
- subdirs="$subdirs ttfdump"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS ttfdump"
fi
-if test -x $srcdir/upmendex/configure; then
- test "x$enable_upmendex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS upmendex"
+if test -x $srcdir/upmendex/configure && test "x$enable_upmendex" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS upmendex"
- if false; then
- subdirs="$subdirs upmendex"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS upmendex"
fi
-if test -x $srcdir/xdvik/configure; then
- test "x$enable_xdvik" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xdvik"
+if test -x $srcdir/xdvik/configure && test "x$enable_xdvik" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS xdvik"
- if false; then
- subdirs="$subdirs xdvik"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS xdvik"
fi
-if test -x $srcdir/texlive/configure; then
- test "x$enable_texlive" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS texlive"
+if test -x $srcdir/texlive/configure && test "x$enable_texlive" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS texlive"
- if false; then
- subdirs="$subdirs texlive"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS texlive"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
@@ -7351,7 +7150,7 @@
Configuration commands:
$config_commands
-Report bugs to <peb at mppmu.mpg.de>."
+Report bugs to <tex-live at tug.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -8032,151 +7831,6 @@
# would make configure fail if this is the last instruction.
$ac_cs_success || as_fn_exit 1
fi
-
-#
-# CONFIG_SUBDIRS section.
-#
-if test "$no_recursion" != yes; then
-
- # Remove --cache-file, --srcdir, and --disable-option-checking arguments
- # so they do not pile up.
- ac_sub_configure_args=
- ac_prev=
- eval "set x $ac_configure_args"
- shift
- for ac_arg
- do
- if test -n "$ac_prev"; then
- ac_prev=
- continue
- fi
- case $ac_arg in
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
- | --c=*)
- ;;
- --config-cache | -C)
- ;;
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- ;;
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- ;;
- --disable-option-checking)
- ;;
- *)
- case $ac_arg in
- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
- esac
- done
-
- # Always prepend --prefix to ensure using the same prefix
- # in subdir configurations.
- ac_arg="--prefix=$prefix"
- case $ac_arg in
- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
-
- # Pass --silent
- if test "$silent" = yes; then
- ac_sub_configure_args="--silent $ac_sub_configure_args"
- fi
-
- # Always prepend --disable-option-checking to silence warnings, since
- # different subdirs can have different --enable and --with options.
- ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
-
- ac_popdir=`pwd`
- for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
- # Do not complain, so a configure script can configure whichever
- # parts of a large source tree are present.
- test -d "$srcdir/$ac_dir" || continue
-
- ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
- $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
- $as_echo "$ac_msg" >&6
- as_dir="$ac_dir"; as_fn_mkdir_p
- ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
- cd "$ac_dir"
-
- # Check for guested configure; otherwise get Cygnus style configure.
- if test -f "$ac_srcdir/configure.gnu"; then
- ac_sub_configure=$ac_srcdir/configure.gnu
- elif test -f "$ac_srcdir/configure"; then
- ac_sub_configure=$ac_srcdir/configure
- elif test -f "$ac_srcdir/configure.in"; then
- # This should be Cygnus configure.
- ac_sub_configure=$ac_aux_dir/configure
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
-$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
- ac_sub_configure=
- fi
-
- # The recursion is here.
- if test -n "$ac_sub_configure"; then
- # Make the cache file name correct relative to the subdirectory.
- case $cache_file in
- [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
- *) # Relative name.
- ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
- esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
- # The eval makes quoting arguments work.
- eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
- --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
- as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
- fi
-
- cd "$ac_popdir"
- done
-fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
Modified: branches/stable/source/src/texk/configure.ac
===================================================================
--- branches/stable/source/src/texk/configure.ac 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/texk/configure.ac 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,6 +1,8 @@
+# $Id: configure.ac 43246 2017-02-16 18:45:03Z karl $
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live at tug.org>
+dnl Copyright 2017 Karl Berry <tex-live at tug.org>
+dnl Copyright 2009-2013 Peter Breitenlohner <tex-live at tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -7,7 +9,7 @@
dnl with or without modifications, as long as this notice is preserved.
dnl
m4_include([../version.ac])[] dnl define tex_live_version
-AC_INIT([TeX Live texk], tex_live_version(), [peb at mppmu.mpg.de])
+AC_INIT([TeX Live texk], tex_live_version(), [tex-live at tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([../build-aux/missing])
AC_CONFIG_AUX_DIR([../build-aux])
Modified: branches/stable/source/src/texk/kpathsea/ChangeLog
===================================================================
--- branches/stable/source/src/texk/kpathsea/ChangeLog 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/texk/kpathsea/ChangeLog 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,3 +1,8 @@
+2017-03-02 Karl Berry <karl at tug.org>
+
+ * texmf.cnf (TEXINPUTS.luajitlatex): add, same as lualatex.
+ Report from Ulrike Fischer, 2 Mar 2017 17:46:50.
+
2016-12-28 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
* xgetcwd.c: Typo. Thanks Luigi.
Modified: branches/stable/source/src/texk/kpathsea/Makefile.in
===================================================================
--- branches/stable/source/src/texk/kpathsea/Makefile.in 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/texk/kpathsea/Makefile.in 2017-03-07 18:21:57 UTC (rev 768)
@@ -523,11 +523,12 @@
$(top_srcdir)/../../build-aux/ltmain.sh \
$(top_srcdir)/../../build-aux/missing \
$(top_srcdir)/../../build-aux/test-driver \
- ../../build-aux/compile ../../build-aux/config.guess \
- ../../build-aux/config.sub ../../build-aux/depcomp \
- ../../build-aux/install-sh ../../build-aux/ltmain.sh \
- ../../build-aux/missing ../../build-aux/texinfo.tex \
- ../../build-aux/ylwrap AUTHORS ChangeLog NEWS README putenv.c
+ ../../build-aux/ar-lib ../../build-aux/compile \
+ ../../build-aux/config.guess ../../build-aux/config.sub \
+ ../../build-aux/depcomp ../../build-aux/install-sh \
+ ../../build-aux/ltmain.sh ../../build-aux/missing \
+ ../../build-aux/texinfo.tex ../../build-aux/ylwrap AUTHORS \
+ ChangeLog NEWS README putenv.c
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -2329,9 +2330,13 @@
rm -f "$(DESTDIR)$(web2cdir)/$$f"; \
else :; fi; \
done
+
+# $Id: bin_links.am 43248 2017-02-16 21:38:29Z karl $
+# am/bin_links.am: Makefile fragment for bindir links.
.PHONY: install-bin-links uninstall-bin-links
install-bin-links:
+ at WIN32_FALSE@ $(MKDIR_P) $(DESTDIR)$(bindir)
@WIN32_FALSE@ @cd $(DESTDIR)$(bindir) && \
@WIN32_FALSE@ for s in $(bin_links); do \
@WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \
Modified: branches/stable/source/src/texk/kpathsea/texmf.cnf
===================================================================
--- branches/stable/source/src/texk/kpathsea/texmf.cnf 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/texk/kpathsea/texmf.cnf 2017-03-07 18:21:57 UTC (rev 768)
@@ -193,11 +193,12 @@
TEXINPUTS.pdfetex = .;$TEXMF/tex/{plain,generic,}//
% LuaTeX.
-TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
TEXINPUTS.luatex = .;$TEXMF/tex/{luatex,plain,generic,}//
TEXINPUTS.luajittex = .;$TEXMF/tex/{luatex,plain,generic,}//
TEXINPUTS.dviluatex = .;$TEXMF/tex/{luatex,plain,generic,}//
+TEXINPUTS.lualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+TEXINPUTS.luajitlatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
+TEXINPUTS.dvilualatex = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
% XeTeX.
TEXINPUTS.xelatex = .;$TEXMF/tex/{xelatex,latex,xetex,generic,}//
Modified: branches/stable/source/src/texk/web2c/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/Makefile.in 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/texk/web2c/Makefile.in 2017-03-07 18:21:57 UTC (rev 768)
@@ -1831,12 +1831,12 @@
$(top_srcdir)/../../build-aux/test-driver \
$(top_srcdir)/../texlive/w32_wrapper/callexe.c \
$(top_srcdir)/luatexdir/luafontloader/ff-config.in \
- $(top_srcdir)/synctexdir/synctex.pc.in ../../build-aux/compile \
- ../../build-aux/config.guess ../../build-aux/config.sub \
- ../../build-aux/depcomp ../../build-aux/install-sh \
- ../../build-aux/ltmain.sh ../../build-aux/missing \
- ../../build-aux/texinfo.tex ../../build-aux/ylwrap AUTHORS \
- ChangeLog NEWS README
+ $(top_srcdir)/synctexdir/synctex.pc.in ../../build-aux/ar-lib \
+ ../../build-aux/compile ../../build-aux/config.guess \
+ ../../build-aux/config.sub ../../build-aux/depcomp \
+ ../../build-aux/install-sh ../../build-aux/ltmain.sh \
+ ../../build-aux/missing ../../build-aux/texinfo.tex \
+ ../../build-aux/ylwrap AUTHORS ChangeLog NEWS README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -15403,9 +15403,13 @@
$(libsynctex_a_OBJECTS): $(ZLIB_DEPEND)
synctexdir/synctex.log: synctex$(EXEEXT)
libmd5/md5.log: md5main$(EXEEXT)
+
+# $Id: bin_links.am 43248 2017-02-16 21:38:29Z karl $
+# am/bin_links.am: Makefile fragment for bindir links.
.PHONY: install-bin-links uninstall-bin-links
install-bin-links:
+ at WIN32_FALSE@ $(MKDIR_P) $(DESTDIR)$(bindir)
@WIN32_FALSE@ @cd $(DESTDIR)$(bindir) && \
@WIN32_FALSE@ for s in $(bin_links); do \
@WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \
Modified: branches/stable/source/src/texk/web2c/cwebdir/common.h
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/common.h 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/texk/web2c/cwebdir/common.h 2017-03-07 18:21:57 UTC (rev 768)
@@ -2,7 +2,7 @@
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
% It is distributed WITHOUT ANY WARRANTY, express or implied.
-% Version 3.0 --- June 1993 (works also with later versions)
+% Version 3.64 --- February 2017 (works also with later versions)
% Copyright (C) 1987,1990,1993 Silvio Levy and Donald E. Knuth
@@ -147,6 +147,7 @@
extern char change_file_name[]; /* name of change file */
extern line[]; /* number of current line in the stacked files */
extern change_line; /* number of current line in change file */
+extern change_depth; /* where \.{@@y} originated during a change */
extern boolean input_has_ended; /* if there is no more input */
extern boolean changing; /* if the current line is from |change_file| */
extern boolean web_file_open; /* if the web file is being read */
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctangle.c
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctangle.c 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctangle.c 2017-03-07 18:21:57 UTC (rev 768)
@@ -215,6 +215,7 @@
extern char change_file_name[];
extern line[];
extern change_line;
+extern change_depth;
extern boolean input_has_ended;
extern boolean changing;
extern boolean web_file_open;
@@ -223,7 +224,7 @@
extern check_complete();
/*:11*//*12:*/
-#line 158 "common.h"
+#line 159 "common.h"
typedef unsigned short sixteen_bits;
extern sixteen_bits section_count;
@@ -232,7 +233,7 @@
extern boolean print_where;
/*:12*//*13:*/
-#line 170 "common.h"
+#line 171 "common.h"
extern int argc;
extern char**argv;
@@ -239,7 +240,7 @@
extern boolean flags[];
/*:13*//*14:*/
-#line 182 "common.h"
+#line 183 "common.h"
extern FILE*C_file;
extern FILE*tex_file;
@@ -248,7 +249,7 @@
extern FILE*active_file;
/*:14*//*15:*/
-#line 191 "common.h"
+#line 192 "common.h"
extern void common_init();
#line 128 "ctangle.w"
@@ -356,7 +357,7 @@
eight_bits next_control;
/*:75*//*82:*/
-#line 1350 "ctangle.w"
+#line 1353 "ctangle.w"
extern sixteen_bits section_count;
@@ -388,12 +389,12 @@
static void out_char();
/*:48*//*90:*/
-#line 1457 "ctangle.w"
+#line 1460 "ctangle.w"
void phase_one();
/*:90*//*92:*/
-#line 1475 "ctangle.w"
+#line 1478 "ctangle.w"
void skip_limbo();
@@ -888,11 +889,14 @@
#line 1225 "ctangle.w"
store_two_bytes(0150000);
-if(changing)id_first= change_file_name;
-else id_first= cur_file_name;
+if(changing&&include_depth==change_depth){
+id_first= change_file_name;
+store_two_bytes((sixteen_bits)change_line);
+}else{
+id_first= cur_file_name;
+store_two_bytes((sixteen_bits)cur_line);
+}
id_loc= id_first+strlen(id_first);
-if(changing)store_two_bytes((sixteen_bits)change_line);
-else store_two_bytes((sixteen_bits)cur_line);
{int a= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a/0400)+0200);
app_repl(a%0400);}
@@ -1192,11 +1196,14 @@
#line 1225 "ctangle.w"
store_two_bytes(0150000);
-if(changing)id_first= change_file_name;
-else id_first= cur_file_name;
+if(changing&&include_depth==change_depth){
+id_first= change_file_name;
+store_two_bytes((sixteen_bits)change_line);
+}else{
+id_first= cur_file_name;
+store_two_bytes((sixteen_bits)cur_line);
+}
id_loc= id_first+strlen(id_first);
-if(changing)store_two_bytes((sixteen_bits)change_line);
-else store_two_bytes((sixteen_bits)cur_line);
{int a= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a/0400)+0200);
app_repl(a%0400);}
@@ -1205,7 +1212,7 @@
;}
while(1)switch(a= get_next()){
/*78:*/
-#line 1235 "ctangle.w"
+#line 1238 "ctangle.w"
case identifier:a= id_lookup(id_first,id_loc,0)-name_dir;
app_repl((a/0400)+0200);
@@ -1213,7 +1220,7 @@
case section_name:if(t!=section_name)goto done;
else{
/*79:*/
-#line 1268 "ctangle.w"
+#line 1271 "ctangle.w"
{
char*try_loc= loc;
while(*try_loc==' '&&try_loc<limit)try_loc++;
@@ -1226,7 +1233,7 @@
}
/*:79*/
-#line 1241 "ctangle.w"
+#line 1244 "ctangle.w"
;
a= cur_section_name-name_dir;
app_repl((a/0400)+0250);
@@ -1235,16 +1242,19 @@
#line 1225 "ctangle.w"
store_two_bytes(0150000);
-if(changing)id_first= change_file_name;
-else id_first= cur_file_name;
+if(changing&&include_depth==change_depth){
+id_first= change_file_name;
+store_two_bytes((sixteen_bits)change_line);
+}else{
+id_first= cur_file_name;
+store_two_bytes((sixteen_bits)cur_line);
+}
id_loc= id_first+strlen(id_first);
-if(changing)store_two_bytes((sixteen_bits)change_line);
-else store_two_bytes((sixteen_bits)cur_line);
{int a= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a/0400)+0200);
app_repl(a%0400);}
/*:77*/
-#line 1245 "ctangle.w"
+#line 1248 "ctangle.w"
;break;
}
case output_defs_code:if(t!=section_name)err_print("! Misplaced @h");
@@ -1258,22 +1268,25 @@
#line 1225 "ctangle.w"
store_two_bytes(0150000);
-if(changing)id_first= change_file_name;
-else id_first= cur_file_name;
+if(changing&&include_depth==change_depth){
+id_first= change_file_name;
+store_two_bytes((sixteen_bits)change_line);
+}else{
+id_first= cur_file_name;
+store_two_bytes((sixteen_bits)cur_line);
+}
id_loc= id_first+strlen(id_first);
-if(changing)store_two_bytes((sixteen_bits)change_line);
-else store_two_bytes((sixteen_bits)cur_line);
{int a= id_lookup(id_first,id_loc,0)-name_dir;app_repl((a/0400)+0200);
app_repl(a%0400);}
/*:77*/
-#line 1254 "ctangle.w"
+#line 1257 "ctangle.w"
;
}
break;
case constant:case string:
/*80:*/
-#line 1279 "ctangle.w"
+#line 1282 "ctangle.w"
app_repl(a);
while(id_first<id_loc){
@@ -1287,11 +1300,11 @@
app_repl(a);break;
/*:80*/
-#line 1258 "ctangle.w"
+#line 1261 "ctangle.w"
;
case ord:
/*81:*/
-#line 1295 "ctangle.w"
+#line 1298 "ctangle.w"
{
int c= (eight_bits)*id_first;
if(c=='\\'){
@@ -1342,7 +1355,7 @@
break;
/*:81*/
-#line 1260 "ctangle.w"
+#line 1263 "ctangle.w"
;
case definition:case format_code:case begin_C:if(t!=section_name)goto done;
else{
@@ -1365,7 +1378,7 @@
}
/*:76*//*83:*/
-#line 1357 "ctangle.w"
+#line 1360 "ctangle.w"
void
scan_section()
@@ -1380,7 +1393,7 @@
next_control= 0;
while(1){
/*84:*/
-#line 1396 "ctangle.w"
+#line 1399 "ctangle.w"
while(next_control<definition)
@@ -1389,11 +1402,11 @@
}
/*:84*/
-#line 1371 "ctangle.w"
+#line 1374 "ctangle.w"
;
if(next_control==definition){
/*85:*/
-#line 1403 "ctangle.w"
+#line 1406 "ctangle.w"
{
while((next_control= get_next())=='\n');
if(next_control!=identifier){
@@ -1412,7 +1425,7 @@
}
/*:85*/
-#line 1373 "ctangle.w"
+#line 1376 "ctangle.w"
continue;
}
@@ -1422,7 +1435,7 @@
if(next_control==section_name){
p= cur_section_name;
/*86:*/
-#line 1428 "ctangle.w"
+#line 1431 "ctangle.w"
while((next_control= get_next())=='+');
if(next_control!='='&&next_control!=eq_eq)
@@ -1429,7 +1442,7 @@
continue;
/*:86*/
-#line 1381 "ctangle.w"
+#line 1384 "ctangle.w"
;
break;
}
@@ -1437,20 +1450,20 @@
}
no_where= print_where= 0;
/*87:*/
-#line 1433 "ctangle.w"
+#line 1436 "ctangle.w"
/*88:*/
-#line 1438 "ctangle.w"
+#line 1441 "ctangle.w"
store_two_bytes((sixteen_bits)(0150000+section_count));
/*:88*/
-#line 1434 "ctangle.w"
+#line 1437 "ctangle.w"
;
scan_repl(section_name);
/*89:*/
-#line 1442 "ctangle.w"
+#line 1445 "ctangle.w"
if(p==name_dir||p==0){
(last_unnamed)->text_link= cur_text-text_info;last_unnamed= cur_text;
@@ -1467,16 +1480,16 @@
/*:89*/
-#line 1436 "ctangle.w"
+#line 1439 "ctangle.w"
;
/*:87*/
-#line 1387 "ctangle.w"
+#line 1390 "ctangle.w"
;
}
/*:83*//*91:*/
-#line 1460 "ctangle.w"
+#line 1463 "ctangle.w"
void
phase_one(){
@@ -1490,7 +1503,7 @@
}
/*:91*//*93:*/
-#line 1478 "ctangle.w"
+#line 1481 "ctangle.w"
void
skip_limbo()
@@ -1505,7 +1518,7 @@
if(ccode[(eight_bits)c]==new_section)break;
switch(ccode[(eight_bits)c]){
case translit_code:/*94:*/
-#line 1507 "ctangle.w"
+#line 1510 "ctangle.w"
while(xisspace(*loc)&&loc<limit)loc++;
loc+= 3;
@@ -1530,7 +1543,7 @@
}
/*:94*/
-#line 1491 "ctangle.w"
+#line 1494 "ctangle.w"
;break;
case format_code:case'@':break;
case control_text:if(c=='q'||c=='Q'){
@@ -1548,7 +1561,7 @@
}
/*:93*//*95:*/
-#line 1533 "ctangle.w"
+#line 1536 "ctangle.w"
void
print_stats(){
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctangle.w
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctangle.w 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctangle.w 2017-03-07 18:21:57 UTC (rev 768)
@@ -1224,11 +1224,14 @@
@<Insert the line...@>=
store_two_bytes(0150000);
-if (changing) id_first=change_file_name;
-else id_first=cur_file_name;
+if (changing && include_depth==change_depth) { /* correction made Feb 2017 */
+ id_first=change_file_name;
+ store_two_bytes((sixteen_bits)change_line);
+}@+else {
+ id_first=cur_file_name;
+ store_two_bytes((sixteen_bits)cur_line);
+}
id_loc=id_first+strlen(id_first);
-if (changing) store_two_bytes((sixteen_bits)change_line);
-else store_two_bytes((sixteen_bits)cur_line);
{int a=id_lookup(id_first,id_loc,0)-name_dir; app_repl((a / 0400)+0200);
app_repl(a % 0400);}
Modified: branches/stable/source/src/texk/web2c/omegafonts/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/omegafonts/Makefile.in 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/texk/web2c/omegafonts/Makefile.in 2017-03-07 18:21:57 UTC (rev 768)
@@ -1330,9 +1330,13 @@
cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
@KPATHSEA_RULE@
+
+# $Id: bin_links.am 43248 2017-02-16 21:38:29Z karl $
+# am/bin_links.am: Makefile fragment for bindir links.
.PHONY: install-bin-links uninstall-bin-links
install-bin-links:
+ at WIN32_FALSE@ $(MKDIR_P) $(DESTDIR)$(bindir)
@WIN32_FALSE@ @cd $(DESTDIR)$(bindir) && \
@WIN32_FALSE@ for s in $(bin_links); do \
@WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \
Modified: branches/stable/source/src/texk/web2c/web2c/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/web2c/Makefile.in 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/texk/web2c/web2c/Makefile.in 2017-03-07 18:21:57 UTC (rev 768)
@@ -239,12 +239,12 @@
$(top_srcdir)/../../../build-aux/ltmain.sh \
$(top_srcdir)/../../../build-aux/missing \
$(top_srcdir)/../../../build-aux/ylwrap \
- ../../../build-aux/compile ../../../build-aux/config.guess \
- ../../../build-aux/config.sub ../../../build-aux/depcomp \
- ../../../build-aux/install-sh ../../../build-aux/ltmain.sh \
- ../../../build-aux/missing ../../../build-aux/texinfo.tex \
- ../../../build-aux/ylwrap ChangeLog README web2c-lexer.c \
- web2c-parser.c web2c-parser.h
+ ../../../build-aux/ar-lib ../../../build-aux/compile \
+ ../../../build-aux/config.guess ../../../build-aux/config.sub \
+ ../../../build-aux/depcomp ../../../build-aux/install-sh \
+ ../../../build-aux/ltmain.sh ../../../build-aux/missing \
+ ../../../build-aux/texinfo.tex ../../../build-aux/ylwrap \
+ ChangeLog README web2c-lexer.c web2c-parser.c web2c-parser.h
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
Modified: branches/stable/source/src/utils/Makefile.in
===================================================================
--- branches/stable/source/src/utils/Makefile.in 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/utils/Makefile.in 2017-03-07 18:21:57 UTC (rev 768)
@@ -151,8 +151,6 @@
$(top_srcdir)/../texk/dvipos/ac/withenable.ac \
$(top_srcdir)/../texk/dvipsk/ac/withenable.ac \
$(top_srcdir)/../texk/dvisvgm/ac/withenable.ac \
- $(top_srcdir)/../texk/dvisvgm/ac/dvisvgm.ac \
- $(top_srcdir)/../texk/dvisvgm/ac/libgs.ac \
$(top_srcdir)/../texk/gregorio/ac/withenable.ac \
$(top_srcdir)/../texk/gsftopk/ac/withenable.ac \
$(top_srcdir)/../texk/lcdf-typetools/ac/withenable.ac \
@@ -265,11 +263,12 @@
$(top_srcdir)/../build-aux/config.guess \
$(top_srcdir)/../build-aux/config.sub \
$(top_srcdir)/../build-aux/install-sh \
- $(top_srcdir)/../build-aux/missing ../build-aux/compile \
- ../build-aux/config.guess ../build-aux/config.sub \
- ../build-aux/depcomp ../build-aux/install-sh \
- ../build-aux/ltmain.sh ../build-aux/missing \
- ../build-aux/texinfo.tex ../build-aux/ylwrap ChangeLog README
+ $(top_srcdir)/../build-aux/missing ../build-aux/ar-lib \
+ ../build-aux/compile ../build-aux/config.guess \
+ ../build-aux/config.sub ../build-aux/depcomp \
+ ../build-aux/install-sh ../build-aux/ltmain.sh \
+ ../build-aux/missing ../build-aux/texinfo.tex \
+ ../build-aux/ylwrap ChangeLog README
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -403,7 +402,6 @@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
-subdirs = @subdirs@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
@@ -420,11 +418,18 @@
recurse_this = utils/
recurse_top = ../
-# We must configure all subdirs since 'make dist' needs the Makefile.
-# For those not required for the current set of configure options
+# $Id: recurse.am 43261 2017-02-17 22:37:44Z karl $
+#
+# Requires $(recurse_this) and $(recurse_top).
+# Uses CONF_SUBDIRS and MAKE_SUBDIRS (set by kpse-setup.m4).
+#
+# For subdirs not required for the current set of configure options
# we append '--disable-build' so they can skip tests that would
# fail because, e.g., some required libraries were not built.
+# (By manually testing $enable_build in configure, e.g., dvisvgm/configure.)
+#
# Code inspired by automake's way to handle recursive targets.
+#
cf_silent = $(cf_silent_ at AM_V@)
cf_silent_ = $(cf_silent_ at AM_DEFAULT_V@)
cf_silent_0 = --silent
Modified: branches/stable/source/src/utils/README
===================================================================
--- branches/stable/source/src/utils/README 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/utils/README 2017-03-07 18:21:57 UTC (rev 768)
@@ -1,4 +1,4 @@
-$Id: README 42657 2016-12-09 07:19:10Z kakuto $
+$Id: README 43422 2017-03-07 18:10:02Z karl $
Public domain. Originally written 2005 by Karl Berry.
Extra utilities we (optionally) compile for TeX Live.
@@ -5,15 +5,14 @@
See comments in ../texk/README.
-asymptote 2.38 - checked 13may16
- (this version for dev build testing only, not to be installed)
+asymptote 2.40 - checked 7mar17
update to TL from CTAN, to include prebuilt doc.
see http://tug.org/texlive/build.html#asymptote
and tlpkg/bin/tl-update-asy
-autosp 2016-01-30 - checked 7mar16
+autosp 2016-11-02 - checked 28feb17
http://ctan.org/pkg/autosp
-
+
devnag - from devanagari package installed in texmf-dist.
lacheck - maintained here, by us
Modified: branches/stable/source/src/utils/configure
===================================================================
--- branches/stable/source/src/utils/configure 2017-02-18 23:49:54 UTC (rev 767)
+++ branches/stable/source/src/utils/configure 2017-03-07 18:21:57 UTC (rev 768)
@@ -585,14 +585,12 @@
PACKAGE_URL=''
ac_unique_file="../build-aux/missing"
-enable_option_checking=no
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+MAKE_SUBDIRS
CONF_SUBDIRS
-MAKE_SUBDIRS
-subdirs
WARNING_CFLAGS
MAINT
MAINTAINER_MODE_FALSE
@@ -775,10 +773,6 @@
enable_dvipos
enable_dvipsk
enable_dvisvgm
-with_libgs
-with_system_libgs
-with_libgs_includes
-with_libgs_libdir
enable_gregorio
enable_gsftopk
enable_lcdf_typetools
@@ -860,19 +854,8 @@
LDFLAGS
LIBS
CPPFLAGS'
-ac_subdirs_all='autosp
-devnag
-lacheck
-m-tx
-pmx
-ps2eps
-t1utils
-texdoctk
-tpic2pdftex
-vlna
-xindy
-xpdfopen'
+
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
@@ -1641,12 +1624,6 @@
[texworks --position=%d "%s"]
--with-mf-x-toolkit use X toolkit for METAFONT
--with-gs=/PATH/TO/gs Hard-wire the location of GhostScript
- --without-libgs build dvisvgm without PostScript support
- --with-system-libgs build dvisvgm with installed gs headers and library
- [default: no]
- --with-libgs-includes=DIR
- libgs headers installed in DIR
- --with-libgs-libdir=DIR libgs library installed in DIR
--with-xdvi-x-toolkit=KIT
Use toolkit KIT (motif/xaw/xaw3d/neXtaw) for xdvi
[default: Motif if available, else Xaw]
@@ -4412,7 +4389,7 @@
need_kpathsea=yes
}
-## texk/dvisvgm/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
+# texk/dvisvgm/ac/withenable.ac: configure.ac fragment
## configure options and TL libraries required for dvisvgm
# Check whether --enable-dvisvgm was given.
if test "${enable_dvisvgm+set}" = set; then :
@@ -4437,39 +4414,6 @@
need_zlib=yes
}
-## texk/dvisvgm/ac/dvisvgm.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
-## configure options for dvisvgm
-
-# Check whether --with-libgs was given.
-if test "${with_libgs+set}" = set; then :
- withval=$with_libgs;
-fi
-
-
-# Check whether --with-system-libgs was given.
-if test "${with_system_libgs+set}" = set; then :
- withval=$with_system_libgs;
-fi
-
-
-# Check whether --with-libgs-includes was given.
-if test "${with_libgs_includes+set}" = set; then :
- withval=$with_libgs_includes;
-fi
-
-
-# Check whether --with-libgs-libdir was given.
-if test "${with_libgs_libdir+set}" = set; then :
- withval=$with_libgs_libdir;
-fi
-
-
-## texk/dvisvgm/ac/libgs.ac: configure.ac fragment for the TeX Live subdirectory texk/dvisvgm/
-## configure checks for dvisvgm and libgs
-if test "x$enable_native_texlive_build:$with_system_libgs" = xyes:yes; then
- as_fn_error $? "you can not use system libraries for a native TeX Live build" "$LINENO" 5
-fi
-
## texk/gregorio/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gregorio/
## configure options and TL libraries required for gregorio
# Check whether --enable-gregorio was given.
@@ -6450,107 +6394,57 @@
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Utils programs to build" >&5
$as_echo_n "checking for Utils programs to build... " >&6; }
+CONF_SUBDIRS=
MAKE_SUBDIRS=
-CONF_SUBDIRS=
-if test -x $srcdir/autosp/configure; then
- test "x$enable_autosp" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS autosp"
+if test -x $srcdir/autosp/configure && test "x$enable_autosp" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS autosp"
- if false; then
- subdirs="$subdirs autosp"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS autosp"
fi
-if test -x $srcdir/devnag/configure; then
- test "x$enable_devnag" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS devnag"
+if test -x $srcdir/devnag/configure && test "x$enable_devnag" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS devnag"
- if false; then
- subdirs="$subdirs devnag"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS devnag"
fi
-if test -x $srcdir/lacheck/configure; then
- test "x$enable_lacheck" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS lacheck"
+if test -x $srcdir/lacheck/configure && test "x$enable_lacheck" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS lacheck"
- if false; then
- subdirs="$subdirs lacheck"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS lacheck"
fi
-if test -x $srcdir/m-tx/configure; then
- test "x$enable_m_tx" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS m-tx"
+if test -x $srcdir/m-tx/configure && test "x$enable_m_tx" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS m-tx"
- if false; then
- subdirs="$subdirs m-tx"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS m-tx"
fi
-if test -x $srcdir/pmx/configure; then
- test "x$enable_pmx" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS pmx"
+if test -x $srcdir/pmx/configure && test "x$enable_pmx" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS pmx"
- if false; then
- subdirs="$subdirs pmx"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS pmx"
fi
-if test -x $srcdir/ps2eps/configure; then
- test "x$enable_ps2eps" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS ps2eps"
+if test -x $srcdir/ps2eps/configure && test "x$enable_ps2eps" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS ps2eps"
- if false; then
- subdirs="$subdirs ps2eps"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS ps2eps"
fi
-if test -x $srcdir/t1utils/configure; then
- test "x$enable_t1utils" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS t1utils"
+if test -x $srcdir/t1utils/configure && test "x$enable_t1utils" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS t1utils"
- if false; then
- subdirs="$subdirs t1utils"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS t1utils"
fi
-if test -x $srcdir/texdoctk/configure; then
- test "x$enable_texdoctk" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS texdoctk"
+if test -x $srcdir/texdoctk/configure && test "x$enable_texdoctk" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS texdoctk"
- if false; then
- subdirs="$subdirs texdoctk"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS texdoctk"
fi
-if test -x $srcdir/tpic2pdftex/configure; then
- test "x$enable_tpic2pdftex" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS tpic2pdftex"
+if test -x $srcdir/tpic2pdftex/configure && test "x$enable_tpic2pdftex" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS tpic2pdftex"
- if false; then
- subdirs="$subdirs tpic2pdftex"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS tpic2pdftex"
fi
-if test -x $srcdir/vlna/configure; then
- test "x$enable_vlna" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS vlna"
+if test -x $srcdir/vlna/configure && test "x$enable_vlna" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS vlna"
- if false; then
- subdirs="$subdirs vlna"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS vlna"
fi
-if test -x $srcdir/xindy/configure; then
- test "x$enable_xindy" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xindy"
+if test -x $srcdir/xindy/configure && test "x$enable_xindy" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS xindy"
- if false; then
- subdirs="$subdirs xindy"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS xindy"
fi
-if test -x $srcdir/xpdfopen/configure; then
- test "x$enable_xpdfopen" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS xpdfopen"
+if test -x $srcdir/xpdfopen/configure && test "x$enable_xpdfopen" = xyes; then
CONF_SUBDIRS="$CONF_SUBDIRS xpdfopen"
- if false; then
- subdirs="$subdirs xpdfopen"
-
- fi
+ MAKE_SUBDIRS="$MAKE_SUBDIRS xpdfopen"
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKE_SUBDIRS" >&5
@@ -7861,151 +7755,6 @@
# would make configure fail if this is the last instruction.
$ac_cs_success || as_fn_exit 1
fi
-
-#
-# CONFIG_SUBDIRS section.
-#
-if test "$no_recursion" != yes; then
-
- # Remove --cache-file, --srcdir, and --disable-option-checking arguments
- # so they do not pile up.
- ac_sub_configure_args=
- ac_prev=
- eval "set x $ac_configure_args"
- shift
- for ac_arg
- do
- if test -n "$ac_prev"; then
- ac_prev=
- continue
- fi
- case $ac_arg in
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
- | --c=*)
- ;;
- --config-cache | -C)
- ;;
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- ;;
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- ;;
- --disable-option-checking)
- ;;
- *)
- case $ac_arg in
- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
- esac
- done
-
- # Always prepend --prefix to ensure using the same prefix
- # in subdir configurations.
- ac_arg="--prefix=$prefix"
- case $ac_arg in
- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
-
- # Pass --silent
- if test "$silent" = yes; then
- ac_sub_configure_args="--silent $ac_sub_configure_args"
- fi
-
- # Always prepend --disable-option-checking to silence warnings, since
- # different subdirs can have different --enable and --with options.
- ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
-
- ac_popdir=`pwd`
- for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
- # Do not complain, so a configure script can configure whichever
- # parts of a large source tree are present.
- test -d "$srcdir/$ac_dir" || continue
-
- ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
- $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
- $as_echo "$ac_msg" >&6
- as_dir="$ac_dir"; as_fn_mkdir_p
- ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
- cd "$ac_dir"
-
- # Check for guested configure; otherwise get Cygnus style configure.
- if test -f "$ac_srcdir/configure.gnu"; then
- ac_sub_configure=$ac_srcdir/configure.gnu
- elif test -f "$ac_srcdir/configure"; then
- ac_sub_configure=$ac_srcdir/configure
- elif test -f "$ac_srcdir/configure.in"; then
- # This should be Cygnus configure.
- ac_sub_configure=$ac_aux_dir/configure
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5
-$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
- ac_sub_configure=
- fi
-
- # The recursion is here.
- if test -n "$ac_sub_configure"; then
- # Make the cache file name correct relative to the subdirectory.
- case $cache_file in
- [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
- *) # Relative name.
- ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
- esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
-$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
- # The eval makes quoting arguments work.
- eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
- --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
- as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
- fi
-
- cd "$ac_popdir"
- done
-fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
More information about the pdftex-commits
mailing list