pdftex[933] branches/stable/source/src: sync from tl 71860
commits+karl at tug.org
commits+karl at tug.org
Sun Jul 21 19:12:46 CEST 2024
Revision: 933
https://tug.org/svn/pdftex?view=revision&revision=933
Author: karl
Date: 2024-07-21 19:12:46 +0200 (Sun, 21 Jul 2024)
Log Message:
-----------
sync from tl 71860
Modified Paths:
--------------
branches/stable/source/src/Makefile.am
branches/stable/source/src/Makefile.in
branches/stable/source/src/aclocal.m4
branches/stable/source/src/auxdir/auxsub/Makefile.in
branches/stable/source/src/auxdir/auxsub/aclocal.m4
branches/stable/source/src/auxdir/auxsub/configure
branches/stable/source/src/build-aux/ar-lib
branches/stable/source/src/build-aux/compile
branches/stable/source/src/build-aux/depcomp
branches/stable/source/src/build-aux/install-sh
branches/stable/source/src/configure
branches/stable/source/src/doc/ChangeLog
branches/stable/source/src/doc/Makefile.in
branches/stable/source/src/doc/build-tools.txt
branches/stable/source/src/doc/tlbuild.info
branches/stable/source/src/doc/tlbuild.texi
branches/stable/source/src/libs/Makefile.in
branches/stable/source/src/libs/README
branches/stable/source/src/libs/aclocal.m4
branches/stable/source/src/libs/configure
branches/stable/source/src/libs/libpng/ChangeLog
branches/stable/source/src/libs/libpng/Makefile.in
branches/stable/source/src/libs/libpng/aclocal.m4
branches/stable/source/src/libs/libpng/config.h.in
branches/stable/source/src/libs/libpng/configure
branches/stable/source/src/libs/libpng/configure.ac
branches/stable/source/src/libs/libpng/include/Makefile.in
branches/stable/source/src/libs/xpdf/Makefile.in
branches/stable/source/src/libs/xpdf/aclocal.m4
branches/stable/source/src/libs/xpdf/aconf.h.in
branches/stable/source/src/libs/xpdf/configure
branches/stable/source/src/libs/xpdf/fofi/Makefile.in
branches/stable/source/src/libs/xpdf/goo/Makefile.in
branches/stable/source/src/libs/xpdf/splash/Makefile.in
branches/stable/source/src/libs/xpdf/xpdf/Makefile.in
branches/stable/source/src/libs/zlib/ChangeLog
branches/stable/source/src/libs/zlib/Makefile.in
branches/stable/source/src/libs/zlib/aclocal.m4
branches/stable/source/src/libs/zlib/config.h.in
branches/stable/source/src/libs/zlib/configure
branches/stable/source/src/libs/zlib/configure.ac
branches/stable/source/src/libs/zlib/include/Makefile.in
branches/stable/source/src/m4/ChangeLog
branches/stable/source/src/m4/kpse-common.m4
branches/stable/source/src/m4/kpse-setup.m4
branches/stable/source/src/m4/kpse-visibility.m4
branches/stable/source/src/reautoconf
branches/stable/source/src/texk/Makefile.in
branches/stable/source/src/texk/README
branches/stable/source/src/texk/aclocal.m4
branches/stable/source/src/texk/configure
branches/stable/source/src/texk/kpathsea/ChangeLog
branches/stable/source/src/texk/kpathsea/Makefile.in
branches/stable/source/src/texk/kpathsea/aclocal.m4
branches/stable/source/src/texk/kpathsea/c-auto.in
branches/stable/source/src/texk/kpathsea/configure
branches/stable/source/src/texk/kpathsea/doc/Makefile.in
branches/stable/source/src/texk/kpathsea/man/Makefile.in
branches/stable/source/src/texk/kpathsea/texmf.cnf
branches/stable/source/src/texk/kpathsea/version.ac
branches/stable/source/src/texk/kpathsea/win32/ChangeLog
branches/stable/source/src/texk/kpathsea/win32/Makefile.in
branches/stable/source/src/texk/kpathsea/win32/mktexpk.c
branches/stable/source/src/texk/kpathsea/win32/mktextfm.c
branches/stable/source/src/texk/kpathsea/win32/mktexupd.c
branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm
branches/stable/source/src/texk/web2c/ChangeLog
branches/stable/source/src/texk/web2c/Makefile.am
branches/stable/source/src/texk/web2c/Makefile.in
branches/stable/source/src/texk/web2c/ac/web2c.ac
branches/stable/source/src/texk/web2c/aclocal.m4
branches/stable/source/src/texk/web2c/c-auto.in
branches/stable/source/src/texk/web2c/configure
branches/stable/source/src/texk/web2c/configure.ac
branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
branches/stable/source/src/texk/web2c/cwebdir/comm-mini.ch
branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/ctwill-mini.ch
branches/stable/source/src/texk/web2c/cwebdir/ctwill-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/cweav-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/cwebacromac.tex
branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex
branches/stable/source/src/texk/web2c/cwebdir/cwebman-w2c.ch
branches/stable/source/src/texk/web2c/cwebdir/texinputs/dcwebmac.tex
branches/stable/source/src/texk/web2c/cwebdir/texinputs/fcwebmac.tex
branches/stable/source/src/texk/web2c/cwebdir/texinputs/icwebmac.tex
branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfctproofmac.tex
branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfctwimac.tex
branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfwebtocfront.tex
branches/stable/source/src/texk/web2c/cwebdir/twinx.ch
branches/stable/source/src/texk/web2c/doc/Makefile.in
branches/stable/source/src/texk/web2c/etexdir/ChangeLog
branches/stable/source/src/texk/web2c/etexdir/etex.ch
branches/stable/source/src/texk/web2c/etexdir/etriptest.test
branches/stable/source/src/texk/web2c/help.h
branches/stable/source/src/texk/web2c/lib/ChangeLog
branches/stable/source/src/texk/web2c/lib/Makefile.am
branches/stable/source/src/texk/web2c/lib/Makefile.in
branches/stable/source/src/texk/web2c/man/Makefile.in
branches/stable/source/src/texk/web2c/omegafonts/Makefile.in
branches/stable/source/src/texk/web2c/otps/Makefile.in
branches/stable/source/src/texk/web2c/otps/win32/Makefile.in
branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
branches/stable/source/src/texk/web2c/pdftexdir/NEWS
branches/stable/source/src/texk/web2c/pdftexdir/tex.ch0
branches/stable/source/src/texk/web2c/synctexdir/ChangeLog
branches/stable/source/src/texk/web2c/synctexdir/am/synctex.am
branches/stable/source/src/texk/web2c/tangle.ch
branches/stable/source/src/texk/web2c/tex.ch
branches/stable/source/src/texk/web2c/tiedir/tie-w2c.ch
branches/stable/source/src/texk/web2c/unbalanced-braces.ch
branches/stable/source/src/texk/web2c/web2c/Makefile.in
branches/stable/source/src/texk/web2c/web2c/aclocal.m4
branches/stable/source/src/texk/web2c/web2c/c-auto.in
branches/stable/source/src/texk/web2c/web2c/configure
branches/stable/source/src/texk/web2c/window/Makefile.in
branches/stable/source/src/utils/Makefile.in
branches/stable/source/src/utils/aclocal.m4
branches/stable/source/src/utils/configure
branches/stable/source/src/version.ac
Added Paths:
-----------
branches/stable/source/src/texk/web2c/tests/aftergroupout.tex
branches/stable/source/src/texk/web2c/tests/fix-changefile-lines.py
Modified: branches/stable/source/src/Makefile.am
===================================================================
--- branches/stable/source/src/Makefile.am 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/Makefile.am 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 55329 2020-05-28 22:03:59Z karl $
+## $Id: Makefile.am 71119 2024-04-29 17:11:37Z karl $
## Makefile.am for the TeX Live top-level
##
## Copyright 2016-2020 Karl Berry <tex-live at tug.org>
@@ -103,3 +103,16 @@
.PHONY: triptrap
triptrap:
cd texk && $(MAKE) $(AM_MAKEFLAGS) $@
+
+# We aren't trying to keep make dist working. Sorry.
+distdir:
+ @echo "Sorry, we don't try to keep make dist working in TeX Live."
+ @echo
+ @echo "You can retrieve the development and/or released sources"
+ @echo " in various ways: https://tug.org/texlive/svn"
+ @echo
+ @echo "For info on how to integrate the built binaries into a runnable"
+ @echo " system, see: https://tug.org/texlive/build.html#deploy"
+ @echo
+ @echo "The result of make install is not usable by itself."
+ @false
Modified: branches/stable/source/src/Makefile.in
===================================================================
--- branches/stable/source/src/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,6 +69,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -296,8 +298,8 @@
top_distdir = $(distdir)
am__remove_distdir = \
if test -d "$(distdir)"; then \
- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -rf "$(distdir)" \
+ find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \
+ ; rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
am__post_remove_distdir = $(am__remove_distdir)
@@ -326,7 +328,7 @@
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
done; \
reldir="$$dir2"
-GZIP_ENV = --best
+GZIP_ENV = -9
DIST_ARCHIVES = $(distdir).tar.xz
DIST_TARGETS = dist-xz
# Exists only to be overridden by the user if desired.
@@ -429,8 +431,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -669,12 +673,10 @@
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-distdir: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) distdir-am
distdir-am: $(DISTFILES)
$(am__remove_distdir)
- test -d "$(distdir)" || mkdir "$(distdir)"
+ $(AM_V_at)$(MKDIR_P) "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -787,7 +789,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -797,7 +799,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
*.tar.zst*) \
@@ -897,8 +899,8 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -1084,6 +1086,26 @@
triptrap:
cd texk && $(MAKE) $(AM_MAKEFLAGS) $@
+# We aren't trying to keep make dist working. Sorry.
+distdir:
+ @echo "Sorry, we don't try to keep make dist working in TeX Live."
+ @echo
+ @echo "You can retrieve the development and/or released sources"
+ @echo " in various ways: https://tug.org/texlive/svn"
+ @echo
+ @echo "For info on how to integrate the built binaries into a runnable"
+ @echo " system, see: https://tug.org/texlive/build.html#deploy"
+ @echo
+ @echo "The result of make install is not usable by itself."
+ @false
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/aclocal.m4
===================================================================
--- branches/stable/source/src/aclocal.m4 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/aclocal.m4 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.17 -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2021 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.16'
+[am__api_version='1.17'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.5], [],
+m4_if([$1], [1.17], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,12 +51,12 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.5])dnl
+[AM_AUTOMAKE_VERSION([1.17])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-# Copyright (C) 2011-2021 Free Software Foundation, Inc.
+# Copyright (C) 2011-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -70,16 +70,18 @@
AC_DEFUN([AM_PROG_AR],
[AC_BEFORE([$0], [LT_INIT])dnl
AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
+AC_BEFORE([$0], [AC_PROG_AR])dnl
AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([ar-lib])dnl
AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
: ${AR=ar}
+: ${ARFLAGS=cr}
AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
[AC_LANG_PUSH([C])
am_cv_ar_interface=ar
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
- [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+ [am_ar_try='$AR $ARFLAGS libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
AC_TRY_EVAL([am_ar_try])
if test "$ac_status" -eq 0; then
am_cv_ar_interface=ar
@@ -118,7 +120,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -170,7 +172,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -201,7 +203,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +335,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -392,7 +394,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -460,7 +462,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -594,7 +596,7 @@
fi
AC_SUBST([CSCOPE])
-AC_REQUIRE([AM_SILENT_RULES])dnl
+AC_REQUIRE([_AM_SILENT_RULES])dnl
dnl The testsuite driver may need to know about EXEEXT, so add the
dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
@@ -602,47 +604,9 @@
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
+AC_REQUIRE([_AM_PROG_RM_F])
+AC_REQUIRE([_AM_PROG_XARGS_N])
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
- AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
- fi
-fi
dnl The trailing newline in this macro's definition is deliberate, for
dnl backward compatibility and to allow trailing 'dnl'-style comments
dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
@@ -675,7 +639,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -696,7 +660,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2021 Free Software Foundation, Inc.
+# Copyright (C) 2003-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -718,7 +682,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -753,7 +717,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -796,7 +760,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -830,7 +794,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -859,7 +823,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -906,12 +870,28 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# _AM_PROG_RM_F
+# ---------------
+# Check whether 'rm -f' without any arguments works.
+# https://bugs.gnu.org/10828
+AC_DEFUN([_AM_PROG_RM_F],
+[am__rm_f_notfound=
+AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='""'])
+AC_SUBST(am__rm_f_notfound)
+])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
# AM_RUN_LOG(COMMAND)
# -------------------
# Run COMMAND, save the exit status in ac_status, and log it.
@@ -925,16 +905,169 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# _AM_SLEEP_FRACTIONAL_SECONDS
+# ----------------------------
+AC_DEFUN([_AM_SLEEP_FRACTIONAL_SECONDS], [dnl
+AC_CACHE_CHECK([whether sleep supports fractional seconds],
+ am_cv_sleep_fractional_seconds, [dnl
+AS_IF([sleep 0.001 2>/dev/null], [am_cv_sleep_fractional_seconds=yes],
+ [am_cv_sleep_fractional_seconds=no])
+])])
+
+# _AM_FILESYSTEM_TIMESTAMP_RESOLUTION
+# -----------------------------------
+# Determine the filesystem's resolution for file modification
+# timestamps. The coarsest we know of is FAT, with a resolution
+# of only two seconds, even with the most recent "exFAT" extensions.
+# The finest (e.g. ext4 with large inodes, XFS, ZFS) is one
+# nanosecond, matching clock_gettime. However, it is probably not
+# possible to delay execution of a shell script for less than one
+# millisecond, due to process creation overhead and scheduling
+# granularity, so we don't check for anything finer than that. (See below.)
+AC_DEFUN([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION], [dnl
+AC_REQUIRE([_AM_SLEEP_FRACTIONAL_SECONDS])
+AC_CACHE_CHECK([filesystem timestamp resolution],
+ am_cv_filesystem_timestamp_resolution, [dnl
+# Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `[ls -t conftest.ts[12]]` &&
+ {
+ test "$[]*" != "X conftest.ts1 conftest.ts2" ||
+ test "$[]*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ _AS_ECHO_UNQUOTED(
+ ["Bad output from ls -t: \"`[ls -t conftest.ts[12]]`\""],
+ [AS_MESSAGE_LOG_FD])
+ AC_MSG_FAILURE([ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.])
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$[]2" = conftest.ts3 &&
+ test "$[]3" = conftest.ts2 &&
+ test "$[]4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+])])
+
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
+[AC_REQUIRE([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION])
+# This check should not be cached, as it may vary across builds of
+# different projects.
+AC_MSG_CHECKING([whether build environment is sane])
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -953,49 +1086,40 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[]*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$[]2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
- alias in your environment])
- fi
- if test "$[2]" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
+AC_MSG_RESULT([$am_build_env_is_sane])
+if test "$am_build_env_is_sane" = no; then
+ AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT([yes])
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+AS_IF([test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1],, [dnl
+ ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
-fi
+])
AC_CONFIG_COMMANDS_PRE(
[AC_MSG_CHECKING([that generated files are newer than configure])
if test -n "$am_sleep_pid"; then
@@ -1006,18 +1130,18 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2021 Free Software Foundation, Inc.
+# Copyright (C) 2009-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
+# _AM_SILENT_RULES
+# ----------------
+# Enable less verbose build rules support.
+AC_DEFUN([_AM_SILENT_RULES],
+[AM_DEFAULT_VERBOSITY=1
+AC_ARG_ENABLE([silent-rules], [dnl
AS_HELP_STRING(
[--enable-silent-rules],
[less verbose build output (undo: "make V=1")])
@@ -1025,11 +1149,6 @@
[--disable-silent-rules],
[verbose build output (undo: "make V=0")])dnl
])
-case $enable_silent_rules in @%:@ (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
dnl
dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
dnl do not support nested variable expansions.
@@ -1048,6 +1167,21 @@
else
am_cv_make_support_nested_variables=no
fi])
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+dnl Delay evaluation of AM_DEFAULT_VERBOSITY to the end to allow multiple calls
+dnl to AM_SILENT_RULES to change the default value.
+AC_CONFIG_COMMANDS_PRE([dnl
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
if test $am_cv_make_support_nested_variables = yes; then
dnl Using '$V' instead of '$(V)' breaks IRIX make.
AM_V='$(V)'
@@ -1056,17 +1190,18 @@
AM_V=$AM_DEFAULT_VERBOSITY
AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])dnl
])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Set the default verbosity level to DEFAULT ("yes" being less verbose, "no" or
+# empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_REQUIRE([_AM_SILENT_RULES])
+AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1094,7 +1229,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2021 Free Software Foundation, Inc.
+# Copyright (C) 2006-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1113,7 +1248,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2021 Free Software Foundation, Inc.
+# Copyright (C) 2004-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1159,15 +1294,19 @@
am_uid=`id -u || echo unknown`
am_gid=`id -g || echo unknown`
AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
- if test $am_uid -le $am_max_uid; then
- AC_MSG_RESULT([yes])
+ if test x$am_uid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current UID is ok, but dist-ustar might not work])
+ elif test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT([no])
- _am_tools=none
+ AC_MSG_RESULT([no])
+ _am_tools=none
fi
AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
- if test $am_gid -le $am_max_gid; then
- AC_MSG_RESULT([yes])
+ if test x$gm_gid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current GID is ok, but dist-ustar might not work])
+ elif test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
_am_tools=none
@@ -1244,6 +1383,26 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_XARGS_N
+# ----------------
+# Check whether 'xargs -n' works. It should work everywhere, so the fallback
+# is not optimized at all as we never expect to use it.
+AC_DEFUN([_AM_PROG_XARGS_N],
+[AC_CACHE_CHECK([xargs -n works], am_cv_xargs_n_works, [dnl
+AS_IF([test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"], [am_cv_xargs_n_works=yes], [am_cv_xargs_n_works=no])])
+AS_IF([test "$am_cv_xargs_n_works" = yes], [am__xargs_n='xargs -n'], [dnl
+ am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "$@" "$am__xargs_n_arg"; done; }'
+])dnl
+AC_SUBST(am__xargs_n)
+])
+
m4_include([m4/kpse-cairo-flags.m4])
m4_include([m4/kpse-common.m4])
m4_include([m4/kpse-cxx-hack.m4])
Modified: branches/stable/source/src/auxdir/auxsub/Makefile.in
===================================================================
--- branches/stable/source/src/auxdir/auxsub/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/auxdir/auxsub/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,6 +69,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -130,13 +132,13 @@
top_distdir = $(distdir)
am__remove_distdir = \
if test -d "$(distdir)"; then \
- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -rf "$(distdir)" \
+ find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \
+ ; rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
am__post_remove_distdir = $(am__remove_distdir)
DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
+GZIP_ENV = -9
DIST_TARGETS = dist-gzip
# Exists only to be overridden by the user if desired.
AM_DISTCHECK_DVI_TARGET = dvi
@@ -143,7 +145,9 @@
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
+distcleancheck_listfiles = \
+ find . \( -type f -a \! \
+ \( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -187,8 +191,10 @@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
am__leading_dot = @am__leading_dot@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build_alias = @build_alias@
builddir = @builddir@
@@ -270,7 +276,7 @@
distdir-am: $(DISTFILES)
$(am__remove_distdir)
- test -d "$(distdir)" || mkdir "$(distdir)"
+ $(AM_V_at)$(MKDIR_P) "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -356,7 +362,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -366,7 +372,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
*.tar.zst*) \
@@ -465,9 +471,9 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -563,3 +569,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/auxdir/auxsub/aclocal.m4
===================================================================
--- branches/stable/source/src/auxdir/auxsub/aclocal.m4 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/auxdir/auxsub/aclocal.m4 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.17 -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2021 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.16'
+[am__api_version='1.17'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.5], [],
+m4_if([$1], [1.17], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.5])dnl
+[AM_AUTOMAKE_VERSION([1.17])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -58,7 +58,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -143,7 +143,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -277,7 +277,7 @@
fi
AC_SUBST([CSCOPE])
-AC_REQUIRE([AM_SILENT_RULES])dnl
+AC_REQUIRE([_AM_SILENT_RULES])dnl
dnl The testsuite driver may need to know about EXEEXT, so add the
dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
@@ -285,47 +285,9 @@
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
+AC_REQUIRE([_AM_PROG_RM_F])
+AC_REQUIRE([_AM_PROG_XARGS_N])
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
- AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
- fi
-fi
dnl The trailing newline in this macro's definition is deliberate, for
dnl backward compatibility and to allow trailing 'dnl'-style comments
dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
@@ -358,7 +320,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -379,7 +341,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2021 Free Software Foundation, Inc.
+# Copyright (C) 2003-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -401,7 +363,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -436,7 +398,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -470,7 +432,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -499,18 +461,187 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_RM_F
+# ---------------
+# Check whether 'rm -f' without any arguments works.
+# https://bugs.gnu.org/10828
+AC_DEFUN([_AM_PROG_RM_F],
+[am__rm_f_notfound=
+AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='""'])
+AC_SUBST(am__rm_f_notfound)
+])
+
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# _AM_SLEEP_FRACTIONAL_SECONDS
+# ----------------------------
+AC_DEFUN([_AM_SLEEP_FRACTIONAL_SECONDS], [dnl
+AC_CACHE_CHECK([whether sleep supports fractional seconds],
+ am_cv_sleep_fractional_seconds, [dnl
+AS_IF([sleep 0.001 2>/dev/null], [am_cv_sleep_fractional_seconds=yes],
+ [am_cv_sleep_fractional_seconds=no])
+])])
+
+# _AM_FILESYSTEM_TIMESTAMP_RESOLUTION
+# -----------------------------------
+# Determine the filesystem's resolution for file modification
+# timestamps. The coarsest we know of is FAT, with a resolution
+# of only two seconds, even with the most recent "exFAT" extensions.
+# The finest (e.g. ext4 with large inodes, XFS, ZFS) is one
+# nanosecond, matching clock_gettime. However, it is probably not
+# possible to delay execution of a shell script for less than one
+# millisecond, due to process creation overhead and scheduling
+# granularity, so we don't check for anything finer than that. (See below.)
+AC_DEFUN([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION], [dnl
+AC_REQUIRE([_AM_SLEEP_FRACTIONAL_SECONDS])
+AC_CACHE_CHECK([filesystem timestamp resolution],
+ am_cv_filesystem_timestamp_resolution, [dnl
+# Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `[ls -t conftest.ts[12]]` &&
+ {
+ test "$[]*" != "X conftest.ts1 conftest.ts2" ||
+ test "$[]*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ _AS_ECHO_UNQUOTED(
+ ["Bad output from ls -t: \"`[ls -t conftest.ts[12]]`\""],
+ [AS_MESSAGE_LOG_FD])
+ AC_MSG_FAILURE([ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.])
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$[]2" = conftest.ts3 &&
+ test "$[]3" = conftest.ts2 &&
+ test "$[]4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+])])
+
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
+[AC_REQUIRE([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION])
+# This check should not be cached, as it may vary across builds of
+# different projects.
+AC_MSG_CHECKING([whether build environment is sane])
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -529,49 +660,40 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[]*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$[]2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
- alias in your environment])
- fi
- if test "$[2]" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
+AC_MSG_RESULT([$am_build_env_is_sane])
+if test "$am_build_env_is_sane" = no; then
+ AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT([yes])
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+AS_IF([test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1],, [dnl
+ ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
-fi
+])
AC_CONFIG_COMMANDS_PRE(
[AC_MSG_CHECKING([that generated files are newer than configure])
if test -n "$am_sleep_pid"; then
@@ -582,18 +704,18 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2021 Free Software Foundation, Inc.
+# Copyright (C) 2009-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
+# _AM_SILENT_RULES
+# ----------------
+# Enable less verbose build rules support.
+AC_DEFUN([_AM_SILENT_RULES],
+[AM_DEFAULT_VERBOSITY=1
+AC_ARG_ENABLE([silent-rules], [dnl
AS_HELP_STRING(
[--enable-silent-rules],
[less verbose build output (undo: "make V=1")])
@@ -601,11 +723,6 @@
[--disable-silent-rules],
[verbose build output (undo: "make V=0")])dnl
])
-case $enable_silent_rules in @%:@ (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
dnl
dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
dnl do not support nested variable expansions.
@@ -624,6 +741,21 @@
else
am_cv_make_support_nested_variables=no
fi])
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+dnl Delay evaluation of AM_DEFAULT_VERBOSITY to the end to allow multiple calls
+dnl to AM_SILENT_RULES to change the default value.
+AC_CONFIG_COMMANDS_PRE([dnl
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
if test $am_cv_make_support_nested_variables = yes; then
dnl Using '$V' instead of '$(V)' breaks IRIX make.
AM_V='$(V)'
@@ -632,17 +764,18 @@
AM_V=$AM_DEFAULT_VERBOSITY
AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])dnl
])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Set the default verbosity level to DEFAULT ("yes" being less verbose, "no" or
+# empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_REQUIRE([_AM_SILENT_RULES])
+AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -670,7 +803,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2021 Free Software Foundation, Inc.
+# Copyright (C) 2006-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -689,7 +822,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2021 Free Software Foundation, Inc.
+# Copyright (C) 2004-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -735,15 +868,19 @@
am_uid=`id -u || echo unknown`
am_gid=`id -g || echo unknown`
AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
- if test $am_uid -le $am_max_uid; then
- AC_MSG_RESULT([yes])
+ if test x$am_uid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current UID is ok, but dist-ustar might not work])
+ elif test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT([no])
- _am_tools=none
+ AC_MSG_RESULT([no])
+ _am_tools=none
fi
AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
- if test $am_gid -le $am_max_gid; then
- AC_MSG_RESULT([yes])
+ if test x$gm_gid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current GID is ok, but dist-ustar might not work])
+ elif test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
_am_tools=none
@@ -820,3 +957,23 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_XARGS_N
+# ----------------
+# Check whether 'xargs -n' works. It should work everywhere, so the fallback
+# is not optimized at all as we never expect to use it.
+AC_DEFUN([_AM_PROG_XARGS_N],
+[AC_CACHE_CHECK([xargs -n works], am_cv_xargs_n_works, [dnl
+AS_IF([test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"], [am_cv_xargs_n_works=yes], [am_cv_xargs_n_works=no])])
+AS_IF([test "$am_cv_xargs_n_works" = yes], [am__xargs_n='xargs -n'], [dnl
+ am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "$@" "$am__xargs_n_arg"; done; }'
+])dnl
+AC_SUBST(am__xargs_n)
+])
+
Modified: branches/stable/source/src/auxdir/auxsub/configure
===================================================================
--- branches/stable/source/src/auxdir/auxsub/configure 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/auxdir/auxsub/configure 2024-07-21 17:12:46 UTC (rev 933)
@@ -614,6 +614,8 @@
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
+am__xargs_n
+am__rm_f_notfound
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -1866,7 +1868,7 @@
-am__api_version='1.16'
+am__api_version='1.17'
@@ -1969,6 +1971,165 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
+printf %s "checking whether sleep supports fractional seconds... " >&6; }
+if test ${am_cv_sleep_fractional_seconds+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if sleep 0.001 2>/dev/null
+then :
+ am_cv_sleep_fractional_seconds=yes
+else case e in #(
+ e) am_cv_sleep_fractional_seconds=no ;;
+esac
+fi
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
+printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; }
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
+printf %s "checking filesystem timestamp resolution... " >&6; }
+if test ${am_cv_filesystem_timestamp_resolution+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) # Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `ls -t conftest.ts[12]` &&
+ {
+ test "$*" != "X conftest.ts1 conftest.ts2" ||
+ test "$*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.
+See 'config.log' for more details" "$LINENO" 5; }
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$2" = conftest.ts3 &&
+ test "$3" = conftest.ts2 &&
+ test "$4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
+printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; }
+
+# This check should not be cached, as it may vary across builds of
+# different projects.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
printf %s "checking whether build environment is sane... " >&6; }
# Reject unsafe characters in $srcdir or the absolute working directory
@@ -1989,49 +2150,45 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
- if test "$2" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$2" = conftest.file
- )
-then
- # Ok.
- :
-else
- as_fn_error $? "newly created file is older than distributed files!
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
+printf "%s\n" "$am_build_env_is_sane" >&6; }
+if test "$am_build_env_is_sane" = no; then
+ as_fn_error $? "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+if test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1
+then :
+
+else case e in #(
+ e) ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
+ ;;
+esac
fi
rm -f conftest.file
@@ -2321,6 +2478,7 @@
fi
rmdir .tst 2>/dev/null
+AM_DEFAULT_VERBOSITY=1
# Check whether --enable-silent-rules was given.
if test ${enable_silent_rules+y}
then :
@@ -2327,11 +2485,6 @@
enableval=$enable_silent_rules;
fi
-case $enable_silent_rules in # (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=1;;
-esac
am_make=${MAKE-make}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
printf %s "checking whether $am_make supports nested variables... " >&6; }
@@ -2354,15 +2507,45 @@
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
AM_BACKSLASH='\'
+am__rm_f_notfound=
+if (rm -f && rm -fr && rm -rf) 2>/dev/null
+then :
+
+else case e in #(
+ e) am__rm_f_notfound='""' ;;
+esac
+fi
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
+printf %s "checking xargs -n works... " >&6; }
+if test ${am_cv_xargs_n_works+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"
+then :
+ am_cv_xargs_n_works=yes
+else case e in #(
+ e) am_cv_xargs_n_works=no ;;
+esac
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
+printf "%s\n" "$am_cv_xargs_n_works" >&6; }
+if test "$am_cv_xargs_n_works" = yes
+then :
+ am__xargs_n='xargs -n'
+else case e in #(
+ e) am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "" "$am__xargs_n_arg"; done; }'
+ ;;
+esac
+fi
+
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
@@ -2446,49 +2629,11 @@
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
- fi
-fi
-
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
@@ -2670,7 +2815,19 @@
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
printf "%s\n" "done" >&6; }
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
Modified: branches/stable/source/src/build-aux/ar-lib
===================================================================
--- branches/stable/source/src/build-aux/ar-lib 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/build-aux/ar-lib 2024-07-21 17:12:46 UTC (rev 933)
@@ -2,7 +2,7 @@
# Wrapper for Microsoft lib.exe
me=ar-lib
-scriptversion=2019-07-04.01; # UTC
+scriptversion=2024-06-19.01; # UTC
# Copyright (C) 2010-2024 Free Software Foundation, Inc.
# Written by Peter Rosin <peda at lysator.liu.se>.
@@ -105,11 +105,15 @@
Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
Members may be specified in a file named with @FILE.
+
+Report bugs to <bug-automake at gnu.org>.
+GNU Automake home page: <https://www.gnu.org/software/automake/>.
+General help using GNU software: <https://www.gnu.org/gethelp/>.
EOF
exit $?
;;
-v | --v*)
- echo "$me, version $scriptversion"
+ echo "$me (GNU Automake) $scriptversion"
exit $?
;;
esac
Modified: branches/stable/source/src/build-aux/compile
===================================================================
--- branches/stable/source/src/build-aux/compile 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/build-aux/compile 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2023-11-23.18; # UTC
+scriptversion=2024-06-19.01; # UTC
# Copyright (C) 1999-2024 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey at cygnus.com>.
@@ -254,7 +254,7 @@
exit $?
;;
-v | --v*)
- echo "compile $scriptversion"
+ echo "compile (GNU Automake) $scriptversion"
exit $?
;;
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
Modified: branches/stable/source/src/build-aux/depcomp
===================================================================
--- branches/stable/source/src/build-aux/depcomp 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/build-aux/depcomp 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2023-11-23.18; # UTC
+scriptversion=2024-06-19.01; # UTC
# Copyright (C) 1999-2024 Free Software Foundation, Inc.
@@ -53,7 +53,7 @@
exit $?
;;
-v | --v*)
- echo "depcomp $scriptversion"
+ echo "depcomp (GNU Automake) $scriptversion"
exit $?
;;
esac
@@ -129,7 +129,7 @@
rm -f "$tmpdepfile"
-# Avoid interferences from the environment.
+# Avoid interference from the environment.
gccflag= dashmflag=
# Some modes work just like other modes, but use different flags. We
Modified: branches/stable/source/src/build-aux/install-sh
===================================================================
--- branches/stable/source/src/build-aux/install-sh 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/build-aux/install-sh 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2023-11-23.18; # UTC
+scriptversion=2024-06-19.01; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -170,7 +170,7 @@
-T) is_target_a_directory=never;;
- --version) echo "$0 $scriptversion"; exit $?;;
+ --version) echo "$0 (GNU Automake) $scriptversion"; exit $?;;
--) shift
break;;
@@ -345,7 +345,7 @@
' 0
# Because "mkdir -p" follows existing symlinks and we likely work
- # directly in world-writeable /tmp, make sure that the '$tmpdir'
+ # directly in world-writable /tmp, make sure that the '$tmpdir'
# directory is successfully created first before we actually test
# 'mkdir -p'.
if (umask $mkdir_umask &&
@@ -353,7 +353,7 @@
exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
then
if test -z "$dir_arg" || {
- # Check for POSIX incompatibilities with -m.
+ # Check for POSIX incompatibility with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
# other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
Modified: branches/stable/source/src/configure
===================================================================
--- branches/stable/source/src/configure 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/configure 2024-07-21 17:12:46 UTC (rev 933)
@@ -708,6 +708,8 @@
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
+am__xargs_n
+am__rm_f_notfound
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -840,8 +842,6 @@
enable_etex_synctex
enable_ptex
enable_ptex_synctex
-enable_eptex
-enable_eptex_synctex
enable_uptex
enable_uptex_synctex
enable_euptex
@@ -1665,8 +1665,6 @@
--disable-etex-synctex build e-TeX without SyncTeX support
--enable-ptex compile and install pTeX
--disable-ptex-synctex build pTeX without SyncTeX support
- --enable-eptex compile and install e-pTeX
- --disable-eptex-synctex build e-pTeX without SyncTeX support
--enable-uptex compile and install upTeX
--disable-uptex-synctex build upTeX without SyncTeX support
--disable-euptex do not compile and install e-upTeX
@@ -1994,6 +1992,41 @@
} # ac_fn_c_try_compile
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ eval "$3=yes"
+else case e in #(
+ e) eval "$3=no" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+eval ac_res=\$$3
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
# ac_fn_c_try_link LINENO
# -----------------------
# Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -2042,41 +2075,6 @@
} # ac_fn_c_try_link
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
- eval "$3=yes"
-else case e in #(
- e) eval "$3=no" ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
-fi
-eval ac_res=\$$3
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
# ac_fn_c_check_func LINENO FUNC VAR
# ----------------------------------
# Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -2919,6 +2917,7 @@
>$cache_file
fi
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
# Test code for whether the C compiler supports C89 (global declarations)
ac_c_conftest_c89_globals='
/* Does the compiler advertise C89 conformance?
@@ -3244,7 +3243,6 @@
}
"
-as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
@@ -3253,6 +3251,8 @@
as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
+as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
# Test code for whether the C++ compiler supports C++98 (global declarations)
ac_cxx_conftest_cxx98_globals='
// Does the compiler advertise C++98 conformance?
@@ -4826,9 +4826,187 @@
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+ if test $ac_cache; then
+ ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+ if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+ printf "%s\n" "#define $ac_item 1" >> confdefs.h
+ fi
+ ac_header= ac_cache=
+ elif test $ac_header; then
+ ac_cache=$ac_item
+ else
+ ac_header=$ac_item
+ fi
+done
+
+
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+
+
+
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test ${ac_cv_safe_to_define___extensions__+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+# define __EXTENSIONS__ 1
+ $ac_includes_default
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_safe_to_define___extensions__=yes
+else case e in #(
+ e) ac_cv_safe_to_define___extensions__=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
+if test ${ac_cv_should_define__xopen_source+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_cv_should_define__xopen_source=no
+ if test $ac_cv_header_wchar_h = yes
+then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <wchar.h>
+ mbstate_t x;
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #define _XOPEN_SOURCE 500
+ #include <wchar.h>
+ mbstate_t x;
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_should_define__xopen_source=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+
+ printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+
+ printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+ printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+ if test $ac_cv_header_minix_config_h = yes
+then :
+ MINIX=yes
+ printf "%s\n" "#define _MINIX 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+else case e in #(
+ e) MINIX= ;;
+esac
+fi
+ if test $ac_cv_safe_to_define___extensions__ = yes
+then :
+ printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
+
+fi
+ if test $ac_cv_should_define__xopen_source = yes
+then :
+ printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
+
+fi
+
+
+
+
+echo 'tldbg:KPSE_SETUP called (toplevel=)' >&5
# Check whether --enable-all-pkgs was given.
if test ${enable_all_pkgs+y}
then :
@@ -4939,6 +5117,24 @@
+
+# We must enable system extensions before any compiler call to avoid
+# (valid) autoconf warnings. Because different configure.ac's use
+# different kpse setup routines, we call the ac_use_system_extensions
+# macro both here and in kpse_basic (in kpse-common.m4).
+#
+# Fortunately, Autoconf defines the system_extensions macro to only have
+# any effect once (with ac_defun_once), so it's harmless to call it
+# multiple time.
+#
+# LuaTeX requires system extensions for socket support. Also, since
+# SyncTeX, some libraries, and others unconditionally #define
+# GNU_SOURCE, it seems more consistent to always use it.
+#
+
+
+# this macro, kpse_check_win32, is the first compiler call for
+# configure.ac files that use this function (kpse setup).
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
printf %s "checking for native WIN32 or MINGW32... " >&6; }
if test ${kpse_cv_have_win32+y}
@@ -4991,6 +5187,8 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5
printf "%s\n" "$kpse_cv_have_win32" >&6; }
+# end call to kpse_check_win32.
+
case $with_x:$kpse_cv_have_win32 in #(
yes:no | no:*) :
: ;; #(
@@ -5502,28 +5700,6 @@
need_ptexenc=yes
need_zlib=yes
}
-# Check whether --enable-eptex was given.
-if test ${enable_eptex+y}
-then :
- enableval=$enable_eptex;
-fi
-case $enable_eptex in #(
- yes | no) :
- ;; #(
- *) :
- enable_eptex=no ;;
-esac
-
-# Check whether --enable-eptex-synctex was given.
-if test ${enable_eptex_synctex+y}
-then :
- enableval=$enable_eptex_synctex;
-fi
-
-test "x$enable_web2c:$enable_eptex" = xyes:yes && {
- need_ptexenc=yes
- need_zlib=yes
-}
# Check whether --enable-uptex was given.
if test ${enable_uptex+y}
then :
@@ -7675,10 +7851,13 @@
+# end of kpse_setup macro.
+echo 'tldbg:KPSE_SETUP done (toplevel=)' >&5
-am__api_version='1.16'
+am__api_version='1.17'
+
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -7778,6 +7957,165 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
+printf %s "checking whether sleep supports fractional seconds... " >&6; }
+if test ${am_cv_sleep_fractional_seconds+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if sleep 0.001 2>/dev/null
+then :
+ am_cv_sleep_fractional_seconds=yes
+else case e in #(
+ e) am_cv_sleep_fractional_seconds=no ;;
+esac
+fi
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
+printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; }
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
+printf %s "checking filesystem timestamp resolution... " >&6; }
+if test ${am_cv_filesystem_timestamp_resolution+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) # Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `ls -t conftest.ts[12]` &&
+ {
+ test "$*" != "X conftest.ts1 conftest.ts2" ||
+ test "$*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.
+See 'config.log' for more details" "$LINENO" 5; }
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$2" = conftest.ts3 &&
+ test "$3" = conftest.ts2 &&
+ test "$4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
+printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; }
+
+# This check should not be cached, as it may vary across builds of
+# different projects.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
printf %s "checking whether build environment is sane... " >&6; }
# Reject unsafe characters in $srcdir or the absolute working directory
@@ -7798,49 +8136,45 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
- if test "$2" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$2" = conftest.file
- )
-then
- # Ok.
- :
-else
- as_fn_error $? "newly created file is older than distributed files!
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
+printf "%s\n" "$am_build_env_is_sane" >&6; }
+if test "$am_build_env_is_sane" = no; then
+ as_fn_error $? "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+if test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1
+then :
+
+else case e in #(
+ e) ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
+ ;;
+esac
fi
rm -f conftest.file
@@ -8190,6 +8524,7 @@
fi
+AM_DEFAULT_VERBOSITY=1
# Check whether --enable-silent-rules was given.
if test ${enable_silent_rules+y}
then :
@@ -8196,11 +8531,6 @@
enableval=$enable_silent_rules;
fi
-case $enable_silent_rules in # (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=1;;
-esac
am_make=${MAKE-make}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
printf %s "checking whether $am_make supports nested variables... " >&6; }
@@ -8223,15 +8553,45 @@
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
AM_BACKSLASH='\'
+am__rm_f_notfound=
+if (rm -f && rm -fr && rm -rf) 2>/dev/null
+then :
+
+else case e in #(
+ e) am__rm_f_notfound='""' ;;
+esac
+fi
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
+printf %s "checking xargs -n works... " >&6; }
+if test ${am_cv_xargs_n_works+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"
+then :
+ am_cv_xargs_n_works=yes
+else case e in #(
+ e) am_cv_xargs_n_works=no ;;
+esac
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
+printf "%s\n" "$am_cv_xargs_n_works" >&6; }
+if test "$am_cv_xargs_n_works" = yes
+then :
+ am__xargs_n='xargs -n'
+else case e in #(
+ e) am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "" "$am__xargs_n_arg"; done; }'
+ ;;
+esac
+fi
+
# Check whether --enable-compiler-warnings was given.
if test ${enable_compiler_warnings+y}
then :
@@ -12014,35 +12374,6 @@
esac
}
-ac_header= ac_cache=
-for ac_item in $ac_header_c_list
-do
- if test $ac_cache; then
- ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
- if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
- printf "%s\n" "#define $ac_item 1" >> confdefs.h
- fi
- ac_header= ac_cache=
- elif test $ac_header; then
- ac_cache=$ac_item
- else
- ac_header=$ac_item
- fi
-done
-
-
-
-
-
-
-
-
-if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
-then :
-
-printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
"
if test "x$ac_cv_header_dlfcn_h" = xyes
@@ -12137,6 +12468,8 @@
echo 'tldbg:KPSE_COMMON called (pkg=TeX Live top-level, amopt=tar-pax dist-xz no-dist-gzip)' >&5
echo 'tldbg:KPSE_BASIC called (pkg=TeX Live top-level, amopt=tar-pax dist-xz no-dist-gzip)' >&5
+#
+# am_init_automake
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
@@ -12387,7 +12720,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -12437,49 +12770,13 @@
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
+# am_maintainer_mode
-END
- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
- fi
-fi
-
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
@@ -12504,6 +12801,11 @@
MAINT=$MAINTAINER_MODE_TRUE
+
+# See comments in kpse-setup.m4 about system extensions.
+
+
+# Check whether prototypes work.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5
printf %s "checking whether the compiler accepts prototypes... " >&6; }
if test ${kb_cv_c_prototypes+y}
@@ -12537,6 +12839,8 @@
if test "x$kb_cv_c_prototypes" = xno; then
as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5
fi
+
+# kpse_compiler_warnings options.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
printf %s "checking what warning flags to pass to the C compiler... " >&6; }
if test ${kpse_cv_warning_cflags+y}
@@ -12594,6 +12898,9 @@
+# end of kpse_basic macro.
+echo 'tldbg:KPSE_BASIC done (pkg=TeX Live top-level, amopt=tar-pax dist-xz no-dist-gzip)' >&5
+
# am_prog_ar must be called before lt_init.
if test -n "$ac_tool_prefix"; then
@@ -12709,6 +13016,7 @@
fi
: ${AR=ar}
+: ${ARFLAGS=cr}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
printf %s "checking the archiver ($AR) interface... " >&6; }
@@ -12729,7 +13037,7 @@
_ACEOF
if ac_fn_c_try_compile "$LINENO"
then :
- am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
+ am_ar_try='$AR $ARFLAGS libconftest.a conftest.$ac_objext >&5'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
(eval $am_ar_try) 2>&5
ac_status=$?
@@ -19737,7 +20045,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -24716,6 +25024,18 @@
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -27162,11 +27482,11 @@
test "x$srcdir" = x. || msg_compiling="$msg_compiling
from sources in $kpse_src"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
-** Configuration summary for $PACKAGE_STRING (2024$with_banner_add):
+** Configuration summary for $PACKAGE_STRING (2025/dev$with_banner_add):
$msg_compiling" >&5
printf "%s\n" "
-** Configuration summary for $PACKAGE_STRING (2024$with_banner_add):
+** Configuration summary for $PACKAGE_STRING (2025/dev$with_banner_add):
$msg_compiling" >&6; }
case $kpse_src$kpse_bld in
Modified: branches/stable/source/src/doc/ChangeLog
===================================================================
--- branches/stable/source/src/doc/ChangeLog 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/doc/ChangeLog 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,3 +1,13 @@
+2024-07-12 Karl Berry <karl at freefriends.org>
+
+ * build-tools.txt: automake 1.17.5
+
+2024-04-18 Karl Berry <karl at freefriends.org>
+
+ * tlbuild.texi (Macros for compilers): mention that
+ -fvisibility-inlines-hidden is not for C,
+ and index -fvisibility... options.
+
2023-12-23 Karl Berry <karl at tug.org>
* build-tools: autoconf 2.72 and (belatedly) makeinfo 7.1
Modified: branches/stable/source/src/doc/Makefile.in
===================================================================
--- branches/stable/source/src/doc/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/doc/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,6 +69,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -307,10 +309,9 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
+ { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
}
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in $(tlbuild_TEXINFOS) \
@@ -412,8 +413,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -574,13 +577,13 @@
.texi.dvi:
$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
- $(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
+ $(TEXI2DVI) $(AM_TEXI2FLAGS) -I $(srcdir) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
$<
.texi.pdf:
$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
- $(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
+ $(TEXI2PDF) $(AM_TEXI2FLAGS) -I $(srcdir) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
$<
.texi.html:
@@ -677,11 +680,10 @@
done
mostlyclean-aminfo:
- -rm -rf tlbuild.t2d tlbuild.t2p
+ -$(am__rm_rf) tlbuild.t2d tlbuild.t2p
clean-aminfo:
- -test -z "tlbuild.dvi tlbuild.pdf tlbuild.ps tlbuild.html" \
- || rm -rf tlbuild.dvi tlbuild.pdf tlbuild.ps tlbuild.html
+ -$(am__rm_rf) tlbuild.dvi tlbuild.pdf tlbuild.ps tlbuild.html
maintainer-clean-aminfo:
@list='$(INFO_DEPS)'; for i in $$list; do \
@@ -762,8 +764,8 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -985,3 +987,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/doc/build-tools.txt
===================================================================
--- branches/stable/source/src/doc/build-tools.txt 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/doc/build-tools.txt 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,5 +1,5 @@
autoconf (GNU Autoconf) 2.72
-automake (GNU automake) 1.16.5
+automake (GNU automake) 1.17
bison (GNU Bison) 3.8.2
flex 2.6.0
ltmain.sh (GNU libtool) 2.4.7
Modified: branches/stable/source/src/doc/tlbuild.info
===================================================================
--- branches/stable/source/src/doc/tlbuild.info 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/doc/tlbuild.info 2024-07-21 17:12:46 UTC (rev 933)
@@ -59,7 +59,7 @@
1 Introduction
**************
-This manual (dated March 2024) corresponds to the TeX Live 2024 release.
+This manual (dated April 2024) corresponds to the TeX Live 2024 release.
This manual is aimed at system installers and programmers, and
focuses on how to configure, build, and develop the TeX Live (TL)
@@ -257,7 +257,7 @@
* Build iteration:: What 'configure' and 'make' do in TL.
* Build in parallel:: Simultaneous 'make' processes.
-* Build distribution:: Making a distribution tarball.
+* Build distribution:: (Not) making a distribution tarball.
* Build one package:: Example of working on just one program.
* Build one engine:: Example of building just one TeX engine.
* Cross compilation:: Building on host X for target Y.
@@ -312,16 +312,21 @@
4.3 Build distribution
======================
-Running 'make dist' at the top level creates a tarball
-'tex-live-YYYY-MM-DD.tar.xz' from the TL source tree. Running 'make
-distcheck' also verifies that this tarball suffices to build and install
-all of TL.
+Running 'make dist' or related targets at the top level outputs an error
+message and fails. We no longer try to keep 'make dist' working,
+although it could be restored if there is some use for it.
- This is useful for checking consistency of the source tree and
-Makefiles, but the result is not a complete or even usable TeX system,
-since all the support files are lacking; *note Installing::. We do not
-actually distribute any such tarball, and have no plans to do so.
+ The 'dist' target used to create a tarball
+'tex-live-YYYY-MM-DD.tar.xz' from the TL source tree, and 'distcheck'
+also verifies that this tarball suffices to build and install all of TL.
+ However, the result was not a complete or even usable TeX system,
+since all the support files are lacking. We do not actually distribute
+any such tarball, and have no plans to do so.
+
+ *Note Installing::, for more information on what to do with the
+results of a build.
+
File: tlbuild.info, Node: Build one package, Next: Build one engine, Prev: Build distribution, Up: Building
@@ -638,7 +643,8 @@
not present in the TL source tree. The best basis for dealing with them
is the TeX Live (plain text) database in 'Master/tlpkg/texlive.tlpdb',
and/or the TeX Live installer, 'install-tl'. More information is under
-'Master/tlpkg' and at <https://tug.org/texlive/distro.html>.
+'Master/tlpkg' and at <https://tug.org/texlive/distro.html> and
+<https://tug.org/texlive/build.html#deploy>.
* Menu:
@@ -825,7 +831,7 @@
Currently the versions we use are:
autoconf (GNU Autoconf) 2.72
- automake (GNU automake) 1.16.5
+ automake (GNU automake) 1.17
bison (GNU Bison) 3.8.2
flex 2.6.0
ltmain.sh (GNU libtool) 2.4.7
@@ -990,9 +996,10 @@
-- Macro: KPSE_COMPILER_VISIBILITY
When using the C or C++ compiler, try to set
'VISIBILITY_C[XX]FLAGS' to flags to hide external symbols. Call
- 'AC_SUBST' for this variable. At present this only tests for the
- compiler option '-fvisibility=hidden', but could be extended if
- necessary.
+ 'AC_SUBST' for this variable. This tests for the compiler option
+ '-fvisibility=hidden' and, except for C,
+ '-fvisibility-inlines-hidden'. Reports or patches for additional
+ tests are welcome.
This macro caches its results in the 'kpse_cv_visibility_cflags' or
'kpse_cv_visibility_cxxflags' variable.
@@ -5778,7 +5785,7 @@
* --enable-compiler-warnings=LEVEL: --enable-compiler-warnings=LEVEL.
(line 6)
* --enable-cxx-runtime-hack: Macros for compilers.
- (line 29)
+ (line 30)
* --enable-etex: Configure options for texk/web2c.
(line 37)
* --enable-libtool-hack: Configure options for texk/web2c.
@@ -5842,6 +5849,10 @@
* --without-ln-s: --without-ln-s. (line 6)
* --without-x: --without-x. (line 6)
* -C configure option: Build in parallel. (line 15)
+* -fvisibility-inlines-hidden: Macros for compilers.
+ (line 19)
+* -fvisibility=hidden: Macros for compilers.
+ (line 19)
* -j make option: Build in parallel. (line 6)
* $@ target in normal make rules: Prerequisites. (line 13)
* ac/withenable.ac: Adding a new program module.
@@ -6066,14 +6077,14 @@
* KPSE_COND_WIN32: Macros for Windows. (line 15)
* KPSE_COND_WIN32_WRAP: Macros for Windows. (line 24)
* kpse_cv_cxx_hack: Macros for compilers.
- (line 33)
+ (line 34)
* kpse_cv_have_win32: Macros for Windows. (line 10)
* kpse_cv_visibility_c[xx]flags: Macros for compilers.
- (line 25)
+ (line 26)
* kpse_cv_warning_cflags: Macros for compilers.
(line 15)
* KPSE_CXX_HACK: Macros for compilers.
- (line 28)
+ (line 29)
* KPSE_ENABLE_PROG: Adding a new program module.
(line 14)
* KPSE_LARGEFILE: Macros for libraries.
@@ -6140,7 +6151,7 @@
(line 6)
* libsigsegv, required by xindy: Prerequisites. (line 44)
* libstc++, statically linking: Macros for compilers.
- (line 29)
+ (line 30)
* Libtool: Overview of build system.
(line 6)
* libtool, hack for avoiding excessive linking: Configure options for texk/web2c.
@@ -6149,7 +6160,7 @@
(line 22)
* linked scripts: Linked scripts. (line 6)
* linking C++ libraries statically: Macros for compilers.
- (line 29)
+ (line 30)
* lisp.run, lisp.exe: Configure options for utils/xindy.
(line 14)
* LittleEndian architectures: Configure options for texk/web2c.
@@ -6244,7 +6255,7 @@
* static functions: Declarations and definitions.
(line 35)
* static linking for C++: Macros for compilers.
- (line 29)
+ (line 30)
* stpcpy: Declarations and definitions.
(line 18)
* Subversion repository: Build system tools. (line 38)
@@ -6335,425 +6346,425 @@
Node: Prerequisites5994
Ref: Prerequisites-Footnote-18993
Node: Building9296
-Node: Build iteration10638
-Node: Build in parallel11682
-Node: Build distribution12433
-Node: Build one package13081
-Node: Build one engine17794
-Node: Cross compilation20406
-Node: Cross configuring21685
-Node: Cross problems23362
-Node: Installing25024
-Node: Installation directories26044
-Node: Linked scripts27862
-Node: Distro builds29357
-Node: Layout and infrastructure31733
-Node: Build system tools32564
-Node: Top-level directories34781
-Node: Autoconf macros37017
-Node: General setup macros37779
-Node: Macros for programs38654
-Node: Macros for compilers39455
-Node: Macros for libraries40863
-Node: Macros for library and header flags41289
-Node: Macros for Windows43200
-Node: Library modules44795
-Node: png library45284
-Node: zlib library47632
-Node: freetype library48147
-Node: kpathsea library48843
-Node: Program modules50222
-Node: t1utils package50650
-Node: xindy package51195
-Node: xdvik package52311
-Node: asymptote53370
-Node: Extending TeX Live53874
-Node: Adding a new program module54681
-Node: Adding a new engine59444
-Node: Adding a new generic library module61229
-Node: Adding a new TeX-specific library module63450
-Node: Configure options64148
-Node: Global configure options65529
-Node: --disable-native-texlive-build66071
-Node: --prefix --bindir ...67033
-Node: --disable-largefile67573
-Node: --disable-missing68115
-Node: --enable-compiler-warnings=LEVEL68516
-Node: --enable-cxx-runtime-hack69172
-Node: --enable-maintainer-mode69592
-Node: --enable-multiplatform70121
-Node: --enable-shared70694
-Node: --enable-silent-rules71065
-Node: --without-ln-s71517
-Node: --without-x71864
-Node: Program-specific configure options72052
-Node: --enable-PROG --disable-PROG72695
-Node: --disable-all-pkgs72968
-Node: Configure options for texk/web2c73751
-Node: Configure options for texk/bibtex-x76289
-Node: Configure options for texk/dvipdfm-x76832
-Node: Configure options for texk/dvisvgm77608
-Node: Configure options for texk/texlive78489
-Node: Configure options for texk/xdvik78910
-Node: Configure options for utils/xindy79531
-Node: Library-specific configure options80421
-Node: Configure options for kpathsea81382
-Node: Variables for configure82086
-Node: Coding conventions83512
-Node: Declarations and definitions84227
-Node: Const86401
-Node: Continuous integration88265
-Node: Transfer from Subversion to Github88929
-Node: Automatic update of the Git mirror91091
-Node: CI testing on Travis-CI91673
-Node: Releases on Github92382
-Node: install-tl92822
-Node: install-tl NAME93266
-Node: install-tl SYNOPSIS93446
-Node: install-tl DESCRIPTION93684
-Node: install-tl REFERENCES94881
-Node: install-tl EXAMPLES95490
-Ref: install-tl install-tl --paper=letter95941
-Ref: install-tl install-tl --scheme _scheme_96077
-Ref: install-tl install-tl --no-interaction96232
-Ref: install-tl install-tl --profile _texlive.profile_96384
-Node: install-tl OPTIONS96652
-Ref: install-tl *-gui* [[=]_module_]97149
-Ref: install-tl *-no-gui*97160
-Ref: install-tl text97368
-Ref: install-tl tcl (or "perltk" or "wizard" or "expert" or nothing)97553
-Ref: install-tl *-lang* _llcode_98185
-Ref: install-tl *-repository* _url|path_98809
-Ref: install-tl *-select-repository*99703
-Ref: install-tl *-all-options*100121
-Ref: install-tl *-custom-bin* _path_100376
-Ref: install-tl *-debug-fakenet*101208
-Ref: install-tl *-debug-setup-vars*101422
-Ref: install-tl *-debug-translation*101570
-Ref: install-tl *-force-platform* _platform_101846
-Ref: install-tl *-help*, *--help*, *-?*102104
-Ref: install-tl *-in-place*102517
-Ref: install-tl *-init-from-profile* _profile_file_103062
-Ref: install-tl *-logfile* _file_103331
-Ref: install-tl *-no-cls*103682
-Ref: install-tl *-no-continue*103809
-Ref: install-tl *-no-doc-install*104380
-Ref: install-tl *-no-src-install*104399
-Ref: install-tl *-no-installation*105190
-Ref: install-tl *-no-interaction*105341
-Ref: install-tl *-no-persistent-downloads*105598
-Ref: install-tl *-persistent-downloads*105623
-Ref: install-tl *-no-verify-downloads*106230
-Ref: install-tl *-non-admin*106593
-Ref: install-tl *-paper* a4*|*letter106699
-Ref: install-tl *-portable*106895
-Ref: install-tl *-print-platform*107032
-Ref: install-tl *-profile* _profile_file_107230
-Ref: install-tl *-q*107451
-Ref: install-tl *-scheme* _scheme_107513
-Ref: install-tl *-texdir* _dir_107914
-Ref: install-tl *-texuserdir* _dir_108519
-Ref: install-tl *-texmflocal* _dir_108808
-Ref: install-tl *-texmfhome* _dir_109433
-Ref: install-tl *-texmfsysconfig* _dir_109742
-Ref: install-tl *-texmfsysvar* _dir_109764
-Ref: install-tl *-texmfconfig* _dir_109859
-Ref: install-tl *-texmfvar* _dir_109878
-Ref: install-tl *-v*110086
-Ref: install-tl *-version*, *--version*110242
-Node: install-tl PROFILES110376
-Ref: install-tl instopt_adjustpath (default 0 on Unix, 1 on Windows)113392
-Ref: install-tl instopt_adjustrepo (default 1)113468
-Ref: install-tl instopt_letter (default 0)113605
-Ref: install-tl instopt_portable (default 0)113696
-Ref: install-tl instopt_write18_restricted (default 1)114235
-Node: install-tl ENVIRONMENT VARIABLES115574
-Ref: install-tl NOPERLDOC115937
-Ref: install-tl TEXLIVE_DOWNLOADER116022
-Ref: install-tl TL_DOWNLOAD_PROGRAM116045
-Ref: install-tl TL_DOWNLOAD_ARGS116065
-Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK116269
-Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE116471
-Ref: install-tl TEXLIVE_INSTALL_NO_DISKCHECK116583
-Ref: install-tl TEXLIVE_INSTALL_NO_RESUME116999
-Ref: install-tl TEXLIVE_INSTALL_NO_WELCOME117151
-Ref: install-tl TEXLIVE_INSTALL_PAPER117272
-Ref: install-tl TEXLIVE_INSTALL_PREFIX117418
-Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG117449
-Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR117477
-Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME117506
-Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL117536
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG117570
-Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR117601
-Node: install-tl DIRECTORY TREES118039
-Node: install-tl BUGS120623
-Node: install-tl AUTHORS AND COPYRIGHT121503
-Node: tlmgr121901
-Node: tlmgr NAME122407
-Node: tlmgr SYNOPSIS122551
-Node: tlmgr DESCRIPTION122753
-Node: tlmgr EXAMPLES123864
-Ref: tlmgr tlmgr option repository ctan124127
-Ref: tlmgr tlmgr option repository https://mirror.ctan.org/systems/texlive/tlnet124200
-Ref: tlmgr tlmgr update --list124805
-Ref: tlmgr tlmgr update --all124898
-Ref: tlmgr tlmgr info _what_125055
-Ref: tlmgr tlmgr bug _what_125233
-Node: tlmgr OPTIONS125428
-Ref: tlmgr *--repository* _url|path_125961
-Ref: tlmgr /some/local/dir127147
-Ref: tlmgr file:/some/local/dir127176
-Ref: tlmgr ctan127249
-Ref: tlmgr https://mirror.ctan.org/systems/texlive/tlnet127303
-Ref: tlmgr http://server/path/to/tlnet127644
-Ref: tlmgr https://server/path/to/tlnet128025
-Ref: tlmgr ftp://server/path/to/tlnet128493
-Ref: tlmgr user at machine:/path/to/tlnet128625
-Ref: tlmgr scp://user@machine/path/to/tlnet128666
-Ref: tlmgr ssh://user@machine/path/to/tlnet128707
-Ref: tlmgr *--gui* [_action_]129101
-Ref: tlmgr *--gui-lang* _llcode_129915
-Ref: tlmgr *--command-logfile* _file_130657
-Ref: tlmgr *--debug-translation*130924
-Ref: tlmgr *--machine-readable*131128
-Ref: tlmgr *--no-execute-actions*131397
-Ref: tlmgr *--package-logfile* _file_131591
-Ref: tlmgr *--pause*131846
-Ref: tlmgr *--persistent-downloads*132002
-Ref: tlmgr *--no-persistent-downloads*132031
-Ref: tlmgr *--pin-file*132526
-Ref: tlmgr *--usermode*132745
-Ref: tlmgr *--usertree* _dir_132866
-Ref: tlmgr *--verify-repo=[none|main|all]*132993
-Node: tlmgr ACTIONS133892
-Node: tlmgr help134785
-Node: tlmgr version135262
-Node: tlmgr backup135525
-Ref: tlmgr *backup [_option_...] --all*135702
-Ref: tlmgr *backup [_option_...] _pkg_...*135735
-Ref: tlmgr *--backupdir* _directory_136802
-Ref: tlmgr *--all*137020
-Ref: tlmgr *--clean*[=_N_]137273
-Ref: tlmgr *--dry-run*137601
-Node: tlmgr bug [_search-string_]137731
-Node: tlmgr candidates _pkg_138317
-Node: tlmgr check [_option_...] [depends|executes|files|runfiles|texmfdbs|all]138687
-Ref: tlmgr *depends*139201
-Ref: tlmgr *executes*139543
-Ref: tlmgr *files*139658
-Ref: tlmgr *runfiles*139794
-Ref: tlmgr *texmfdbs*139931
-Ref: tlmgr - all items in TEXMFDBS have the !! prefix.140161
-Ref: tlmgr - all items in TEXMFBDS have an ls-R file (if they exist at all).140237
-Ref: tlmgr - all items in TEXMF with !! are listed in TEXMFDBS.140302
-Ref: tlmgr - all items in TEXMF with an ls-R file are listed in TEXMFDBS.140377
-Ref: tlmgr *--use-svn*140403
-Node: tlmgr conf140544
-Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*140834
-Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|remove] [_value_]*140899
-Node: tlmgr dump-tlpdb [_option_...] [--json]143315
-Ref: tlmgr *--local*143751
-Ref: tlmgr *--remote*143791
-Ref: tlmgr *--json*143830
-Node: tlmgr generate144401
-Ref: tlmgr *generate [_option_...] language*144597
-Ref: tlmgr *generate [_option_...] language.dat*144636
-Ref: tlmgr *generate [_option_...] language.def*144675
-Ref: tlmgr *generate [_option_...] language.dat.lua*144718
-Ref: tlmgr *--dest* _output_file_147046
-Ref: tlmgr *--localcfg* _local_conf_file_147623
-Ref: tlmgr *--rebuild-sys*147747
-Node: tlmgr gui148562
-Node: tlmgr info148742
-Ref: tlmgr *info [_option_...] _pkg_...*148904
-Ref: tlmgr *info [_option_...] collections*148938
-Ref: tlmgr *info [_option_...] schemes*148968
-Ref: tlmgr *--list*150499
-Ref: tlmgr *--only-installed*150814
-Ref: tlmgr *--only-remote*151003
-Ref: tlmgr *--data item1,item2,...*151308
-Ref: tlmgr *--json* 1152681
-Node: tlmgr init-usertree153064
-Node: tlmgr install [_option_...] _pkg_...153445
-Ref: tlmgr *--dry-run* 1153954
-Ref: tlmgr *--file*154072
-Ref: tlmgr *--force*154295
-Ref: tlmgr *--no-depends*154516
-Ref: tlmgr *--no-depends-at-all*154676
-Ref: tlmgr *--reinstall*155077
-Ref: tlmgr *--with-doc*155456
-Ref: tlmgr *--with-src*155470
-Node: tlmgr key156198
-Ref: tlmgr *key list*156356
-Ref: tlmgr *key add _file_*156374
-Ref: tlmgr *key remove _keyid_*156396
-Node: tlmgr list156990
-Node: tlmgr option157152
-Ref: tlmgr *option [--json] [show]*157308
-Ref: tlmgr *option [--json] showall|help*157340
-Ref: tlmgr *option _key_ [_value_]*157366
-Node: tlmgr paper161945
-Ref: tlmgr *paper [a4|letter]*162094
-Ref: tlmgr *<[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*>162171
-Ref: tlmgr *paper --json*162187
-Node: tlmgr path163402
-Ref: tlmgr *path [--windowsmode=user|admin] add*163568
-Ref: tlmgr *path [--windowsmode=user|admin] remove*163610
-Node: tlmgr pinning165125
-Ref: tlmgr pinning show165366
-Ref: tlmgr pinning add _repo_ _pkgglob_...165439
-Ref: tlmgr pinning remove _repo_ _pkgglob_...165558
-Ref: tlmgr pinning remove _repo_ --all165711
-Node: tlmgr platform165765
-Ref: tlmgr *platform list|add|remove _platform_...*165951
-Ref: tlmgr *platform set _platform_*165978
-Ref: tlmgr *platform set auto*165999
-Ref: tlmgr *--dry-run* 2166877
-Node: tlmgr postaction166996
-Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*167226
-Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*167300
-Ref: tlmgr *--windowsmode=[user|admin]*167620
-Ref: tlmgr *--fileassocmode=[1|2]*168045
-Ref: tlmgr *--all* 1168331
-Node: tlmgr print-platform168386
-Node: tlmgr print-platform-info168717
-Node: tlmgr remove [_option_...] _pkg_...169017
-Ref: tlmgr *--all* 2169502
-Ref: tlmgr *--backup*169613
-Ref: tlmgr *--backupdir* _directory_ 1169640
-Ref: tlmgr *--no-depends* 1170045
-Ref: tlmgr *--no-depends-at-all* 1170108
-Ref: tlmgr *--force* 1170215
-Ref: tlmgr *--dry-run* 3170689
-Node: tlmgr repository171066
-Ref: tlmgr *repository list*171254
-Ref: tlmgr *repository list _path|url|tag_*171288
-Ref: tlmgr *repository add _path_ [_tag_]*171321
-Ref: tlmgr *repository remove _path|tag_*171353
-Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*171407
-Ref: tlmgr *repository status*171428
-Ref: tlmgr The tag (which can be the same as the url);172655
-Node: tlmgr restore173133
-Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*173312
-Ref: tlmgr *restore [_option_...] --all*173343
-Ref: tlmgr *--all* 3174044
-Ref: tlmgr *--backupdir* _directory_ 2174259
-Ref: tlmgr *--dry-run* 4174441
-Ref: tlmgr *--force* 2174574
-Ref: tlmgr *--json* 2174621
-Node: tlmgr search174948
-Ref: tlmgr *search [_option_...] _what_*175112
-Ref: tlmgr *search [_option_...] --file _what_*175150
-Ref: tlmgr *search [_option_...] --all _what_*175187
-Ref: tlmgr *--file* 1175408
-Ref: tlmgr *--all* 4175471
-Ref: tlmgr *--global*175561
-Ref: tlmgr *--word*175689
-Node: tlmgr shell176004
-Ref: tlmgr protocol176739
-Ref: tlmgr help 1176803
-Ref: tlmgr version 1176856
-Ref: tlmgr quit, end, bye, byebye, EOF176924
-Ref: tlmgr restart176945
-Ref: tlmgr load [local|remote]177068
-Ref: tlmgr save177138
-Ref: tlmgr get [_var_] =item set [_var_ [_val_]]177261
-Node: tlmgr show177862
-Node: tlmgr uninstall178029
-Node: tlmgr update [_option_...] [_pkg_...]178261
-Ref: tlmgr *--all* 5178633
-Ref: tlmgr *--self*180813
-Ref: tlmgr *--dry-run* 5181578
-Ref: tlmgr *--list* [_pkg_]181756
-Ref: tlmgr *--exclude* _pkg_182446
-Ref: tlmgr *--no-auto-remove* [_pkg_...]183247
-Ref: tlmgr *--no-auto-install* [_pkg_...]183732
-Ref: tlmgr *--reinstall-forcibly-removed*184495
-Ref: tlmgr *--backup* 1185031
-Ref: tlmgr *--backupdir* _directory_ 3185058
-Ref: tlmgr *--no-depends* 2186225
-Ref: tlmgr *--no-depends-at-all* 2186429
-Ref: tlmgr *--force* 3186536
-Node: tlmgr CONFIGURATION FILE FOR TLMGR187527
-Ref: tlmgr auto-remove = 0 or 1 (default 1), same as command-line option.188529
-Ref: tlmgr gui-expertmode = 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.188661
-Ref: tlmgr gui-lang = _llcode_, with a language code value as with the command-line option.188745
-Ref: tlmgr no-checksums = 0 or 1 (default 0, see below).188794
-Ref: tlmgr persistent-downloads = 0 or 1 (default 1), same as command-line option.188869
-Ref: tlmgr require-verification = 0 or 1 (default 0), same as command-line option.188944
-Ref: tlmgr tkfontscale = _floating-point number_ (default 1.0); scaling factor for fonts in the Tk-based frontends.189052
-Ref: tlmgr update-exclude = _comma-separated list of packages_ (no spaces allowed). Same as the command line option --exclude for the update action.189197
-Ref: tlmgr verify-downloads = 0 or 1 (default 1), same as command-line option.189268
-Ref: tlmgr allowed-actions = _action1_[,_action2_,...] The value is a comma-separated list (no spaces) of tlmgr actions which are allowed to be executed when tlmgr is invoked in system mode (that is, without --usermode). This allows distributors to include tlmgr in their packaging, but allow only a restricted set of actions that do not interfere with their distro package manager. For native TeX Live installations, it doesn't make sense to set this.189785
-Node: tlmgr CRYPTOGRAPHIC VERIFICATION190617
-Node: tlmgr Configuration of GnuPG invocation192790
-Node: tlmgr USER MODE193428
-Node: tlmgr User mode install196299
-Node: tlmgr User mode backup, restore, remove, update197445
-Node: tlmgr User mode generate, option, paper197891
-Node: tlmgr User mode logs198258
-Node: tlmgr MULTIPLE REPOSITORIES198556
-Node: tlmgr Pinning200285
-Node: tlmgr GUI FOR TLMGR202208
-Node: tlmgr Main display203857
-Node: tlmgr Display configuration area204109
-Ref: tlmgr Status204470
-Ref: tlmgr Category204634
-Ref: tlmgr Match204820
-Ref: tlmgr Selection205001
-Ref: tlmgr Display configuration buttons205205
-Node: tlmgr Package list area205388
-Ref: tlmgr a checkbox205972
-Ref: tlmgr package name206108
-Ref: tlmgr local revision (and version)206207
-Ref: tlmgr remote revision (and version)206582
-Ref: tlmgr short description206879
-Node: tlmgr Main display action buttons206924
-Ref: tlmgr Update all installed207190
-Ref: tlmgr Update207562
-Ref: tlmgr Install207612
-Ref: tlmgr Remove207798
-Ref: tlmgr Backup207976
-Node: tlmgr Menu bar208133
-Ref: tlmgr tlmgr menu208356
-Ref: tlmgr Options menu208664
-Ref: tlmgr Actions menu209747
-Ref: tlmgr Help menu210175
-Node: tlmgr GUI options210309
-Ref: tlmgr -background _color_210555
-Ref: tlmgr -font " _fontname_ _fontsize_ "210620
-Ref: tlmgr -foreground _color_210778
-Ref: tlmgr -geometry _geomspec_210830
-Ref: tlmgr -xrm _xresource_211022
-Node: tlmgr MACHINE-READABLE OUTPUT211291
-Node: tlmgr Machine-readable update and install output212105
-Ref: tlmgr location-url _location_213381
-Ref: tlmgr total-bytes _count_213597
-Ref: tlmgr _pkgname_214007
-Ref: tlmgr _status_214217
-Ref: tlmgr d214295
-Ref: tlmgr f214355
-Ref: tlmgr u214534
-Ref: tlmgr r214580
-Ref: tlmgr a214703
-Ref: tlmgr i214881
-Ref: tlmgr I215000
-Ref: tlmgr _localrev_215102
-Ref: tlmgr _serverrev_215209
-Ref: tlmgr _size_215321
-Ref: tlmgr _runtime_215490
-Ref: tlmgr _esttot_215560
-Node: tlmgr Machine-readable option output215593
-Node: tlmgr ENVIRONMENT VARIABLES216105
-Ref: tlmgr TEXLIVE_COMPRESSOR216616
-Ref: tlmgr TEXLIVE_DOWNLOADER217464
-Ref: tlmgr TL_DOWNLOAD_PROGRAM217487
-Ref: tlmgr TL_DOWNLOAD_ARGS217507
-Ref: tlmgr TEXLIVE_PREFER_OWN218533
-Node: tlmgr AUTHORS AND COPYRIGHT219357
-Node: tlmgr POD ERRORS219780
-Ref: tlmgr Around line 8454:220005
-Node: Index220041
+Node: Build iteration10644
+Node: Build in parallel11688
+Node: Build distribution12439
+Node: Build one package13267
+Node: Build one engine17980
+Node: Cross compilation20592
+Node: Cross configuring21871
+Node: Cross problems23548
+Node: Installing25210
+Node: Installation directories26278
+Node: Linked scripts28096
+Node: Distro builds29591
+Node: Layout and infrastructure31967
+Node: Build system tools32798
+Node: Top-level directories35013
+Node: Autoconf macros37249
+Node: General setup macros38011
+Node: Macros for programs38886
+Node: Macros for compilers39687
+Node: Macros for libraries41151
+Node: Macros for library and header flags41577
+Node: Macros for Windows43488
+Node: Library modules45083
+Node: png library45572
+Node: zlib library47920
+Node: freetype library48435
+Node: kpathsea library49131
+Node: Program modules50510
+Node: t1utils package50938
+Node: xindy package51483
+Node: xdvik package52599
+Node: asymptote53658
+Node: Extending TeX Live54162
+Node: Adding a new program module54969
+Node: Adding a new engine59732
+Node: Adding a new generic library module61517
+Node: Adding a new TeX-specific library module63738
+Node: Configure options64436
+Node: Global configure options65817
+Node: --disable-native-texlive-build66359
+Node: --prefix --bindir ...67321
+Node: --disable-largefile67861
+Node: --disable-missing68403
+Node: --enable-compiler-warnings=LEVEL68804
+Node: --enable-cxx-runtime-hack69460
+Node: --enable-maintainer-mode69880
+Node: --enable-multiplatform70409
+Node: --enable-shared70982
+Node: --enable-silent-rules71353
+Node: --without-ln-s71805
+Node: --without-x72152
+Node: Program-specific configure options72340
+Node: --enable-PROG --disable-PROG72983
+Node: --disable-all-pkgs73256
+Node: Configure options for texk/web2c74039
+Node: Configure options for texk/bibtex-x76577
+Node: Configure options for texk/dvipdfm-x77120
+Node: Configure options for texk/dvisvgm77896
+Node: Configure options for texk/texlive78777
+Node: Configure options for texk/xdvik79198
+Node: Configure options for utils/xindy79819
+Node: Library-specific configure options80709
+Node: Configure options for kpathsea81670
+Node: Variables for configure82374
+Node: Coding conventions83800
+Node: Declarations and definitions84515
+Node: Const86689
+Node: Continuous integration88553
+Node: Transfer from Subversion to Github89217
+Node: Automatic update of the Git mirror91379
+Node: CI testing on Travis-CI91961
+Node: Releases on Github92670
+Node: install-tl93110
+Node: install-tl NAME93554
+Node: install-tl SYNOPSIS93734
+Node: install-tl DESCRIPTION93972
+Node: install-tl REFERENCES95169
+Node: install-tl EXAMPLES95778
+Ref: install-tl install-tl --paper=letter96229
+Ref: install-tl install-tl --scheme _scheme_96365
+Ref: install-tl install-tl --no-interaction96520
+Ref: install-tl install-tl --profile _texlive.profile_96672
+Node: install-tl OPTIONS96940
+Ref: install-tl *-gui* [[=]_module_]97437
+Ref: install-tl *-no-gui*97448
+Ref: install-tl text97656
+Ref: install-tl tcl (or "perltk" or "wizard" or "expert" or nothing)97841
+Ref: install-tl *-lang* _llcode_98473
+Ref: install-tl *-repository* _url|path_99097
+Ref: install-tl *-select-repository*99991
+Ref: install-tl *-all-options*100409
+Ref: install-tl *-custom-bin* _path_100664
+Ref: install-tl *-debug-fakenet*101496
+Ref: install-tl *-debug-setup-vars*101710
+Ref: install-tl *-debug-translation*101858
+Ref: install-tl *-force-platform* _platform_102134
+Ref: install-tl *-help*, *--help*, *-?*102392
+Ref: install-tl *-in-place*102805
+Ref: install-tl *-init-from-profile* _profile_file_103350
+Ref: install-tl *-logfile* _file_103619
+Ref: install-tl *-no-cls*103970
+Ref: install-tl *-no-continue*104097
+Ref: install-tl *-no-doc-install*104668
+Ref: install-tl *-no-src-install*104687
+Ref: install-tl *-no-installation*105478
+Ref: install-tl *-no-interaction*105629
+Ref: install-tl *-no-persistent-downloads*105886
+Ref: install-tl *-persistent-downloads*105911
+Ref: install-tl *-no-verify-downloads*106518
+Ref: install-tl *-non-admin*106881
+Ref: install-tl *-paper* a4*|*letter106987
+Ref: install-tl *-portable*107183
+Ref: install-tl *-print-platform*107320
+Ref: install-tl *-profile* _profile_file_107518
+Ref: install-tl *-q*107739
+Ref: install-tl *-scheme* _scheme_107801
+Ref: install-tl *-texdir* _dir_108202
+Ref: install-tl *-texuserdir* _dir_108807
+Ref: install-tl *-texmflocal* _dir_109096
+Ref: install-tl *-texmfhome* _dir_109721
+Ref: install-tl *-texmfsysconfig* _dir_110030
+Ref: install-tl *-texmfsysvar* _dir_110052
+Ref: install-tl *-texmfconfig* _dir_110147
+Ref: install-tl *-texmfvar* _dir_110166
+Ref: install-tl *-v*110374
+Ref: install-tl *-version*, *--version*110530
+Node: install-tl PROFILES110664
+Ref: install-tl instopt_adjustpath (default 0 on Unix, 1 on Windows)113680
+Ref: install-tl instopt_adjustrepo (default 1)113756
+Ref: install-tl instopt_letter (default 0)113893
+Ref: install-tl instopt_portable (default 0)113984
+Ref: install-tl instopt_write18_restricted (default 1)114523
+Node: install-tl ENVIRONMENT VARIABLES115862
+Ref: install-tl NOPERLDOC116225
+Ref: install-tl TEXLIVE_DOWNLOADER116310
+Ref: install-tl TL_DOWNLOAD_PROGRAM116333
+Ref: install-tl TL_DOWNLOAD_ARGS116353
+Ref: install-tl TEXLIVE_INSTALL_ENV_NOCHECK116557
+Ref: install-tl TEXLIVE_INSTALL_NO_CONTEXT_CACHE116759
+Ref: install-tl TEXLIVE_INSTALL_NO_DISKCHECK116871
+Ref: install-tl TEXLIVE_INSTALL_NO_RESUME117287
+Ref: install-tl TEXLIVE_INSTALL_NO_WELCOME117439
+Ref: install-tl TEXLIVE_INSTALL_PAPER117560
+Ref: install-tl TEXLIVE_INSTALL_PREFIX117706
+Ref: install-tl TEXLIVE_INSTALL_TEXMFCONFIG117737
+Ref: install-tl TEXLIVE_INSTALL_TEXMFVAR117765
+Ref: install-tl TEXLIVE_INSTALL_TEXMFHOME117794
+Ref: install-tl TEXLIVE_INSTALL_TEXMFLOCAL117824
+Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSCONFIG117858
+Ref: install-tl TEXLIVE_INSTALL_TEXMFSYSVAR117889
+Node: install-tl DIRECTORY TREES118327
+Node: install-tl BUGS120911
+Node: install-tl AUTHORS AND COPYRIGHT121791
+Node: tlmgr122189
+Node: tlmgr NAME122695
+Node: tlmgr SYNOPSIS122839
+Node: tlmgr DESCRIPTION123041
+Node: tlmgr EXAMPLES124152
+Ref: tlmgr tlmgr option repository ctan124415
+Ref: tlmgr tlmgr option repository https://mirror.ctan.org/systems/texlive/tlnet124488
+Ref: tlmgr tlmgr update --list125093
+Ref: tlmgr tlmgr update --all125186
+Ref: tlmgr tlmgr info _what_125343
+Ref: tlmgr tlmgr bug _what_125521
+Node: tlmgr OPTIONS125716
+Ref: tlmgr *--repository* _url|path_126249
+Ref: tlmgr /some/local/dir127435
+Ref: tlmgr file:/some/local/dir127464
+Ref: tlmgr ctan127537
+Ref: tlmgr https://mirror.ctan.org/systems/texlive/tlnet127591
+Ref: tlmgr http://server/path/to/tlnet127932
+Ref: tlmgr https://server/path/to/tlnet128313
+Ref: tlmgr ftp://server/path/to/tlnet128781
+Ref: tlmgr user at machine:/path/to/tlnet128913
+Ref: tlmgr scp://user@machine/path/to/tlnet128954
+Ref: tlmgr ssh://user@machine/path/to/tlnet128995
+Ref: tlmgr *--gui* [_action_]129389
+Ref: tlmgr *--gui-lang* _llcode_130203
+Ref: tlmgr *--command-logfile* _file_130945
+Ref: tlmgr *--debug-translation*131212
+Ref: tlmgr *--machine-readable*131416
+Ref: tlmgr *--no-execute-actions*131685
+Ref: tlmgr *--package-logfile* _file_131879
+Ref: tlmgr *--pause*132134
+Ref: tlmgr *--persistent-downloads*132290
+Ref: tlmgr *--no-persistent-downloads*132319
+Ref: tlmgr *--pin-file*132814
+Ref: tlmgr *--usermode*133033
+Ref: tlmgr *--usertree* _dir_133154
+Ref: tlmgr *--verify-repo=[none|main|all]*133281
+Node: tlmgr ACTIONS134180
+Node: tlmgr help135073
+Node: tlmgr version135550
+Node: tlmgr backup135813
+Ref: tlmgr *backup [_option_...] --all*135990
+Ref: tlmgr *backup [_option_...] _pkg_...*136023
+Ref: tlmgr *--backupdir* _directory_137090
+Ref: tlmgr *--all*137308
+Ref: tlmgr *--clean*[=_N_]137561
+Ref: tlmgr *--dry-run*137889
+Node: tlmgr bug [_search-string_]138019
+Node: tlmgr candidates _pkg_138605
+Node: tlmgr check [_option_...] [depends|executes|files|runfiles|texmfdbs|all]138975
+Ref: tlmgr *depends*139489
+Ref: tlmgr *executes*139831
+Ref: tlmgr *files*139946
+Ref: tlmgr *runfiles*140082
+Ref: tlmgr *texmfdbs*140219
+Ref: tlmgr - all items in TEXMFDBS have the !! prefix.140449
+Ref: tlmgr - all items in TEXMFBDS have an ls-R file (if they exist at all).140525
+Ref: tlmgr - all items in TEXMF with !! are listed in TEXMFDBS.140590
+Ref: tlmgr - all items in TEXMF with an ls-R file are listed in TEXMFDBS.140665
+Ref: tlmgr *--use-svn*140691
+Node: tlmgr conf140832
+Ref: tlmgr *conf [texmf|tlmgr|updmap [--conffile _file_] [--delete] [_key_ [_value_]]]*141122
+Ref: tlmgr *conf auxtrees [--conffile _file_] [show|add|remove] [_value_]*141187
+Node: tlmgr dump-tlpdb [_option_...] [--json]143603
+Ref: tlmgr *--local*144039
+Ref: tlmgr *--remote*144079
+Ref: tlmgr *--json*144118
+Node: tlmgr generate144689
+Ref: tlmgr *generate [_option_...] language*144885
+Ref: tlmgr *generate [_option_...] language.dat*144924
+Ref: tlmgr *generate [_option_...] language.def*144963
+Ref: tlmgr *generate [_option_...] language.dat.lua*145006
+Ref: tlmgr *--dest* _output_file_147334
+Ref: tlmgr *--localcfg* _local_conf_file_147911
+Ref: tlmgr *--rebuild-sys*148035
+Node: tlmgr gui148850
+Node: tlmgr info149030
+Ref: tlmgr *info [_option_...] _pkg_...*149192
+Ref: tlmgr *info [_option_...] collections*149226
+Ref: tlmgr *info [_option_...] schemes*149256
+Ref: tlmgr *--list*150787
+Ref: tlmgr *--only-installed*151102
+Ref: tlmgr *--only-remote*151291
+Ref: tlmgr *--data item1,item2,...*151596
+Ref: tlmgr *--json* 1152969
+Node: tlmgr init-usertree153352
+Node: tlmgr install [_option_...] _pkg_...153733
+Ref: tlmgr *--dry-run* 1154242
+Ref: tlmgr *--file*154360
+Ref: tlmgr *--force*154583
+Ref: tlmgr *--no-depends*154804
+Ref: tlmgr *--no-depends-at-all*154964
+Ref: tlmgr *--reinstall*155365
+Ref: tlmgr *--with-doc*155744
+Ref: tlmgr *--with-src*155758
+Node: tlmgr key156486
+Ref: tlmgr *key list*156644
+Ref: tlmgr *key add _file_*156662
+Ref: tlmgr *key remove _keyid_*156684
+Node: tlmgr list157278
+Node: tlmgr option157440
+Ref: tlmgr *option [--json] [show]*157596
+Ref: tlmgr *option [--json] showall|help*157628
+Ref: tlmgr *option _key_ [_value_]*157654
+Node: tlmgr paper162233
+Ref: tlmgr *paper [a4|letter]*162382
+Ref: tlmgr *<[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [_papersize_|--list]*>162459
+Ref: tlmgr *paper --json*162475
+Node: tlmgr path163690
+Ref: tlmgr *path [--windowsmode=user|admin] add*163856
+Ref: tlmgr *path [--windowsmode=user|admin] remove*163898
+Node: tlmgr pinning165413
+Ref: tlmgr pinning show165654
+Ref: tlmgr pinning add _repo_ _pkgglob_...165727
+Ref: tlmgr pinning remove _repo_ _pkgglob_...165846
+Ref: tlmgr pinning remove _repo_ --all165999
+Node: tlmgr platform166053
+Ref: tlmgr *platform list|add|remove _platform_...*166239
+Ref: tlmgr *platform set _platform_*166266
+Ref: tlmgr *platform set auto*166287
+Ref: tlmgr *--dry-run* 2167165
+Node: tlmgr postaction167284
+Ref: tlmgr *postaction [_option_...] install [shortcut|fileassoc|script] [_pkg_...]*167514
+Ref: tlmgr *postaction [_option_...] remove [shortcut|fileassoc|script] [_pkg_...]*167588
+Ref: tlmgr *--windowsmode=[user|admin]*167908
+Ref: tlmgr *--fileassocmode=[1|2]*168333
+Ref: tlmgr *--all* 1168619
+Node: tlmgr print-platform168674
+Node: tlmgr print-platform-info169005
+Node: tlmgr remove [_option_...] _pkg_...169305
+Ref: tlmgr *--all* 2169790
+Ref: tlmgr *--backup*169901
+Ref: tlmgr *--backupdir* _directory_ 1169928
+Ref: tlmgr *--no-depends* 1170333
+Ref: tlmgr *--no-depends-at-all* 1170396
+Ref: tlmgr *--force* 1170503
+Ref: tlmgr *--dry-run* 3170977
+Node: tlmgr repository171354
+Ref: tlmgr *repository list*171542
+Ref: tlmgr *repository list _path|url|tag_*171576
+Ref: tlmgr *repository add _path_ [_tag_]*171609
+Ref: tlmgr *repository remove _path|tag_*171641
+Ref: tlmgr *repository set _path_[#_tag_] [_path_[#_tag_] ...]*171695
+Ref: tlmgr *repository status*171716
+Ref: tlmgr The tag (which can be the same as the url);172943
+Node: tlmgr restore173421
+Ref: tlmgr *restore [_option_...] _pkg_ [_rev_]*173600
+Ref: tlmgr *restore [_option_...] --all*173631
+Ref: tlmgr *--all* 3174332
+Ref: tlmgr *--backupdir* _directory_ 2174547
+Ref: tlmgr *--dry-run* 4174729
+Ref: tlmgr *--force* 2174862
+Ref: tlmgr *--json* 2174909
+Node: tlmgr search175236
+Ref: tlmgr *search [_option_...] _what_*175400
+Ref: tlmgr *search [_option_...] --file _what_*175438
+Ref: tlmgr *search [_option_...] --all _what_*175475
+Ref: tlmgr *--file* 1175696
+Ref: tlmgr *--all* 4175759
+Ref: tlmgr *--global*175849
+Ref: tlmgr *--word*175977
+Node: tlmgr shell176292
+Ref: tlmgr protocol177027
+Ref: tlmgr help 1177091
+Ref: tlmgr version 1177144
+Ref: tlmgr quit, end, bye, byebye, EOF177212
+Ref: tlmgr restart177233
+Ref: tlmgr load [local|remote]177356
+Ref: tlmgr save177426
+Ref: tlmgr get [_var_] =item set [_var_ [_val_]]177549
+Node: tlmgr show178150
+Node: tlmgr uninstall178317
+Node: tlmgr update [_option_...] [_pkg_...]178549
+Ref: tlmgr *--all* 5178921
+Ref: tlmgr *--self*181101
+Ref: tlmgr *--dry-run* 5181866
+Ref: tlmgr *--list* [_pkg_]182044
+Ref: tlmgr *--exclude* _pkg_182734
+Ref: tlmgr *--no-auto-remove* [_pkg_...]183535
+Ref: tlmgr *--no-auto-install* [_pkg_...]184020
+Ref: tlmgr *--reinstall-forcibly-removed*184783
+Ref: tlmgr *--backup* 1185319
+Ref: tlmgr *--backupdir* _directory_ 3185346
+Ref: tlmgr *--no-depends* 2186513
+Ref: tlmgr *--no-depends-at-all* 2186717
+Ref: tlmgr *--force* 3186824
+Node: tlmgr CONFIGURATION FILE FOR TLMGR187815
+Ref: tlmgr auto-remove = 0 or 1 (default 1), same as command-line option.188817
+Ref: tlmgr gui-expertmode = 0 or 1 (default 1). This switches between the full GUI and a simplified GUI with only the most common settings.188949
+Ref: tlmgr gui-lang = _llcode_, with a language code value as with the command-line option.189033
+Ref: tlmgr no-checksums = 0 or 1 (default 0, see below).189082
+Ref: tlmgr persistent-downloads = 0 or 1 (default 1), same as command-line option.189157
+Ref: tlmgr require-verification = 0 or 1 (default 0), same as command-line option.189232
+Ref: tlmgr tkfontscale = _floating-point number_ (default 1.0); scaling factor for fonts in the Tk-based frontends.189340
+Ref: tlmgr update-exclude = _comma-separated list of packages_ (no spaces allowed). Same as the command line option --exclude for the update action.189485
+Ref: tlmgr verify-downloads = 0 or 1 (default 1), same as command-line option.189556
+Ref: tlmgr allowed-actions = _action1_[,_action2_,...] The value is a comma-separated list (no spaces) of tlmgr actions which are allowed to be executed when tlmgr is invoked in system mode (that is, without --usermode). This allows distributors to include tlmgr in their packaging, but allow only a restricted set of actions that do not interfere with their distro package manager. For native TeX Live installations, it doesn't make sense to set this.190073
+Node: tlmgr CRYPTOGRAPHIC VERIFICATION190905
+Node: tlmgr Configuration of GnuPG invocation193078
+Node: tlmgr USER MODE193716
+Node: tlmgr User mode install196587
+Node: tlmgr User mode backup, restore, remove, update197733
+Node: tlmgr User mode generate, option, paper198179
+Node: tlmgr User mode logs198546
+Node: tlmgr MULTIPLE REPOSITORIES198844
+Node: tlmgr Pinning200573
+Node: tlmgr GUI FOR TLMGR202496
+Node: tlmgr Main display204145
+Node: tlmgr Display configuration area204397
+Ref: tlmgr Status204758
+Ref: tlmgr Category204922
+Ref: tlmgr Match205108
+Ref: tlmgr Selection205289
+Ref: tlmgr Display configuration buttons205493
+Node: tlmgr Package list area205676
+Ref: tlmgr a checkbox206260
+Ref: tlmgr package name206396
+Ref: tlmgr local revision (and version)206495
+Ref: tlmgr remote revision (and version)206870
+Ref: tlmgr short description207167
+Node: tlmgr Main display action buttons207212
+Ref: tlmgr Update all installed207478
+Ref: tlmgr Update207850
+Ref: tlmgr Install207900
+Ref: tlmgr Remove208086
+Ref: tlmgr Backup208264
+Node: tlmgr Menu bar208421
+Ref: tlmgr tlmgr menu208644
+Ref: tlmgr Options menu208952
+Ref: tlmgr Actions menu210035
+Ref: tlmgr Help menu210463
+Node: tlmgr GUI options210597
+Ref: tlmgr -background _color_210843
+Ref: tlmgr -font " _fontname_ _fontsize_ "210908
+Ref: tlmgr -foreground _color_211066
+Ref: tlmgr -geometry _geomspec_211118
+Ref: tlmgr -xrm _xresource_211310
+Node: tlmgr MACHINE-READABLE OUTPUT211579
+Node: tlmgr Machine-readable update and install output212393
+Ref: tlmgr location-url _location_213669
+Ref: tlmgr total-bytes _count_213885
+Ref: tlmgr _pkgname_214295
+Ref: tlmgr _status_214505
+Ref: tlmgr d214583
+Ref: tlmgr f214643
+Ref: tlmgr u214822
+Ref: tlmgr r214868
+Ref: tlmgr a214991
+Ref: tlmgr i215169
+Ref: tlmgr I215288
+Ref: tlmgr _localrev_215390
+Ref: tlmgr _serverrev_215497
+Ref: tlmgr _size_215609
+Ref: tlmgr _runtime_215778
+Ref: tlmgr _esttot_215848
+Node: tlmgr Machine-readable option output215881
+Node: tlmgr ENVIRONMENT VARIABLES216393
+Ref: tlmgr TEXLIVE_COMPRESSOR216904
+Ref: tlmgr TEXLIVE_DOWNLOADER217752
+Ref: tlmgr TL_DOWNLOAD_PROGRAM217775
+Ref: tlmgr TL_DOWNLOAD_ARGS217795
+Ref: tlmgr TEXLIVE_PREFER_OWN218821
+Node: tlmgr AUTHORS AND COPYRIGHT219645
+Node: tlmgr POD ERRORS220068
+Ref: tlmgr Around line 8454:220293
+Node: Index220329
End Tag Table
Modified: branches/stable/source/src/doc/tlbuild.texi
===================================================================
--- branches/stable/source/src/doc/tlbuild.texi 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/doc/tlbuild.texi 2024-07-21 17:12:46 UTC (rev 933)
@@ -2,7 +2,7 @@
@setfilename tlbuild.info
@set version 2024
- at set month-year March 2024
+ at set month-year April 2024
@set mytitle Building @TeX{} Live (@value{version})
@settitle @value{mytitle}
@@ -349,7 +349,7 @@
@menu
* Build iteration:: What @code{configure} and @code{make} do in TL.
* Build in parallel:: Simultaneous @code{make} processes.
-* Build distribution:: Making a distribution tarball.
+* Build distribution:: (Not) making a distribution tarball.
* Build one package:: Example of working on just one program.
* Build one engine:: Example of building just one @TeX{} engine.
* Cross compilation:: Building on host X for target Y.
@@ -420,17 +420,22 @@
@cindex distribution tarball, making
@cindex @code{dist} and @code{distcheck} targets for @code{make}
-Running @code{make dist} at the top level creates a tarball
+Running @code{make dist} or related targets at the top level outputs an
+error message and fails. We no longer try to keep @code{make dist}
+working, although it could be restored if there is some use for it.
+
+The @code{dist} target used to create a tarball
@file{tex-live- at var{yyyy}- at var{mm}- at var{dd}.tar.xz} from the TL source
-tree. Running @code{make distcheck} also verifies that this tarball
-suffices to build and install all of TL.
+tree, and @code{distcheck} also verifies that this tarball suffices to
+build and install all of TL.
-This is useful for checking consistency of the source tree and
-Makefiles, but the result is not a complete or even usable @TeX{}
-system, since all the support files are lacking; @pxref{Installing}.
-We do not actually distribute any such tarball, and have no plans to
-do so.
+However, the result was not a complete or even usable @TeX{} system,
+since all the support files are lacking. We do not actually
+distribute any such tarball, and have no plans to do so.
+ at xref{Installing}, for more information on what to do with the results
+of a build.
+
@node Build one package
@section Build one package
@@ -811,8 +816,9 @@
is the @TL{} (plain text) database in
@file{Master/tlpkg/texlive.tlpdb}, and/or the @TL{} installer,
@code{install-tl}. More information is under @file{Master/tlpkg} and
-at @url{https://tug.org/texlive/distro.html}.
-
+at @url{https://tug.org/texlive/distro.html} and
+ @url{https://tug.org/texlive/build.html#deploy}.
+
@menu
* Installation directories:: The prefix, @code{bindir}, etc., directories.
* Linked scripts:: Scripts not maintained in the sources.
@@ -1233,11 +1239,14 @@
@end defmac
@defmac KPSE_COMPILER_VISIBILITY
+ at vindex -fvisibility=hidden
+ at vindex -fvisibility-inlines-hidden
When using the C or C++ compiler, try to set
@code{VISIBILITY_C[XX]FLAGS} to flags to hide external symbols. Call
- at code{AC_SUBST} for this variable. At present this only tests for
-the compiler option @code{-fvisibility=hidden}, but could be
-extended if necessary.
+ at code{AC_SUBST} for this variable. This tests for the compiler option
+ at code{-fvisibility=hidden} and, except for C,
+ at code{-fvisibility-inlines-hidden}. Reports or patches for additional
+tests are welcome.
@vindex kpse_cv_visibility_c[xx]flags
This macro caches its results in the @code{kpse_cv_visibility_cflags}
Modified: branches/stable/source/src/libs/Makefile.in
===================================================================
--- branches/stable/source/src/libs/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,6 +69,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -275,8 +277,8 @@
top_distdir = $(distdir)
am__remove_distdir = \
if test -d "$(distdir)"; then \
- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -rf "$(distdir)" \
+ find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \
+ ; rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
am__post_remove_distdir = $(am__remove_distdir)
@@ -306,7 +308,7 @@
done; \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
+GZIP_ENV = -9
DIST_TARGETS = dist-gzip
# Exists only to be overridden by the user if desired.
AM_DISTCHECK_DVI_TARGET = dvi
@@ -313,7 +315,9 @@
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
+distcleancheck_listfiles = \
+ find . \( -type f -a \! \
+ \( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
ACLOCAL = @ACLOCAL@ --force
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -371,8 +375,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -577,7 +583,7 @@
distdir-am: $(DISTFILES)
$(am__remove_distdir)
- test -d "$(distdir)" || mkdir "$(distdir)"
+ $(AM_V_at)$(MKDIR_P) "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -691,7 +697,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -701,7 +707,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
*.tar.zst*) \
@@ -801,8 +807,8 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -939,3 +945,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/libs/README
===================================================================
--- branches/stable/source/src/libs/README 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/README 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,4 +1,4 @@
-$Id: README 70115 2024-02-24 01:06:57Z kakuto $
+$Id: README 71261 2024-05-14 00:13:23Z kakuto $
Public domain. Originally created by Karl Berry, 2005.
Libraries we compile for TeX Live.
@@ -28,7 +28,7 @@
https://sourceforge.net/projects/silgraphite/files/graphite2/
(requires C++11)
-harfbuzz 8.3.0 - checked 12nov23
+harfbuzz 8.5.0 - checked 14may24
https://github.com/harfbuzz/harfbuzz/releases/latest
icu 74.2 - checked 22dec23
Modified: branches/stable/source/src/libs/aclocal.m4
===================================================================
--- branches/stable/source/src/libs/aclocal.m4 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/aclocal.m4 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.17 -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2021 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.16'
+[am__api_version='1.17'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.5], [],
+m4_if([$1], [1.17], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.5])dnl
+[AM_AUTOMAKE_VERSION([1.17])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -58,7 +58,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -273,7 +273,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -332,7 +332,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -400,7 +400,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -534,7 +534,7 @@
fi
AC_SUBST([CSCOPE])
-AC_REQUIRE([AM_SILENT_RULES])dnl
+AC_REQUIRE([_AM_SILENT_RULES])dnl
dnl The testsuite driver may need to know about EXEEXT, so add the
dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
@@ -542,47 +542,9 @@
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
+AC_REQUIRE([_AM_PROG_RM_F])
+AC_REQUIRE([_AM_PROG_XARGS_N])
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
- AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
- fi
-fi
dnl The trailing newline in this macro's definition is deliberate, for
dnl backward compatibility and to allow trailing 'dnl'-style comments
dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
@@ -615,7 +577,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -636,7 +598,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2021 Free Software Foundation, Inc.
+# Copyright (C) 2003-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -658,7 +620,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -693,7 +655,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -736,7 +698,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -770,7 +732,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -799,7 +761,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -846,12 +808,28 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# _AM_PROG_RM_F
+# ---------------
+# Check whether 'rm -f' without any arguments works.
+# https://bugs.gnu.org/10828
+AC_DEFUN([_AM_PROG_RM_F],
+[am__rm_f_notfound=
+AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='""'])
+AC_SUBST(am__rm_f_notfound)
+])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
# AM_RUN_LOG(COMMAND)
# -------------------
# Run COMMAND, save the exit status in ac_status, and log it.
@@ -865,16 +843,169 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# _AM_SLEEP_FRACTIONAL_SECONDS
+# ----------------------------
+AC_DEFUN([_AM_SLEEP_FRACTIONAL_SECONDS], [dnl
+AC_CACHE_CHECK([whether sleep supports fractional seconds],
+ am_cv_sleep_fractional_seconds, [dnl
+AS_IF([sleep 0.001 2>/dev/null], [am_cv_sleep_fractional_seconds=yes],
+ [am_cv_sleep_fractional_seconds=no])
+])])
+
+# _AM_FILESYSTEM_TIMESTAMP_RESOLUTION
+# -----------------------------------
+# Determine the filesystem's resolution for file modification
+# timestamps. The coarsest we know of is FAT, with a resolution
+# of only two seconds, even with the most recent "exFAT" extensions.
+# The finest (e.g. ext4 with large inodes, XFS, ZFS) is one
+# nanosecond, matching clock_gettime. However, it is probably not
+# possible to delay execution of a shell script for less than one
+# millisecond, due to process creation overhead and scheduling
+# granularity, so we don't check for anything finer than that. (See below.)
+AC_DEFUN([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION], [dnl
+AC_REQUIRE([_AM_SLEEP_FRACTIONAL_SECONDS])
+AC_CACHE_CHECK([filesystem timestamp resolution],
+ am_cv_filesystem_timestamp_resolution, [dnl
+# Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `[ls -t conftest.ts[12]]` &&
+ {
+ test "$[]*" != "X conftest.ts1 conftest.ts2" ||
+ test "$[]*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ _AS_ECHO_UNQUOTED(
+ ["Bad output from ls -t: \"`[ls -t conftest.ts[12]]`\""],
+ [AS_MESSAGE_LOG_FD])
+ AC_MSG_FAILURE([ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.])
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$[]2" = conftest.ts3 &&
+ test "$[]3" = conftest.ts2 &&
+ test "$[]4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+])])
+
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
+[AC_REQUIRE([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION])
+# This check should not be cached, as it may vary across builds of
+# different projects.
+AC_MSG_CHECKING([whether build environment is sane])
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -893,49 +1024,40 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[]*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$[]2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
- alias in your environment])
- fi
- if test "$[2]" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
+AC_MSG_RESULT([$am_build_env_is_sane])
+if test "$am_build_env_is_sane" = no; then
+ AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT([yes])
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+AS_IF([test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1],, [dnl
+ ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
-fi
+])
AC_CONFIG_COMMANDS_PRE(
[AC_MSG_CHECKING([that generated files are newer than configure])
if test -n "$am_sleep_pid"; then
@@ -946,18 +1068,18 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2021 Free Software Foundation, Inc.
+# Copyright (C) 2009-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
+# _AM_SILENT_RULES
+# ----------------
+# Enable less verbose build rules support.
+AC_DEFUN([_AM_SILENT_RULES],
+[AM_DEFAULT_VERBOSITY=1
+AC_ARG_ENABLE([silent-rules], [dnl
AS_HELP_STRING(
[--enable-silent-rules],
[less verbose build output (undo: "make V=1")])
@@ -965,11 +1087,6 @@
[--disable-silent-rules],
[verbose build output (undo: "make V=0")])dnl
])
-case $enable_silent_rules in @%:@ (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
dnl
dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
dnl do not support nested variable expansions.
@@ -988,6 +1105,21 @@
else
am_cv_make_support_nested_variables=no
fi])
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+dnl Delay evaluation of AM_DEFAULT_VERBOSITY to the end to allow multiple calls
+dnl to AM_SILENT_RULES to change the default value.
+AC_CONFIG_COMMANDS_PRE([dnl
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
if test $am_cv_make_support_nested_variables = yes; then
dnl Using '$V' instead of '$(V)' breaks IRIX make.
AM_V='$(V)'
@@ -996,17 +1128,18 @@
AM_V=$AM_DEFAULT_VERBOSITY
AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])dnl
])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Set the default verbosity level to DEFAULT ("yes" being less verbose, "no" or
+# empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_REQUIRE([_AM_SILENT_RULES])
+AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1034,7 +1167,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2021 Free Software Foundation, Inc.
+# Copyright (C) 2006-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1053,7 +1186,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2021 Free Software Foundation, Inc.
+# Copyright (C) 2004-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1099,15 +1232,19 @@
am_uid=`id -u || echo unknown`
am_gid=`id -g || echo unknown`
AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
- if test $am_uid -le $am_max_uid; then
- AC_MSG_RESULT([yes])
+ if test x$am_uid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current UID is ok, but dist-ustar might not work])
+ elif test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT([no])
- _am_tools=none
+ AC_MSG_RESULT([no])
+ _am_tools=none
fi
AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
- if test $am_gid -le $am_max_gid; then
- AC_MSG_RESULT([yes])
+ if test x$gm_gid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current GID is ok, but dist-ustar might not work])
+ elif test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
_am_tools=none
@@ -1184,6 +1321,26 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_XARGS_N
+# ----------------
+# Check whether 'xargs -n' works. It should work everywhere, so the fallback
+# is not optimized at all as we never expect to use it.
+AC_DEFUN([_AM_PROG_XARGS_N],
+[AC_CACHE_CHECK([xargs -n works], am_cv_xargs_n_works, [dnl
+AS_IF([test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"], [am_cv_xargs_n_works=yes], [am_cv_xargs_n_works=no])])
+AS_IF([test "$am_cv_xargs_n_works" = yes], [am__xargs_n='xargs -n'], [dnl
+ am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "$@" "$am__xargs_n_arg"; done; }'
+])dnl
+AC_SUBST(am__xargs_n)
+])
+
m4_include([../m4/kpse-cairo-flags.m4])
m4_include([../m4/kpse-common.m4])
m4_include([../m4/kpse-cxx-hack.m4])
Modified: branches/stable/source/src/libs/configure
===================================================================
--- branches/stable/source/src/libs/configure 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/configure 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for TeX Live libs 2024.
+# Generated by GNU Autoconf 2.72 for TeX Live libs 2025/dev.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -603,12 +603,44 @@
# Identity of this package.
PACKAGE_NAME='TeX Live libs'
PACKAGE_TARNAME='tex-live-libs'
-PACKAGE_VERSION='2024'
-PACKAGE_STRING='TeX Live libs 2024'
+PACKAGE_VERSION='2025/dev'
+PACKAGE_STRING='TeX Live libs 2025/dev'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
ac_unique_file="../build-aux/missing"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stddef.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_header_c_list=
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
@@ -619,6 +651,8 @@
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
+am__xargs_n
+am__rm_f_notfound
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -751,8 +785,6 @@
enable_etex_synctex
enable_ptex
enable_ptex_synctex
-enable_eptex
-enable_eptex_synctex
enable_uptex
enable_uptex_synctex
enable_euptex
@@ -1437,7 +1469,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 TeX Live libs 2024 to adapt to many kinds of systems.
+'configure' configures TeX Live libs 2025/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1508,7 +1540,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live libs 2024:";;
+ short | recursive ) echo "Configuration of TeX Live libs 2025/dev:";;
esac
cat <<\_ACEOF
@@ -1553,8 +1585,6 @@
--disable-etex-synctex build e-TeX without SyncTeX support
--enable-ptex compile and install pTeX
--disable-ptex-synctex build pTeX without SyncTeX support
- --enable-eptex compile and install e-pTeX
- --disable-eptex-synctex build e-pTeX without SyncTeX support
--enable-uptex compile and install upTeX
--disable-uptex-synctex build upTeX without SyncTeX support
--disable-euptex do not compile and install e-upTeX
@@ -1804,7 +1834,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live libs configure 2024
+TeX Live libs configure 2025/dev
generated by GNU Autoconf 2.72
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1858,6 +1888,41 @@
} # ac_fn_c_try_compile
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ eval "$3=yes"
+else case e in #(
+ e) eval "$3=no" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+eval ac_res=\$$3
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
# ac_fn_c_try_link LINENO
# -----------------------
# Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -1929,7 +1994,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live libs $as_me 2024, which was
+It was created by TeX Live libs $as_me 2025/dev, which was
generated by GNU Autoconf 2.72. Invocation command line was
$ $0$ac_configure_args_raw
@@ -2200,6 +2265,7 @@
>$cache_file
fi
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
# Test code for whether the C compiler supports C89 (global declarations)
ac_c_conftest_c89_globals='
/* Does the compiler advertise C89 conformance?
@@ -2525,6 +2591,16 @@
}
"
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
+as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
# Auxiliary files required by this configure script.
ac_aux_files="missing install-sh compile config.guess config.sub"
@@ -3874,9 +3950,187 @@
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+ if test $ac_cache; then
+ ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+ if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+ printf "%s\n" "#define $ac_item 1" >> confdefs.h
+ fi
+ ac_header= ac_cache=
+ elif test $ac_header; then
+ ac_cache=$ac_item
+ else
+ ac_header=$ac_item
+ fi
+done
+
+
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+
+
+
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test ${ac_cv_safe_to_define___extensions__+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+# define __EXTENSIONS__ 1
+ $ac_includes_default
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_safe_to_define___extensions__=yes
+else case e in #(
+ e) ac_cv_safe_to_define___extensions__=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
+if test ${ac_cv_should_define__xopen_source+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_cv_should_define__xopen_source=no
+ if test $ac_cv_header_wchar_h = yes
+then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <wchar.h>
+ mbstate_t x;
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #define _XOPEN_SOURCE 500
+ #include <wchar.h>
+ mbstate_t x;
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_should_define__xopen_source=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+
+ printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+
+ printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+ printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+ if test $ac_cv_header_minix_config_h = yes
+then :
+ MINIX=yes
+ printf "%s\n" "#define _MINIX 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+else case e in #(
+ e) MINIX= ;;
+esac
+fi
+ if test $ac_cv_safe_to_define___extensions__ = yes
+then :
+ printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
+
+fi
+ if test $ac_cv_should_define__xopen_source = yes
+then :
+ printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
+
+fi
+
+
+
+
+echo 'tldbg:KPSE_SETUP called (toplevel=../)' >&5
# Check whether --enable-all-pkgs was given.
if test ${enable_all_pkgs+y}
then :
@@ -3987,6 +4241,24 @@
+
+# We must enable system extensions before any compiler call to avoid
+# (valid) autoconf warnings. Because different configure.ac's use
+# different kpse setup routines, we call the ac_use_system_extensions
+# macro both here and in kpse_basic (in kpse-common.m4).
+#
+# Fortunately, Autoconf defines the system_extensions macro to only have
+# any effect once (with ac_defun_once), so it's harmless to call it
+# multiple time.
+#
+# LuaTeX requires system extensions for socket support. Also, since
+# SyncTeX, some libraries, and others unconditionally #define
+# GNU_SOURCE, it seems more consistent to always use it.
+#
+
+
+# this macro, kpse_check_win32, is the first compiler call for
+# configure.ac files that use this function (kpse setup).
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
printf %s "checking for native WIN32 or MINGW32... " >&6; }
if test ${kpse_cv_have_win32+y}
@@ -4039,6 +4311,8 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5
printf "%s\n" "$kpse_cv_have_win32" >&6; }
+# end call to kpse_check_win32.
+
case $with_x:$kpse_cv_have_win32 in #(
yes:no | no:*) :
: ;; #(
@@ -4550,28 +4824,6 @@
need_ptexenc=yes
need_zlib=yes
}
-# Check whether --enable-eptex was given.
-if test ${enable_eptex+y}
-then :
- enableval=$enable_eptex;
-fi
-case $enable_eptex in #(
- yes | no) :
- ;; #(
- *) :
- enable_eptex=no ;;
-esac
-
-# Check whether --enable-eptex-synctex was given.
-if test ${enable_eptex_synctex+y}
-then :
- enableval=$enable_eptex_synctex;
-fi
-
-test "x$enable_web2c:$enable_eptex" = xyes:yes && {
- need_ptexenc=yes
- need_zlib=yes
-}
# Check whether --enable-uptex was given.
if test ${enable_uptex+y}
then :
@@ -6533,10 +6785,13 @@
+# end of kpse_setup macro.
+echo 'tldbg:KPSE_SETUP done (toplevel=../)' >&5
-am__api_version='1.16'
+am__api_version='1.17'
+
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -6636,6 +6891,165 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
+printf %s "checking whether sleep supports fractional seconds... " >&6; }
+if test ${am_cv_sleep_fractional_seconds+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if sleep 0.001 2>/dev/null
+then :
+ am_cv_sleep_fractional_seconds=yes
+else case e in #(
+ e) am_cv_sleep_fractional_seconds=no ;;
+esac
+fi
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
+printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; }
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
+printf %s "checking filesystem timestamp resolution... " >&6; }
+if test ${am_cv_filesystem_timestamp_resolution+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) # Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `ls -t conftest.ts[12]` &&
+ {
+ test "$*" != "X conftest.ts1 conftest.ts2" ||
+ test "$*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.
+See 'config.log' for more details" "$LINENO" 5; }
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$2" = conftest.ts3 &&
+ test "$3" = conftest.ts2 &&
+ test "$4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
+printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; }
+
+# This check should not be cached, as it may vary across builds of
+# different projects.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
printf %s "checking whether build environment is sane... " >&6; }
# Reject unsafe characters in $srcdir or the absolute working directory
@@ -6656,49 +7070,45 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
- if test "$2" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$2" = conftest.file
- )
-then
- # Ok.
- :
-else
- as_fn_error $? "newly created file is older than distributed files!
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
+printf "%s\n" "$am_build_env_is_sane" >&6; }
+if test "$am_build_env_is_sane" = no; then
+ as_fn_error $? "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+if test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1
+then :
+
+else case e in #(
+ e) ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
+ ;;
+esac
fi
rm -f conftest.file
@@ -7048,6 +7458,7 @@
fi
+AM_DEFAULT_VERBOSITY=1
# Check whether --enable-silent-rules was given.
if test ${enable_silent_rules+y}
then :
@@ -7054,11 +7465,6 @@
enableval=$enable_silent_rules;
fi
-case $enable_silent_rules in # (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=1;;
-esac
am_make=${MAKE-make}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
printf %s "checking whether $am_make supports nested variables... " >&6; }
@@ -7081,15 +7487,45 @@
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
AM_BACKSLASH='\'
+am__rm_f_notfound=
+if (rm -f && rm -fr && rm -rf) 2>/dev/null
+then :
+
+else case e in #(
+ e) am__rm_f_notfound='""' ;;
+esac
+fi
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
+printf %s "checking xargs -n works... " >&6; }
+if test ${am_cv_xargs_n_works+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"
+then :
+ am_cv_xargs_n_works=yes
+else case e in #(
+ e) am_cv_xargs_n_works=no ;;
+esac
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
+printf "%s\n" "$am_cv_xargs_n_works" >&6; }
+if test "$am_cv_xargs_n_works" = yes
+then :
+ am__xargs_n='xargs -n'
+else case e in #(
+ e) am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "" "$am__xargs_n_arg"; done; }'
+ ;;
+esac
+fi
+
# Check whether --enable-compiler-warnings was given.
if test ${enable_compiler_warnings+y}
then :
@@ -7110,6 +7546,8 @@
echo 'tldbg:KPSE_BASIC called (pkg=libs, amopt=)' >&5
+#
+# am_init_automake
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
@@ -7132,7 +7570,7 @@
# Define the identity of the package.
PACKAGE='tex-live-libs'
- VERSION='2024'
+ VERSION='2025/dev'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -7273,7 +7711,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -7323,49 +7761,13 @@
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
+# am_maintainer_mode
-END
- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
- fi
-fi
-
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
@@ -7390,6 +7792,11 @@
MAINT=$MAINTAINER_MODE_TRUE
+
+# See comments in kpse-setup.m4 about system extensions.
+
+
+# Check whether prototypes work.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5
printf %s "checking whether the compiler accepts prototypes... " >&6; }
if test ${kb_cv_c_prototypes+y}
@@ -7423,6 +7830,8 @@
if test "x$kb_cv_c_prototypes" = xno; then
as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5
fi
+
+# kpse_compiler_warnings options.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
printf %s "checking what warning flags to pass to the C compiler... " >&6; }
if test ${kpse_cv_warning_cflags+y}
@@ -7480,9 +7889,12 @@
+# end of kpse_basic macro.
+echo 'tldbg:KPSE_BASIC done (pkg=libs, amopt=)' >&5
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for generic libraries to build" >&5
printf %s "checking for generic libraries to build... " >&6; }
echo 'tldbg:_KPSE_RECURSE called: list=libs, text=generic libraries, cond=test "x$with_system_[]Kpse_pkg" != xyes && test "x$need_[]Kpse_pkg" = xyes, prefix=.' >&5
@@ -7774,6 +8186,18 @@
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -8179,7 +8603,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live libs $as_me 2024, which was
+This file was extended by TeX Live libs $as_me 2025/dev, which was
generated by GNU Autoconf 2.72. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8238,7 +8662,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-TeX Live libs config.status 2024
+TeX Live libs config.status 2025/dev
configured by $0, generated by GNU Autoconf 2.72,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/libs/libpng/ChangeLog
===================================================================
--- branches/stable/source/src/libs/libpng/ChangeLog 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/libpng/ChangeLog 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,3 +1,7 @@
+2024-04-07 Karl Berry <karl at freefriends.org>
+
+ * configure.ac (AM_PROG_AR): include for cosmopolitan, from Luigi.
+
2024-02-24 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
Import libpng-1.6.43.
Modified: branches/stable/source/src/libs/libpng/Makefile.in
===================================================================
--- branches/stable/source/src/libs/libpng/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/libpng/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -70,6 +70,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -115,13 +117,13 @@
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
-ARFLAGS = cru
+ARFLAGS = cr
AM_V_AR = $(am__v_AR_ at AM_V@)
am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
am__v_AR_0 = @echo " AR " $@;
am__v_AR_1 =
libpng_a_AR = $(AR) $(ARFLAGS)
+libpng_a_RANLIB = $(RANLIB)
libpng_a_LIBADD =
am__dirstamp = $(am__leading_dot)dirstamp
@PNG_ARM_NEON_TRUE at am__objects_1 = \
@@ -293,10 +295,9 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
+ { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
}
am__recheck_rx = ^[ ]*:recheck:[ ]*
am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
@@ -384,6 +385,7 @@
# Default flags passed to test drivers.
am__common_driver_flags = \
--color-tests "$$am__color_tests" \
+ $$am__collect_skipped_logs \
--enable-hard-errors "$$am__enable_hard_errors" \
--expect-failure "$$am__expect_failure"
# To be inserted before the command running the test. Creates the
@@ -408,6 +410,11 @@
elif test -f "$$f"; then dir=; \
else dir="$(srcdir)/"; fi; \
tst=$$dir$$f; log='$@'; \
+if test -n '$(IGNORE_SKIPPED_LOGS)'; then \
+ am__collect_skipped_logs='--collect-skipped-logs no'; \
+else \
+ am__collect_skipped_logs=''; \
+fi; \
if test -n '$(DISABLE_HARD_ERRORS)'; then \
am__enable_hard_errors=no; \
else \
@@ -455,6 +462,7 @@
am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
$(srcdir)/../../am/rebuild.am $(srcdir)/../../am/reconfig.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(top_srcdir)/../../build-aux/ar-lib \
$(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/config.guess \
$(top_srcdir)/../../build-aux/config.sub \
@@ -473,8 +481,8 @@
top_distdir = $(distdir)
am__remove_distdir = \
if test -d "$(distdir)"; then \
- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -rf "$(distdir)" \
+ find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \
+ ; rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
am__post_remove_distdir = $(am__remove_distdir)
@@ -504,7 +512,7 @@
done; \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
+GZIP_ENV = -9
DIST_TARGETS = dist-gzip
# Exists only to be overridden by the user if desired.
AM_DISTCHECK_DVI_TARGET = dvi
@@ -511,10 +519,13 @@
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
+distcleancheck_listfiles = \
+ find . \( -type f -a \! \
+ \( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -577,12 +588,15 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -704,27 +718,27 @@
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
+ $(AM_V_at)rm -f stamp-h1
+ $(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
- rm -f stamp-h1
- touch $@
+ $(AM_V_GEN)($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ $(AM_V_at)rm -f stamp-h1
+ $(AM_V_at)touch $@
distclean-hdr:
-rm -f config.h stamp-h1
clean-checkPROGRAMS:
- -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
+ -$(am__rm_f) $(check_PROGRAMS)
clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+ -$(am__rm_f) $(noinst_LIBRARIES)
@LIBPNG_TREE@/$(am__dirstamp):
@$(MKDIR_P) @LIBPNG_TREE@
- @: > @LIBPNG_TREE@/$(am__dirstamp)
+ @: >>@LIBPNG_TREE@/$(am__dirstamp)
@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) @LIBPNG_TREE@/$(DEPDIR)
- @: > @LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
+ @: >>@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
@LIBPNG_TREE@/png.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
@LIBPNG_TREE@/pngerror.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
@@ -757,10 +771,10 @@
@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
@LIBPNG_TREE@/arm/$(am__dirstamp):
@$(MKDIR_P) @LIBPNG_TREE@/arm
- @: > @LIBPNG_TREE@/arm/$(am__dirstamp)
+ @: >>@LIBPNG_TREE@/arm/$(am__dirstamp)
@LIBPNG_TREE@/arm/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) @LIBPNG_TREE@/arm/$(DEPDIR)
- @: > @LIBPNG_TREE@/arm/$(DEPDIR)/$(am__dirstamp)
+ @: >>@LIBPNG_TREE@/arm/$(DEPDIR)/$(am__dirstamp)
@LIBPNG_TREE@/arm/arm_init.$(OBJEXT): \
@LIBPNG_TREE@/arm/$(am__dirstamp) \
@LIBPNG_TREE@/arm/$(DEPDIR)/$(am__dirstamp)
@@ -775,10 +789,10 @@
@LIBPNG_TREE@/arm/$(DEPDIR)/$(am__dirstamp)
@LIBPNG_TREE@/powerpc/$(am__dirstamp):
@$(MKDIR_P) @LIBPNG_TREE@/powerpc
- @: > @LIBPNG_TREE@/powerpc/$(am__dirstamp)
+ @: >>@LIBPNG_TREE@/powerpc/$(am__dirstamp)
@LIBPNG_TREE@/powerpc/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) @LIBPNG_TREE@/powerpc/$(DEPDIR)
- @: > @LIBPNG_TREE@/powerpc/$(DEPDIR)/$(am__dirstamp)
+ @: >>@LIBPNG_TREE@/powerpc/$(DEPDIR)/$(am__dirstamp)
@LIBPNG_TREE@/powerpc/powerpc_init.$(OBJEXT): \
@LIBPNG_TREE@/powerpc/$(am__dirstamp) \
@LIBPNG_TREE@/powerpc/$(DEPDIR)/$(am__dirstamp)
@@ -789,7 +803,7 @@
libpng.a: $(libpng_a_OBJECTS) $(libpng_a_DEPENDENCIES) $(EXTRA_libpng_a_DEPENDENCIES)
$(AM_V_at)-rm -f libpng.a
$(AM_V_AR)$(libpng_a_AR) libpng.a $(libpng_a_OBJECTS) $(libpng_a_LIBADD)
- $(AM_V_at)$(RANLIB) libpng.a
+ $(AM_V_at)$(libpng_a_RANLIB) libpng.a
@LIBPNG_TREE@/pngtest.$(OBJEXT): @LIBPNG_TREE@/$(am__dirstamp) \
@LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
@@ -831,7 +845,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+ @: >>$@
am--depfiles: $(am__depfiles_remade)
@@ -986,7 +1000,6 @@
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
am--force-recheck:
@:
-
$(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__set_TESTS_bases); \
am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
@@ -1062,10 +1075,37 @@
result_count $$1 "XPASS:" $$xpass "$$red"; \
result_count $$1 "ERROR:" $$error "$$mgn"; \
}; \
+ output_system_information () \
+ { \
+ echo; \
+ { uname -a | $(AWK) '{ \
+ printf "System information (uname -a):"; \
+ for (i = 1; i < NF; ++i) \
+ { \
+ if (i != 2) \
+ printf " %s", $$i; \
+ } \
+ printf "\n"; \
+}'; } 2>&1; \
+ if test -r /etc/os-release; then \
+ echo "Distribution information (/etc/os-release):"; \
+ sed 8q /etc/os-release; \
+ elif test -r /etc/issue; then \
+ echo "Distribution information (/etc/issue):"; \
+ cat /etc/issue; \
+ fi; \
+ }; \
+ please_report () \
+ { \
+echo "Some test(s) failed. Please report this to $(PACKAGE_BUGREPORT),"; \
+echo "together with the test-suite.log file (gzipped) and your system"; \
+echo "information. Thanks."; \
+ }; \
{ \
echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
$(am__rst_title); \
create_testsuite_report --no-color; \
+ output_system_information; \
echo; \
echo ".. contents:: :depth: 2"; \
echo; \
@@ -1085,9 +1125,9 @@
create_testsuite_report --maybe-color; \
echo "$$col$$br$$std"; \
if $$success; then :; else \
- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
if test -n "$(PACKAGE_BUGREPORT)"; then \
- echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
+ please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
fi; \
echo "$$col$$br$$std"; \
fi; \
@@ -1094,17 +1134,16 @@
$$success || exit 1
check-TESTS: $(check_PROGRAMS) $(dist_check_SCRIPTS)
- @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
- @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @$(am__rm_f) $(RECHECK_LOGS)
+ @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
+ @$(am__rm_f) $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
log_list=`for i in $$bases; do echo $$i.log; done`; \
- trs_list=`for i in $$bases; do echo $$i.trs; done`; \
- log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+ log_list=`echo $$log_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
recheck: all $(check_PROGRAMS) $(dist_check_SCRIPTS)
- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @$(am__rm_f) $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
| $(am__list_recheck_tests)` || exit 1; \
@@ -1133,7 +1172,7 @@
distdir-am: $(DISTFILES)
$(am__remove_distdir)
- test -d "$(distdir)" || mkdir "$(distdir)"
+ $(AM_V_at)$(MKDIR_P) "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -1247,7 +1286,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -1257,7 +1296,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
*.tar.zst*) \
@@ -1356,23 +1395,23 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
- -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
- -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ -$(am__rm_f) $(TEST_LOGS)
+ -$(am__rm_f) $(TEST_LOGS:.log=.trs)
+ -$(am__rm_f) $(TEST_SUITE_LOG)
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+ -$(am__rm_f) $(CLEANFILES)
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -rm -f @LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
- -rm -f @LIBPNG_TREE@/$(am__dirstamp)
- -rm -f @LIBPNG_TREE@/arm/$(DEPDIR)/$(am__dirstamp)
- -rm -f @LIBPNG_TREE@/arm/$(am__dirstamp)
- -rm -f @LIBPNG_TREE@/powerpc/$(DEPDIR)/$(am__dirstamp)
- -rm -f @LIBPNG_TREE@/powerpc/$(am__dirstamp)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(DISTCLEANFILES)
+ -$(am__rm_f) @LIBPNG_TREE@/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) @LIBPNG_TREE@/$(am__dirstamp)
+ -$(am__rm_f) @LIBPNG_TREE@/arm/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) @LIBPNG_TREE@/arm/$(am__dirstamp)
+ -$(am__rm_f) @LIBPNG_TREE@/powerpc/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) @LIBPNG_TREE@/powerpc/$(am__dirstamp)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -1384,7 +1423,7 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f @LIBPNG_TREE@/$(DEPDIR)/png.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/png.Po
-rm -f @LIBPNG_TREE@/$(DEPDIR)/pngerror.Po
-rm -f @LIBPNG_TREE@/$(DEPDIR)/pngget.Po
-rm -f @LIBPNG_TREE@/$(DEPDIR)/pngmem.Po
@@ -1453,7 +1492,7 @@
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -f @LIBPNG_TREE@/$(DEPDIR)/png.Po
+ -rm -f @LIBPNG_TREE@/$(DEPDIR)/png.Po
-rm -f @LIBPNG_TREE@/$(DEPDIR)/pngerror.Po
-rm -f @LIBPNG_TREE@/$(DEPDIR)/pngget.Po
-rm -f @LIBPNG_TREE@/$(DEPDIR)/pngmem.Po
@@ -1558,3 +1597,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/libs/libpng/aclocal.m4
===================================================================
--- branches/stable/source/src/libs/libpng/aclocal.m4 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/libpng/aclocal.m4 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.17 -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2021 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.16'
+[am__api_version='1.17'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.5], [],
+m4_if([$1], [1.17], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,76 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.5])dnl
+[AM_AUTOMAKE_VERSION([1.17])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+# Copyright (C) 2011-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_AR([ACT-IF-FAIL])
+# -------------------------
+# Try to determine the archiver interface, and trigger the ar-lib wrapper
+# if it is needed. If the detection of archiver interface fails, run
+# ACT-IF-FAIL (default is to abort configure with a proper error message).
+AC_DEFUN([AM_PROG_AR],
+[AC_BEFORE([$0], [LT_INIT])dnl
+AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
+AC_BEFORE([$0], [AC_PROG_AR])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([ar-lib])dnl
+AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
+: ${AR=ar}
+: ${ARFLAGS=cr}
+
+AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
+ [AC_LANG_PUSH([C])
+ am_cv_ar_interface=ar
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
+ [am_ar_try='$AR $ARFLAGS libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+ AC_TRY_EVAL([am_ar_try])
+ if test "$ac_status" -eq 0; then
+ am_cv_ar_interface=ar
+ else
+ am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+ AC_TRY_EVAL([am_ar_try])
+ if test "$ac_status" -eq 0; then
+ am_cv_ar_interface=lib
+ else
+ am_cv_ar_interface=unknown
+ fi
+ fi
+ rm -f conftest.lib libconftest.a
+ ])
+ AC_LANG_POP([C])])
+
+case $am_cv_ar_interface in
+ar)
+ ;;
+lib)
+ # Microsoft lib, so override with the ar-lib wrapper script.
+ # FIXME: It is wrong to rewrite AR.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__AR in this case,
+ # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
+ # similar.
+ AR="$am_aux_dir/ar-lib $AR"
+ ;;
+unknown)
+ m4_default([$1],
+ [AC_MSG_ERROR([could not determine $AR interface])])
+ ;;
+esac
+AC_SUBST([AR])dnl
+])
+
# Figure out how to run the assembler. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -78,7 +140,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -130,7 +192,7 @@
# AM_COND_IF -*- Autoconf -*-
-# Copyright (C) 2008-2021 Free Software Foundation, Inc.
+# Copyright (C) 2008-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -167,7 +229,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -198,7 +260,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -330,7 +392,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -389,7 +451,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -457,7 +519,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -591,7 +653,7 @@
fi
AC_SUBST([CSCOPE])
-AC_REQUIRE([AM_SILENT_RULES])dnl
+AC_REQUIRE([_AM_SILENT_RULES])dnl
dnl The testsuite driver may need to know about EXEEXT, so add the
dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
@@ -599,47 +661,9 @@
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
+AC_REQUIRE([_AM_PROG_RM_F])
+AC_REQUIRE([_AM_PROG_XARGS_N])
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
- AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
- fi
-fi
dnl The trailing newline in this macro's definition is deliberate, for
dnl backward compatibility and to allow trailing 'dnl'-style comments
dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
@@ -672,7 +696,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -693,7 +717,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2021 Free Software Foundation, Inc.
+# Copyright (C) 2003-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -715,7 +739,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -750,7 +774,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -793,7 +817,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -827,7 +851,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -856,7 +880,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -903,12 +927,28 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# _AM_PROG_RM_F
+# ---------------
+# Check whether 'rm -f' without any arguments works.
+# https://bugs.gnu.org/10828
+AC_DEFUN([_AM_PROG_RM_F],
+[am__rm_f_notfound=
+AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='""'])
+AC_SUBST(am__rm_f_notfound)
+])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
# AM_RUN_LOG(COMMAND)
# -------------------
# Run COMMAND, save the exit status in ac_status, and log it.
@@ -922,16 +962,169 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# _AM_SLEEP_FRACTIONAL_SECONDS
+# ----------------------------
+AC_DEFUN([_AM_SLEEP_FRACTIONAL_SECONDS], [dnl
+AC_CACHE_CHECK([whether sleep supports fractional seconds],
+ am_cv_sleep_fractional_seconds, [dnl
+AS_IF([sleep 0.001 2>/dev/null], [am_cv_sleep_fractional_seconds=yes],
+ [am_cv_sleep_fractional_seconds=no])
+])])
+
+# _AM_FILESYSTEM_TIMESTAMP_RESOLUTION
+# -----------------------------------
+# Determine the filesystem's resolution for file modification
+# timestamps. The coarsest we know of is FAT, with a resolution
+# of only two seconds, even with the most recent "exFAT" extensions.
+# The finest (e.g. ext4 with large inodes, XFS, ZFS) is one
+# nanosecond, matching clock_gettime. However, it is probably not
+# possible to delay execution of a shell script for less than one
+# millisecond, due to process creation overhead and scheduling
+# granularity, so we don't check for anything finer than that. (See below.)
+AC_DEFUN([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION], [dnl
+AC_REQUIRE([_AM_SLEEP_FRACTIONAL_SECONDS])
+AC_CACHE_CHECK([filesystem timestamp resolution],
+ am_cv_filesystem_timestamp_resolution, [dnl
+# Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `[ls -t conftest.ts[12]]` &&
+ {
+ test "$[]*" != "X conftest.ts1 conftest.ts2" ||
+ test "$[]*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ _AS_ECHO_UNQUOTED(
+ ["Bad output from ls -t: \"`[ls -t conftest.ts[12]]`\""],
+ [AS_MESSAGE_LOG_FD])
+ AC_MSG_FAILURE([ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.])
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$[]2" = conftest.ts3 &&
+ test "$[]3" = conftest.ts2 &&
+ test "$[]4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+])])
+
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
+[AC_REQUIRE([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION])
+# This check should not be cached, as it may vary across builds of
+# different projects.
+AC_MSG_CHECKING([whether build environment is sane])
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -950,49 +1143,40 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[]*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$[]2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
- alias in your environment])
- fi
- if test "$[2]" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
+AC_MSG_RESULT([$am_build_env_is_sane])
+if test "$am_build_env_is_sane" = no; then
+ AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT([yes])
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+AS_IF([test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1],, [dnl
+ ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
-fi
+])
AC_CONFIG_COMMANDS_PRE(
[AC_MSG_CHECKING([that generated files are newer than configure])
if test -n "$am_sleep_pid"; then
@@ -1003,18 +1187,18 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2021 Free Software Foundation, Inc.
+# Copyright (C) 2009-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
+# _AM_SILENT_RULES
+# ----------------
+# Enable less verbose build rules support.
+AC_DEFUN([_AM_SILENT_RULES],
+[AM_DEFAULT_VERBOSITY=1
+AC_ARG_ENABLE([silent-rules], [dnl
AS_HELP_STRING(
[--enable-silent-rules],
[less verbose build output (undo: "make V=1")])
@@ -1022,11 +1206,6 @@
[--disable-silent-rules],
[verbose build output (undo: "make V=0")])dnl
])
-case $enable_silent_rules in @%:@ (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
dnl
dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
dnl do not support nested variable expansions.
@@ -1045,6 +1224,21 @@
else
am_cv_make_support_nested_variables=no
fi])
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+dnl Delay evaluation of AM_DEFAULT_VERBOSITY to the end to allow multiple calls
+dnl to AM_SILENT_RULES to change the default value.
+AC_CONFIG_COMMANDS_PRE([dnl
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
if test $am_cv_make_support_nested_variables = yes; then
dnl Using '$V' instead of '$(V)' breaks IRIX make.
AM_V='$(V)'
@@ -1053,17 +1247,18 @@
AM_V=$AM_DEFAULT_VERBOSITY
AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])dnl
])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Set the default verbosity level to DEFAULT ("yes" being less verbose, "no" or
+# empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_REQUIRE([_AM_SILENT_RULES])
+AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1091,7 +1286,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2021 Free Software Foundation, Inc.
+# Copyright (C) 2006-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1110,7 +1305,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2021 Free Software Foundation, Inc.
+# Copyright (C) 2004-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1156,15 +1351,19 @@
am_uid=`id -u || echo unknown`
am_gid=`id -g || echo unknown`
AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
- if test $am_uid -le $am_max_uid; then
- AC_MSG_RESULT([yes])
+ if test x$am_uid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current UID is ok, but dist-ustar might not work])
+ elif test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT([no])
- _am_tools=none
+ AC_MSG_RESULT([no])
+ _am_tools=none
fi
AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
- if test $am_gid -le $am_max_gid; then
- AC_MSG_RESULT([yes])
+ if test x$gm_gid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current GID is ok, but dist-ustar might not work])
+ elif test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
_am_tools=none
@@ -1241,6 +1440,26 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_XARGS_N
+# ----------------
+# Check whether 'xargs -n' works. It should work everywhere, so the fallback
+# is not optimized at all as we never expect to use it.
+AC_DEFUN([_AM_PROG_XARGS_N],
+[AC_CACHE_CHECK([xargs -n works], am_cv_xargs_n_works, [dnl
+AS_IF([test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"], [am_cv_xargs_n_works=yes], [am_cv_xargs_n_works=no])])
+AS_IF([test "$am_cv_xargs_n_works" = yes], [am__xargs_n='xargs -n'], [dnl
+ am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "$@" "$am__xargs_n_arg"; done; }'
+])dnl
+AC_SUBST(am__xargs_n)
+])
+
m4_include([../../m4/kpse-common.m4])
m4_include([../../m4/kpse-visibility.m4])
m4_include([../../m4/kpse-warnings.m4])
Modified: branches/stable/source/src/libs/libpng/config.h.in
===================================================================
--- branches/stable/source/src/libs/libpng/config.h.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/libpng/config.h.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -9,6 +9,9 @@
/* Define to 1 if you have the 'memset' function. */
#undef HAVE_MEMSET
+/* Define to 1 if you have the <minix/config.h> header file. */
+#undef HAVE_MINIX_CONFIG_H
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
@@ -33,6 +36,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to 1 if you have the <wchar.h> header file. */
+#undef HAVE_WCHAR_H
+
/* Name of package */
#undef PACKAGE
@@ -80,6 +86,98 @@
/* Define to 1 if your <sys/time.h> declares 'struct tm'. */
#undef TM_IN_SYS_TIME
+/* Enable extensions on AIX, Interix, z/OS. */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable general extensions on macOS. */
+#ifndef _DARWIN_C_SOURCE
+# undef _DARWIN_C_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable X/Open compliant socket functions that do not require linking
+ with -lxnet on HP-UX 11.11. */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# undef _HPUX_ALT_XOPEN_SOCKET_API
+#endif
+/* Identify the host operating system as Minix.
+ This macro does not affect the system headers' behavior.
+ A future release of Autoconf may stop defining this macro. */
+#ifndef _MINIX
+# undef _MINIX
+#endif
+/* Enable general extensions on NetBSD.
+ Enable NetBSD compatibility extensions on Minix. */
+#ifndef _NETBSD_SOURCE
+# undef _NETBSD_SOURCE
+#endif
+/* Enable OpenBSD compatibility extensions on NetBSD.
+ Oddly enough, this does nothing on OpenBSD. */
+#ifndef _OPENBSD_SOURCE
+# undef _OPENBSD_SOURCE
+#endif
+/* Define to 1 if needed for POSIX-compatible behavior. */
+#ifndef _POSIX_SOURCE
+# undef _POSIX_SOURCE
+#endif
+/* Define to 2 if needed for POSIX-compatible behavior. */
+#ifndef _POSIX_1_SOURCE
+# undef _POSIX_1_SOURCE
+#endif
+/* Enable POSIX-compatible threading on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# undef __STDC_WANT_IEC_60559_BFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# undef __STDC_WANT_IEC_60559_DFP_EXT__
+#endif
+/* Enable extensions specified by C23 Annex F. */
+#ifndef __STDC_WANT_IEC_60559_EXT__
+# undef __STDC_WANT_IEC_60559_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#endif
+/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# undef __STDC_WANT_IEC_60559_TYPES_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */
+#ifndef __STDC_WANT_LIB_EXT2__
+# undef __STDC_WANT_LIB_EXT2__
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009. */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# undef __STDC_WANT_MATH_SPEC_FUNCS__
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable X/Open extensions. Define to 500 only if necessary
+ to make mbstate_t available. */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
+#endif
+
+
/* Version number of package */
#undef VERSION
Modified: branches/stable/source/src/libs/libpng/configure
===================================================================
--- branches/stable/source/src/libs/libpng/configure 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/libpng/configure 2024-07-21 17:12:46 UTC (rev 933)
@@ -664,6 +664,8 @@
VISIBILITY_CFLAGS
LN_S
RANLIB
+ac_ct_AR
+AR
am__fastdepCCAS_FALSE
am__fastdepCCAS_TRUE
CCASDEPMODE
@@ -697,6 +699,8 @@
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
+am__xargs_n
+am__rm_f_notfound
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -1584,6 +1588,41 @@
} # ac_fn_c_try_compile
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ eval "$3=yes"
+else case e in #(
+ e) eval "$3=no" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+eval ac_res=\$$3
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
# ac_fn_c_try_link LINENO
# -----------------------
# Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -1632,41 +1671,6 @@
} # ac_fn_c_try_link
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
- eval "$3=yes"
-else case e in #(
- e) eval "$3=no" ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
-fi
-eval ac_res=\$$3
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
# -------------------------------------------
# Tests whether TYPE exists after having included INCLUDES, setting cache
@@ -2128,6 +2132,7 @@
>$cache_file
fi
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
# Test code for whether the C compiler supports C89 (global declarations)
ac_c_conftest_c89_globals='
/* Does the compiler advertise C89 conformance?
@@ -2453,7 +2458,6 @@
}
"
-as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
@@ -2462,9 +2466,11 @@
as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
+as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
# Auxiliary files required by this configure script.
-ac_aux_files="config.guess config.sub compile missing install-sh"
+ac_aux_files="ar-lib config.guess config.sub compile missing install-sh"
# Locations in which to look for auxiliary files.
ac_aux_dir_candidates="${srcdir}/../../build-aux"
@@ -2635,7 +2641,7 @@
-am__api_version='1.16'
+am__api_version='1.17'
@@ -2738,6 +2744,165 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
+printf %s "checking whether sleep supports fractional seconds... " >&6; }
+if test ${am_cv_sleep_fractional_seconds+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if sleep 0.001 2>/dev/null
+then :
+ am_cv_sleep_fractional_seconds=yes
+else case e in #(
+ e) am_cv_sleep_fractional_seconds=no ;;
+esac
+fi
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
+printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; }
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
+printf %s "checking filesystem timestamp resolution... " >&6; }
+if test ${am_cv_filesystem_timestamp_resolution+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) # Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `ls -t conftest.ts[12]` &&
+ {
+ test "$*" != "X conftest.ts1 conftest.ts2" ||
+ test "$*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.
+See 'config.log' for more details" "$LINENO" 5; }
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$2" = conftest.ts3 &&
+ test "$3" = conftest.ts2 &&
+ test "$4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
+printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; }
+
+# This check should not be cached, as it may vary across builds of
+# different projects.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
printf %s "checking whether build environment is sane... " >&6; }
# Reject unsafe characters in $srcdir or the absolute working directory
@@ -2758,49 +2923,45 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
- if test "$2" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$2" = conftest.file
- )
-then
- # Ok.
- :
-else
- as_fn_error $? "newly created file is older than distributed files!
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
+printf "%s\n" "$am_build_env_is_sane" >&6; }
+if test "$am_build_env_is_sane" = no; then
+ as_fn_error $? "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+if test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1
+then :
+
+else case e in #(
+ e) ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
+ ;;
+esac
fi
rm -f conftest.file
@@ -3090,6 +3251,7 @@
fi
rmdir .tst 2>/dev/null
+AM_DEFAULT_VERBOSITY=1
# Check whether --enable-silent-rules was given.
if test ${enable_silent_rules+y}
then :
@@ -3096,11 +3258,6 @@
enableval=$enable_silent_rules;
fi
-case $enable_silent_rules in # (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=1;;
-esac
am_make=${MAKE-make}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
printf %s "checking whether $am_make supports nested variables... " >&6; }
@@ -3123,18 +3280,44 @@
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
AM_BACKSLASH='\'
+am__rm_f_notfound=
+if (rm -f && rm -fr && rm -rf) 2>/dev/null
+then :
+else case e in #(
+ e) am__rm_f_notfound='""' ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
+printf %s "checking xargs -n works... " >&6; }
+if test ${am_cv_xargs_n_works+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"
+then :
+ am_cv_xargs_n_works=yes
+else case e in #(
+ e) am_cv_xargs_n_works=no ;;
+esac
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
+printf "%s\n" "$am_cv_xargs_n_works" >&6; }
+if test "$am_cv_xargs_n_works" = yes
+then :
+ am__xargs_n='xargs -n'
+else case e in #(
+ e) am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "" "$am__xargs_n_arg"; done; }'
+ ;;
+esac
+fi
@@ -3141,6 +3324,10 @@
+
+
+
+
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -4378,7 +4565,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -4414,6 +4601,183 @@
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+ if test $ac_cache; then
+ ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+ if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+ printf "%s\n" "#define $ac_item 1" >> confdefs.h
+ fi
+ ac_header= ac_cache=
+ elif test $ac_header; then
+ ac_cache=$ac_item
+ else
+ ac_header=$ac_item
+ fi
+done
+
+
+
+
+
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+
+
+
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test ${ac_cv_safe_to_define___extensions__+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+# define __EXTENSIONS__ 1
+ $ac_includes_default
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_safe_to_define___extensions__=yes
+else case e in #(
+ e) ac_cv_safe_to_define___extensions__=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
+if test ${ac_cv_should_define__xopen_source+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_cv_should_define__xopen_source=no
+ if test $ac_cv_header_wchar_h = yes
+then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <wchar.h>
+ mbstate_t x;
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #define _XOPEN_SOURCE 500
+ #include <wchar.h>
+ mbstate_t x;
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_should_define__xopen_source=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+
+ printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+
+ printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+ printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+ if test $ac_cv_header_minix_config_h = yes
+then :
+ MINIX=yes
+ printf "%s\n" "#define _MINIX 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+else case e in #(
+ e) MINIX= ;;
+esac
+fi
+ if test $ac_cv_safe_to_define___extensions__ = yes
+then :
+ printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
+
+fi
+ if test $ac_cv_should_define__xopen_source = yes
+then :
+ printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
+
+fi
+
# Check whether --enable-compiler-warnings was given.
if test ${enable_compiler_warnings+y}
then :
@@ -4434,6 +4798,8 @@
echo 'tldbg:KPSE_BASIC called (pkg=libpng, amopt=)' >&5
+#
+# am_init_automake
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
@@ -4517,49 +4883,13 @@
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
+# am_maintainer_mode
-END
- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
- fi
-fi
-
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
@@ -4584,6 +4914,11 @@
MAINT=$MAINTAINER_MODE_TRUE
+
+# See comments in kpse-setup.m4 about system extensions.
+
+
+# Check whether prototypes work.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5
printf %s "checking whether the compiler accepts prototypes... " >&6; }
if test ${kb_cv_c_prototypes+y}
@@ -4617,6 +4952,8 @@
if test "x$kb_cv_c_prototypes" = xno; then
as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5
fi
+
+# kpse_compiler_warnings options.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
printf %s "checking what warning flags to pass to the C compiler... " >&6; }
if test ${kpse_cv_warning_cflags+y}
@@ -4674,7 +5011,10 @@
+# end of kpse_basic macro.
+echo 'tldbg:KPSE_BASIC done (pkg=libpng, amopt=)' >&5
+
# Because we use $host_cpu below.
@@ -5673,7 +6013,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -5808,7 +6148,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -5843,6 +6183,194 @@
fi
+
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in ar lib "link -lib"
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AR+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf "%s\n" "$AR" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+ test -n "$AR" && break
+ done
+fi
+if test -z "$AR"; then
+ ac_ct_AR=$AR
+ for ac_prog in ar lib "link -lib"
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_AR+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_AR="$ac_prog"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf "%s\n" "$ac_ct_AR" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_AR" && break
+done
+
+ if test "x$ac_ct_AR" = x; then
+ AR="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ AR=$ac_ct_AR
+ fi
+fi
+
+: ${AR=ar}
+: ${ARFLAGS=cr}
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
+printf %s "checking the archiver ($AR) interface... " >&6; }
+if test ${am_cv_ar_interface+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ am_cv_ar_interface=ar
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int some_variable = 0;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ am_ar_try='$AR $ARFLAGS libconftest.a conftest.$ac_objext >&5'
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+ (eval $am_ar_try) 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if test "$ac_status" -eq 0; then
+ am_cv_ar_interface=ar
+ else
+ am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+ (eval $am_ar_try) 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if test "$ac_status" -eq 0; then
+ am_cv_ar_interface=lib
+ else
+ am_cv_ar_interface=unknown
+ fi
+ fi
+ rm -f conftest.lib libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
+printf "%s\n" "$am_cv_ar_interface" >&6; }
+
+case $am_cv_ar_interface in
+ar)
+ ;;
+lib)
+ # Microsoft lib, so override with the ar-lib wrapper script.
+ # FIXME: It is wrong to rewrite AR.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__AR in this case,
+ # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
+ # similar.
+ AR="$am_aux_dir/ar-lib $AR"
+ ;;
+unknown)
+ as_fn_error $? "could not determine $AR interface" "$LINENO" 5
+ ;;
+esac
+
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -5980,8 +6508,19 @@
extern void foo(void);
void foo(void){printf("foo\n");}
_ACEOF
-# FIXME: Add tests for non-GNU compilers
-for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+# Maybe other compiler need other tests; patches needed.
+#
+# The idea, maybe, is to use both flags when they are supported, but
+# old C++ compilers, as well as C, don't support
+# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too?
+#
+for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \
+ "-fvisibility=hidden"; do
+ if test x"C" = xC \
+ && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then
+ # C does not support this additional flag; just skip the test.
+ continue
+ fi
CFLAGS="$kpse_save_flags -Werror $kpse_flag"
if ac_fn_c_try_compile "$LINENO"
then :
@@ -6053,35 +6592,7 @@
# Checks for header files.
# Autoupdate added the next two lines to ensure that your configure
# script's behavior did not change. They are probably safe to remove.
-ac_header= ac_cache=
-for ac_item in $ac_header_c_list
-do
- if test $ac_cache; then
- ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
- if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
- printf "%s\n" "#define $ac_item 1" >> confdefs.h
- fi
- ac_header= ac_cache=
- elif test $ac_header; then
- ac_cache=$ac_item
- else
- ac_header=$ac_item
- fi
-done
-
-
-
-
-
-
-
-if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
-then :
-
-printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
printf %s "checking for grep that handles long lines and -e... " >&6; }
if test ${ac_cv_path_GREP+y}
@@ -7040,6 +7551,18 @@
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
printf "%s\n" "done" >&6; }
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
Modified: branches/stable/source/src/libs/libpng/configure.ac
===================================================================
--- branches/stable/source/src/libs/libpng/configure.ac 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/libpng/configure.ac 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-dnl $Id: configure.ac 70115 2024-02-24 01:06:57Z kakuto $
+dnl $Id: configure.ac 70884 2024-04-07 22:16:46Z karl $
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright 2016-2023 Karl Berry <tex-live at tug.org>
+dnl Copyright 2016-2024 Karl Berry <tex-live at tug.org>
dnl Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
dnl
dnl This file is free software; the copyright holder
@@ -24,6 +24,7 @@
AC_PROG_CC
AM_PROG_AS
+AM_PROG_AR
AC_PROG_RANLIB
AC_PROG_LN_S
Modified: branches/stable/source/src/libs/libpng/include/Makefile.in
===================================================================
--- branches/stable/source/src/libs/libpng/include/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/libpng/include/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,6 +69,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -127,6 +129,7 @@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -189,12 +192,15 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -342,8 +348,8 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -447,3 +453,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/libs/xpdf/Makefile.in
===================================================================
--- branches/stable/source/src/libs/xpdf/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/xpdf/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -70,6 +70,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -103,12 +105,13 @@
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
AR = ar
-ARFLAGS = cru
+ARFLAGS = cr
AM_V_AR = $(am__v_AR_ at AM_V@)
am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
am__v_AR_0 = @echo " AR " $@;
am__v_AR_1 =
libxpdf_a_AR = $(AR) $(ARFLAGS)
+libxpdf_a_RANLIB = $(RANLIB)
libxpdf_a_LIBADD =
am__dirstamp = $(am__leading_dot)dirstamp
am__objects_1 = @XPDF_TREE@/goo/FixedPoint.$(OBJEXT) \
@@ -312,8 +315,8 @@
top_distdir = $(distdir)
am__remove_distdir = \
if test -d "$(distdir)"; then \
- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -rf "$(distdir)" \
+ find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \
+ ; rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
am__post_remove_distdir = $(am__remove_distdir)
@@ -343,7 +346,7 @@
done; \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
+GZIP_ENV = -9
DIST_TARGETS = dist-gzip
# Exists only to be overridden by the user if desired.
AM_DISTCHECK_DVI_TARGET = dvi
@@ -350,7 +353,9 @@
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
+distcleancheck_listfiles = \
+ find . \( -type f -a \! \
+ \( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -415,8 +420,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build_alias = @build_alias@
builddir = @builddir@
@@ -588,24 +595,24 @@
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/aconf.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status aconf.h
+ $(AM_V_at)rm -f stamp-h1
+ $(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status aconf.h
$(srcdir)/aconf.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
- rm -f stamp-h1
- touch $@
+ $(AM_V_GEN)($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ $(AM_V_at)rm -f stamp-h1
+ $(AM_V_at)touch $@
distclean-hdr:
-rm -f aconf.h stamp-h1
clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+ -$(am__rm_f) $(noinst_LIBRARIES)
@XPDF_TREE@/goo/$(am__dirstamp):
@$(MKDIR_P) @XPDF_TREE@/goo
- @: > @XPDF_TREE@/goo/$(am__dirstamp)
+ @: >>@XPDF_TREE@/goo/$(am__dirstamp)
@XPDF_TREE@/goo/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) @XPDF_TREE@/goo/$(DEPDIR)
- @: > @XPDF_TREE@/goo/$(DEPDIR)/$(am__dirstamp)
+ @: >>@XPDF_TREE@/goo/$(DEPDIR)/$(am__dirstamp)
@XPDF_TREE@/goo/FixedPoint.$(OBJEXT): @XPDF_TREE@/goo/$(am__dirstamp) \
@XPDF_TREE@/goo/$(DEPDIR)/$(am__dirstamp)
@XPDF_TREE@/goo/GHash.$(OBJEXT): @XPDF_TREE@/goo/$(am__dirstamp) \
@@ -624,10 +631,10 @@
@XPDF_TREE@/goo/$(DEPDIR)/$(am__dirstamp)
@XPDF_TREE@/fofi/$(am__dirstamp):
@$(MKDIR_P) @XPDF_TREE@/fofi
- @: > @XPDF_TREE@/fofi/$(am__dirstamp)
+ @: >>@XPDF_TREE@/fofi/$(am__dirstamp)
@XPDF_TREE@/fofi/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) @XPDF_TREE@/fofi/$(DEPDIR)
- @: > @XPDF_TREE@/fofi/$(DEPDIR)/$(am__dirstamp)
+ @: >>@XPDF_TREE@/fofi/$(DEPDIR)/$(am__dirstamp)
@XPDF_TREE@/fofi/FoFiBase.$(OBJEXT): @XPDF_TREE@/fofi/$(am__dirstamp) \
@XPDF_TREE@/fofi/$(DEPDIR)/$(am__dirstamp)
@XPDF_TREE@/fofi/FoFiEncodings.$(OBJEXT): \
@@ -647,10 +654,10 @@
@XPDF_TREE@/fofi/$(DEPDIR)/$(am__dirstamp)
@XPDF_TREE@/xpdf/$(am__dirstamp):
@$(MKDIR_P) @XPDF_TREE@/xpdf
- @: > @XPDF_TREE@/xpdf/$(am__dirstamp)
+ @: >>@XPDF_TREE@/xpdf/$(am__dirstamp)
@XPDF_TREE@/xpdf/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) @XPDF_TREE@/xpdf/$(DEPDIR)
- @: > @XPDF_TREE@/xpdf/$(DEPDIR)/$(am__dirstamp)
+ @: >>@XPDF_TREE@/xpdf/$(DEPDIR)/$(am__dirstamp)
@XPDF_TREE@/xpdf/AcroForm.$(OBJEXT): @XPDF_TREE@/xpdf/$(am__dirstamp) \
@XPDF_TREE@/xpdf/$(DEPDIR)/$(am__dirstamp)
@XPDF_TREE@/xpdf/Annot.$(OBJEXT): @XPDF_TREE@/xpdf/$(am__dirstamp) \
@@ -758,7 +765,7 @@
libxpdf.a: $(libxpdf_a_OBJECTS) $(libxpdf_a_DEPENDENCIES) $(EXTRA_libxpdf_a_DEPENDENCIES)
$(AM_V_at)-rm -f libxpdf.a
$(AM_V_AR)$(libxpdf_a_AR) libxpdf.a $(libxpdf_a_OBJECTS) $(libxpdf_a_LIBADD)
- $(AM_V_at)$(RANLIB) libxpdf.a
+ $(AM_V_at)$(libxpdf_a_RANLIB) libxpdf.a
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -828,7 +835,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+ @: >>$@
am--depfiles: $(am__depfiles_remade)
@@ -958,7 +965,7 @@
distdir-am: $(DISTFILES)
$(am__remove_distdir)
- test -d "$(distdir)" || mkdir "$(distdir)"
+ $(AM_V_at)$(MKDIR_P) "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -1072,7 +1079,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -1082,7 +1089,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
*.tar.zst*) \
@@ -1180,17 +1187,17 @@
mostlyclean-generic:
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+ -$(am__rm_f) $(CLEANFILES)
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -rm -f @XPDF_TREE@/fofi/$(DEPDIR)/$(am__dirstamp)
- -rm -f @XPDF_TREE@/fofi/$(am__dirstamp)
- -rm -f @XPDF_TREE@/goo/$(DEPDIR)/$(am__dirstamp)
- -rm -f @XPDF_TREE@/goo/$(am__dirstamp)
- -rm -f @XPDF_TREE@/xpdf/$(DEPDIR)/$(am__dirstamp)
- -rm -f @XPDF_TREE@/xpdf/$(am__dirstamp)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) @XPDF_TREE@/fofi/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) @XPDF_TREE@/fofi/$(am__dirstamp)
+ -$(am__rm_f) @XPDF_TREE@/goo/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) @XPDF_TREE@/goo/$(am__dirstamp)
+ -$(am__rm_f) @XPDF_TREE@/xpdf/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) @XPDF_TREE@/xpdf/$(am__dirstamp)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -1201,7 +1208,7 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiBase.Po
+ -rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiBase.Po
-rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiEncodings.Po
-rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiIdentifier.Po
-rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiTrueType.Po
@@ -1304,7 +1311,7 @@
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiBase.Po
+ -rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiBase.Po
-rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiEncodings.Po
-rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiIdentifier.Po
-rm -f @XPDF_TREE@/fofi/$(DEPDIR)/FoFiTrueType.Po
@@ -1425,3 +1432,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/libs/xpdf/aclocal.m4
===================================================================
--- branches/stable/source/src/libs/xpdf/aclocal.m4 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/xpdf/aclocal.m4 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.17 -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2021 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.16'
+[am__api_version='1.17'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.5], [],
+m4_if([$1], [1.17], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.5])dnl
+[AM_AUTOMAKE_VERSION([1.17])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -58,7 +58,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -273,7 +273,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -332,7 +332,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -400,7 +400,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -534,7 +534,7 @@
fi
AC_SUBST([CSCOPE])
-AC_REQUIRE([AM_SILENT_RULES])dnl
+AC_REQUIRE([_AM_SILENT_RULES])dnl
dnl The testsuite driver may need to know about EXEEXT, so add the
dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
@@ -542,47 +542,9 @@
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
+AC_REQUIRE([_AM_PROG_RM_F])
+AC_REQUIRE([_AM_PROG_XARGS_N])
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
- AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
- fi
-fi
dnl The trailing newline in this macro's definition is deliberate, for
dnl backward compatibility and to allow trailing 'dnl'-style comments
dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
@@ -615,7 +577,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -636,7 +598,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2021 Free Software Foundation, Inc.
+# Copyright (C) 2003-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -658,7 +620,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -693,7 +655,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -736,7 +698,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -770,7 +732,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -799,7 +761,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -846,12 +808,28 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# _AM_PROG_RM_F
+# ---------------
+# Check whether 'rm -f' without any arguments works.
+# https://bugs.gnu.org/10828
+AC_DEFUN([_AM_PROG_RM_F],
+[am__rm_f_notfound=
+AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='""'])
+AC_SUBST(am__rm_f_notfound)
+])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
# AM_RUN_LOG(COMMAND)
# -------------------
# Run COMMAND, save the exit status in ac_status, and log it.
@@ -865,16 +843,169 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# _AM_SLEEP_FRACTIONAL_SECONDS
+# ----------------------------
+AC_DEFUN([_AM_SLEEP_FRACTIONAL_SECONDS], [dnl
+AC_CACHE_CHECK([whether sleep supports fractional seconds],
+ am_cv_sleep_fractional_seconds, [dnl
+AS_IF([sleep 0.001 2>/dev/null], [am_cv_sleep_fractional_seconds=yes],
+ [am_cv_sleep_fractional_seconds=no])
+])])
+
+# _AM_FILESYSTEM_TIMESTAMP_RESOLUTION
+# -----------------------------------
+# Determine the filesystem's resolution for file modification
+# timestamps. The coarsest we know of is FAT, with a resolution
+# of only two seconds, even with the most recent "exFAT" extensions.
+# The finest (e.g. ext4 with large inodes, XFS, ZFS) is one
+# nanosecond, matching clock_gettime. However, it is probably not
+# possible to delay execution of a shell script for less than one
+# millisecond, due to process creation overhead and scheduling
+# granularity, so we don't check for anything finer than that. (See below.)
+AC_DEFUN([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION], [dnl
+AC_REQUIRE([_AM_SLEEP_FRACTIONAL_SECONDS])
+AC_CACHE_CHECK([filesystem timestamp resolution],
+ am_cv_filesystem_timestamp_resolution, [dnl
+# Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `[ls -t conftest.ts[12]]` &&
+ {
+ test "$[]*" != "X conftest.ts1 conftest.ts2" ||
+ test "$[]*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ _AS_ECHO_UNQUOTED(
+ ["Bad output from ls -t: \"`[ls -t conftest.ts[12]]`\""],
+ [AS_MESSAGE_LOG_FD])
+ AC_MSG_FAILURE([ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.])
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$[]2" = conftest.ts3 &&
+ test "$[]3" = conftest.ts2 &&
+ test "$[]4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+])])
+
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
+[AC_REQUIRE([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION])
+# This check should not be cached, as it may vary across builds of
+# different projects.
+AC_MSG_CHECKING([whether build environment is sane])
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -893,49 +1024,40 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[]*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$[]2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
- alias in your environment])
- fi
- if test "$[2]" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
+AC_MSG_RESULT([$am_build_env_is_sane])
+if test "$am_build_env_is_sane" = no; then
+ AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT([yes])
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+AS_IF([test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1],, [dnl
+ ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
-fi
+])
AC_CONFIG_COMMANDS_PRE(
[AC_MSG_CHECKING([that generated files are newer than configure])
if test -n "$am_sleep_pid"; then
@@ -946,18 +1068,18 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2021 Free Software Foundation, Inc.
+# Copyright (C) 2009-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
+# _AM_SILENT_RULES
+# ----------------
+# Enable less verbose build rules support.
+AC_DEFUN([_AM_SILENT_RULES],
+[AM_DEFAULT_VERBOSITY=1
+AC_ARG_ENABLE([silent-rules], [dnl
AS_HELP_STRING(
[--enable-silent-rules],
[less verbose build output (undo: "make V=1")])
@@ -965,11 +1087,6 @@
[--disable-silent-rules],
[verbose build output (undo: "make V=0")])dnl
])
-case $enable_silent_rules in @%:@ (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
dnl
dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
dnl do not support nested variable expansions.
@@ -988,6 +1105,21 @@
else
am_cv_make_support_nested_variables=no
fi])
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+dnl Delay evaluation of AM_DEFAULT_VERBOSITY to the end to allow multiple calls
+dnl to AM_SILENT_RULES to change the default value.
+AC_CONFIG_COMMANDS_PRE([dnl
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
if test $am_cv_make_support_nested_variables = yes; then
dnl Using '$V' instead of '$(V)' breaks IRIX make.
AM_V='$(V)'
@@ -996,17 +1128,18 @@
AM_V=$AM_DEFAULT_VERBOSITY
AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])dnl
])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Set the default verbosity level to DEFAULT ("yes" being less verbose, "no" or
+# empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_REQUIRE([_AM_SILENT_RULES])
+AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1034,7 +1167,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2021 Free Software Foundation, Inc.
+# Copyright (C) 2006-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1053,7 +1186,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2021 Free Software Foundation, Inc.
+# Copyright (C) 2004-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1099,15 +1232,19 @@
am_uid=`id -u || echo unknown`
am_gid=`id -g || echo unknown`
AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
- if test $am_uid -le $am_max_uid; then
- AC_MSG_RESULT([yes])
+ if test x$am_uid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current UID is ok, but dist-ustar might not work])
+ elif test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT([no])
- _am_tools=none
+ AC_MSG_RESULT([no])
+ _am_tools=none
fi
AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
- if test $am_gid -le $am_max_gid; then
- AC_MSG_RESULT([yes])
+ if test x$gm_gid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current GID is ok, but dist-ustar might not work])
+ elif test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
_am_tools=none
@@ -1184,5 +1321,25 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_XARGS_N
+# ----------------
+# Check whether 'xargs -n' works. It should work everywhere, so the fallback
+# is not optimized at all as we never expect to use it.
+AC_DEFUN([_AM_PROG_XARGS_N],
+[AC_CACHE_CHECK([xargs -n works], am_cv_xargs_n_works, [dnl
+AS_IF([test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"], [am_cv_xargs_n_works=yes], [am_cv_xargs_n_works=no])])
+AS_IF([test "$am_cv_xargs_n_works" = yes], [am__xargs_n='xargs -n'], [dnl
+ am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "$@" "$am__xargs_n_arg"; done; }'
+])dnl
+AC_SUBST(am__xargs_n)
+])
+
m4_include([../../m4/kpse-common.m4])
m4_include([../../m4/kpse-warnings.m4])
Modified: branches/stable/source/src/libs/xpdf/aconf.h.in
===================================================================
--- branches/stable/source/src/libs/xpdf/aconf.h.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/xpdf/aconf.h.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -32,6 +32,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
+/* Define to 1 if you have the <minix/config.h> header file. */
+#undef HAVE_MINIX_CONFIG_H
+
/* Define to 1 if you have the 'mkstemp' function. */
#undef HAVE_MKSTEMP
@@ -82,6 +85,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to 1 if you have the <wchar.h> header file. */
+#undef HAVE_WCHAR_H
+
/* Enable multithreading support */
#undef MULTITHREADED
@@ -111,6 +117,98 @@
backward compatibility; new code need not use it. */
#undef STDC_HEADERS
+/* Enable extensions on AIX, Interix, z/OS. */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable general extensions on macOS. */
+#ifndef _DARWIN_C_SOURCE
+# undef _DARWIN_C_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable X/Open compliant socket functions that do not require linking
+ with -lxnet on HP-UX 11.11. */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# undef _HPUX_ALT_XOPEN_SOCKET_API
+#endif
+/* Identify the host operating system as Minix.
+ This macro does not affect the system headers' behavior.
+ A future release of Autoconf may stop defining this macro. */
+#ifndef _MINIX
+# undef _MINIX
+#endif
+/* Enable general extensions on NetBSD.
+ Enable NetBSD compatibility extensions on Minix. */
+#ifndef _NETBSD_SOURCE
+# undef _NETBSD_SOURCE
+#endif
+/* Enable OpenBSD compatibility extensions on NetBSD.
+ Oddly enough, this does nothing on OpenBSD. */
+#ifndef _OPENBSD_SOURCE
+# undef _OPENBSD_SOURCE
+#endif
+/* Define to 1 if needed for POSIX-compatible behavior. */
+#ifndef _POSIX_SOURCE
+# undef _POSIX_SOURCE
+#endif
+/* Define to 2 if needed for POSIX-compatible behavior. */
+#ifndef _POSIX_1_SOURCE
+# undef _POSIX_1_SOURCE
+#endif
+/* Enable POSIX-compatible threading on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# undef __STDC_WANT_IEC_60559_BFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# undef __STDC_WANT_IEC_60559_DFP_EXT__
+#endif
+/* Enable extensions specified by C23 Annex F. */
+#ifndef __STDC_WANT_IEC_60559_EXT__
+# undef __STDC_WANT_IEC_60559_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#endif
+/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# undef __STDC_WANT_IEC_60559_TYPES_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */
+#ifndef __STDC_WANT_LIB_EXT2__
+# undef __STDC_WANT_LIB_EXT2__
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009. */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# undef __STDC_WANT_MATH_SPEC_FUNCS__
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable X/Open extensions. Define to 500 only if necessary
+ to make mbstate_t available. */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
+#endif
+
+
/* Number of bits in a file offset, on hosts where this is settable. */
#undef _FILE_OFFSET_BITS
Modified: branches/stable/source/src/libs/xpdf/configure
===================================================================
--- branches/stable/source/src/libs/xpdf/configure 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/xpdf/configure 2024-07-21 17:12:46 UTC (rev 933)
@@ -677,6 +677,8 @@
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
+am__xargs_n
+am__rm_f_notfound
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -1545,6 +1547,41 @@
} # ac_fn_c_try_compile
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ eval "$3=yes"
+else case e in #(
+ e) eval "$3=no" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+eval ac_res=\$$3
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
# ac_fn_c_try_link LINENO
# -----------------------
# Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -1633,41 +1670,6 @@
} # ac_fn_cxx_try_compile
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
- eval "$3=yes"
-else case e in #(
- e) eval "$3=no" ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
-fi
-eval ac_res=\$$3
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
# ac_fn_c_check_func LINENO FUNC VAR
# ----------------------------------
# Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -2026,6 +2028,7 @@
>$cache_file
fi
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
# Test code for whether the C compiler supports C89 (global declarations)
ac_c_conftest_c89_globals='
/* Does the compiler advertise C89 conformance?
@@ -2351,6 +2354,16 @@
}
"
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
+as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
# Test code for whether the C++ compiler supports C++98 (global declarations)
ac_cxx_conftest_cxx98_globals='
// Does the compiler advertise C++98 conformance?
@@ -2567,15 +2580,6 @@
}
"
-as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
-as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
-as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
-as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
-as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
-as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
-as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
-as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
-as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
# Auxiliary files required by this configure script.
ac_aux_files="compile missing install-sh"
@@ -2749,7 +2753,7 @@
-am__api_version='1.16'
+am__api_version='1.17'
@@ -2852,6 +2856,165 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
+printf %s "checking whether sleep supports fractional seconds... " >&6; }
+if test ${am_cv_sleep_fractional_seconds+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if sleep 0.001 2>/dev/null
+then :
+ am_cv_sleep_fractional_seconds=yes
+else case e in #(
+ e) am_cv_sleep_fractional_seconds=no ;;
+esac
+fi
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
+printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; }
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
+printf %s "checking filesystem timestamp resolution... " >&6; }
+if test ${am_cv_filesystem_timestamp_resolution+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) # Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `ls -t conftest.ts[12]` &&
+ {
+ test "$*" != "X conftest.ts1 conftest.ts2" ||
+ test "$*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.
+See 'config.log' for more details" "$LINENO" 5; }
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$2" = conftest.ts3 &&
+ test "$3" = conftest.ts2 &&
+ test "$4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
+printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; }
+
+# This check should not be cached, as it may vary across builds of
+# different projects.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
printf %s "checking whether build environment is sane... " >&6; }
# Reject unsafe characters in $srcdir or the absolute working directory
@@ -2872,49 +3035,45 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
- if test "$2" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$2" = conftest.file
- )
-then
- # Ok.
- :
-else
- as_fn_error $? "newly created file is older than distributed files!
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
+printf "%s\n" "$am_build_env_is_sane" >&6; }
+if test "$am_build_env_is_sane" = no; then
+ as_fn_error $? "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+if test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1
+then :
+
+else case e in #(
+ e) ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
+ ;;
+esac
fi
rm -f conftest.file
@@ -3204,6 +3363,7 @@
fi
rmdir .tst 2>/dev/null
+AM_DEFAULT_VERBOSITY=1
# Check whether --enable-silent-rules was given.
if test ${enable_silent_rules+y}
then :
@@ -3210,11 +3370,6 @@
enableval=$enable_silent_rules;
fi
-case $enable_silent_rules in # (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=1;;
-esac
am_make=${MAKE-make}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
printf %s "checking whether $am_make supports nested variables... " >&6; }
@@ -3237,18 +3392,44 @@
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
AM_BACKSLASH='\'
+am__rm_f_notfound=
+if (rm -f && rm -fr && rm -rf) 2>/dev/null
+then :
+else case e in #(
+ e) am__rm_f_notfound='""' ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
+printf %s "checking xargs -n works... " >&6; }
+if test ${am_cv_xargs_n_works+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"
+then :
+ am_cv_xargs_n_works=yes
+else case e in #(
+ e) am_cv_xargs_n_works=no ;;
+esac
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
+printf "%s\n" "$am_cv_xargs_n_works" >&6; }
+if test "$am_cv_xargs_n_works" = yes
+then :
+ am__xargs_n='xargs -n'
+else case e in #(
+ e) am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "" "$am__xargs_n_arg"; done; }'
+ ;;
+esac
+fi
@@ -3255,6 +3436,10 @@
+
+
+
+
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -4492,7 +4677,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -4528,6 +4713,183 @@
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+ if test $ac_cache; then
+ ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+ if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+ printf "%s\n" "#define $ac_item 1" >> confdefs.h
+ fi
+ ac_header= ac_cache=
+ elif test $ac_header; then
+ ac_cache=$ac_item
+ else
+ ac_header=$ac_item
+ fi
+done
+
+
+
+
+
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+
+
+
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test ${ac_cv_safe_to_define___extensions__+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+# define __EXTENSIONS__ 1
+ $ac_includes_default
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_safe_to_define___extensions__=yes
+else case e in #(
+ e) ac_cv_safe_to_define___extensions__=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
+if test ${ac_cv_should_define__xopen_source+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_cv_should_define__xopen_source=no
+ if test $ac_cv_header_wchar_h = yes
+then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <wchar.h>
+ mbstate_t x;
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #define _XOPEN_SOURCE 500
+ #include <wchar.h>
+ mbstate_t x;
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_should_define__xopen_source=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+
+ printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+
+ printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+ printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+ if test $ac_cv_header_minix_config_h = yes
+then :
+ MINIX=yes
+ printf "%s\n" "#define _MINIX 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+else case e in #(
+ e) MINIX= ;;
+esac
+fi
+ if test $ac_cv_safe_to_define___extensions__ = yes
+then :
+ printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
+
+fi
+ if test $ac_cv_should_define__xopen_source = yes
+then :
+ printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
+
+fi
+
# Check whether --enable-compiler-warnings was given.
if test ${enable_compiler_warnings+y}
then :
@@ -4548,6 +4910,8 @@
echo 'tldbg:KPSE_BASIC called (pkg=xpdf, amopt=no-define)' >&5
+#
+# am_init_automake
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
@@ -4626,49 +4990,13 @@
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
+# am_maintainer_mode
-END
- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
- fi
-fi
-
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
@@ -4693,6 +5021,11 @@
MAINT=$MAINTAINER_MODE_TRUE
+
+# See comments in kpse-setup.m4 about system extensions.
+
+
+# Check whether prototypes work.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5
printf %s "checking whether the compiler accepts prototypes... " >&6; }
if test ${kb_cv_c_prototypes+y}
@@ -4726,6 +5059,8 @@
if test "x$kb_cv_c_prototypes" = xno; then
as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5
fi
+
+# kpse_compiler_warnings options.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
printf %s "checking what warning flags to pass to the C compiler... " >&6; }
if test ${kpse_cv_warning_cflags+y}
@@ -4783,7 +5118,10 @@
+# end of kpse_basic macro.
+echo 'tldbg:KPSE_BASIC done (pkg=xpdf, amopt=no-define)' >&5
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5694,7 +6032,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -6212,7 +6550,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -6451,35 +6789,6 @@
-ac_header= ac_cache=
-for ac_item in $ac_header_c_list
-do
- if test $ac_cache; then
- ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
- if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
- printf "%s\n" "#define $ac_item 1" >> confdefs.h
- fi
- ac_header= ac_cache=
- elif test $ac_header; then
- ac_cache=$ac_item
- else
- ac_header=$ac_item
- fi
-done
-
-
-
-
-
-
-
-
-if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
-then :
-
-printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
ac_fn_c_check_header_compile "$LINENO" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default"
if test "x$ac_cv_header_strings_h" = xyes
then :
@@ -7119,6 +7428,18 @@
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
printf "%s\n" "done" >&6; }
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
Modified: branches/stable/source/src/libs/xpdf/fofi/Makefile.in
===================================================================
--- branches/stable/source/src/libs/xpdf/fofi/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/xpdf/fofi/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,6 +69,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -184,8 +186,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build_alias = @build_alias@
builddir = @builddir@
@@ -320,8 +324,8 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -425,3 +429,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/libs/xpdf/goo/Makefile.in
===================================================================
--- branches/stable/source/src/libs/xpdf/goo/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/xpdf/goo/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,6 +69,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -184,8 +186,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build_alias = @build_alias@
builddir = @builddir@
@@ -320,8 +324,8 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -425,3 +429,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/libs/xpdf/splash/Makefile.in
===================================================================
--- branches/stable/source/src/libs/xpdf/splash/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/xpdf/splash/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,6 +69,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -184,8 +186,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build_alias = @build_alias@
builddir = @builddir@
@@ -320,8 +324,8 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -425,3 +429,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/libs/xpdf/xpdf/Makefile.in
===================================================================
--- branches/stable/source/src/libs/xpdf/xpdf/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/xpdf/xpdf/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,6 +69,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -184,8 +186,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build_alias = @build_alias@
builddir = @builddir@
@@ -320,8 +324,8 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -425,3 +429,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/libs/zlib/ChangeLog
===================================================================
--- branches/stable/source/src/libs/zlib/ChangeLog 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/zlib/ChangeLog 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,3 +1,7 @@
+2024-04-07 Karl Berry <karl at freefriends.org>
+
+ * configure.ac (AM_PROG_AR): include for cosmopolitan, from Luigi.
+
2024-01-30 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
Import zlib-1.3.1.
Modified: branches/stable/source/src/libs/zlib/Makefile.in
===================================================================
--- branches/stable/source/src/libs/zlib/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/zlib/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -70,6 +70,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -107,13 +109,13 @@
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
-AR = ar
-ARFLAGS = cru
+ARFLAGS = cr
AM_V_AR = $(am__v_AR_ at AM_V@)
am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
am__v_AR_0 = @echo " AR " $@;
am__v_AR_1 =
libz_a_AR = $(AR) $(ARFLAGS)
+libz_a_RANLIB = $(RANLIB)
libz_a_LIBADD =
am__dirstamp = $(am__leading_dot)dirstamp
nodist_libz_a_OBJECTS = @ZLIB_TREE@/adler32.$(OBJEXT) \
@@ -265,10 +267,9 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
+ { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
}
am__recheck_rx = ^[ ]*:recheck:[ ]*
am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
@@ -356,6 +357,7 @@
# Default flags passed to test drivers.
am__common_driver_flags = \
--color-tests "$$am__color_tests" \
+ $$am__collect_skipped_logs \
--enable-hard-errors "$$am__enable_hard_errors" \
--expect-failure "$$am__expect_failure"
# To be inserted before the command running the test. Creates the
@@ -380,6 +382,11 @@
elif test -f "$$f"; then dir=; \
else dir="$(srcdir)/"; fi; \
tst=$$dir$$f; log='$@'; \
+if test -n '$(IGNORE_SKIPPED_LOGS)'; then \
+ am__collect_skipped_logs='--collect-skipped-logs no'; \
+else \
+ am__collect_skipped_logs=''; \
+fi; \
if test -n '$(DISABLE_HARD_ERRORS)'; then \
am__enable_hard_errors=no; \
else \
@@ -426,7 +433,8 @@
DIST_SUBDIRS = $(SUBDIRS)
am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
$(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \
- $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/compile \
+ $(srcdir)/config.h.in $(top_srcdir)/../../build-aux/ar-lib \
+ $(top_srcdir)/../../build-aux/compile \
$(top_srcdir)/../../build-aux/depcomp \
$(top_srcdir)/../../build-aux/install-sh \
$(top_srcdir)/../../build-aux/missing \
@@ -442,8 +450,8 @@
top_distdir = $(distdir)
am__remove_distdir = \
if test -d "$(distdir)"; then \
- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -rf "$(distdir)" \
+ find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \
+ ; rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
am__post_remove_distdir = $(am__remove_distdir)
@@ -473,7 +481,7 @@
done; \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
+GZIP_ENV = -9
DIST_TARGETS = dist-gzip
# Exists only to be overridden by the user if desired.
AM_DISTCHECK_DVI_TARGET = dvi
@@ -480,15 +488,21 @@
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
+distcleancheck_listfiles = \
+ find . \( -type f -a \! \
+ \( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
@@ -537,12 +551,15 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build_alias = @build_alias@
builddir = @builddir@
@@ -669,27 +686,27 @@
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
+ $(AM_V_at)rm -f stamp-h1
+ $(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status config.h
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
- rm -f stamp-h1
- touch $@
+ $(AM_V_GEN)($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ $(AM_V_at)rm -f stamp-h1
+ $(AM_V_at)touch $@
distclean-hdr:
-rm -f config.h stamp-h1
clean-checkPROGRAMS:
- -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
+ -$(am__rm_f) $(check_PROGRAMS)
clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+ -$(am__rm_f) $(noinst_LIBRARIES)
@ZLIB_TREE@/$(am__dirstamp):
@$(MKDIR_P) @ZLIB_TREE@
- @: > @ZLIB_TREE@/$(am__dirstamp)
+ @: >>@ZLIB_TREE@/$(am__dirstamp)
@ZLIB_TREE@/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) @ZLIB_TREE@/$(DEPDIR)
- @: > @ZLIB_TREE@/$(DEPDIR)/$(am__dirstamp)
+ @: >>@ZLIB_TREE@/$(DEPDIR)/$(am__dirstamp)
@ZLIB_TREE@/adler32.$(OBJEXT): @ZLIB_TREE@/$(am__dirstamp) \
@ZLIB_TREE@/$(DEPDIR)/$(am__dirstamp)
@ZLIB_TREE@/compress.$(OBJEXT): @ZLIB_TREE@/$(am__dirstamp) \
@@ -724,13 +741,13 @@
libz.a: $(libz_a_OBJECTS) $(libz_a_DEPENDENCIES) $(EXTRA_libz_a_DEPENDENCIES)
$(AM_V_at)-rm -f libz.a
$(AM_V_AR)$(libz_a_AR) libz.a $(libz_a_OBJECTS) $(libz_a_LIBADD)
- $(AM_V_at)$(RANLIB) libz.a
+ $(AM_V_at)$(libz_a_RANLIB) libz.a
@ZLIB_TREE@/test/$(am__dirstamp):
@$(MKDIR_P) @ZLIB_TREE@/test
- @: > @ZLIB_TREE@/test/$(am__dirstamp)
+ @: >>@ZLIB_TREE@/test/$(am__dirstamp)
@ZLIB_TREE@/test/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) @ZLIB_TREE@/test/$(DEPDIR)
- @: > @ZLIB_TREE@/test/$(DEPDIR)/$(am__dirstamp)
+ @: >>@ZLIB_TREE@/test/$(DEPDIR)/$(am__dirstamp)
@ZLIB_TREE@/test/example.$(OBJEXT): @ZLIB_TREE@/test/$(am__dirstamp) \
@ZLIB_TREE@/test/$(DEPDIR)/$(am__dirstamp)
@@ -772,7 +789,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+ @: >>$@
am--depfiles: $(am__depfiles_remade)
@@ -911,7 +928,6 @@
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
am--force-recheck:
@:
-
$(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__set_TESTS_bases); \
am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
@@ -987,10 +1003,37 @@
result_count $$1 "XPASS:" $$xpass "$$red"; \
result_count $$1 "ERROR:" $$error "$$mgn"; \
}; \
+ output_system_information () \
+ { \
+ echo; \
+ { uname -a | $(AWK) '{ \
+ printf "System information (uname -a):"; \
+ for (i = 1; i < NF; ++i) \
+ { \
+ if (i != 2) \
+ printf " %s", $$i; \
+ } \
+ printf "\n"; \
+}'; } 2>&1; \
+ if test -r /etc/os-release; then \
+ echo "Distribution information (/etc/os-release):"; \
+ sed 8q /etc/os-release; \
+ elif test -r /etc/issue; then \
+ echo "Distribution information (/etc/issue):"; \
+ cat /etc/issue; \
+ fi; \
+ }; \
+ please_report () \
+ { \
+echo "Some test(s) failed. Please report this to $(PACKAGE_BUGREPORT),"; \
+echo "together with the test-suite.log file (gzipped) and your system"; \
+echo "information. Thanks."; \
+ }; \
{ \
echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
$(am__rst_title); \
create_testsuite_report --no-color; \
+ output_system_information; \
echo; \
echo ".. contents:: :depth: 2"; \
echo; \
@@ -1010,9 +1053,9 @@
create_testsuite_report --maybe-color; \
echo "$$col$$br$$std"; \
if $$success; then :; else \
- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
if test -n "$(PACKAGE_BUGREPORT)"; then \
- echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
+ please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
fi; \
echo "$$col$$br$$std"; \
fi; \
@@ -1019,17 +1062,16 @@
$$success || exit 1
check-TESTS: $(check_PROGRAMS) $(dist_check_SCRIPTS)
- @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
- @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @$(am__rm_f) $(RECHECK_LOGS)
+ @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
+ @$(am__rm_f) $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
log_list=`for i in $$bases; do echo $$i.log; done`; \
- trs_list=`for i in $$bases; do echo $$i.trs; done`; \
- log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+ log_list=`echo $$log_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
recheck: all $(check_PROGRAMS) $(dist_check_SCRIPTS)
- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @$(am__rm_f) $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
| $(am__list_recheck_tests)` || exit 1; \
@@ -1058,7 +1100,7 @@
distdir-am: $(DISTFILES)
$(am__remove_distdir)
- test -d "$(distdir)" || mkdir "$(distdir)"
+ $(AM_V_at)$(MKDIR_P) "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -1172,7 +1214,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -1182,7 +1224,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
*.tar.zst*) \
@@ -1281,21 +1323,21 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
- -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
- -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ -$(am__rm_f) $(TEST_LOGS)
+ -$(am__rm_f) $(TEST_LOGS:.log=.trs)
+ -$(am__rm_f) $(TEST_SUITE_LOG)
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+ -$(am__rm_f) $(CLEANFILES)
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -rm -f @ZLIB_TREE@/$(DEPDIR)/$(am__dirstamp)
- -rm -f @ZLIB_TREE@/$(am__dirstamp)
- -rm -f @ZLIB_TREE@/test/$(DEPDIR)/$(am__dirstamp)
- -rm -f @ZLIB_TREE@/test/$(am__dirstamp)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(DISTCLEANFILES)
+ -$(am__rm_f) @ZLIB_TREE@/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) @ZLIB_TREE@/$(am__dirstamp)
+ -$(am__rm_f) @ZLIB_TREE@/test/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) @ZLIB_TREE@/test/$(am__dirstamp)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -1307,7 +1349,7 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f @ZLIB_TREE@/$(DEPDIR)/adler32.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/adler32.Po
-rm -f @ZLIB_TREE@/$(DEPDIR)/compress.Po
-rm -f @ZLIB_TREE@/$(DEPDIR)/crc32.Po
-rm -f @ZLIB_TREE@/$(DEPDIR)/deflate.Po
@@ -1371,7 +1413,7 @@
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -f @ZLIB_TREE@/$(DEPDIR)/adler32.Po
+ -rm -f @ZLIB_TREE@/$(DEPDIR)/adler32.Po
-rm -f @ZLIB_TREE@/$(DEPDIR)/compress.Po
-rm -f @ZLIB_TREE@/$(DEPDIR)/crc32.Po
-rm -f @ZLIB_TREE@/$(DEPDIR)/deflate.Po
@@ -1461,3 +1503,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/libs/zlib/aclocal.m4
===================================================================
--- branches/stable/source/src/libs/zlib/aclocal.m4 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/zlib/aclocal.m4 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.17 -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2021 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.16'
+[am__api_version='1.17'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.5], [],
+m4_if([$1], [1.17], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,14 +51,96 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.5])dnl
+[AM_AUTOMAKE_VERSION([1.17])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+# Copyright (C) 2011-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_AR([ACT-IF-FAIL])
+# -------------------------
+# Try to determine the archiver interface, and trigger the ar-lib wrapper
+# if it is needed. If the detection of archiver interface fails, run
+# ACT-IF-FAIL (default is to abort configure with a proper error message).
+AC_DEFUN([AM_PROG_AR],
+[AC_BEFORE([$0], [LT_INIT])dnl
+AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
+AC_BEFORE([$0], [AC_PROG_AR])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([ar-lib])dnl
+AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
+: ${AR=ar}
+: ${ARFLAGS=cr}
+
+AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
+ [AC_LANG_PUSH([C])
+ am_cv_ar_interface=ar
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
+ [am_ar_try='$AR $ARFLAGS libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+ AC_TRY_EVAL([am_ar_try])
+ if test "$ac_status" -eq 0; then
+ am_cv_ar_interface=ar
+ else
+ am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+ AC_TRY_EVAL([am_ar_try])
+ if test "$ac_status" -eq 0; then
+ am_cv_ar_interface=lib
+ else
+ am_cv_ar_interface=unknown
+ fi
+ fi
+ rm -f conftest.lib libconftest.a
+ ])
+ AC_LANG_POP([C])])
+
+case $am_cv_ar_interface in
+ar)
+ ;;
+lib)
+ # Microsoft lib, so override with the ar-lib wrapper script.
+ # FIXME: It is wrong to rewrite AR.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__AR in this case,
+ # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
+ # similar.
+ AR="$am_aux_dir/ar-lib $AR"
+ ;;
+unknown)
+ m4_default([$1],
+ [AC_MSG_ERROR([could not determine $AR interface])])
+ ;;
+esac
+AC_SUBST([AR])dnl
+])
+
+# Figure out how to run the assembler. -*- Autoconf -*-
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_PROG_AS
+# ----------
+AC_DEFUN([AM_PROG_AS],
+[# By default we simply use the C compiler to build assembly code.
+AC_REQUIRE([AC_PROG_CC])
+test "${CCAS+set}" = set || CCAS=$CC
+test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
+AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)])
+AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
+_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
+])
+
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +192,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +223,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -273,7 +355,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -332,7 +414,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -400,7 +482,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -534,7 +616,7 @@
fi
AC_SUBST([CSCOPE])
-AC_REQUIRE([AM_SILENT_RULES])dnl
+AC_REQUIRE([_AM_SILENT_RULES])dnl
dnl The testsuite driver may need to know about EXEEXT, so add the
dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
@@ -542,47 +624,9 @@
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
+AC_REQUIRE([_AM_PROG_RM_F])
+AC_REQUIRE([_AM_PROG_XARGS_N])
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
- AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
- fi
-fi
dnl The trailing newline in this macro's definition is deliberate, for
dnl backward compatibility and to allow trailing 'dnl'-style comments
dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
@@ -615,7 +659,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -636,7 +680,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2021 Free Software Foundation, Inc.
+# Copyright (C) 2003-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -658,7 +702,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -693,7 +737,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -736,7 +780,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -770,7 +814,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -799,7 +843,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -846,12 +890,28 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# _AM_PROG_RM_F
+# ---------------
+# Check whether 'rm -f' without any arguments works.
+# https://bugs.gnu.org/10828
+AC_DEFUN([_AM_PROG_RM_F],
+[am__rm_f_notfound=
+AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='""'])
+AC_SUBST(am__rm_f_notfound)
+])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
# AM_RUN_LOG(COMMAND)
# -------------------
# Run COMMAND, save the exit status in ac_status, and log it.
@@ -865,16 +925,169 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# _AM_SLEEP_FRACTIONAL_SECONDS
+# ----------------------------
+AC_DEFUN([_AM_SLEEP_FRACTIONAL_SECONDS], [dnl
+AC_CACHE_CHECK([whether sleep supports fractional seconds],
+ am_cv_sleep_fractional_seconds, [dnl
+AS_IF([sleep 0.001 2>/dev/null], [am_cv_sleep_fractional_seconds=yes],
+ [am_cv_sleep_fractional_seconds=no])
+])])
+
+# _AM_FILESYSTEM_TIMESTAMP_RESOLUTION
+# -----------------------------------
+# Determine the filesystem's resolution for file modification
+# timestamps. The coarsest we know of is FAT, with a resolution
+# of only two seconds, even with the most recent "exFAT" extensions.
+# The finest (e.g. ext4 with large inodes, XFS, ZFS) is one
+# nanosecond, matching clock_gettime. However, it is probably not
+# possible to delay execution of a shell script for less than one
+# millisecond, due to process creation overhead and scheduling
+# granularity, so we don't check for anything finer than that. (See below.)
+AC_DEFUN([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION], [dnl
+AC_REQUIRE([_AM_SLEEP_FRACTIONAL_SECONDS])
+AC_CACHE_CHECK([filesystem timestamp resolution],
+ am_cv_filesystem_timestamp_resolution, [dnl
+# Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `[ls -t conftest.ts[12]]` &&
+ {
+ test "$[]*" != "X conftest.ts1 conftest.ts2" ||
+ test "$[]*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ _AS_ECHO_UNQUOTED(
+ ["Bad output from ls -t: \"`[ls -t conftest.ts[12]]`\""],
+ [AS_MESSAGE_LOG_FD])
+ AC_MSG_FAILURE([ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.])
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$[]2" = conftest.ts3 &&
+ test "$[]3" = conftest.ts2 &&
+ test "$[]4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+])])
+
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
+[AC_REQUIRE([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION])
+# This check should not be cached, as it may vary across builds of
+# different projects.
+AC_MSG_CHECKING([whether build environment is sane])
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -893,49 +1106,40 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[]*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$[]2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
- alias in your environment])
- fi
- if test "$[2]" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
+AC_MSG_RESULT([$am_build_env_is_sane])
+if test "$am_build_env_is_sane" = no; then
+ AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT([yes])
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+AS_IF([test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1],, [dnl
+ ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
-fi
+])
AC_CONFIG_COMMANDS_PRE(
[AC_MSG_CHECKING([that generated files are newer than configure])
if test -n "$am_sleep_pid"; then
@@ -946,18 +1150,18 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2021 Free Software Foundation, Inc.
+# Copyright (C) 2009-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
+# _AM_SILENT_RULES
+# ----------------
+# Enable less verbose build rules support.
+AC_DEFUN([_AM_SILENT_RULES],
+[AM_DEFAULT_VERBOSITY=1
+AC_ARG_ENABLE([silent-rules], [dnl
AS_HELP_STRING(
[--enable-silent-rules],
[less verbose build output (undo: "make V=1")])
@@ -965,11 +1169,6 @@
[--disable-silent-rules],
[verbose build output (undo: "make V=0")])dnl
])
-case $enable_silent_rules in @%:@ (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
dnl
dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
dnl do not support nested variable expansions.
@@ -988,6 +1187,21 @@
else
am_cv_make_support_nested_variables=no
fi])
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+dnl Delay evaluation of AM_DEFAULT_VERBOSITY to the end to allow multiple calls
+dnl to AM_SILENT_RULES to change the default value.
+AC_CONFIG_COMMANDS_PRE([dnl
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
if test $am_cv_make_support_nested_variables = yes; then
dnl Using '$V' instead of '$(V)' breaks IRIX make.
AM_V='$(V)'
@@ -996,17 +1210,18 @@
AM_V=$AM_DEFAULT_VERBOSITY
AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])dnl
])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Set the default verbosity level to DEFAULT ("yes" being less verbose, "no" or
+# empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_REQUIRE([_AM_SILENT_RULES])
+AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1034,7 +1249,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2021 Free Software Foundation, Inc.
+# Copyright (C) 2006-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1053,7 +1268,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2021 Free Software Foundation, Inc.
+# Copyright (C) 2004-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1099,15 +1314,19 @@
am_uid=`id -u || echo unknown`
am_gid=`id -g || echo unknown`
AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
- if test $am_uid -le $am_max_uid; then
- AC_MSG_RESULT([yes])
+ if test x$am_uid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current UID is ok, but dist-ustar might not work])
+ elif test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT([no])
- _am_tools=none
+ AC_MSG_RESULT([no])
+ _am_tools=none
fi
AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
- if test $am_gid -le $am_max_gid; then
- AC_MSG_RESULT([yes])
+ if test x$gm_gid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current GID is ok, but dist-ustar might not work])
+ elif test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
_am_tools=none
@@ -1184,6 +1403,26 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_XARGS_N
+# ----------------
+# Check whether 'xargs -n' works. It should work everywhere, so the fallback
+# is not optimized at all as we never expect to use it.
+AC_DEFUN([_AM_PROG_XARGS_N],
+[AC_CACHE_CHECK([xargs -n works], am_cv_xargs_n_works, [dnl
+AS_IF([test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"], [am_cv_xargs_n_works=yes], [am_cv_xargs_n_works=no])])
+AS_IF([test "$am_cv_xargs_n_works" = yes], [am__xargs_n='xargs -n'], [dnl
+ am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "$@" "$am__xargs_n_arg"; done; }'
+])dnl
+AC_SUBST(am__xargs_n)
+])
+
m4_include([../../m4/kpse-common.m4])
m4_include([../../m4/kpse-largefile.m4])
m4_include([../../m4/kpse-visibility.m4])
Modified: branches/stable/source/src/libs/zlib/config.h.in
===================================================================
--- branches/stable/source/src/libs/zlib/config.h.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/zlib/config.h.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -6,6 +6,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
+/* Define to 1 if you have the <minix/config.h> header file. */
+#undef HAVE_MINIX_CONFIG_H
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
@@ -30,6 +33,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to 1 if you have the <wchar.h> header file. */
+#undef HAVE_WCHAR_H
+
/* Name of package */
#undef PACKAGE
@@ -56,6 +62,98 @@
backward compatibility; new code need not use it. */
#undef STDC_HEADERS
+/* Enable extensions on AIX, Interix, z/OS. */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable general extensions on macOS. */
+#ifndef _DARWIN_C_SOURCE
+# undef _DARWIN_C_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable X/Open compliant socket functions that do not require linking
+ with -lxnet on HP-UX 11.11. */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# undef _HPUX_ALT_XOPEN_SOCKET_API
+#endif
+/* Identify the host operating system as Minix.
+ This macro does not affect the system headers' behavior.
+ A future release of Autoconf may stop defining this macro. */
+#ifndef _MINIX
+# undef _MINIX
+#endif
+/* Enable general extensions on NetBSD.
+ Enable NetBSD compatibility extensions on Minix. */
+#ifndef _NETBSD_SOURCE
+# undef _NETBSD_SOURCE
+#endif
+/* Enable OpenBSD compatibility extensions on NetBSD.
+ Oddly enough, this does nothing on OpenBSD. */
+#ifndef _OPENBSD_SOURCE
+# undef _OPENBSD_SOURCE
+#endif
+/* Define to 1 if needed for POSIX-compatible behavior. */
+#ifndef _POSIX_SOURCE
+# undef _POSIX_SOURCE
+#endif
+/* Define to 2 if needed for POSIX-compatible behavior. */
+#ifndef _POSIX_1_SOURCE
+# undef _POSIX_1_SOURCE
+#endif
+/* Enable POSIX-compatible threading on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# undef __STDC_WANT_IEC_60559_BFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# undef __STDC_WANT_IEC_60559_DFP_EXT__
+#endif
+/* Enable extensions specified by C23 Annex F. */
+#ifndef __STDC_WANT_IEC_60559_EXT__
+# undef __STDC_WANT_IEC_60559_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#endif
+/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# undef __STDC_WANT_IEC_60559_TYPES_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */
+#ifndef __STDC_WANT_LIB_EXT2__
+# undef __STDC_WANT_LIB_EXT2__
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009. */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# undef __STDC_WANT_MATH_SPEC_FUNCS__
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable X/Open extensions. Define to 500 only if necessary
+ to make mbstate_t available. */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
+#endif
+
+
/* Version number of package */
#undef VERSION
Modified: branches/stable/source/src/libs/zlib/configure
===================================================================
--- branches/stable/source/src/libs/zlib/configure 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/zlib/configure 2024-07-21 17:12:46 UTC (rev 933)
@@ -653,6 +653,13 @@
VISIBILITY_CFLAGS
LN_S
RANLIB
+ac_ct_AR
+AR
+am__fastdepCCAS_FALSE
+am__fastdepCCAS_TRUE
+CCASDEPMODE
+CCASFLAGS
+CCAS
WARNING_CFLAGS
am__fastdepCC_FALSE
am__fastdepCC_TRUE
@@ -673,6 +680,8 @@
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
+am__xargs_n
+am__rm_f_notfound
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -760,7 +769,9 @@
CFLAGS
LDFLAGS
LIBS
-CPPFLAGS'
+CPPFLAGS
+CCAS
+CCASFLAGS'
# Initialize some variables set by options.
@@ -1407,6 +1418,8 @@
LIBS libraries to pass to the linker, e.g. -l<library>
CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
+ CCAS assembler compiler command (defaults to CC)
+ CCASFLAGS assembler compiler flags (defaults to CFLAGS)
Use these variables to override the choices made by 'configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1529,6 +1542,41 @@
} # ac_fn_c_try_compile
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ eval "$3=yes"
+else case e in #(
+ e) eval "$3=no" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+eval ac_res=\$$3
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
# ac_fn_c_try_link LINENO
# -----------------------
# Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -1576,41 +1624,6 @@
as_fn_set_status $ac_retval
} # ac_fn_c_try_link
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
- eval "$3=yes"
-else case e in #(
- e) eval "$3=no" ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
-fi
-eval ac_res=\$$3
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
ac_configure_args_raw=
for ac_arg
do
@@ -1906,6 +1919,7 @@
>$cache_file
fi
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
# Test code for whether the C compiler supports C89 (global declarations)
ac_c_conftest_c89_globals='
/* Does the compiler advertise C89 conformance?
@@ -2231,7 +2245,6 @@
}
"
-as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
@@ -2240,9 +2253,11 @@
as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
+as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
# Auxiliary files required by this configure script.
-ac_aux_files="compile missing install-sh"
+ac_aux_files="ar-lib compile missing install-sh"
# Locations in which to look for auxiliary files.
ac_aux_dir_candidates="${srcdir}/../../build-aux"
@@ -2413,10 +2428,11 @@
-am__api_version='1.16'
+am__api_version='1.17'
+
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -2516,6 +2532,165 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
+printf %s "checking whether sleep supports fractional seconds... " >&6; }
+if test ${am_cv_sleep_fractional_seconds+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if sleep 0.001 2>/dev/null
+then :
+ am_cv_sleep_fractional_seconds=yes
+else case e in #(
+ e) am_cv_sleep_fractional_seconds=no ;;
+esac
+fi
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
+printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; }
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
+printf %s "checking filesystem timestamp resolution... " >&6; }
+if test ${am_cv_filesystem_timestamp_resolution+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) # Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `ls -t conftest.ts[12]` &&
+ {
+ test "$*" != "X conftest.ts1 conftest.ts2" ||
+ test "$*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.
+See 'config.log' for more details" "$LINENO" 5; }
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$2" = conftest.ts3 &&
+ test "$3" = conftest.ts2 &&
+ test "$4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
+printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; }
+
+# This check should not be cached, as it may vary across builds of
+# different projects.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
printf %s "checking whether build environment is sane... " >&6; }
# Reject unsafe characters in $srcdir or the absolute working directory
@@ -2536,49 +2711,45 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
- if test "$2" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$2" = conftest.file
- )
-then
- # Ok.
- :
-else
- as_fn_error $? "newly created file is older than distributed files!
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
+printf "%s\n" "$am_build_env_is_sane" >&6; }
+if test "$am_build_env_is_sane" = no; then
+ as_fn_error $? "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+if test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1
+then :
+
+else case e in #(
+ e) ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
+ ;;
+esac
fi
rm -f conftest.file
@@ -2868,6 +3039,7 @@
fi
rmdir .tst 2>/dev/null
+AM_DEFAULT_VERBOSITY=1
# Check whether --enable-silent-rules was given.
if test ${enable_silent_rules+y}
then :
@@ -2874,11 +3046,6 @@
enableval=$enable_silent_rules;
fi
-case $enable_silent_rules in # (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=1;;
-esac
am_make=${MAKE-make}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
printf %s "checking whether $am_make supports nested variables... " >&6; }
@@ -2901,18 +3068,44 @@
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
AM_BACKSLASH='\'
+am__rm_f_notfound=
+if (rm -f && rm -fr && rm -rf) 2>/dev/null
+then :
+else case e in #(
+ e) am__rm_f_notfound='""' ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
+printf %s "checking xargs -n works... " >&6; }
+if test ${am_cv_xargs_n_works+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"
+then :
+ am_cv_xargs_n_works=yes
+else case e in #(
+ e) am_cv_xargs_n_works=no ;;
+esac
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
+printf "%s\n" "$am_cv_xargs_n_works" >&6; }
+if test "$am_cv_xargs_n_works" = yes
+then :
+ am__xargs_n='xargs -n'
+else case e in #(
+ e) am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "" "$am__xargs_n_arg"; done; }'
+ ;;
+esac
+fi
@@ -2919,6 +3112,10 @@
+
+
+
+
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -4156,7 +4353,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -4192,6 +4389,183 @@
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+ if test $ac_cache; then
+ ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+ if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+ printf "%s\n" "#define $ac_item 1" >> confdefs.h
+ fi
+ ac_header= ac_cache=
+ elif test $ac_header; then
+ ac_cache=$ac_item
+ else
+ ac_header=$ac_item
+ fi
+done
+
+
+
+
+
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+
+
+
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test ${ac_cv_safe_to_define___extensions__+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+# define __EXTENSIONS__ 1
+ $ac_includes_default
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_safe_to_define___extensions__=yes
+else case e in #(
+ e) ac_cv_safe_to_define___extensions__=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
+if test ${ac_cv_should_define__xopen_source+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_cv_should_define__xopen_source=no
+ if test $ac_cv_header_wchar_h = yes
+then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <wchar.h>
+ mbstate_t x;
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #define _XOPEN_SOURCE 500
+ #include <wchar.h>
+ mbstate_t x;
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_should_define__xopen_source=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+
+ printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+
+ printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+ printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+ if test $ac_cv_header_minix_config_h = yes
+then :
+ MINIX=yes
+ printf "%s\n" "#define _MINIX 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+else case e in #(
+ e) MINIX= ;;
+esac
+fi
+ if test $ac_cv_safe_to_define___extensions__ = yes
+then :
+ printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
+
+fi
+ if test $ac_cv_should_define__xopen_source = yes
+then :
+ printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
+
+fi
+
# Check whether --enable-compiler-warnings was given.
if test ${enable_compiler_warnings+y}
then :
@@ -4212,6 +4586,8 @@
echo 'tldbg:KPSE_BASIC called (pkg=zlib, amopt=)' >&5
+#
+# am_init_automake
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
@@ -4295,49 +4671,13 @@
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
+# am_maintainer_mode
-END
- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
- fi
-fi
-
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
@@ -4362,6 +4702,11 @@
MAINT=$MAINTAINER_MODE_TRUE
+
+# See comments in kpse-setup.m4 about system extensions.
+
+
+# Check whether prototypes work.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5
printf %s "checking whether the compiler accepts prototypes... " >&6; }
if test ${kb_cv_c_prototypes+y}
@@ -4395,6 +4740,8 @@
if test "x$kb_cv_c_prototypes" = xno; then
as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5
fi
+
+# kpse_compiler_warnings options.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
printf %s "checking what warning flags to pass to the C compiler... " >&6; }
if test ${kpse_cv_warning_cflags+y}
@@ -4452,7 +4799,10 @@
+# end of kpse_basic macro.
+echo 'tldbg:KPSE_BASIC done (pkg=zlib, amopt=)' >&5
+
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5363,7 +5713,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -5398,6 +5748,329 @@
fi
+# By default we simply use the C compiler to build assembly code.
+
+test "${CCAS+set}" = set || CCAS=$CC
+test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
+
+
+
+depcc="$CCAS" am_compiler_list=
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+printf %s "checking dependency style of $depcc... " >&6; }
+if test ${am_cv_CCAS_dependencies_compiler_type+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_CCAS_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ am__universal=false
+
+
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
+ case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
+ nosideeffect)
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
+ none) break ;;
+ esac
+ if depmode=$depmode \
+ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thus:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CCAS_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CCAS_dependencies_compiler_type=none
+fi
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CCAS_dependencies_compiler_type" >&5
+printf "%s\n" "$am_cv_CCAS_dependencies_compiler_type" >&6; }
+CCASDEPMODE=depmode=$am_cv_CCAS_dependencies_compiler_type
+
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CCAS_dependencies_compiler_type" = gcc3; then
+ am__fastdepCCAS_TRUE=
+ am__fastdepCCAS_FALSE='#'
+else
+ am__fastdepCCAS_TRUE='#'
+ am__fastdepCCAS_FALSE=
+fi
+
+
+
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in ar lib "link -lib"
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AR+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$AR"; then
+ ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf "%s\n" "$AR" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+ test -n "$AR" && break
+ done
+fi
+if test -z "$AR"; then
+ ac_ct_AR=$AR
+ for ac_prog in ar lib "link -lib"
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_AR+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$ac_ct_AR"; then
+ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_AR="$ac_prog"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+printf "%s\n" "$ac_ct_AR" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+ test -n "$ac_ct_AR" && break
+done
+
+ if test "x$ac_ct_AR" = x; then
+ AR="false"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ AR=$ac_ct_AR
+ fi
+fi
+
+: ${AR=ar}
+: ${ARFLAGS=cr}
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
+printf %s "checking the archiver ($AR) interface... " >&6; }
+if test ${am_cv_ar_interface+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ am_cv_ar_interface=ar
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int some_variable = 0;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ am_ar_try='$AR $ARFLAGS libconftest.a conftest.$ac_objext >&5'
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+ (eval $am_ar_try) 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if test "$ac_status" -eq 0; then
+ am_cv_ar_interface=ar
+ else
+ am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
+ { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+ (eval $am_ar_try) 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if test "$ac_status" -eq 0; then
+ am_cv_ar_interface=lib
+ else
+ am_cv_ar_interface=unknown
+ fi
+ fi
+ rm -f conftest.lib libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
+printf "%s\n" "$am_cv_ar_interface" >&6; }
+
+case $am_cv_ar_interface in
+ar)
+ ;;
+lib)
+ # Microsoft lib, so override with the ar-lib wrapper script.
+ # FIXME: It is wrong to rewrite AR.
+ # But if we don't then we get into trouble of one sort or another.
+ # A longer-term fix would be to have automake use am__AR in this case,
+ # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
+ # similar.
+ AR="$am_aux_dir/ar-lib $AR"
+ ;;
+unknown)
+ as_fn_error $? "could not determine $AR interface" "$LINENO" 5
+ ;;
+esac
+
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -5535,8 +6208,19 @@
extern void foo(void);
void foo(void){printf("foo\n");}
_ACEOF
-# FIXME: Add tests for non-GNU compilers
-for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+# Maybe other compiler need other tests; patches needed.
+#
+# The idea, maybe, is to use both flags when they are supported, but
+# old C++ compilers, as well as C, don't support
+# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too?
+#
+for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \
+ "-fvisibility=hidden"; do
+ if test x"C" = xC \
+ && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then
+ # C does not support this additional flag; just skip the test.
+ continue
+ fi
CFLAGS="$kpse_save_flags -Werror $kpse_flag"
if ac_fn_c_try_compile "$LINENO"
then :
@@ -5579,35 +6263,6 @@
fi
-ac_header= ac_cache=
-for ac_item in $ac_header_c_list
-do
- if test $ac_cache; then
- ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
- if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
- printf "%s\n" "#define $ac_item 1" >> confdefs.h
- fi
- ac_header= ac_cache=
- elif test $ac_header; then
- ac_cache=$ac_item
- else
- ac_header=$ac_item
- fi
-done
-
-
-
-
-
-
-
-
-if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
-then :
-
-printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
ac_fn_c_check_header_compile "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
if test "x$ac_cv_header_errno_h" = xyes
then :
@@ -6142,6 +6797,18 @@
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
printf "%s\n" "done" >&6; }
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -6166,6 +6833,10 @@
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
+ as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${build_TRUE}" && test -z "${build_FALSE}"; then
as_fn_error $? "conditional \"build\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
Modified: branches/stable/source/src/libs/zlib/configure.ac
===================================================================
--- branches/stable/source/src/libs/zlib/configure.ac 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/zlib/configure.ac 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-dnl $Id: configure.ac 57060 2020-12-03 22:59:23Z karl $
+dnl $Id: configure.ac 70884 2024-04-07 22:16:46Z karl $
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2016-2020 Karl Berry <tex-live at tug.org>
+dnl Copyright (C) 2016-2024 Karl Berry <tex-live at tug.org>
dnl Copyright (C) 2009-2013 Peter Breitenlohner <tex-live at tug.org>
dnl
dnl This file is free software; the copyright holder
@@ -15,9 +15,12 @@
AC_CONFIG_AUX_DIR([../../build-aux])
AC_CONFIG_MACRO_DIR([../../m4])
+
KPSE_BASIC([zlib])
AC_PROG_CC
+AM_PROG_AS
+AM_PROG_AR
AC_PROG_RANLIB
AC_PROG_LN_S
Modified: branches/stable/source/src/libs/zlib/include/Makefile.in
===================================================================
--- branches/stable/source/src/libs/zlib/include/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/libs/zlib/include/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,6 +69,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -126,11 +128,15 @@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
+CCAS = @CCAS@
+CCASDEPMODE = @CCASDEPMODE@
+CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
@@ -179,12 +185,15 @@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build_alias = @build_alias@
builddir = @builddir@
@@ -324,8 +333,8 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -429,3 +438,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/m4/ChangeLog
===================================================================
--- branches/stable/source/src/m4/ChangeLog 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/m4/ChangeLog 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,3 +1,13 @@
+2024-04-28 Karl Berry <karl at freefriends.org>
+
+ * kpse-common.m4 (KPSE_BASIC):
+
+2024-04-18 Karl Berry <karl at freefriends.org>
+
+ * kpse-visibility.m4 (_KPSE_VISIBILITY_FLAGS): avoid testing or
+ including -fvisibility-inlines-hidden for C. From Luigi, mail of
+ 12 Apr 2024 06:26:23.
+
2024-02-01 Luigi Scarso <luigi.scarso at gmail.com>
* kpse-pkgs.m4 (kpse_libs_pkgs): add mpfi (new subdir).
Modified: branches/stable/source/src/m4/kpse-common.m4
===================================================================
--- branches/stable/source/src/m4/kpse-common.m4 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/m4/kpse-common.m4 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,6 +1,6 @@
-# $Id: kpse-common.m4 69184 2023-12-21 21:02:03Z karl $
+# $Id: kpse-common.m4 71106 2024-04-28 16:42:22Z karl $
# Public macros for the TeX Live (TL) tree.
-# Copyright 1995-2009, 2015-2023 Karl Berry <tex-live at tug.org>
+# Copyright 1995-2009, 2015-2024 Karl Berry <tex-live at tug.org>
# Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
#
# This file is free software; the copyright holders
@@ -217,23 +217,32 @@
AC_DEFUN([KPSE_BASIC], [dnl
echo 'tldbg:[$0] called (pkg=[$1], amopt=[$2])' >&AS_MESSAGE_LOG_FD
m4_define([Kpse_Package], [$1])
-dnl
+#
+# am_init_automake
AM_INIT_AUTOMAKE([foreign silent-rules subdir-objects]m4_ifval([$2], [ $2]))
+
+# am_maintainer_mode
AM_MAINTAINER_MODE
-dnl
-dnl Check whether prototypes work.
+
+# See comments in kpse-setup.m4 about system extensions.
+AC_USE_SYSTEM_EXTENSIONS
+
+# Check whether prototypes work.
AC_CACHE_CHECK([whether the compiler accepts prototypes],
[kb_cv_c_prototypes],
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>]],
- [[extern void foo(int i,...);]])],
+ [[extern void foo(int i,...);]])],
[kb_cv_c_prototypes=yes],
[kb_cv_c_prototypes=no])])
if test "x$kb_cv_c_prototypes" = xno; then
AC_MSG_ERROR([Sorry, your compiler does not understand prototypes.])
fi
-dnl
-dnl Enable flags for compiler warnings
+
+# kpse_compiler_warnings options.
KPSE_COMPILER_WARNINGS
+
+# end of kpse_basic macro.
+echo 'tldbg:[$0] done (pkg=[$1], amopt=[$2])' >&AS_MESSAGE_LOG_FD
]) # KPSE_BASIC
# KPSE_COMMON(PACKAGE-NAME, [MORE-AUTOMAKE-OPTIONS])
Modified: branches/stable/source/src/m4/kpse-setup.m4
===================================================================
--- branches/stable/source/src/m4/kpse-setup.m4 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/m4/kpse-setup.m4 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,4 +1,4 @@
-# $Id: kpse-setup.m4 57699 2021-02-10 02:06:16Z karl $
+# $Id: kpse-setup.m4 71106 2024-04-28 16:42:22Z karl $
# Private macros for the TeX Live (TL) tree.
# Copyright 2017-2021 Karl Berry <tex-live at tug.org>
# Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
@@ -18,6 +18,7 @@
# additional program specific configure options (if any)
# library dependencies for programs and libraries
AC_DEFUN([KPSE_SETUP], [dnl
+echo 'tldbg:[$0] called (toplevel=[$1])' >&AS_MESSAGE_LOG_FD
AC_REQUIRE([AC_CANONICAL_HOST])[]dnl
AC_REQUIRE([_KPSE_MSG_WARN_PREPARE])[]dnl
m4_define([kpse_TL], [$1])[]dnl
@@ -74,7 +75,27 @@
KPSE_LIBS_PREPARE
KPSE_MKTEX_PREPARE
KPSE_WEB2C_PREPARE
+
+# We must enable system extensions before any compiler call to avoid
+# (valid) autoconf warnings. Because different configure.ac's use
+# different kpse setup routines, we call the ac_use_system_extensions
+# macro both here and in kpse_basic (in kpse-common.m4).
+#
+# Fortunately, Autoconf defines the system_extensions macro to only have
+# any effect once (with ac_defun_once), so it's harmless to call it
+# multiple time.
+#
+# LuaTeX requires system extensions for socket support. Also, since
+# SyncTeX, some libraries, and others unconditionally #define
+# GNU_SOURCE, it seems more consistent to always use it.
+#
+AC_USE_SYSTEM_EXTENSIONS
+
+# this macro, kpse_check_win32, is the first compiler call for
+# configure.ac files that use this function (kpse setup).
KPSE_CHECK_WIN32
+# end call to kpse_check_win32.
+
AS_CASE([$with_x:$kpse_cv_have_win32],
[yes:no | no:*], [:],
[yes:*], [AC_MSG_ERROR([you can not use `--with-x' for Windows])],
@@ -96,6 +117,9 @@
KPSE_FOR_PKGS([texk], [m4_sinclude(kpse_TL[texk/]Kpse_Pkg[/ac/withenable.ac])])
KPSE_FOR_PKGS([libs], [m4_sinclude(kpse_TL[libs/]Kpse_Pkg[/ac/withenable.ac])])
KPSE_FOR_PKGS([texlibs], [m4_sinclude(kpse_TL[texk/]Kpse_Pkg[/ac/withenable.ac])])
+
+# end of kpse_setup macro.
+echo 'tldbg:[$0] done (toplevel=[$1])' >&AS_MESSAGE_LOG_FD
]) # KPSE_SETUP
# KPSE_ENABLE_PROG(PROG, REQUIRED-LIBS, OPTIONS, [COMMENT])
Modified: branches/stable/source/src/m4/kpse-visibility.m4
===================================================================
--- branches/stable/source/src/m4/kpse-visibility.m4 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/m4/kpse-visibility.m4 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,6 +1,6 @@
-# $Id: kpse-visibility.m4 49495 2018-12-24 23:17:30Z karl $
+# $Id: kpse-visibility.m4 70984 2024-04-18 22:14:36Z karl $
# Public macros for the TeX Live (TL) tree.
-# Copyright 2017-2018 Karl Berry <tex-live at tug.org>
+# Copyright 2017-2024 Karl Berry <tex-live at tug.org>
# Copyright 2013-2014 Peter Breitenlohner <tex-live at tug.org>
#
# This file is free software; the copyright holder
@@ -62,8 +62,19 @@
AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <stdio.h>
extern void foo(void);
void foo(void){printf("foo\n");}]])])
-# FIXME: Add tests for non-GNU compilers
-for kpse_flag in '-fvisibility=hidden -fvisibility-inlines-hidden' '-fvisibility=hidden'; do
+# Maybe other compiler need other tests; patches needed.
+#
+# The idea, maybe, is to use both flags when they are supported, but
+# old C++ compilers, as well as C, don't support
+# -fvisibility-inlines-hidden, so test just -fvisibility=hidden too?
+#
+for kpse_flag in "-fvisibility=hidden -fvisibility-inlines-hidden" \
+ "-fvisibility=hidden"; do
+ if test x"$1" = xC \
+ && echo "$kpse_flag" | grep inlines-hidden >/dev/null; then
+ # C does not support this additional flag; just skip the test.
+ continue
+ fi
AS_TR_CPP($2)="$kpse_save_flags -Werror $kpse_flag"
AC_COMPILE_IFELSE([], [kpse_cv_visibility_$2=$kpse_flag; break])
done
Modified: branches/stable/source/src/reautoconf
===================================================================
--- branches/stable/source/src/reautoconf 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/reautoconf 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Id: reautoconf 69342 2024-01-07 21:44:58Z karl $
+# $Id: reautoconf 71106 2024-04-28 16:42:22Z karl $
# This "reautoconf" script at the root of the TeX Live source tree
# runs autoreconf (from PATH) in all relevant TL directories.
#
@@ -47,7 +47,7 @@
Report bugs (and any other discussion) to:
tlbuild at tug.org (https://lists.tug.org/tlbuild)
-Version: $Id: reautoconf 69342 2024-01-07 21:44:58Z karl $
+Version: $Id: reautoconf 71106 2024-04-28 16:42:22Z karl $
"
do_cmd=eval
@@ -97,6 +97,7 @@
$do_cmd "$@"
if test $? -ne 0; then
echo "$0: goodbye, exit status of $*: $?" >&2
+ echo "$0: directory: `/bin/pwd`" >&2
exit 1
fi
}
Modified: branches/stable/source/src/texk/Makefile.in
===================================================================
--- branches/stable/source/src/texk/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,6 +69,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -275,8 +277,8 @@
top_distdir = $(distdir)
am__remove_distdir = \
if test -d "$(distdir)"; then \
- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -rf "$(distdir)" \
+ find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \
+ ; rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
am__post_remove_distdir = $(am__remove_distdir)
@@ -306,7 +308,7 @@
done; \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
+GZIP_ENV = -9
DIST_TARGETS = dist-gzip
# Exists only to be overridden by the user if desired.
AM_DISTCHECK_DVI_TARGET = dvi
@@ -313,7 +315,9 @@
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
+distcleancheck_listfiles = \
+ find . \( -type f -a \! \
+ \( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
ACLOCAL = @ACLOCAL@ --force
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -371,8 +375,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -580,7 +586,7 @@
distdir-am: $(DISTFILES)
$(am__remove_distdir)
- test -d "$(distdir)" || mkdir "$(distdir)"
+ $(AM_V_at)$(MKDIR_P) "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -694,7 +700,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -704,7 +710,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
*.tar.zst*) \
@@ -804,8 +810,8 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -947,3 +953,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/texk/README
===================================================================
--- branches/stable/source/src/texk/README 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/README 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,4 +1,4 @@
-$Id: README 70487 2024-03-07 22:55:09Z karl $
+$Id: README 71501 2024-06-12 08:45:56Z kakuto $
Copyright 2006-2024 TeX Users Group.
You may freely use, modify and/or distribute this file.
@@ -25,7 +25,7 @@
bibtex-x - maintained here, contains
bibtex8, bibtexu
-chktex 1.7.8 - checked 15dec22
+chktex 1.7.9 - checked 12jun24
https://mirror.ctan.org/support/chktex/
https://download.savannah.gnu.org/releases/chktex/
@@ -118,10 +118,10 @@
cweb - https://github.com/ascherer/cwebbin
(original Knuth, ftp://ftp.cs.stanford.edu/pub/cweb/
and ftp://ftp.cs.stanford.edu/pub/ctwill/)
- eptex - https://github.com/texjporg/tex-jp-build
- also: https://osdn.jp/projects/eptex
etex - maintained here
- euptex - https://www.t-lab.opal.ne.jp/tex/uptex_en.html
+ euptex - https://github.com/texjporg/tex-jp-build
+ also: https://www.t-lab.opal.ne.jp/tex/uptex_en.html
+ also: https://github.com/h-kitagawa/eptex-wiki
hitex - https://hint.userweb.mwn.de/hint/hitex.html
mflua[jit] - https://serveur-svn.lri.fr/svn/modhel/mflua
also: https://www.luatex.org/download.html
Modified: branches/stable/source/src/texk/aclocal.m4
===================================================================
--- branches/stable/source/src/texk/aclocal.m4 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/aclocal.m4 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.17 -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2021 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.16'
+[am__api_version='1.17'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.5], [],
+m4_if([$1], [1.17], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.5])dnl
+[AM_AUTOMAKE_VERSION([1.17])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -58,7 +58,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -110,7 +110,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -141,7 +141,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -273,7 +273,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -332,7 +332,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -400,7 +400,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -534,7 +534,7 @@
fi
AC_SUBST([CSCOPE])
-AC_REQUIRE([AM_SILENT_RULES])dnl
+AC_REQUIRE([_AM_SILENT_RULES])dnl
dnl The testsuite driver may need to know about EXEEXT, so add the
dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
@@ -542,47 +542,9 @@
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
+AC_REQUIRE([_AM_PROG_RM_F])
+AC_REQUIRE([_AM_PROG_XARGS_N])
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
- AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
- fi
-fi
dnl The trailing newline in this macro's definition is deliberate, for
dnl backward compatibility and to allow trailing 'dnl'-style comments
dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
@@ -615,7 +577,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -636,7 +598,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2021 Free Software Foundation, Inc.
+# Copyright (C) 2003-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -658,7 +620,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -693,7 +655,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -736,7 +698,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -770,7 +732,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -799,7 +761,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -846,12 +808,28 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# _AM_PROG_RM_F
+# ---------------
+# Check whether 'rm -f' without any arguments works.
+# https://bugs.gnu.org/10828
+AC_DEFUN([_AM_PROG_RM_F],
+[am__rm_f_notfound=
+AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='""'])
+AC_SUBST(am__rm_f_notfound)
+])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
# AM_RUN_LOG(COMMAND)
# -------------------
# Run COMMAND, save the exit status in ac_status, and log it.
@@ -865,16 +843,169 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# _AM_SLEEP_FRACTIONAL_SECONDS
+# ----------------------------
+AC_DEFUN([_AM_SLEEP_FRACTIONAL_SECONDS], [dnl
+AC_CACHE_CHECK([whether sleep supports fractional seconds],
+ am_cv_sleep_fractional_seconds, [dnl
+AS_IF([sleep 0.001 2>/dev/null], [am_cv_sleep_fractional_seconds=yes],
+ [am_cv_sleep_fractional_seconds=no])
+])])
+
+# _AM_FILESYSTEM_TIMESTAMP_RESOLUTION
+# -----------------------------------
+# Determine the filesystem's resolution for file modification
+# timestamps. The coarsest we know of is FAT, with a resolution
+# of only two seconds, even with the most recent "exFAT" extensions.
+# The finest (e.g. ext4 with large inodes, XFS, ZFS) is one
+# nanosecond, matching clock_gettime. However, it is probably not
+# possible to delay execution of a shell script for less than one
+# millisecond, due to process creation overhead and scheduling
+# granularity, so we don't check for anything finer than that. (See below.)
+AC_DEFUN([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION], [dnl
+AC_REQUIRE([_AM_SLEEP_FRACTIONAL_SECONDS])
+AC_CACHE_CHECK([filesystem timestamp resolution],
+ am_cv_filesystem_timestamp_resolution, [dnl
+# Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `[ls -t conftest.ts[12]]` &&
+ {
+ test "$[]*" != "X conftest.ts1 conftest.ts2" ||
+ test "$[]*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ _AS_ECHO_UNQUOTED(
+ ["Bad output from ls -t: \"`[ls -t conftest.ts[12]]`\""],
+ [AS_MESSAGE_LOG_FD])
+ AC_MSG_FAILURE([ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.])
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$[]2" = conftest.ts3 &&
+ test "$[]3" = conftest.ts2 &&
+ test "$[]4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+])])
+
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
+[AC_REQUIRE([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION])
+# This check should not be cached, as it may vary across builds of
+# different projects.
+AC_MSG_CHECKING([whether build environment is sane])
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -893,49 +1024,40 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[]*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$[]2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
- alias in your environment])
- fi
- if test "$[2]" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
+AC_MSG_RESULT([$am_build_env_is_sane])
+if test "$am_build_env_is_sane" = no; then
+ AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT([yes])
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+AS_IF([test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1],, [dnl
+ ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
-fi
+])
AC_CONFIG_COMMANDS_PRE(
[AC_MSG_CHECKING([that generated files are newer than configure])
if test -n "$am_sleep_pid"; then
@@ -946,18 +1068,18 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2021 Free Software Foundation, Inc.
+# Copyright (C) 2009-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
+# _AM_SILENT_RULES
+# ----------------
+# Enable less verbose build rules support.
+AC_DEFUN([_AM_SILENT_RULES],
+[AM_DEFAULT_VERBOSITY=1
+AC_ARG_ENABLE([silent-rules], [dnl
AS_HELP_STRING(
[--enable-silent-rules],
[less verbose build output (undo: "make V=1")])
@@ -965,11 +1087,6 @@
[--disable-silent-rules],
[verbose build output (undo: "make V=0")])dnl
])
-case $enable_silent_rules in @%:@ (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
dnl
dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
dnl do not support nested variable expansions.
@@ -988,6 +1105,21 @@
else
am_cv_make_support_nested_variables=no
fi])
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+dnl Delay evaluation of AM_DEFAULT_VERBOSITY to the end to allow multiple calls
+dnl to AM_SILENT_RULES to change the default value.
+AC_CONFIG_COMMANDS_PRE([dnl
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
if test $am_cv_make_support_nested_variables = yes; then
dnl Using '$V' instead of '$(V)' breaks IRIX make.
AM_V='$(V)'
@@ -996,17 +1128,18 @@
AM_V=$AM_DEFAULT_VERBOSITY
AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])dnl
])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Set the default verbosity level to DEFAULT ("yes" being less verbose, "no" or
+# empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_REQUIRE([_AM_SILENT_RULES])
+AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1034,7 +1167,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2021 Free Software Foundation, Inc.
+# Copyright (C) 2006-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1053,7 +1186,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2021 Free Software Foundation, Inc.
+# Copyright (C) 2004-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1099,15 +1232,19 @@
am_uid=`id -u || echo unknown`
am_gid=`id -g || echo unknown`
AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
- if test $am_uid -le $am_max_uid; then
- AC_MSG_RESULT([yes])
+ if test x$am_uid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current UID is ok, but dist-ustar might not work])
+ elif test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT([no])
- _am_tools=none
+ AC_MSG_RESULT([no])
+ _am_tools=none
fi
AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
- if test $am_gid -le $am_max_gid; then
- AC_MSG_RESULT([yes])
+ if test x$gm_gid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current GID is ok, but dist-ustar might not work])
+ elif test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
_am_tools=none
@@ -1184,6 +1321,26 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_XARGS_N
+# ----------------
+# Check whether 'xargs -n' works. It should work everywhere, so the fallback
+# is not optimized at all as we never expect to use it.
+AC_DEFUN([_AM_PROG_XARGS_N],
+[AC_CACHE_CHECK([xargs -n works], am_cv_xargs_n_works, [dnl
+AS_IF([test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"], [am_cv_xargs_n_works=yes], [am_cv_xargs_n_works=no])])
+AS_IF([test "$am_cv_xargs_n_works" = yes], [am__xargs_n='xargs -n'], [dnl
+ am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "$@" "$am__xargs_n_arg"; done; }'
+])dnl
+AC_SUBST(am__xargs_n)
+])
+
m4_include([../m4/kpse-cairo-flags.m4])
m4_include([../m4/kpse-common.m4])
m4_include([../m4/kpse-cxx-hack.m4])
Modified: branches/stable/source/src/texk/configure
===================================================================
--- branches/stable/source/src/texk/configure 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/configure 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for TeX Live texk 2024.
+# Generated by GNU Autoconf 2.72 for TeX Live texk 2025/dev.
#
# Report bugs to <tex-live at tug.org>.
#
@@ -603,12 +603,44 @@
# Identity of this package.
PACKAGE_NAME='TeX Live texk'
PACKAGE_TARNAME='tex-live-texk'
-PACKAGE_VERSION='2024'
-PACKAGE_STRING='TeX Live texk 2024'
+PACKAGE_VERSION='2025/dev'
+PACKAGE_STRING='TeX Live texk 2025/dev'
PACKAGE_BUGREPORT='tex-live at tug.org'
PACKAGE_URL=''
ac_unique_file="../build-aux/missing"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stddef.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_header_c_list=
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
@@ -619,6 +651,8 @@
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
+am__xargs_n
+am__rm_f_notfound
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -751,8 +785,6 @@
enable_etex_synctex
enable_ptex
enable_ptex_synctex
-enable_eptex
-enable_eptex_synctex
enable_uptex
enable_uptex_synctex
enable_euptex
@@ -1437,7 +1469,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 TeX Live texk 2024 to adapt to many kinds of systems.
+'configure' configures TeX Live texk 2025/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1508,7 +1540,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of TeX Live texk 2024:";;
+ short | recursive ) echo "Configuration of TeX Live texk 2025/dev:";;
esac
cat <<\_ACEOF
@@ -1553,8 +1585,6 @@
--disable-etex-synctex build e-TeX without SyncTeX support
--enable-ptex compile and install pTeX
--disable-ptex-synctex build pTeX without SyncTeX support
- --enable-eptex compile and install e-pTeX
- --disable-eptex-synctex build e-pTeX without SyncTeX support
--enable-uptex compile and install upTeX
--disable-uptex-synctex build upTeX without SyncTeX support
--disable-euptex do not compile and install e-upTeX
@@ -1804,7 +1834,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-TeX Live texk configure 2024
+TeX Live texk configure 2025/dev
generated by GNU Autoconf 2.72
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1858,6 +1888,41 @@
} # ac_fn_c_try_compile
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ eval "$3=yes"
+else case e in #(
+ e) eval "$3=no" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+eval ac_res=\$$3
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
# ac_fn_c_try_link LINENO
# -----------------------
# Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -1929,7 +1994,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by TeX Live texk $as_me 2024, which was
+It was created by TeX Live texk $as_me 2025/dev, which was
generated by GNU Autoconf 2.72. Invocation command line was
$ $0$ac_configure_args_raw
@@ -2200,6 +2265,7 @@
>$cache_file
fi
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
# Test code for whether the C compiler supports C89 (global declarations)
ac_c_conftest_c89_globals='
/* Does the compiler advertise C89 conformance?
@@ -2525,6 +2591,16 @@
}
"
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
+as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
# Auxiliary files required by this configure script.
ac_aux_files="missing install-sh compile config.guess config.sub"
@@ -3874,9 +3950,187 @@
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+ if test $ac_cache; then
+ ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+ if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+ printf "%s\n" "#define $ac_item 1" >> confdefs.h
+ fi
+ ac_header= ac_cache=
+ elif test $ac_header; then
+ ac_cache=$ac_item
+ else
+ ac_header=$ac_item
+ fi
+done
+
+
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+
+
+
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test ${ac_cv_safe_to_define___extensions__+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+# define __EXTENSIONS__ 1
+ $ac_includes_default
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_safe_to_define___extensions__=yes
+else case e in #(
+ e) ac_cv_safe_to_define___extensions__=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
+if test ${ac_cv_should_define__xopen_source+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_cv_should_define__xopen_source=no
+ if test $ac_cv_header_wchar_h = yes
+then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <wchar.h>
+ mbstate_t x;
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #define _XOPEN_SOURCE 500
+ #include <wchar.h>
+ mbstate_t x;
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_should_define__xopen_source=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+
+ printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+
+ printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+ printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+ if test $ac_cv_header_minix_config_h = yes
+then :
+ MINIX=yes
+ printf "%s\n" "#define _MINIX 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+else case e in #(
+ e) MINIX= ;;
+esac
+fi
+ if test $ac_cv_safe_to_define___extensions__ = yes
+then :
+ printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
+
+fi
+ if test $ac_cv_should_define__xopen_source = yes
+then :
+ printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
+
+fi
+
+
+
+
+echo 'tldbg:KPSE_SETUP called (toplevel=../)' >&5
# Check whether --enable-all-pkgs was given.
if test ${enable_all_pkgs+y}
then :
@@ -3987,6 +4241,24 @@
+
+# We must enable system extensions before any compiler call to avoid
+# (valid) autoconf warnings. Because different configure.ac's use
+# different kpse setup routines, we call the ac_use_system_extensions
+# macro both here and in kpse_basic (in kpse-common.m4).
+#
+# Fortunately, Autoconf defines the system_extensions macro to only have
+# any effect once (with ac_defun_once), so it's harmless to call it
+# multiple time.
+#
+# LuaTeX requires system extensions for socket support. Also, since
+# SyncTeX, some libraries, and others unconditionally #define
+# GNU_SOURCE, it seems more consistent to always use it.
+#
+
+
+# this macro, kpse_check_win32, is the first compiler call for
+# configure.ac files that use this function (kpse setup).
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
printf %s "checking for native WIN32 or MINGW32... " >&6; }
if test ${kpse_cv_have_win32+y}
@@ -4039,6 +4311,8 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5
printf "%s\n" "$kpse_cv_have_win32" >&6; }
+# end call to kpse_check_win32.
+
case $with_x:$kpse_cv_have_win32 in #(
yes:no | no:*) :
: ;; #(
@@ -4550,28 +4824,6 @@
need_ptexenc=yes
need_zlib=yes
}
-# Check whether --enable-eptex was given.
-if test ${enable_eptex+y}
-then :
- enableval=$enable_eptex;
-fi
-case $enable_eptex in #(
- yes | no) :
- ;; #(
- *) :
- enable_eptex=no ;;
-esac
-
-# Check whether --enable-eptex-synctex was given.
-if test ${enable_eptex_synctex+y}
-then :
- enableval=$enable_eptex_synctex;
-fi
-
-test "x$enable_web2c:$enable_eptex" = xyes:yes && {
- need_ptexenc=yes
- need_zlib=yes
-}
# Check whether --enable-uptex was given.
if test ${enable_uptex+y}
then :
@@ -6533,10 +6785,13 @@
+# end of kpse_setup macro.
+echo 'tldbg:KPSE_SETUP done (toplevel=../)' >&5
-am__api_version='1.16'
+am__api_version='1.17'
+
# Find a good install program. We prefer a C program (faster),
# so one script is as good as another. But avoid the broken or
# incompatible versions:
@@ -6636,6 +6891,165 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
+printf %s "checking whether sleep supports fractional seconds... " >&6; }
+if test ${am_cv_sleep_fractional_seconds+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if sleep 0.001 2>/dev/null
+then :
+ am_cv_sleep_fractional_seconds=yes
+else case e in #(
+ e) am_cv_sleep_fractional_seconds=no ;;
+esac
+fi
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
+printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; }
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
+printf %s "checking filesystem timestamp resolution... " >&6; }
+if test ${am_cv_filesystem_timestamp_resolution+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) # Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `ls -t conftest.ts[12]` &&
+ {
+ test "$*" != "X conftest.ts1 conftest.ts2" ||
+ test "$*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.
+See 'config.log' for more details" "$LINENO" 5; }
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$2" = conftest.ts3 &&
+ test "$3" = conftest.ts2 &&
+ test "$4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
+printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; }
+
+# This check should not be cached, as it may vary across builds of
+# different projects.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
printf %s "checking whether build environment is sane... " >&6; }
# Reject unsafe characters in $srcdir or the absolute working directory
@@ -6656,49 +7070,45 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
- if test "$2" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$2" = conftest.file
- )
-then
- # Ok.
- :
-else
- as_fn_error $? "newly created file is older than distributed files!
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
+printf "%s\n" "$am_build_env_is_sane" >&6; }
+if test "$am_build_env_is_sane" = no; then
+ as_fn_error $? "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+if test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1
+then :
+
+else case e in #(
+ e) ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
+ ;;
+esac
fi
rm -f conftest.file
@@ -7048,6 +7458,7 @@
fi
+AM_DEFAULT_VERBOSITY=1
# Check whether --enable-silent-rules was given.
if test ${enable_silent_rules+y}
then :
@@ -7054,11 +7465,6 @@
enableval=$enable_silent_rules;
fi
-case $enable_silent_rules in # (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=1;;
-esac
am_make=${MAKE-make}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
printf %s "checking whether $am_make supports nested variables... " >&6; }
@@ -7081,15 +7487,45 @@
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
AM_BACKSLASH='\'
+am__rm_f_notfound=
+if (rm -f && rm -fr && rm -rf) 2>/dev/null
+then :
+
+else case e in #(
+ e) am__rm_f_notfound='""' ;;
+esac
+fi
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
+printf %s "checking xargs -n works... " >&6; }
+if test ${am_cv_xargs_n_works+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"
+then :
+ am_cv_xargs_n_works=yes
+else case e in #(
+ e) am_cv_xargs_n_works=no ;;
+esac
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
+printf "%s\n" "$am_cv_xargs_n_works" >&6; }
+if test "$am_cv_xargs_n_works" = yes
+then :
+ am__xargs_n='xargs -n'
+else case e in #(
+ e) am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "" "$am__xargs_n_arg"; done; }'
+ ;;
+esac
+fi
+
# Check whether --enable-compiler-warnings was given.
if test ${enable_compiler_warnings+y}
then :
@@ -7110,6 +7546,8 @@
echo 'tldbg:KPSE_BASIC called (pkg=texk, amopt=)' >&5
+#
+# am_init_automake
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
@@ -7132,7 +7570,7 @@
# Define the identity of the package.
PACKAGE='tex-live-texk'
- VERSION='2024'
+ VERSION='2025/dev'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -7273,7 +7711,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -7323,49 +7761,13 @@
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
+# am_maintainer_mode
-END
- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
- fi
-fi
-
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
@@ -7390,6 +7792,11 @@
MAINT=$MAINTAINER_MODE_TRUE
+
+# See comments in kpse-setup.m4 about system extensions.
+
+
+# Check whether prototypes work.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5
printf %s "checking whether the compiler accepts prototypes... " >&6; }
if test ${kb_cv_c_prototypes+y}
@@ -7423,6 +7830,8 @@
if test "x$kb_cv_c_prototypes" = xno; then
as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5
fi
+
+# kpse_compiler_warnings options.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
printf %s "checking what warning flags to pass to the C compiler... " >&6; }
if test ${kpse_cv_warning_cflags+y}
@@ -7480,9 +7889,12 @@
+# end of kpse_basic macro.
+echo 'tldbg:KPSE_BASIC done (pkg=texk, amopt=)' >&5
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TeXk programs to build" >&5
printf %s "checking for TeXk programs to build... " >&6; }
echo 'tldbg:_KPSE_RECURSE called: list=texk, text=TeXk programs, cond=test "x$enable_[]Kpse_pkg" = xyes, prefix=.' >&5
@@ -7846,6 +8258,18 @@
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -8251,7 +8675,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by TeX Live texk $as_me 2024, which was
+This file was extended by TeX Live texk $as_me 2025/dev, which was
generated by GNU Autoconf 2.72. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8310,7 +8734,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-TeX Live texk config.status 2024
+TeX Live texk config.status 2025/dev
configured by $0, generated by GNU Autoconf 2.72,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/texk/kpathsea/ChangeLog
===================================================================
--- branches/stable/source/src/texk/kpathsea/ChangeLog 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/kpathsea/ChangeLog 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,3 +1,22 @@
+2024-07-01 Karl Berry <karl at tug.org>
+
+ * texmf.cnf (shell_escape_commands): restore extractbb,
+ now as a wrapper script that protects against the exploit.
+
+2024-06-29 Karl Berry <karl at tug.org>
+
+ * texmf.cnf (shell_escape_commands): remove extractbb.
+
+2024-06-04 Karl Berry <karl at freefriends.org>
+
+ * texmf.cnf (MKTEXPK, etc.): adjust values shown to the
+ compile-time defaults, as given in kpathsea/ac/mktex.ac.
+
+2024-03-17 Karl Berry <karl at tug.org>
+
+ * texmf.cnf (shell_escape_commands): add l3sys-query
+ after analysis on tex-live. https://ctan.org/pkg/l3sys-query
+
2024-03-10 Karl Berry <karl at tug.org>
* TL'24 release.
Modified: branches/stable/source/src/texk/kpathsea/Makefile.in
===================================================================
--- branches/stable/source/src/texk/kpathsea/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/kpathsea/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -73,6 +73,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -166,10 +168,9 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
+ { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
}
LTLIBRARIES = $(lib_LTLIBRARIES)
libkpathsea_la_DEPENDENCIES = $(LTLIBOBJS)
@@ -501,6 +502,7 @@
# Default flags passed to test drivers.
am__common_driver_flags = \
--color-tests "$$am__color_tests" \
+ $$am__collect_skipped_logs \
--enable-hard-errors "$$am__enable_hard_errors" \
--expect-failure "$$am__expect_failure"
# To be inserted before the command running the test. Creates the
@@ -525,6 +527,11 @@
elif test -f "$$f"; then dir=; \
else dir="$(srcdir)/"; fi; \
tst=$$dir$$f; log='$@'; \
+if test -n '$(IGNORE_SKIPPED_LOGS)'; then \
+ am__collect_skipped_logs='--collect-skipped-logs no'; \
+else \
+ am__collect_skipped_logs=''; \
+fi; \
if test -n '$(DISABLE_HARD_ERRORS)'; then \
am__enable_hard_errors=no; \
else \
@@ -591,8 +598,8 @@
top_distdir = $(distdir)
am__remove_distdir = \
if test -d "$(distdir)"; then \
- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -rf "$(distdir)" \
+ find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \
+ ; rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
am__post_remove_distdir = $(am__remove_distdir)
@@ -622,7 +629,7 @@
done; \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
+GZIP_ENV = -9
DIST_TARGETS = dist-gzip
# Exists only to be overridden by the user if desired.
AM_DISTCHECK_DVI_TARGET = dvi
@@ -629,7 +636,9 @@
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
+distcleancheck_listfiles = \
+ find . \( -type f -a \! \
+ \( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -713,8 +722,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -917,12 +928,12 @@
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status c-auto.h
+ $(AM_V_at)rm -f stamp-h1
+ $(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status c-auto.h
$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
- rm -f stamp-h1
- touch $@
+ $(AM_V_GEN)($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ $(AM_V_at)rm -f stamp-h1
+ $(AM_V_at)touch $@
distclean-hdr:
-rm -f c-auto.h stamp-h1
@@ -967,16 +978,11 @@
`; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ cd "$(DESTDIR)$(bindir)" && $(am__rm_f) $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ $(am__rm_f) $(bin_PROGRAMS)
+ test -z "$(EXEEXT)" || $(am__rm_f) $(bin_PROGRAMS:$(EXEEXT)=)
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@@ -1003,15 +1009,13 @@
done
clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ -$(am__rm_f) $(lib_LTLIBRARIES)
@list='$(lib_LTLIBRARIES)'; \
locs=`for p in $$list; do echo $$p; done | \
sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
sort -u`; \
- test -z "$$locs" || { \
- echo rm -f $${locs}; \
- rm -f $${locs}; \
- }
+ echo rm -f $${locs}; \
+ $(am__rm_f) $${locs}
libkpathsea.la: $(libkpathsea_la_OBJECTS) $(libkpathsea_la_DEPENDENCIES) $(EXTRA_libkpathsea_la_DEPENDENCIES)
$(AM_V_CCLD)$(libkpathsea_la_LINK) -rpath $(libdir) $(libkpathsea_la_OBJECTS) $(libkpathsea_la_LIBADD) $(LIBS)
@@ -1114,7 +1118,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+ @: >>$@
am--depfiles: $(am__depfiles_remade)
@@ -1753,7 +1757,6 @@
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
am--force-recheck:
@:
-
$(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__set_TESTS_bases); \
am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
@@ -1829,10 +1832,37 @@
result_count $$1 "XPASS:" $$xpass "$$red"; \
result_count $$1 "ERROR:" $$error "$$mgn"; \
}; \
+ output_system_information () \
+ { \
+ echo; \
+ { uname -a | $(AWK) '{ \
+ printf "System information (uname -a):"; \
+ for (i = 1; i < NF; ++i) \
+ { \
+ if (i != 2) \
+ printf " %s", $$i; \
+ } \
+ printf "\n"; \
+}'; } 2>&1; \
+ if test -r /etc/os-release; then \
+ echo "Distribution information (/etc/os-release):"; \
+ sed 8q /etc/os-release; \
+ elif test -r /etc/issue; then \
+ echo "Distribution information (/etc/issue):"; \
+ cat /etc/issue; \
+ fi; \
+ }; \
+ please_report () \
+ { \
+echo "Some test(s) failed. Please report this to $(PACKAGE_BUGREPORT),"; \
+echo "together with the test-suite.log file (gzipped) and your system"; \
+echo "information. Thanks."; \
+ }; \
{ \
echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
$(am__rst_title); \
create_testsuite_report --no-color; \
+ output_system_information; \
echo; \
echo ".. contents:: :depth: 2"; \
echo; \
@@ -1852,9 +1882,9 @@
create_testsuite_report --maybe-color; \
echo "$$col$$br$$std"; \
if $$success; then :; else \
- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
if test -n "$(PACKAGE_BUGREPORT)"; then \
- echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
+ please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
fi; \
echo "$$col$$br$$std"; \
fi; \
@@ -1861,17 +1891,16 @@
$$success || exit 1
check-TESTS:
- @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
- @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @$(am__rm_f) $(RECHECK_LOGS)
+ @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
+ @$(am__rm_f) $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
log_list=`for i in $$bases; do echo $$i.log; done`; \
- trs_list=`for i in $$bases; do echo $$i.trs; done`; \
- log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+ log_list=`echo $$log_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
recheck: all
- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @$(am__rm_f) $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
| $(am__list_recheck_tests)` || exit 1; \
@@ -1900,7 +1929,7 @@
distdir-am: $(DISTFILES)
$(am__remove_distdir)
- test -d "$(distdir)" || mkdir "$(distdir)"
+ $(AM_V_at)$(MKDIR_P) "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -2011,7 +2040,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -2021,7 +2050,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
*.tar.zst*) \
@@ -2129,22 +2158,22 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
- -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
- -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ -$(am__rm_f) $(TEST_LOGS)
+ -$(am__rm_f) $(TEST_LOGS:.log=.trs)
+ -$(am__rm_f) $(TEST_SUITE_LOG)
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+ -$(am__rm_f) $(CLEANFILES)
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+ -$(am__rm_f) $(BUILT_SOURCES)
clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
@@ -2152,7 +2181,7 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f $(DEPDIR)/putenv.Plo
+ -rm -f $(DEPDIR)/putenv.Plo
-rm -f ./$(DEPDIR)/access.Po
-rm -f ./$(DEPDIR)/kpsestat.Po
-rm -f ./$(DEPDIR)/kpsewhich.Po
@@ -2265,7 +2294,7 @@
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -f $(DEPDIR)/putenv.Plo
+ -rm -f $(DEPDIR)/putenv.Plo
-rm -f ./$(DEPDIR)/access.Po
-rm -f ./$(DEPDIR)/kpsestat.Po
-rm -f ./$(DEPDIR)/kpsewhich.Po
@@ -2466,3 +2495,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/texk/kpathsea/aclocal.m4
===================================================================
--- branches/stable/source/src/texk/kpathsea/aclocal.m4 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/kpathsea/aclocal.m4 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.17 -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2021 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.16'
+[am__api_version='1.17'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.5], [],
+m4_if([$1], [1.17], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,12 +51,12 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.5])dnl
+[AM_AUTOMAKE_VERSION([1.17])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-# Copyright (C) 2011-2021 Free Software Foundation, Inc.
+# Copyright (C) 2011-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -70,16 +70,18 @@
AC_DEFUN([AM_PROG_AR],
[AC_BEFORE([$0], [LT_INIT])dnl
AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
+AC_BEFORE([$0], [AC_PROG_AR])dnl
AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([ar-lib])dnl
AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
: ${AR=ar}
+: ${ARFLAGS=cr}
AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
[AC_LANG_PUSH([C])
am_cv_ar_interface=ar
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
- [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+ [am_ar_try='$AR $ARFLAGS libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
AC_TRY_EVAL([am_ar_try])
if test "$ac_status" -eq 0; then
am_cv_ar_interface=ar
@@ -118,7 +120,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -170,7 +172,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -201,7 +203,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -333,7 +335,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -392,7 +394,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -460,7 +462,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -594,7 +596,7 @@
fi
AC_SUBST([CSCOPE])
-AC_REQUIRE([AM_SILENT_RULES])dnl
+AC_REQUIRE([_AM_SILENT_RULES])dnl
dnl The testsuite driver may need to know about EXEEXT, so add the
dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
@@ -602,47 +604,9 @@
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
+AC_REQUIRE([_AM_PROG_RM_F])
+AC_REQUIRE([_AM_PROG_XARGS_N])
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
- AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
- fi
-fi
dnl The trailing newline in this macro's definition is deliberate, for
dnl backward compatibility and to allow trailing 'dnl'-style comments
dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
@@ -675,7 +639,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -696,7 +660,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2021 Free Software Foundation, Inc.
+# Copyright (C) 2003-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -718,7 +682,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -753,7 +717,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -796,7 +760,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -830,7 +794,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -859,7 +823,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -906,12 +870,28 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# _AM_PROG_RM_F
+# ---------------
+# Check whether 'rm -f' without any arguments works.
+# https://bugs.gnu.org/10828
+AC_DEFUN([_AM_PROG_RM_F],
+[am__rm_f_notfound=
+AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='""'])
+AC_SUBST(am__rm_f_notfound)
+])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
# AM_RUN_LOG(COMMAND)
# -------------------
# Run COMMAND, save the exit status in ac_status, and log it.
@@ -925,16 +905,169 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# _AM_SLEEP_FRACTIONAL_SECONDS
+# ----------------------------
+AC_DEFUN([_AM_SLEEP_FRACTIONAL_SECONDS], [dnl
+AC_CACHE_CHECK([whether sleep supports fractional seconds],
+ am_cv_sleep_fractional_seconds, [dnl
+AS_IF([sleep 0.001 2>/dev/null], [am_cv_sleep_fractional_seconds=yes],
+ [am_cv_sleep_fractional_seconds=no])
+])])
+
+# _AM_FILESYSTEM_TIMESTAMP_RESOLUTION
+# -----------------------------------
+# Determine the filesystem's resolution for file modification
+# timestamps. The coarsest we know of is FAT, with a resolution
+# of only two seconds, even with the most recent "exFAT" extensions.
+# The finest (e.g. ext4 with large inodes, XFS, ZFS) is one
+# nanosecond, matching clock_gettime. However, it is probably not
+# possible to delay execution of a shell script for less than one
+# millisecond, due to process creation overhead and scheduling
+# granularity, so we don't check for anything finer than that. (See below.)
+AC_DEFUN([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION], [dnl
+AC_REQUIRE([_AM_SLEEP_FRACTIONAL_SECONDS])
+AC_CACHE_CHECK([filesystem timestamp resolution],
+ am_cv_filesystem_timestamp_resolution, [dnl
+# Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `[ls -t conftest.ts[12]]` &&
+ {
+ test "$[]*" != "X conftest.ts1 conftest.ts2" ||
+ test "$[]*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ _AS_ECHO_UNQUOTED(
+ ["Bad output from ls -t: \"`[ls -t conftest.ts[12]]`\""],
+ [AS_MESSAGE_LOG_FD])
+ AC_MSG_FAILURE([ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.])
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$[]2" = conftest.ts3 &&
+ test "$[]3" = conftest.ts2 &&
+ test "$[]4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+])])
+
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
+[AC_REQUIRE([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION])
+# This check should not be cached, as it may vary across builds of
+# different projects.
+AC_MSG_CHECKING([whether build environment is sane])
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -953,49 +1086,40 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[]*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$[]2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
- alias in your environment])
- fi
- if test "$[2]" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
+AC_MSG_RESULT([$am_build_env_is_sane])
+if test "$am_build_env_is_sane" = no; then
+ AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT([yes])
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+AS_IF([test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1],, [dnl
+ ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
-fi
+])
AC_CONFIG_COMMANDS_PRE(
[AC_MSG_CHECKING([that generated files are newer than configure])
if test -n "$am_sleep_pid"; then
@@ -1006,18 +1130,18 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2021 Free Software Foundation, Inc.
+# Copyright (C) 2009-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
+# _AM_SILENT_RULES
+# ----------------
+# Enable less verbose build rules support.
+AC_DEFUN([_AM_SILENT_RULES],
+[AM_DEFAULT_VERBOSITY=1
+AC_ARG_ENABLE([silent-rules], [dnl
AS_HELP_STRING(
[--enable-silent-rules],
[less verbose build output (undo: "make V=1")])
@@ -1025,11 +1149,6 @@
[--disable-silent-rules],
[verbose build output (undo: "make V=0")])dnl
])
-case $enable_silent_rules in @%:@ (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
dnl
dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
dnl do not support nested variable expansions.
@@ -1048,6 +1167,21 @@
else
am_cv_make_support_nested_variables=no
fi])
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+dnl Delay evaluation of AM_DEFAULT_VERBOSITY to the end to allow multiple calls
+dnl to AM_SILENT_RULES to change the default value.
+AC_CONFIG_COMMANDS_PRE([dnl
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
if test $am_cv_make_support_nested_variables = yes; then
dnl Using '$V' instead of '$(V)' breaks IRIX make.
AM_V='$(V)'
@@ -1056,17 +1190,18 @@
AM_V=$AM_DEFAULT_VERBOSITY
AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])dnl
])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Set the default verbosity level to DEFAULT ("yes" being less verbose, "no" or
+# empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_REQUIRE([_AM_SILENT_RULES])
+AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1094,7 +1229,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2021 Free Software Foundation, Inc.
+# Copyright (C) 2006-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1113,7 +1248,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2021 Free Software Foundation, Inc.
+# Copyright (C) 2004-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1159,15 +1294,19 @@
am_uid=`id -u || echo unknown`
am_gid=`id -g || echo unknown`
AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
- if test $am_uid -le $am_max_uid; then
- AC_MSG_RESULT([yes])
+ if test x$am_uid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current UID is ok, but dist-ustar might not work])
+ elif test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT([no])
- _am_tools=none
+ AC_MSG_RESULT([no])
+ _am_tools=none
fi
AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
- if test $am_gid -le $am_max_gid; then
- AC_MSG_RESULT([yes])
+ if test x$gm_gid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current GID is ok, but dist-ustar might not work])
+ elif test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
_am_tools=none
@@ -1244,6 +1383,26 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_XARGS_N
+# ----------------
+# Check whether 'xargs -n' works. It should work everywhere, so the fallback
+# is not optimized at all as we never expect to use it.
+AC_DEFUN([_AM_PROG_XARGS_N],
+[AC_CACHE_CHECK([xargs -n works], am_cv_xargs_n_works, [dnl
+AS_IF([test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"], [am_cv_xargs_n_works=yes], [am_cv_xargs_n_works=no])])
+AS_IF([test "$am_cv_xargs_n_works" = yes], [am__xargs_n='xargs -n'], [dnl
+ am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "$@" "$am__xargs_n_arg"; done; }'
+])dnl
+AC_SUBST(am__xargs_n)
+])
+
m4_include([../../m4/kpse-common.m4])
m4_include([../../m4/kpse-lib-version.m4])
m4_include([../../m4/kpse-mktex.m4])
Modified: branches/stable/source/src/texk/kpathsea/c-auto.in
===================================================================
--- branches/stable/source/src/texk/kpathsea/c-auto.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/kpathsea/c-auto.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -23,7 +23,7 @@
#define KPATHSEA_C_AUTO_H
/* kpathsea: the version string. */
-#define KPSEVERSION "kpathsea version 6.4.0"
+#define KPSEVERSION "kpathsea version 6.4.0/dev"
/* Define to 1 if the 'closedir' function returns void instead of int. */
#undef CLOSEDIR_VOID
@@ -74,6 +74,9 @@
/* Define to 1 if you have the 'memcpy' function. */
#undef HAVE_MEMCPY
+/* Define to 1 if you have the <minix/config.h> header file. */
+#undef HAVE_MINIX_CONFIG_H
+
/* Define to 1 if you have the 'mkstemp' function. */
#undef HAVE_MKSTEMP
@@ -133,6 +136,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to 1 if you have the <wchar.h> header file. */
+#undef HAVE_WCHAR_H
+
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
@@ -193,6 +199,98 @@
backward compatibility; new code need not use it. */
#undef STDC_HEADERS
+/* Enable extensions on AIX, Interix, z/OS. */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable general extensions on macOS. */
+#ifndef _DARWIN_C_SOURCE
+# undef _DARWIN_C_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable X/Open compliant socket functions that do not require linking
+ with -lxnet on HP-UX 11.11. */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# undef _HPUX_ALT_XOPEN_SOCKET_API
+#endif
+/* Identify the host operating system as Minix.
+ This macro does not affect the system headers' behavior.
+ A future release of Autoconf may stop defining this macro. */
+#ifndef _MINIX
+# undef _MINIX
+#endif
+/* Enable general extensions on NetBSD.
+ Enable NetBSD compatibility extensions on Minix. */
+#ifndef _NETBSD_SOURCE
+# undef _NETBSD_SOURCE
+#endif
+/* Enable OpenBSD compatibility extensions on NetBSD.
+ Oddly enough, this does nothing on OpenBSD. */
+#ifndef _OPENBSD_SOURCE
+# undef _OPENBSD_SOURCE
+#endif
+/* Define to 1 if needed for POSIX-compatible behavior. */
+#ifndef _POSIX_SOURCE
+# undef _POSIX_SOURCE
+#endif
+/* Define to 2 if needed for POSIX-compatible behavior. */
+#ifndef _POSIX_1_SOURCE
+# undef _POSIX_1_SOURCE
+#endif
+/* Enable POSIX-compatible threading on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# undef __STDC_WANT_IEC_60559_BFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# undef __STDC_WANT_IEC_60559_DFP_EXT__
+#endif
+/* Enable extensions specified by C23 Annex F. */
+#ifndef __STDC_WANT_IEC_60559_EXT__
+# undef __STDC_WANT_IEC_60559_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#endif
+/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# undef __STDC_WANT_IEC_60559_TYPES_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */
+#ifndef __STDC_WANT_LIB_EXT2__
+# undef __STDC_WANT_LIB_EXT2__
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009. */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# undef __STDC_WANT_MATH_SPEC_FUNCS__
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable X/Open extensions. Define to 500 only if necessary
+ to make mbstate_t available. */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
+#endif
+
+
/* Version number of package */
#undef VERSION
Modified: branches/stable/source/src/texk/kpathsea/configure
===================================================================
--- branches/stable/source/src/texk/kpathsea/configure 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/kpathsea/configure 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for Kpathsea 6.4.0.
+# Generated by GNU Autoconf 2.72 for Kpathsea 6.4.0/dev.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -614,8 +614,8 @@
# Identity of this package.
PACKAGE_NAME='Kpathsea'
PACKAGE_TARNAME='kpathsea'
-PACKAGE_VERSION='6.4.0'
-PACKAGE_STRING='Kpathsea 6.4.0'
+PACKAGE_VERSION='6.4.0/dev'
+PACKAGE_STRING='Kpathsea 6.4.0/dev'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -716,6 +716,8 @@
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
+am__xargs_n
+am__rm_f_notfound
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -1372,7 +1374,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 Kpathsea 6.4.0 to adapt to many kinds of systems.
+'configure' configures Kpathsea 6.4.0/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1443,7 +1445,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Kpathsea 6.4.0:";;
+ short | recursive ) echo "Configuration of Kpathsea 6.4.0/dev:";;
esac
cat <<\_ACEOF
@@ -1572,7 +1574,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Kpathsea configure 6.4.0
+Kpathsea configure 6.4.0/dev
generated by GNU Autoconf 2.72
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -1626,6 +1628,41 @@
} # ac_fn_c_try_compile
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ eval "$3=yes"
+else case e in #(
+ e) eval "$3=no" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+eval ac_res=\$$3
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
# ac_fn_c_try_link LINENO
# -----------------------
# Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -1674,41 +1711,6 @@
} # ac_fn_c_try_link
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
- eval "$3=yes"
-else case e in #(
- e) eval "$3=no" ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
-fi
-eval ac_res=\$$3
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
# ac_fn_c_check_func LINENO FUNC VAR
# ----------------------------------
# Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -2353,7 +2355,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Kpathsea $as_me 6.4.0, which was
+It was created by Kpathsea $as_me 6.4.0/dev, which was
generated by GNU Autoconf 2.72. Invocation command line was
$ $0$ac_configure_args_raw
@@ -2624,6 +2626,7 @@
>$cache_file
fi
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
# Test code for whether the C compiler supports C89 (global declarations)
ac_c_conftest_c89_globals='
/* Does the compiler advertise C89 conformance?
@@ -2949,7 +2952,6 @@
}
"
-as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
@@ -2958,6 +2960,8 @@
as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
+as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
# Auxiliary files required by this configure script.
ac_aux_files="config.guess config.sub ltmain.sh ar-lib compile missing install-sh"
@@ -3131,7 +3135,7 @@
-KPSEVERSION=6.4.0
+KPSEVERSION=6.4.0/dev
KPSE_LT_VERSINFO=10:0:4
@@ -3138,10 +3142,10 @@
- WEB2CVERSION=" (TeX Live 2024)"
+ WEB2CVERSION=" (TeX Live 2025/dev)"
-am__api_version='1.16'
+am__api_version='1.17'
@@ -3244,6 +3248,165 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
+printf %s "checking whether sleep supports fractional seconds... " >&6; }
+if test ${am_cv_sleep_fractional_seconds+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if sleep 0.001 2>/dev/null
+then :
+ am_cv_sleep_fractional_seconds=yes
+else case e in #(
+ e) am_cv_sleep_fractional_seconds=no ;;
+esac
+fi
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
+printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; }
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
+printf %s "checking filesystem timestamp resolution... " >&6; }
+if test ${am_cv_filesystem_timestamp_resolution+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) # Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `ls -t conftest.ts[12]` &&
+ {
+ test "$*" != "X conftest.ts1 conftest.ts2" ||
+ test "$*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.
+See 'config.log' for more details" "$LINENO" 5; }
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$2" = conftest.ts3 &&
+ test "$3" = conftest.ts2 &&
+ test "$4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
+printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; }
+
+# This check should not be cached, as it may vary across builds of
+# different projects.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
printf %s "checking whether build environment is sane... " >&6; }
# Reject unsafe characters in $srcdir or the absolute working directory
@@ -3264,49 +3427,45 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
- if test "$2" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$2" = conftest.file
- )
-then
- # Ok.
- :
-else
- as_fn_error $? "newly created file is older than distributed files!
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
+printf "%s\n" "$am_build_env_is_sane" >&6; }
+if test "$am_build_env_is_sane" = no; then
+ as_fn_error $? "newly created file is older than distributed files!
Check your system clock" "$LINENO" 5
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+if test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1
+then :
+
+else case e in #(
+ e) ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
+ ;;
+esac
fi
rm -f conftest.file
@@ -3596,6 +3755,7 @@
fi
rmdir .tst 2>/dev/null
+AM_DEFAULT_VERBOSITY=1
# Check whether --enable-silent-rules was given.
if test ${enable_silent_rules+y}
then :
@@ -3602,11 +3762,6 @@
enableval=$enable_silent_rules;
fi
-case $enable_silent_rules in # (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=1;;
-esac
am_make=${MAKE-make}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
printf %s "checking whether $am_make supports nested variables... " >&6; }
@@ -3629,18 +3784,44 @@
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
AM_BACKSLASH='\'
+am__rm_f_notfound=
+if (rm -f && rm -fr && rm -rf) 2>/dev/null
+then :
+else case e in #(
+ e) am__rm_f_notfound='""' ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
+printf %s "checking xargs -n works... " >&6; }
+if test ${am_cv_xargs_n_works+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"
+then :
+ am_cv_xargs_n_works=yes
+else case e in #(
+ e) am_cv_xargs_n_works=no ;;
+esac
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
+printf "%s\n" "$am_cv_xargs_n_works" >&6; }
+if test "$am_cv_xargs_n_works" = yes
+then :
+ am__xargs_n='xargs -n'
+else case e in #(
+ e) am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "" "$am__xargs_n_arg"; done; }'
+ ;;
+esac
+fi
@@ -3647,6 +3828,10 @@
+
+
+
+
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -4884,7 +5069,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -4920,6 +5105,183 @@
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+ if test $ac_cache; then
+ ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+ if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+ printf "%s\n" "#define $ac_item 1" >> confdefs.h
+ fi
+ ac_header= ac_cache=
+ elif test $ac_header; then
+ ac_cache=$ac_item
+ else
+ ac_header=$ac_item
+ fi
+done
+
+
+
+
+
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+
+
+
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test ${ac_cv_safe_to_define___extensions__+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+# define __EXTENSIONS__ 1
+ $ac_includes_default
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_safe_to_define___extensions__=yes
+else case e in #(
+ e) ac_cv_safe_to_define___extensions__=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
+if test ${ac_cv_should_define__xopen_source+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_cv_should_define__xopen_source=no
+ if test $ac_cv_header_wchar_h = yes
+then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <wchar.h>
+ mbstate_t x;
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #define _XOPEN_SOURCE 500
+ #include <wchar.h>
+ mbstate_t x;
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_should_define__xopen_source=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+
+ printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+
+ printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+ printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+ if test $ac_cv_header_minix_config_h = yes
+then :
+ MINIX=yes
+ printf "%s\n" "#define _MINIX 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+else case e in #(
+ e) MINIX= ;;
+esac
+fi
+ if test $ac_cv_safe_to_define___extensions__ = yes
+then :
+ printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
+
+fi
+ if test $ac_cv_should_define__xopen_source = yes
+then :
+ printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
+
+fi
+
# Check whether --enable-compiler-warnings was given.
if test ${enable_compiler_warnings+y}
then :
@@ -8779,35 +9141,6 @@
esac
}
-ac_header= ac_cache=
-for ac_item in $ac_header_c_list
-do
- if test $ac_cache; then
- ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
- if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
- printf "%s\n" "#define $ac_item 1" >> confdefs.h
- fi
- ac_header= ac_cache=
- elif test $ac_header; then
- ac_cache=$ac_item
- else
- ac_header=$ac_item
- fi
-done
-
-
-
-
-
-
-
-
-if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
-then :
-
-printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
"
if test "x$ac_cv_header_dlfcn_h" = xyes
@@ -8902,6 +9235,8 @@
echo 'tldbg:KPSE_COMMON called (pkg=kpathsea, amopt=)' >&5
echo 'tldbg:KPSE_BASIC called (pkg=kpathsea, amopt=)' >&5
+#
+# am_init_automake
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
@@ -8924,7 +9259,7 @@
# Define the identity of the package.
PACKAGE='kpathsea'
- VERSION='6.4.0'
+ VERSION='6.4.0/dev'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -8985,49 +9320,13 @@
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
+# am_maintainer_mode
-END
- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
- fi
-fi
-
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
@@ -9052,6 +9351,11 @@
MAINT=$MAINTAINER_MODE_TRUE
+
+# See comments in kpse-setup.m4 about system extensions.
+
+
+# Check whether prototypes work.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5
printf %s "checking whether the compiler accepts prototypes... " >&6; }
if test ${kb_cv_c_prototypes+y}
@@ -9085,6 +9389,8 @@
if test "x$kb_cv_c_prototypes" = xno; then
as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5
fi
+
+# kpse_compiler_warnings options.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
printf %s "checking what warning flags to pass to the C compiler... " >&6; }
if test ${kpse_cv_warning_cflags+y}
@@ -9142,6 +9448,9 @@
+# end of kpse_basic macro.
+echo 'tldbg:KPSE_BASIC done (pkg=kpathsea, amopt=)' >&5
+
# am_prog_ar must be called before lt_init.
if test -n "$ac_tool_prefix"; then
@@ -9257,6 +9566,7 @@
fi
: ${AR=ar}
+: ${ARFLAGS=cr}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
printf %s "checking the archiver ($AR) interface... " >&6; }
@@ -9277,7 +9587,7 @@
_ACEOF
if ac_fn_c_try_compile "$LINENO"
then :
- am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
+ am_ar_try='$AR $ARFLAGS libconftest.a conftest.$ac_objext >&5'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
(eval $am_ar_try) 2>&5
ac_status=$?
@@ -15509,6 +15819,18 @@
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
printf "%s\n" "done" >&6; }
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -15940,7 +16262,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Kpathsea $as_me 6.4.0, which was
+This file was extended by Kpathsea $as_me 6.4.0/dev, which was
generated by GNU Autoconf 2.72. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16008,7 +16330,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-Kpathsea config.status 6.4.0
+Kpathsea config.status 6.4.0/dev
configured by $0, generated by GNU Autoconf 2.72,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/texk/kpathsea/doc/Makefile.in
===================================================================
--- branches/stable/source/src/texk/kpathsea/doc/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/kpathsea/doc/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,6 +69,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -191,10 +193,9 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
+ { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
}
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(kpathsea_TEXINFOS) $(srcdir)/Makefile.in \
@@ -283,8 +284,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -393,13 +396,13 @@
.texi.dvi:
$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
- $(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
+ $(TEXI2DVI) $(AM_TEXI2FLAGS) -I $(srcdir) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
$<
.texi.pdf:
$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
- $(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
+ $(TEXI2PDF) $(AM_TEXI2FLAGS) -I $(srcdir) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
$<
.texi.html:
@@ -496,11 +499,10 @@
done
mostlyclean-aminfo:
- -rm -rf kpathsea.t2d kpathsea.t2p
+ -$(am__rm_rf) kpathsea.t2d kpathsea.t2p
clean-aminfo:
- -test -z "kpathsea.dvi kpathsea.pdf kpathsea.ps kpathsea.html" \
- || rm -rf kpathsea.dvi kpathsea.pdf kpathsea.ps kpathsea.html
+ -$(am__rm_rf) kpathsea.dvi kpathsea.pdf kpathsea.ps kpathsea.html
maintainer-clean-aminfo:
@list='$(INFO_DEPS)'; for i in $$list; do \
@@ -581,8 +583,8 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -770,3 +772,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/texk/kpathsea/man/Makefile.in
===================================================================
--- branches/stable/source/src/texk/kpathsea/man/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/kpathsea/man/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,6 +69,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -149,10 +151,9 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
+ { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
}
man1dir = $(mandir)/man1
am__installdirs = "$(DESTDIR)$(man1dir)"
@@ -244,8 +245,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -453,9 +456,9 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -581,3 +584,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/texk/kpathsea/texmf.cnf
===================================================================
--- branches/stable/source/src/texk/kpathsea/texmf.cnf 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/kpathsea/texmf.cnf 2024-07-21 17:12:46 UTC (rev 933)
@@ -652,6 +652,7 @@
extractbb,\
gregorio,\
kpsewhich,\
+l3sys-query,\
makeindex,\
memoize-extract.pl,\
memoize-extract.py,\
@@ -659,7 +660,7 @@
r-mpost,\
texosquery-jre8,\
-% we'd like to allow:
+% other programs considered:
% dvips - but external commands can be executed, need at least -R1.
% epspdf, ps2pdf, pstopdf - need to respect openout_any,
% and gs -dSAFER must be used and check for shell injection with filenames.
@@ -737,9 +738,9 @@
file_line_error_style = f
% Enable the mktex... scripts by default? These must be set to 0 or 1.
-% Particular programs can and do override these settings, for example
-% dvips's -M option. Your first chance to specify whether the scripts
-% are invoked by default is at configure time.
+% The values shown here are the compile-time defaults for original TeX Live;
+% they can be overridden at compile time with configure options,
+% or at runtime with environment variables or program options.
%
% These values are ignored if the script names are changed; e.g., if you
% set DVIPSMAKEPK to `foo', what counts is the value of the environment
@@ -746,12 +747,12 @@
% variable/config value `FOO', not the `MKTEXPK' value.
%
%MKTEXTEX = 0
-%MKTEXPK = 0
-%MKTEXMF = 0
-%MKTEXTFM = 0
-%MKTEXFMT = 0
-%MKOCP = 0
-%MKOFM = 0
+%MKTEXPK = 1
+%MKTEXMF = 1
+%MKTEXTFM = 1
+%MKTEXFMT = 1
+%MKOCP = 1
+%MKOFM = 1
% Used by makempx to run TeX. We use "etex" because MetaPost is
% expecting DVI, and not "tex" because we want first line parsing.
@@ -940,3 +941,11 @@
% command_line_encoding = none
% in a texmf.cnf prefered, for example $TEXMFLOCAL/web2c/texmf.cnf.
command_line_encoding = utf-8
+
+% From TeX Live 2024, the engine for ptex, eptex, platex, and
+% platex-dev is euptex. Therefore the function should be switched off
+% for ptex, eptex, platex and platex-dev.
+command_line_encoding.ptex = none
+command_line_encoding.eptex = none
+command_line_encoding.platex = none
+command_line_encoding.platex-dev = none
Modified: branches/stable/source/src/texk/kpathsea/version.ac
===================================================================
--- branches/stable/source/src/texk/kpathsea/version.ac 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/kpathsea/version.ac 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,4 +1,4 @@
-dnl $Id: version.ac 69711 2024-02-05 17:23:27Z karl $
+dnl $Id: version.ac 70630 2024-03-13 22:40:16Z karl $
dnl Copyright 2016-2024 Karl Berry <tex-live at tug.org>
dnl Copyright 2011-2015 Peter Breitenlohner <tex-live at tug.org>
dnl
@@ -23,4 +23,4 @@
dnl --------------------------------------------------------
dnl
dnl This file is m4-included from configure.ac.
-m4_define([kpse_version], [6.4.0])
+m4_define([kpse_version], [6.4.0/dev])
Modified: branches/stable/source/src/texk/kpathsea/win32/ChangeLog
===================================================================
--- branches/stable/source/src/texk/kpathsea/win32/ChangeLog 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/kpathsea/win32/ChangeLog 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,3 +1,10 @@
+2024-05-09 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
+
+ * mktexpk.c, mktextfm.c: Add xputenv("TEXMF_OUTPUT_DIRECTORY", "")
+ to disable output-directory option in METAFONT passed on from a
+ parent program.
+ mktexupd.c: Remove unnecessary messages.
+
2023-07-08 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
* mktextfm.c: remove an unused variable.
Modified: branches/stable/source/src/texk/kpathsea/win32/Makefile.in
===================================================================
--- branches/stable/source/src/texk/kpathsea/win32/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/kpathsea/win32/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -70,6 +70,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -298,8 +300,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -457,16 +461,11 @@
`; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ cd "$(DESTDIR)$(bindir)" && $(am__rm_f) $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ $(am__rm_f) $(bin_PROGRAMS)
+ test -z "$(EXEEXT)" || $(am__rm_f) $(bin_PROGRAMS:$(EXEEXT)=)
mktexfmt$(EXEEXT): $(mktexfmt_OBJECTS) $(mktexfmt_DEPENDENCIES) $(EXTRA_mktexfmt_DEPENDENCIES)
@rm -f mktexfmt$(EXEEXT)
@@ -511,7 +510,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+ @: >>$@
am--depfiles: $(am__depfiles_remade)
@@ -660,8 +659,8 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -671,7 +670,7 @@
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/dirutil.Po
+ -rm -f ./$(DEPDIR)/dirutil.Po
-rm -f ./$(DEPDIR)/getdestdir.Po
-rm -f ./$(DEPDIR)/mkpaths.Po
-rm -f ./$(DEPDIR)/mktexfmt.Po
@@ -727,7 +726,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/dirutil.Po
+ -rm -f ./$(DEPDIR)/dirutil.Po
-rm -f ./$(DEPDIR)/getdestdir.Po
-rm -f ./$(DEPDIR)/mkpaths.Po
-rm -f ./$(DEPDIR)/mktexfmt.Po
@@ -790,3 +789,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/texk/kpathsea/win32/mktexpk.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/win32/mktexpk.c 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/kpathsea/win32/mktexpk.c 2024-07-21 17:12:46 UTC (rev 933)
@@ -307,6 +307,11 @@
progname = kpse_program_name;
/*
+ * disable output_directory in mktexpk (2024/05/09)
+ */
+ xputenv("TEXMF_OUTPUT_DIRECTORY", "");
+
+/*
* get tex binary dir
*
*/
Modified: branches/stable/source/src/texk/kpathsea/win32/mktextfm.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/win32/mktextfm.c 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/kpathsea/win32/mktextfm.c 2024-07-21 17:12:46 UTC (rev 933)
@@ -97,6 +97,11 @@
progname = kpse_program_name;
/*
+ * disable output_directory in mktextfm (2024/05/09)
+ */
+ xputenv("TEXMF_OUTPUT_DIRECTORY", "");
+
+/*
* get tex binary dir
*
*/
Modified: branches/stable/source/src/texk/kpathsea/win32/mktexupd.c
===================================================================
--- branches/stable/source/src/texk/kpathsea/win32/mktexupd.c 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/kpathsea/win32/mktexupd.c 2024-07-21 17:12:46 UTC (rev 933)
@@ -86,8 +86,7 @@
f = fopen (lsrname, "ab");
fprintf (f, "\n.%s:\n%s\n", pa, fname);
fclose (f);
- } else
- fprintf(stderr, "mktexupd failed\n");
+ }
for (i = 0; i < numtree; i++)
free (pathbuff[i]);
free (pathbuff);
Modified: branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm
===================================================================
--- branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/tests/TeXLive/TLUtils.pm 2024-07-21 17:12:46 UTC (rev 933)
@@ -7,7 +7,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 69980 $';
+my $svnrev = '$Revision: 71593 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -2267,7 +2267,7 @@
C<$progext> to check if commands can be run. Use the function reference
C<$run_postinst_cmd> to actually run the commands. The return status is
zero if all succeeded, nonzero otherwise. If the main ConTeXt program
-(C<luametatex>) cannot be run at all, the return status is status.
+(C<luametatex>) cannot be run at all, the return status is zero.
Functions C<info> and C<debug> are called with status reports.
@@ -2289,7 +2289,7 @@
# can be done about it.
my $lmtx = "$bindir/luametatex$progext";
if (TeXLive::TLUtils::system_ok("$lmtx --version")) {
- info("setting up ConTeXt cache: ");
+ info("setting up ConTeXt caches: ");
$errcount += &$run_postinst_cmd("mtxrun --generate");
#
# If mtxrun failed, don't bother trying more.
@@ -2296,9 +2296,17 @@
if ($errcount == 0) {
$errcount += &$run_postinst_cmd("context --luatex --generate");
#
+ # This is for finding fonts by font name (the --generate suffices
+ # for file name). Although ConTeXt does some automatic cache
+ # regeneration, Hans advises that this manual reload can help, and
+ # should be no harm.
+ # https://wiki.contextgarden.net/Use_the_fonts_you_want
+ # https://wiki.contextgarden.net/Mtxrun#base and #fonts
+ $errcount += &$run_postinst_cmd("mtxrun --script fonts --reload");
+ #
# If context succeeded too, try luajittex. Missing on some platforms.
# Although we build luajittex normally, instead of importing the
- # binary, testing for file existence should suffice, we may as
+ # binary, so testing for file existence should suffice, we may as
# well test execution since it's just as easy.
#
if ($errcount == 0) {
@@ -2635,7 +2643,7 @@
if (!$checksum && !$checksize) {
tlwarn("$fn_name: neither checksum nor checksize " .
- "available for $xzfile, cannot check integrity");
+ "available for $xzfile, cannot check integrity\n");
return;
}
@@ -4857,6 +4865,13 @@
return @ret;
}
+=item C<< report_tlpdb_differences($rret) >>
+
+Report, using info function, as given in hash reference argument RET,
+with keys removed_packages, added_packages, different_packages.
+
+=cut
+
sub report_tlpdb_differences {
my $rret = shift;
my %ret = %$rret;
@@ -4875,19 +4890,29 @@
}
if (defined($ret{'different_packages'})) {
info ("different packages from A to B:\n");
+ my $printed_fmttriggers_msg = 0;
for my $p (sort keys %{$ret{'different_packages'}}) {
- info (" $p\n");
+ info (" $p:\n");
for my $k (sort keys %{$ret{'different_packages'}->{$p}}) {
if ($k eq "revision") {
- info(" revision differ: $ret{'different_packages'}->{$p}->{$k}\n");
+ info(" revision differ: $ret{'different_packages'}->{$p}->{$k}\n");
} elsif ($k eq "removed" || $k eq "added") {
- info(" $k files:\n");
+ info (" $k files:\n");
for my $f (sort @{$ret{'different_packages'}->{$p}->{$k}}) {
- info(" $f\n");
+ info (" $f\n");
}
+ } elsif ($k eq "fmttriggers") {
+ # fmttriggers; don't bother making a complete report.
+ # The fmttriggers will differ when the global variables in
+ # 00texlive.autopatterns.tlpsrc change but we forgot to
+ # tlforceincr all the packages that depend on the variables.
+ # Which happens depressingly often.
+ info(" $k differ)\n");
+ info("(if 00texlive.autopatterns change, tlforceincr dependents.)\n")
+ if ! $printed_fmttriggers_msg; # just show once
+ $printed_fmttriggers_msg = 1;
} else {
- # e.g., fmttriggers; don't bother making a nice report.
- info(" unknown differ $k\n");
+ info(" $k differ\n");
}
}
}
Modified: branches/stable/source/src/texk/web2c/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/ChangeLog 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/ChangeLog 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,3 +1,94 @@
+2024-07-14 Andreas Scherer <https://ascherer.github.io>
+
+ * mft.ch: Preserve Metafont logo on title page.
+
+2024-06-28 Andreas Scherer <https://ascherer.github.io>
+
+ * cwebdir/ctwill-w2c.ch,
+ * tests/fix-changefile-lines.py,
+ * tex.ch: Simpler check for 'change section'.
+
+2024-06-24 Andreas Scherer <https://ascherer.github.io>
+
+ * tests/fix-changefile-lines.py,
+ * bibtex.ch: Update a few tags.
+
+2024-06-15 Andreas Scherer <https://ascherer.github.io>
+
+ * tests/fix-changefile-lines.py,
+ * dvicopy.ch: Output '@x' with optional information.
+
+2024-06-05 Andreas Scherer <https://ascherer.github.io>
+
+ * tests/fix-changefile-lines.py,
+ * tangle.ch,
+ * weave.ch: Correctly count section start markers.
+ * mf.ch,
+ * tex.ch: Recount parts and sections.
+
+2024-06-03 David Fuchs <drfuchs at yahoo.com>
+
+ * tex.ch (check_outer_validity): don't check unless OK_to_interrupt,
+ to avoid getting into an erroneous state if an \outer token
+ is deleted interactively.
+ Report from Tyge Thiessen:
+ https://tug.org/pipermail/tex-k/2024-March/004021.html
+ DEK bug entry: https://tug.org/texmfbug/newbug.html#B142outer
+
+2024-06-03 Karl Berry <karl at freefriends.org>
+
+ * tests/fix-changefile-lines.py: new script from Tyge Thiessen
+ to update the chapter/section/line numbers in a .ch file,
+ following my request:
+ https://tug.org/pipermail/tex-k/2024-June/004064.html
+ * tex.ch,
+ * mf.ch: update with the script.
+
+ * unbalanced-braces.ch: tweak text.
+
+2024-04-28 Luigi Scarso <luigi.scarso at gmail.com>
+
+ * configure.ac (LUA53_DEFINES, LUA52_DEFINES, LUAJIT_DEFINES):
+ define _LARGEFILE_SOURCE to help avoid off64_t errors. Specifically:
+
+In file included from /home/texlive/karl/Build/source/Work/libs/zziplib/include/zzip/types.h:25,
+ from /home/texlive/karl/Build/source/Work/libs/zziplib/include/zzip/zzip.h:17,
+ from ../../../texk/web2c/luatexdir/luazip/src/luazip.c:13:
+/home/texlive/karl/Build/source/Work/libs/zziplib/include/zzip/conf.h:50:23: error: unknown type name 'off64_t'
+ #define _zzip_off64_t off64_t
+ ^~~~~~~
+/home/texlive/karl/Build/source/Work/libs/zziplib/include/zzip/types.h:35:15: note: in expansion of macro '_zzip_off64_t'
+ typedef _zzip_off64_t zzip_off64_t;
+ ^~~~~~~~~~~~~
+make[5]: *** [Makefile:10380: luatexdir/luazip/src/libluajitmisc_a-luazip.o] Error 1
+
+2024-04-21 Karl Berry <karl at freefriends.org>
+
+ * configure.ac (AC_USE_SYSTEM_EXTENSIONS): make it unconditional,
+ since otherwise we get:
+make[5]: *** No rule to make target 'basechsuffix.', needed by 'lib.a'. Stop.
+
+2024-04-18 Karl Berry <karl at freefriends.org>
+
+ * configure.ac (AC_USE_SYSTEM_EXTENSIONS) [enable_luatex]: call this.
+ From the Makefile of busytex, via Luigi mail to karl
+ of 12 Apr 2024 06:26:23:
+ "For example `gethostbyaddr()` requires `_GNU_SOURCE` or similar".
+
+2024-04-14 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * ac/web2c.ac (eptex), Makefile.am,
+ euptexdir/am/euptex.am, eptexdir/*: Remove eptex and eptexdir/.
+ * {mftraptest,triptest}.test:
+ Filter Web2C year/dev in banner.
+
+2024-03-24 Karl Berry <karl at freefriends.org>
+
+ * unbalanced-braces.ch: fix from DRF in order to make
+ \aftergroup work again with the output routine. Report
+ from David Carlisle and Frank Mittelbach, thread starts at:
+ https://tug.org/pipermail/tex-live/2024-March/050290.html
+
2024-03-10 Karl Berry <karl at tug.org>
* TL'24 release.
Modified: branches/stable/source/src/texk/web2c/Makefile.am
===================================================================
--- branches/stable/source/src/texk/web2c/Makefile.am 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/Makefile.am 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,4 +1,4 @@
-## $Id: Makefile.am 69664 2024-02-01 22:56:12Z karl $
+## $Id: Makefile.am 70943 2024-04-14 05:29:13Z takuji $
## Makefile.am for the TeX Live subdirectory texk/web2c/.
##
## Copyright 2017-2024 Karl Berry <tex-live at tug.org>
@@ -272,9 +272,6 @@
## pTeX
include $(srcdir)/ptexdir/am/ptex.am
-## e-pTeX
-include $(srcdir)/eptexdir/am/eptex.am
-
## upTeX
include $(srcdir)/uptexdir/am/uptex.am
Modified: branches/stable/source/src/texk/web2c/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -75,6 +75,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -96,8 +98,8 @@
EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEEXT) \
mf-nowin$(EXEEXT) mflua$(EXEEXT) mflua-nowin$(EXEEXT) \
mfluajit$(EXEEXT) mfluajit-nowin$(EXEEXT) mpost$(EXEEXT) \
- pmpost$(EXEEXT) upmpost$(EXEEXT) etex$(EXEEXT) eptex$(EXEEXT) \
- uptex$(EXEEXT) $(am__EXEEXT_2) euptex$(EXEEXT) pdftex$(EXEEXT) \
+ pmpost$(EXEEXT) upmpost$(EXEEXT) etex$(EXEEXT) uptex$(EXEEXT) \
+ $(am__EXEEXT_2) euptex$(EXEEXT) pdftex$(EXEEXT) \
ttf2afm$(EXEEXT) pdftosrc$(EXEEXT) luatex$(EXEEXT) \
luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \
xetex$(EXEEXT) $(am__EXEEXT_3) aleph$(EXEEXT) synctex$(EXEEXT) \
@@ -113,23 +115,22 @@
$(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \
$(am__EXEEXT_23) $(am__EXEEXT_24) $(am__EXEEXT_25) \
$(am__EXEEXT_26) $(am__EXEEXT_27) $(am__EXEEXT_28) \
- $(am__EXEEXT_29) $(am__EXEEXT_30) $(am__EXEEXT_31)
+ $(am__EXEEXT_29) $(am__EXEEXT_30)
noinst_PROGRAMS = tangleboot$(EXEEXT) ctangleboot$(EXEEXT) \
- $(am__EXEEXT_32) $(am__EXEEXT_33) $(am__EXEEXT_34) \
- $(am__EXEEXT_35) $(am__EXEEXT_36) $(am__EXEEXT_37) \
- $(am__EXEEXT_38) $(am__EXEEXT_39) $(am__EXEEXT_40) \
- $(am__EXEEXT_41) $(am__EXEEXT_42)
-TESTS = tangle.test $(am__EXEEXT_45) ctiedir/ctie.test \
+ $(am__EXEEXT_31) $(am__EXEEXT_32) $(am__EXEEXT_33) \
+ $(am__EXEEXT_34) $(am__EXEEXT_35) $(am__EXEEXT_36) \
+ $(am__EXEEXT_37) $(am__EXEEXT_38) $(am__EXEEXT_39) \
+ $(am__EXEEXT_40) $(am__EXEEXT_41)
+TESTS = tangle.test $(am__EXEEXT_44) ctiedir/ctie.test \
cwebdir/ctwill.test cwebdir/cweave.test tiedir/tie.test \
$(am__append_6) $(am__append_16) $(am__append_25) \
$(am__append_34) $(am__append_42) $(am__append_55) \
$(am__append_56) $(am__append_58) $(am__append_62) \
- $(am__EXEEXT_46) $(am__append_68) $(am__append_73) \
- $(am__append_76) $(am__append_81) $(am__append_86) \
- $(am__append_89) $(am__append_110) $(am__append_111) \
- $(am__append_112) $(am__append_113) $(am__append_121) \
- $(am__append_123) $(am__append_125) $(am__append_152) \
- libmd5/md5.test
+ $(am__EXEEXT_45) $(am__append_68) $(am__append_71) \
+ $(am__append_76) $(am__append_81) $(am__append_84) \
+ $(am__append_105) $(am__append_106) $(am__append_107) \
+ $(am__append_108) $(am__append_116) $(am__append_118) \
+ $(am__append_120) $(am__append_143) libmd5/md5.test
@WEB_TRUE at am__append_1 = $(web_programs)
@WEB_TRUE at am__append_2 = $(web_tests)
@TEX_TRUE at am__append_3 = tex
@@ -199,66 +200,61 @@
@PTEX_TRUE at am__append_63 = ptrip.diffs
@PTEX_TRUE at am__append_64 = ptrip-clean
@PWEB_TRUE at am__append_65 = $(pweb_tests)
- at EPTEX_TRUE@am__append_66 = eptex
- at EPTEX_TRUE@@PTEX_FALSE at am__append_67 = eptex$(EXEEXT):ptex
- at EPTEX_TRUE@am__append_68 = $(eptex_tests)
- at EPTEX_TRUE@am__append_69 = eptrip.diffs
- at EPTEX_TRUE@am__append_70 = eptrip-clean
- at UPTEX_TRUE@am__append_71 = uptex
- at UPWEB_TRUE@am__append_72 = $(upweb_programs)
- at UPTEX_TRUE@am__append_73 = $(uptex_tests)
- at UPTEX_TRUE@am__append_74 = uptrip.diffs
- at UPTEX_TRUE@am__append_75 = uptrip-clean
- at UPWEB_TRUE@am__append_76 = $(upweb_tests)
- at EUPTEX_TRUE@am__append_77 = euptex
- at EUPTEX_TRUE@@UPTEX_FALSE at am__append_78 = euptex$(EXEEXT):uptex
- at EPTEX_FALSE@@EUPTEX_TRUE at am__append_79 = euptex$(EXEEXT):eptex
- at EPTEX_FALSE@@EUPTEX_TRUE@@PTEX_FALSE at am__append_80 = euptex$(EXEEXT):ptex
- at EUPTEX_TRUE@am__append_81 = $(euptex_tests)
- at EUPTEX_TRUE@am__append_82 = euptrip.diffs
- at EUPTEX_TRUE@am__append_83 = euptrip-clean
- at HITEX_TRUE@am__append_84 = hitex hishrink histretch
- at HITEX_TRUE@am__append_85 = himktables
- at HITEX_TRUE@am__append_86 = $(hitex_tests)
- at MINGW32_TRUE@am__append_87 = \
+ at UPTEX_TRUE@am__append_66 = uptex
+ at UPWEB_TRUE@am__append_67 = $(upweb_programs)
+ at UPTEX_TRUE@am__append_68 = $(uptex_tests)
+ at UPTEX_TRUE@am__append_69 = uptrip.diffs
+ at UPTEX_TRUE@am__append_70 = uptrip-clean
+ at UPWEB_TRUE@am__append_71 = $(upweb_tests)
+ at EUPTEX_TRUE@am__append_72 = euptex
+ at EUPTEX_TRUE@@UPTEX_FALSE at am__append_73 = euptex$(EXEEXT):uptex
+ at EUPTEX_TRUE@am__append_74 = euptex$(EXEEXT):eptex
+ at EUPTEX_TRUE@@PTEX_FALSE at am__append_75 = euptex$(EXEEXT):ptex
+ at EUPTEX_TRUE@am__append_76 = $(euptex_tests)
+ at EUPTEX_TRUE@am__append_77 = euptrip.diffs
+ at EUPTEX_TRUE@am__append_78 = euptrip-clean
+ at HITEX_TRUE@am__append_79 = hitex hishrink histretch
+ at HITEX_TRUE@am__append_80 = himktables
+ at HITEX_TRUE@am__append_81 = $(hitex_tests)
+ at MINGW32_TRUE@am__append_82 = \
@MINGW32_TRUE@ pdftexdir/regex/regex.c \
@MINGW32_TRUE@ pdftexdir/regex/regex.h
- at PDFTEX_TRUE@am__append_88 = pdftex ttf2afm pdftosrc
- at PDFTEX_TRUE@am__append_89 = $(pdftex_tests) $(ttf2afm_tests) \
+ at PDFTEX_TRUE@am__append_83 = pdftex ttf2afm pdftosrc
+ at PDFTEX_TRUE@am__append_84 = $(pdftex_tests) $(ttf2afm_tests) \
@PDFTEX_TRUE@ $(pdftosrc_tests)
- at LUATEX_TRUE@am__append_90 = luatex
- at LUATEX_TRUE@@WIN32_TRUE at am__append_91 = call_luatex
- at LUATEX_TRUE@@WIN32_TRUE at am__append_92 = install-luatex-links
- at LUATEX_TRUE@@WIN32_TRUE at am__append_93 = uninstall-luatex-links
- at LUATEX_TRUE@@WIN32_FALSE at am__append_94 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
- at LUAHBTEX_TRUE@am__append_95 = luahbtex
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_96 = call_luahbtex
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_97 = install-luahbtex-links
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_98 = uninstall-luahbtex-links
+ at LUATEX_TRUE@am__append_85 = luatex
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_86 = call_luatex
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_87 = install-luatex-links
+ at LUATEX_TRUE@@WIN32_TRUE at am__append_88 = uninstall-luatex-links
+ at LUATEX_TRUE@@WIN32_FALSE at am__append_89 = luatex$(EXEEXT):texlua luatex$(EXEEXT):texluac
+ at LUAHBTEX_TRUE@am__append_90 = luahbtex
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_91 = call_luahbtex
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_92 = install-luahbtex-links
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__append_93 = uninstall-luahbtex-links
# keep texlua[c] as links to luatex unless luatex is not installed.
- at LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE at am__append_99 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
- at LUAJITTEX_TRUE@am__append_100 = luajittex
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_101 = call_luajittex
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_102 = install-luajittex-links
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_103 = uninstall-luajittex-links
- at LUAJITTEX_TRUE@@WIN32_FALSE at am__append_104 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
- at LUAJITHBTEX_TRUE@am__append_105 = luajithbtex
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_106 = call_luajithbtex
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_107 = install-luajithbtex-links
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_108 = uninstall-luajithbtex-links
+ at LUAHBTEX_TRUE@@LUATEX_FALSE@@WIN32_FALSE at am__append_94 = luahbtex$(EXEEXT):texlua luahbtex$(EXEEXT):texluac
+ at LUAJITTEX_TRUE@am__append_95 = luajittex
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_96 = call_luajittex
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_97 = install-luajittex-links
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__append_98 = uninstall-luajittex-links
+ at LUAJITTEX_TRUE@@WIN32_FALSE at am__append_99 = luajittex$(EXEEXT):texluajit luajittex$(EXEEXT):texluajitc
+ at LUAJITHBTEX_TRUE@am__append_100 = luajithbtex
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_101 = call_luajithbtex
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_102 = install-luajithbtex-links
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__append_103 = uninstall-luajithbtex-links
# keep texluajit[c] as links to luajittex unless luajittex is not installed.
- at LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE at am__append_109 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
- at LUATEX_TRUE@am__append_110 = $(luatex_tests)
- at LUAHBTEX_TRUE@am__append_111 = $(luahbtex_tests)
- at LUAJITTEX_TRUE@am__append_112 = $(luajittex_tests)
- at LUAJITHBTEX_TRUE@am__append_113 = $(luajithbtex_tests)
- at XETEX_TRUE@am__append_114 = xetex
- at XETEX_MACOSX_TRUE@am__append_115 = -DXETEX_MAC
- at XETEX_MACOSX_TRUE@am__append_116 = -std=c++11
- at XETEX_MACOSX_FALSE@am__append_117 = $(FONTCONFIG_INCLUDES)
- at XETEX_MACOSX_FALSE@am__append_118 = $(FONTCONFIG_LIBS)
- at XETEX_MACOSX_TRUE@am__append_119 = \
+ at LUAJITHBTEX_TRUE@@LUAJITTEX_FALSE@@WIN32_FALSE at am__append_104 = luajithbtex$(EXEEXT):texluajit luajithbtex$(EXEEXT):texluajitc
+ at LUATEX_TRUE@am__append_105 = $(luatex_tests)
+ at LUAHBTEX_TRUE@am__append_106 = $(luahbtex_tests)
+ at LUAJITTEX_TRUE@am__append_107 = $(luajittex_tests)
+ at LUAJITHBTEX_TRUE@am__append_108 = $(luajithbtex_tests)
+ at XETEX_TRUE@am__append_109 = xetex
+ at XETEX_MACOSX_TRUE@am__append_110 = -DXETEX_MAC
+ at XETEX_MACOSX_TRUE@am__append_111 = -std=c++11
+ at XETEX_MACOSX_FALSE@am__append_112 = $(FONTCONFIG_INCLUDES)
+ at XETEX_MACOSX_FALSE@am__append_113 = $(FONTCONFIG_LIBS)
+ at XETEX_MACOSX_TRUE@am__append_114 = \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.cpp \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.h \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.mm \
@@ -265,84 +261,73 @@
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontMgr_Mac.h \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeX_mac.c
- at XETEX_MACOSX_FALSE@am__append_120 = \
+ at XETEX_MACOSX_FALSE@am__append_115 = \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h
- at XETEX_TRUE@am__append_121 = $(xetex_tests)
- at OTANGLE_TRUE@am__append_122 = $(omegaware_programs)
- at OTANGLE_TRUE@am__append_123 = $(OTANGLE_tests) $(OMFONTS_tests)
- at ALEPH_TRUE@am__append_124 = aleph
- at ALEPH_TRUE@am__append_125 = $(aleph_tests)
- at SYNCTEX_TRUE@am__append_126 = synctex
- at SYNCTEX_TRUE@am__append_127 = $(LTLIBSYNCTEX)
- at SYNCTEX_TRUE@am__append_128 = $(LIBSYNCTEX)
- at MINGW32_TRUE@am__append_129 = $(KPATHSEA_INCLUDES)
- at MINGW32_TRUE@am__append_130 = -lshlwapi $(KPATHSEA_LIBS)
- at MINGW32_TRUE@am__append_131 = -lshlwapi
- at TEX_SYNCTEX_TRUE@am__append_132 = -I$(srcdir)/synctexdir \
+ at XETEX_TRUE@am__append_116 = $(xetex_tests)
+ at OTANGLE_TRUE@am__append_117 = $(omegaware_programs)
+ at OTANGLE_TRUE@am__append_118 = $(OTANGLE_tests) $(OMFONTS_tests)
+ at ALEPH_TRUE@am__append_119 = aleph
+ at ALEPH_TRUE@am__append_120 = $(aleph_tests)
+ at SYNCTEX_TRUE@am__append_121 = synctex
+ at SYNCTEX_TRUE@am__append_122 = $(LTLIBSYNCTEX)
+ at SYNCTEX_TRUE@am__append_123 = $(LIBSYNCTEX)
+ at MINGW32_TRUE@am__append_124 = $(KPATHSEA_INCLUDES)
+ at MINGW32_TRUE@am__append_125 = -lshlwapi $(KPATHSEA_LIBS)
+ at MINGW32_TRUE@am__append_126 = -lshlwapi
+ at TEX_SYNCTEX_TRUE@am__append_127 = -I$(srcdir)/synctexdir \
@TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@TEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-tex.h\"
- at TEX_SYNCTEX_TRUE@am__append_133 = $(ZLIB_LIBS)
- at TEX_SYNCTEX_TRUE@am__append_134 = $(ZLIB_DEPEND)
- at TEX_SYNCTEX_TRUE@am__append_135 = \
+ at TEX_SYNCTEX_TRUE@am__append_128 = $(ZLIB_LIBS)
+ at TEX_SYNCTEX_TRUE@am__append_129 = $(ZLIB_DEPEND)
+ at TEX_SYNCTEX_TRUE@am__append_130 = \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@TEX_SYNCTEX_TRUE@ synctexdir/synctex-tex.h
- at ETEX_SYNCTEX_TRUE@am__append_136 = -I$(srcdir)/synctexdir \
+ at ETEX_SYNCTEX_TRUE@am__append_131 = -I$(srcdir)/synctexdir \
@ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@ETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-etex.h\"
- at ETEX_SYNCTEX_TRUE@am__append_137 = $(ZLIB_LIBS)
- at ETEX_SYNCTEX_TRUE@am__append_138 = $(ZLIB_DEPEND)
- at ETEX_SYNCTEX_TRUE@am__append_139 = \
+ at ETEX_SYNCTEX_TRUE@am__append_132 = $(ZLIB_LIBS)
+ at ETEX_SYNCTEX_TRUE@am__append_133 = $(ZLIB_DEPEND)
+ at ETEX_SYNCTEX_TRUE@am__append_134 = \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-etex.h
- at EPTEX_SYNCTEX_TRUE@am__append_140 = -I$(srcdir)/synctexdir \
- at EPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
- at EPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
- at EPTEX_SYNCTEX_TRUE@am__append_141 = $(ZLIB_LIBS)
- at EPTEX_SYNCTEX_TRUE@am__append_142 = $(ZLIB_DEPEND)
- at EPTEX_SYNCTEX_TRUE@am__append_143 = \
- at EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
- at EPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
- at EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
- at EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-eptex.h
-
- at EUPTEX_SYNCTEX_TRUE@am__append_144 = -I$(srcdir)/synctexdir \
+ at EUPTEX_SYNCTEX_TRUE@am__append_135 = -I$(srcdir)/synctexdir \
@EUPTEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__ \
@EUPTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-euptex.h\"
- at EUPTEX_SYNCTEX_TRUE@am__append_145 = $(ZLIB_LIBS)
- at EUPTEX_SYNCTEX_TRUE@am__append_146 = $(ZLIB_DEPEND)
- at EUPTEX_SYNCTEX_TRUE@am__append_147 = \
+ at EUPTEX_SYNCTEX_TRUE@am__append_136 = $(ZLIB_LIBS)
+ at EUPTEX_SYNCTEX_TRUE@am__append_137 = $(ZLIB_DEPEND)
+ at EUPTEX_SYNCTEX_TRUE@am__append_138 = \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-euptex.h
- at PDFTEX_SYNCTEX_TRUE@am__append_148 = -I$(srcdir)/synctexdir \
+ at PDFTEX_SYNCTEX_TRUE@am__append_139 = -I$(srcdir)/synctexdir \
@PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@PDFTEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-pdftex.h\"
- at PDFTEX_SYNCTEX_TRUE@am__append_149 = \
+ at PDFTEX_SYNCTEX_TRUE@am__append_140 = \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/synctex-pdftex.h
- at XETEX_SYNCTEX_TRUE@am__append_150 = -I$(srcdir)/synctexdir \
+ at XETEX_SYNCTEX_TRUE@am__append_141 = -I$(srcdir)/synctexdir \
@XETEX_SYNCTEX_TRUE@ -D__SyncTeX__ \
@XETEX_SYNCTEX_TRUE@ -DSYNCTEX_ENGINE_H=\"synctex-xetex.h\"
- at XETEX_SYNCTEX_TRUE@am__append_151 = \
+ at XETEX_SYNCTEX_TRUE@am__append_142 = \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.c \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex.h \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-common.h \
@XETEX_SYNCTEX_TRUE@ synctexdir/synctex-xetex.h
- at SYNCTEX_TRUE@am__append_152 = $(synctex_tests)
+ at SYNCTEX_TRUE@am__append_143 = $(synctex_tests)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -359,6 +344,7 @@
$(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-largefile.m4 \
$(top_srcdir)/../../m4/kpse-lex.m4 \
$(top_srcdir)/../../m4/kpse-lib-version.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -427,37 +413,36 @@
@UPMP_TRUE at am__EXEEXT_15 = upmpost$(EXEEXT)
@ETEX_TRUE at am__EXEEXT_16 = etex$(EXEEXT)
@PTEX_TRUE at am__EXEEXT_17 = ptex$(EXEEXT)
- at EPTEX_TRUE@am__EXEEXT_18 = eptex$(EXEEXT)
- at UPTEX_TRUE@am__EXEEXT_19 = uptex$(EXEEXT)
- at UPWEB_TRUE@am__EXEEXT_20 = $(am__EXEEXT_2)
- at EUPTEX_TRUE@am__EXEEXT_21 = euptex$(EXEEXT)
- at HITEX_TRUE@am__EXEEXT_22 = hitex$(EXEEXT) hishrink$(EXEEXT) \
+ at UPTEX_TRUE@am__EXEEXT_18 = uptex$(EXEEXT)
+ at UPWEB_TRUE@am__EXEEXT_19 = $(am__EXEEXT_2)
+ at EUPTEX_TRUE@am__EXEEXT_20 = euptex$(EXEEXT)
+ at HITEX_TRUE@am__EXEEXT_21 = hitex$(EXEEXT) hishrink$(EXEEXT) \
@HITEX_TRUE@ histretch$(EXEEXT)
- at PDFTEX_TRUE@am__EXEEXT_23 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
+ at PDFTEX_TRUE@am__EXEEXT_22 = pdftex$(EXEEXT) ttf2afm$(EXEEXT) \
@PDFTEX_TRUE@ pdftosrc$(EXEEXT)
- at LUATEX_TRUE@am__EXEEXT_24 = luatex$(EXEEXT)
- at LUAHBTEX_TRUE@am__EXEEXT_25 = luahbtex$(EXEEXT)
- at LUAJITTEX_TRUE@am__EXEEXT_26 = luajittex$(EXEEXT)
- at LUAJITHBTEX_TRUE@am__EXEEXT_27 = luajithbtex$(EXEEXT)
- at XETEX_TRUE@am__EXEEXT_28 = xetex$(EXEEXT)
- at OTANGLE_TRUE@am__EXEEXT_29 = $(am__EXEEXT_3)
- at ALEPH_TRUE@am__EXEEXT_30 = aleph$(EXEEXT)
- at SYNCTEX_TRUE@am__EXEEXT_31 = synctex$(EXEEXT)
+ at LUATEX_TRUE@am__EXEEXT_23 = luatex$(EXEEXT)
+ at LUAHBTEX_TRUE@am__EXEEXT_24 = luahbtex$(EXEEXT)
+ at LUAJITTEX_TRUE@am__EXEEXT_25 = luajittex$(EXEEXT)
+ at LUAJITHBTEX_TRUE@am__EXEEXT_26 = luajithbtex$(EXEEXT)
+ at XETEX_TRUE@am__EXEEXT_27 = xetex$(EXEEXT)
+ at OTANGLE_TRUE@am__EXEEXT_28 = $(am__EXEEXT_3)
+ at ALEPH_TRUE@am__EXEEXT_29 = aleph$(EXEEXT)
+ at SYNCTEX_TRUE@am__EXEEXT_30 = synctex$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libdir)" \
"$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(syncincludedir)"
- at MF_TRUE@@WIN32_TRUE at am__EXEEXT_32 = call_mf$(EXEEXT)
- at MFLUA_TRUE@@WIN32_TRUE at am__EXEEXT_33 = call_mflua$(EXEEXT)
- at MFLUAJIT_TRUE@@WIN32_TRUE at am__EXEEXT_34 = call_mfluajit$(EXEEXT)
- at MP_TRUE@@WIN32_TRUE at am__EXEEXT_35 = call_mpost$(EXEEXT)
- at PMP_TRUE@@WIN32_TRUE at am__EXEEXT_36 = call_pmpost$(EXEEXT)
- at UPMP_TRUE@@WIN32_TRUE at am__EXEEXT_37 = call_upmpost$(EXEEXT)
- at HITEX_TRUE@am__EXEEXT_38 = himktables$(EXEEXT)
- at LUATEX_TRUE@@WIN32_TRUE at am__EXEEXT_39 = call_luatex$(EXEEXT)
- at LUAHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_40 = call_luahbtex$(EXEEXT)
- at LUAJITTEX_TRUE@@WIN32_TRUE at am__EXEEXT_41 = call_luajittex$(EXEEXT)
- at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_42 = \
+ at MF_TRUE@@WIN32_TRUE at am__EXEEXT_31 = call_mf$(EXEEXT)
+ at MFLUA_TRUE@@WIN32_TRUE at am__EXEEXT_32 = call_mflua$(EXEEXT)
+ at MFLUAJIT_TRUE@@WIN32_TRUE at am__EXEEXT_33 = call_mfluajit$(EXEEXT)
+ at MP_TRUE@@WIN32_TRUE at am__EXEEXT_34 = call_mpost$(EXEEXT)
+ at PMP_TRUE@@WIN32_TRUE at am__EXEEXT_35 = call_pmpost$(EXEEXT)
+ at UPMP_TRUE@@WIN32_TRUE at am__EXEEXT_36 = call_upmpost$(EXEEXT)
+ at HITEX_TRUE@am__EXEEXT_37 = himktables$(EXEEXT)
+ at LUATEX_TRUE@@WIN32_TRUE at am__EXEEXT_38 = call_luatex$(EXEEXT)
+ at LUAHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_39 = call_luahbtex$(EXEEXT)
+ at LUAJITTEX_TRUE@@WIN32_TRUE at am__EXEEXT_40 = call_luajittex$(EXEEXT)
+ at LUAJITHBTEX_TRUE@@WIN32_TRUE at am__EXEEXT_41 = \
@LUAJITHBTEX_TRUE@@WIN32_TRUE@ call_luajithbtex$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -482,19 +467,19 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
+ { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
}
LIBRARIES = $(lib_LIBRARIES)
LTLIBRARIES = $(lib_LTLIBRARIES)
-ARFLAGS = cru
+ARFLAGS = cr
AM_V_AR = $(am__v_AR_ at AM_V@)
am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
am__v_AR_0 = @echo " AR " $@;
am__v_AR_1 =
libff_a_AR = $(AR) $(ARFLAGS)
+libff_a_RANLIB = $(RANLIB)
libff_a_LIBADD =
am__dirstamp = $(am__leading_dot)dirstamp
am_libff_a_OBJECTS = luatexdir/luafontloader/fontforge/fontforge/libff_a-autohint.$(OBJEXT) \
@@ -541,11 +526,13 @@
luatexdir/luafontloader/fontforge/gutils/libff_a-fsys.$(OBJEXT)
libff_a_OBJECTS = $(am_libff_a_OBJECTS)
libkanji_a_AR = $(AR) $(ARFLAGS)
+libkanji_a_RANLIB = $(RANLIB)
libkanji_a_LIBADD =
am_libkanji_a_OBJECTS = ptexdir/libkanji_a-kanji.$(OBJEXT) \
ptexdir/libkanji_a-kanji_dump.$(OBJEXT)
libkanji_a_OBJECTS = $(am_libkanji_a_OBJECTS)
libluaffi_a_AR = $(AR) $(ARFLAGS)
+libluaffi_a_RANLIB = $(RANLIB)
libluaffi_a_LIBADD =
am__objects_1 = luatexdir/luaffi/libluaffi_a-call.$(OBJEXT) \
luatexdir/luaffi/libluaffi_a-ctype.$(OBJEXT) \
@@ -554,6 +541,7 @@
nodist_libluaffi_a_OBJECTS = $(am__objects_1)
libluaffi_a_OBJECTS = $(nodist_libluaffi_a_OBJECTS)
libluaharfbuzz_a_AR = $(AR) $(ARFLAGS)
+libluaharfbuzz_a_RANLIB = $(RANLIB)
libluaharfbuzz_a_LIBADD =
am_libluaharfbuzz_a_OBJECTS = luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-blob.$(OBJEXT) \
luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-buffer.$(OBJEXT) \
@@ -571,6 +559,7 @@
luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-variation.$(OBJEXT)
libluaharfbuzz_a_OBJECTS = $(am_libluaharfbuzz_a_OBJECTS)
libluahbtexspecific_a_AR = $(AR) $(ARFLAGS)
+libluahbtexspecific_a_RANLIB = $(RANLIB)
libluahbtexspecific_a_LIBADD =
am__objects_2 = libluahbtexspecific_a-utils-hb.$(OBJEXT) \
libluahbtexspecific_a-luastuff-hb.$(OBJEXT) \
@@ -580,6 +569,7 @@
libluahbtexspecific_a_OBJECTS = \
$(nodist_libluahbtexspecific_a_OBJECTS)
libluajitharfbuzz_a_AR = $(AR) $(ARFLAGS)
+libluajitharfbuzz_a_RANLIB = $(RANLIB)
libluajitharfbuzz_a_LIBADD =
am__objects_3 = luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-blob.$(OBJEXT) \
luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-buffer.$(OBJEXT) \
@@ -598,6 +588,7 @@
am_libluajitharfbuzz_a_OBJECTS = $(am__objects_3)
libluajitharfbuzz_a_OBJECTS = $(am_libluajitharfbuzz_a_OBJECTS)
libluajithbtexspecific_a_AR = $(AR) $(ARFLAGS)
+libluajithbtexspecific_a_RANLIB = $(RANLIB)
libluajithbtexspecific_a_LIBADD =
am__objects_4 = libluajithbtexspecific_a-utils-hb.$(OBJEXT) \
libluajithbtexspecific_a-luastuff-hb.$(OBJEXT) \
@@ -607,6 +598,7 @@
libluajithbtexspecific_a_OBJECTS = \
$(nodist_libluajithbtexspecific_a_OBJECTS)
libluajitmisc_a_AR = $(AR) $(ARFLAGS)
+libluajitmisc_a_RANLIB = $(RANLIB)
libluajitmisc_a_LIBADD =
am__objects_5 = \
luatexdir/luafilesystem/src/libluajitmisc_a-lfs.$(OBJEXT) \
@@ -620,6 +612,7 @@
nodist_libluajitmisc_a_OBJECTS = $(am__objects_5)
libluajitmisc_a_OBJECTS = $(nodist_libluajitmisc_a_OBJECTS)
libluajitsocket_a_AR = $(AR) $(ARFLAGS)
+libluajitsocket_a_RANLIB = $(RANLIB)
libluajitsocket_a_LIBADD =
am__objects_6 = \
luatexdir/luasocket/src/libluajitsocket_a-auxiliar.$(OBJEXT) \
@@ -641,6 +634,7 @@
nodist_libluajitsocket_a_OBJECTS = $(am__objects_6)
libluajitsocket_a_OBJECTS = $(nodist_libluajitsocket_a_OBJECTS)
libluajittex_a_AR = $(AR) $(ARFLAGS)
+libluajittex_a_RANLIB = $(RANLIB)
libluajittex_a_LIBADD =
dist_libluajittex_a_OBJECTS = \
luatexdir/lua/libluajittex_a-lstrlibext.$(OBJEXT) \
@@ -762,6 +756,7 @@
libluajittex_a_OBJECTS = $(dist_libluajittex_a_OBJECTS) \
$(nodist_libluajittex_a_OBJECTS)
libluajittexspecific_a_AR = $(AR) $(ARFLAGS)
+libluajittexspecific_a_RANLIB = $(RANLIB)
libluajittexspecific_a_LIBADD =
am__objects_9 = \
luatexdir/utils/libluajittexspecific_a-utils.$(OBJEXT) \
@@ -772,6 +767,7 @@
libluajittexspecific_a_OBJECTS = \
$(nodist_libluajittexspecific_a_OBJECTS)
libluamisc_a_AR = $(AR) $(ARFLAGS)
+libluamisc_a_RANLIB = $(RANLIB)
libluamisc_a_LIBADD =
am__objects_10 = \
luatexdir/luafilesystem/src/libluamisc_a-lfs.$(OBJEXT) \
@@ -785,6 +781,7 @@
nodist_libluamisc_a_OBJECTS = $(am__objects_10)
libluamisc_a_OBJECTS = $(nodist_libluamisc_a_OBJECTS)
libluasocket_a_AR = $(AR) $(ARFLAGS)
+libluasocket_a_RANLIB = $(RANLIB)
libluasocket_a_LIBADD =
am__objects_11 = \
luatexdir/luasocket/src/libluasocket_a-auxiliar.$(OBJEXT) \
@@ -806,6 +803,7 @@
nodist_libluasocket_a_OBJECTS = $(am__objects_11)
libluasocket_a_OBJECTS = $(nodist_libluasocket_a_OBJECTS)
libluatex_a_AR = $(AR) $(ARFLAGS)
+libluatex_a_RANLIB = $(RANLIB)
libluatex_a_LIBADD =
dist_libluatex_a_OBJECTS = \
luatexdir/lua/libluatex_a-lstrlibext.$(OBJEXT) \
@@ -928,6 +926,7 @@
libluatex_a_OBJECTS = $(dist_libluatex_a_OBJECTS) \
$(nodist_libluatex_a_OBJECTS)
libluatexspecific_a_AR = $(AR) $(ARFLAGS)
+libluatexspecific_a_RANLIB = $(RANLIB)
libluatexspecific_a_LIBADD =
am__objects_13 = luatexdir/utils/libluatexspecific_a-utils.$(OBJEXT) \
luatexdir/lua/libluatexspecific_a-luastuff.$(OBJEXT) \
@@ -936,15 +935,18 @@
nodist_libluatexspecific_a_OBJECTS = $(am__objects_13)
libluatexspecific_a_OBJECTS = $(nodist_libluatexspecific_a_OBJECTS)
libmd5_a_AR = $(AR) $(ARFLAGS)
+libmd5_a_RANLIB = $(RANLIB)
libmd5_a_LIBADD =
am_libmd5_a_OBJECTS = libmd5/a-md5.$(OBJEXT)
libmd5_a_OBJECTS = $(am_libmd5_a_OBJECTS)
libmf_a_AR = $(AR) $(ARFLAGS)
+libmf_a_RANLIB = $(RANLIB)
libmf_a_LIBADD =
am__objects_14 = mfini.$(OBJEXT) mf0.$(OBJEXT)
nodist_libmf_a_OBJECTS = $(am__objects_14) mf-pool.$(OBJEXT)
libmf_a_OBJECTS = $(nodist_libmf_a_OBJECTS)
libmflua_a_AR = $(AR) $(ARFLAGS)
+libmflua_a_RANLIB = $(RANLIB)
libmflua_a_LIBADD =
dist_libmflua_a_OBJECTS = luatexdir/lua/libmflua_a-lkpselib.$(OBJEXT) \
mfluadir/libmflua_a-mfluac.$(OBJEXT)
@@ -955,6 +957,7 @@
libmflua_a_OBJECTS = $(dist_libmflua_a_OBJECTS) \
$(nodist_libmflua_a_OBJECTS)
libmfluajit_a_AR = $(AR) $(ARFLAGS)
+libmfluajit_a_RANLIB = $(RANLIB)
libmfluajit_a_LIBADD =
dist_libmfluajit_a_OBJECTS = \
luatexdir/lua/libmfluajit_a-lkpselib.$(OBJEXT) \
@@ -966,16 +969,19 @@
libmfluajit_a_OBJECTS = $(dist_libmfluajit_a_OBJECTS) \
$(nodist_libmfluajit_a_OBJECTS)
libmfluajitlpeg_a_AR = $(AR) $(ARFLAGS)
+libmfluajitlpeg_a_RANLIB = $(RANLIB)
libmfluajitlpeg_a_LIBADD =
am_libmfluajitlpeg_a_OBJECTS = \
mfluadir/luapeg/libmfluajitlpeg_a-lpeg.$(OBJEXT)
libmfluajitlpeg_a_OBJECTS = $(am_libmfluajitlpeg_a_OBJECTS)
libmflualpeg_a_AR = $(AR) $(ARFLAGS)
+libmflualpeg_a_RANLIB = $(RANLIB)
libmflualpeg_a_LIBADD =
am_libmflualpeg_a_OBJECTS = \
mfluadir/luapeg/libmflualpeg_a-lpeg.$(OBJEXT)
libmflualpeg_a_OBJECTS = $(am_libmflualpeg_a_OBJECTS)
libmfluaotfcc_a_AR = $(AR) $(ARFLAGS)
+libmfluaotfcc_a_RANLIB = $(RANLIB)
libmfluaotfcc_a_LIBADD =
am_libmfluaotfcc_a_OBJECTS = mfluadir/otfcc/dep/extern/emyg-dtoa/libmfluaotfcc_a-emyg-dtoa.$(OBJEXT) \
mfluadir/otfcc/dep/extern/libmfluaotfcc_a-json.$(OBJEXT) \
@@ -1095,11 +1101,13 @@
mfluadir/otfcc/lib/table/libmfluaotfcc_a-TSI5.$(OBJEXT)
libmfluaotfcc_a_OBJECTS = $(am_libmfluaotfcc_a_OBJECTS)
libmfluapotrace_a_AR = $(AR) $(ARFLAGS)
+libmfluapotrace_a_RANLIB = $(RANLIB)
libmfluapotrace_a_LIBADD =
am_libmfluapotrace_a_OBJECTS = \
mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT)
libmfluapotrace_a_OBJECTS = $(am_libmfluapotrace_a_OBJECTS)
libmplibbackends_a_AR = $(AR) $(ARFLAGS)
+libmplibbackends_a_RANLIB = $(RANLIB)
libmplibbackends_a_LIBADD =
am__objects_17 = libmplibbackends_a-pngout.$(OBJEXT)
am__objects_18 = libmplibbackends_a-svgout.$(OBJEXT)
@@ -1107,6 +1115,7 @@
$(am__objects_18)
libmplibbackends_a_OBJECTS = $(nodist_libmplibbackends_a_OBJECTS)
libmplibcore_a_AR = $(AR) $(ARFLAGS)
+libmplibcore_a_RANLIB = $(RANLIB)
libmplibcore_a_LIBADD =
am__objects_19 = libmplibcore_a-mp.$(OBJEXT)
am__objects_20 = libmplibcore_a-mpmath.$(OBJEXT)
@@ -1119,6 +1128,7 @@
$(am__objects_22) $(am__objects_23) $(am__objects_24)
libmplibcore_a_OBJECTS = $(nodist_libmplibcore_a_OBJECTS)
libmplibextramath_a_AR = $(AR) $(ARFLAGS)
+libmplibextramath_a_RANLIB = $(RANLIB)
libmplibextramath_a_LIBADD =
am__objects_25 = libmplibextramath_a-mpmathbinary.$(OBJEXT)
am__objects_26 = libmplibextramath_a-mpmathinterval.$(OBJEXT)
@@ -1126,6 +1136,7 @@
$(am__objects_26)
libmplibextramath_a_OBJECTS = $(nodist_libmplibextramath_a_OBJECTS)
libmputil_a_AR = $(AR) $(ARFLAGS)
+libmputil_a_RANLIB = $(RANLIB)
libmputil_a_LIBADD =
am_libmputil_a_OBJECTS = mplibdir/libmputil_a-avl.$(OBJEXT) \
mplibdir/libmputil_a-decNumber.$(OBJEXT) \
@@ -1132,6 +1143,7 @@
mplibdir/libmputil_a-decContext.$(OBJEXT)
libmputil_a_OBJECTS = $(am_libmputil_a_OBJECTS)
libpdftex_a_AR = $(AR) $(ARFLAGS)
+libpdftex_a_RANLIB = $(RANLIB)
libpdftex_a_LIBADD =
am__libpdftex_a_SOURCES_DIST = pdftexdir/avl.c pdftexdir/avl.h \
pdftexdir/avlstuff.c pdftexdir/avlstuff.h pdftexdir/epdf.c \
@@ -1169,6 +1181,7 @@
pdftexdir/libpdftex_a-writezip.$(OBJEXT) $(am__objects_27)
libpdftex_a_OBJECTS = $(am_libpdftex_a_OBJECTS)
libsynctex_a_AR = $(AR) $(ARFLAGS)
+libsynctex_a_RANLIB = $(RANLIB)
libsynctex_a_LIBADD =
am__objects_28 = synctexdir/libsynctex_a-synctex_parser.$(OBJEXT) \
synctexdir/libsynctex_a-synctex_parser_utils.$(OBJEXT)
@@ -1175,11 +1188,13 @@
nodist_libsynctex_a_OBJECTS = $(am__objects_28)
libsynctex_a_OBJECTS = $(nodist_libsynctex_a_OBJECTS)
libukanji_a_AR = $(AR) $(ARFLAGS)
+libukanji_a_RANLIB = $(RANLIB)
libukanji_a_LIBADD =
am_libukanji_a_OBJECTS = uptexdir/libukanji_a-kanji.$(OBJEXT) \
uptexdir/libukanji_a-kanji_dump.$(OBJEXT)
libukanji_a_OBJECTS = $(am_libukanji_a_OBJECTS)
libunilib_a_AR = $(AR) $(ARFLAGS)
+libunilib_a_RANLIB = $(RANLIB)
libunilib_a_LIBADD =
am_libunilib_a_OBJECTS = \
luatexdir/unilib/libunilib_a-ArabicForms.$(OBJEXT) \
@@ -1194,6 +1209,7 @@
luatexdir/unilib/libunilib_a-utype.$(OBJEXT)
libunilib_a_OBJECTS = $(am_libunilib_a_OBJECTS)
libxetex_a_AR = $(AR) $(ARFLAGS)
+libxetex_a_RANLIB = $(RANLIB)
libxetex_a_LIBADD =
am__libxetex_a_SOURCES_DIST = xetexdir/XeTeXFontInst.cpp \
xetexdir/XeTeXFontInst.h xetexdir/XeTeXFontMgr.cpp \
@@ -1322,40 +1338,28 @@
dvitype_OBJECTS = $(nodist_dvitype_OBJECTS)
dvitype_LDADD = $(LDADD)
dvitype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__dist_eptex_SOURCES_DIST = eptexdir/eptexextra.c \
- eptexdir/eptexextra.h eptexdir/eptex_version.h \
- synctexdir/synctex.c synctexdir/synctex.h \
- synctexdir/synctex-common.h synctexdir/synctex-eptex.h
- at EPTEX_SYNCTEX_TRUE@am__objects_32 = \
- at EPTEX_SYNCTEX_TRUE@ synctexdir/eptex-synctex.$(OBJEXT)
-dist_eptex_OBJECTS = eptexdir/eptex-eptexextra.$(OBJEXT) \
- $(am__objects_32)
-am__objects_33 = eptex-eptexini.$(OBJEXT) eptex-eptex0.$(OBJEXT)
-nodist_eptex_OBJECTS = $(am__objects_33) eptex-eptex-pool.$(OBJEXT)
-eptex_OBJECTS = $(dist_eptex_OBJECTS) $(nodist_eptex_OBJECTS)
- at EPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
am__dist_etex_SOURCES_DIST = etexdir/etexextra.c etexdir/etexextra.h \
etexdir/etex_version.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-etex.h
- at ETEX_SYNCTEX_TRUE@am__objects_34 = synctexdir/etex-synctex.$(OBJEXT)
-dist_etex_OBJECTS = etexdir/etex-etexextra.$(OBJEXT) $(am__objects_34)
-am__objects_35 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT)
-nodist_etex_OBJECTS = $(am__objects_35) etex-etex-pool.$(OBJEXT)
+ at ETEX_SYNCTEX_TRUE@am__objects_32 = synctexdir/etex-synctex.$(OBJEXT)
+dist_etex_OBJECTS = etexdir/etex-etexextra.$(OBJEXT) $(am__objects_32)
+am__objects_33 = etex-etexini.$(OBJEXT) etex-etex0.$(OBJEXT)
+nodist_etex_OBJECTS = $(am__objects_33) etex-etex-pool.$(OBJEXT)
etex_OBJECTS = $(dist_etex_OBJECTS) $(nodist_etex_OBJECTS)
- at ETEX_SYNCTEX_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
+ at ETEX_SYNCTEX_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
am__dist_euptex_SOURCES_DIST = euptexdir/euptexextra.c \
euptexdir/euptexextra.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-euptex.h
- at EUPTEX_SYNCTEX_TRUE@am__objects_36 = \
+ at EUPTEX_SYNCTEX_TRUE@am__objects_34 = \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/euptex-synctex.$(OBJEXT)
dist_euptex_OBJECTS = euptexdir/euptex-euptexextra.$(OBJEXT) \
- $(am__objects_36)
-am__objects_37 = euptex-euptexini.$(OBJEXT) euptex-euptex0.$(OBJEXT)
-nodist_euptex_OBJECTS = $(am__objects_37) euptex-euptex-pool.$(OBJEXT)
+ $(am__objects_34)
+am__objects_35 = euptex-euptexini.$(OBJEXT) euptex-euptex0.$(OBJEXT)
+nodist_euptex_OBJECTS = $(am__objects_35) euptex-euptex-pool.$(OBJEXT)
euptex_OBJECTS = $(dist_euptex_OBJECTS) $(nodist_euptex_OBJECTS)
- at EUPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
+ at EUPTEX_SYNCTEX_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
am_gftodvi_OBJECTS =
nodist_gftodvi_OBJECTS = gftodvi.$(OBJEXT)
gftodvi_OBJECTS = $(am_gftodvi_OBJECTS) $(nodist_gftodvi_OBJECTS)
@@ -1381,19 +1385,19 @@
nodist_histretch_OBJECTS = histretch-hitables.$(OBJEXT) \
histretch-histretch.$(OBJEXT)
histretch_OBJECTS = $(nodist_histretch_OBJECTS)
-am__objects_38 = hitex-hitex.$(OBJEXT)
+am__objects_36 = hitex-hitex.$(OBJEXT)
nodist_hitex_OBJECTS = hitex-hitables.$(OBJEXT) hitex-hiput.$(OBJEXT) \
- $(am__objects_38)
+ $(am__objects_36)
hitex_OBJECTS = $(nodist_hitex_OBJECTS)
nodist_initex_OBJECTS = initex-callexe.$(OBJEXT)
initex_OBJECTS = $(nodist_initex_OBJECTS)
initex_DEPENDENCIES =
-am__objects_39 = luatexdir/luahbtex-luatex.$(OBJEXT) \
+am__objects_37 = luatexdir/luahbtex-luatex.$(OBJEXT) \
mplibdir/luahbtex-lmplib.$(OBJEXT)
-nodist_luahbtex_OBJECTS = $(am__objects_39)
+nodist_luahbtex_OBJECTS = $(am__objects_37)
luahbtex_OBJECTS = $(nodist_luahbtex_OBJECTS)
-am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_7 = libmplibcore.a $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_6 = libmplibcore.a $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) libmputil.a \
@@ -1401,18 +1405,18 @@
luahbtex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(luahbtex_CXXFLAGS) \
$(CXXFLAGS) $(luahbtex_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_40 = luatexdir/luajithbtex-luatex.$(OBJEXT) \
+am__objects_38 = luatexdir/luajithbtex-luatex.$(OBJEXT) \
mplibdir/luajithbtex-lmplib.$(OBJEXT)
-nodist_luajithbtex_OBJECTS = $(am__objects_40)
+nodist_luajithbtex_OBJECTS = $(am__objects_38)
luajithbtex_OBJECTS = $(nodist_luajithbtex_OBJECTS)
luajithbtex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(luajithbtex_CXXFLAGS) \
$(CXXFLAGS) $(luajithbtex_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_41 = luatexdir/luajittex-luatex.$(OBJEXT) \
+am__objects_39 = luatexdir/luajittex-luatex.$(OBJEXT) \
mplibdir/luajittex-lmplib.$(OBJEXT)
-nodist_luajittex_OBJECTS = $(am__objects_41)
+nodist_luajittex_OBJECTS = $(am__objects_39)
luajittex_OBJECTS = $(nodist_luajittex_OBJECTS)
-am__DEPENDENCIES_8 = libmplibcore.a $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_7 = libmplibcore.a $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) libmputil.a \
libunilib.a libmd5.a $(am__DEPENDENCIES_1)
@@ -1419,9 +1423,9 @@
luajittex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(luajittex_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_42 = luatexdir/luatex-luatex.$(OBJEXT) \
+am__objects_40 = luatexdir/luatex-luatex.$(OBJEXT) \
mplibdir/luatex-lmplib.$(OBJEXT)
-nodist_luatex_OBJECTS = $(am__objects_42)
+nodist_luatex_OBJECTS = $(am__objects_40)
luatex_OBJECTS = $(nodist_luatex_OBJECTS)
luatex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -1431,12 +1435,12 @@
md5main_DEPENDENCIES = libmd5.a
dist_mf_OBJECTS = mf-mfextra.$(OBJEXT)
mf_OBJECTS = $(dist_mf_OBJECTS)
- at WIN32_FALSE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) \
+ at WIN32_FALSE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1) \
@WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@WIN32_FALSE@ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@WIN32_FALSE@ $(am__DEPENDENCIES_1)
mf_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib) \
- $(am__DEPENDENCIES_9)
+ $(am__DEPENDENCIES_8)
dist_mf_nowin_OBJECTS = mf_nowin-mfextra.$(OBJEXT)
mf_nowin_OBJECTS = $(dist_mf_nowin_OBJECTS)
mf_nowin_DEPENDENCIES = libmf.a $(am__DEPENDENCIES_2) $(windowlib)
@@ -1444,17 +1448,17 @@
mflua_OBJECTS = $(dist_mflua_OBJECTS)
mflua_DEPENDENCIES = libmflua.a libmfluaotfcc.a libmfluapotrace.a \
libmflualpeg.a $(am__DEPENDENCIES_2) $(windowlib) \
- $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_6) \
+ $(am__DEPENDENCIES_8) $(am__DEPENDENCIES_5) \
$(am__DEPENDENCIES_1)
mflua_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(mflua_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_43 = mfluadir/mflua_nowin-mfluaextra.$(OBJEXT)
-nodist_mflua_nowin_OBJECTS = $(am__objects_43)
+am__objects_41 = mfluadir/mflua_nowin-mfluaextra.$(OBJEXT)
+nodist_mflua_nowin_OBJECTS = $(am__objects_41)
mflua_nowin_OBJECTS = $(nodist_mflua_nowin_OBJECTS)
mflua_nowin_DEPENDENCIES = libmflua.a libmfluaotfcc.a \
libmfluapotrace.a libmflualpeg.a $(am__DEPENDENCIES_2) \
- $(windowlib) $(am__DEPENDENCIES_6) $(am__DEPENDENCIES_1)
+ $(windowlib) $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_1)
mflua_nowin_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(mflua_nowin_LDFLAGS) $(LDFLAGS) -o $@
@@ -1462,13 +1466,13 @@
mfluajit_OBJECTS = $(dist_mfluajit_OBJECTS)
mfluajit_DEPENDENCIES = libmfluajit.a libmfluaotfcc.a \
libmfluapotrace.a libmfluajitlpeg.a $(am__DEPENDENCIES_2) \
- $(windowlib) $(am__DEPENDENCIES_9) $(am__DEPENDENCIES_1) \
+ $(windowlib) $(am__DEPENDENCIES_8) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
mfluajit_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(mfluajit_LDFLAGS) $(LDFLAGS) -o $@
-am__objects_44 = mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT)
-nodist_mfluajit_nowin_OBJECTS = $(am__objects_44)
+am__objects_42 = mfluajitdir/mfluajit_nowin-mfluajitextra.$(OBJEXT)
+nodist_mfluajit_nowin_OBJECTS = $(am__objects_42)
mfluajit_nowin_OBJECTS = $(nodist_mfluajit_nowin_OBJECTS)
mfluajit_nowin_DEPENDENCIES = libmfluajit.a libmfluaotfcc.a \
libmfluapotrace.a libmfluajitlpeg.a $(am__DEPENDENCIES_2) \
@@ -1481,8 +1485,8 @@
mft_OBJECTS = $(nodist_mft_OBJECTS)
mft_LDADD = $(LDADD)
mft_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_45 = mpost-mpxout.$(OBJEXT)
-nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_45)
+am__objects_43 = mpost-mpxout.$(OBJEXT)
+nodist_mpost_OBJECTS = mpost-mpost.$(OBJEXT) $(am__objects_43)
mpost_OBJECTS = $(nodist_mpost_OBJECTS)
mpost_DEPENDENCIES = libmplibcore.a libmplibextramath.a \
libmplibbackends.a $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -1510,14 +1514,14 @@
pdftexdir/etex_version.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-pdftex.h
- at PDFTEX_SYNCTEX_TRUE@am__objects_46 = \
+ at PDFTEX_SYNCTEX_TRUE@am__objects_44 = \
@PDFTEX_SYNCTEX_TRUE@ synctexdir/pdftex-synctex.$(OBJEXT)
dist_pdftex_OBJECTS = pdftexdir/pdftex-pdftexextra.$(OBJEXT) \
- $(am__objects_46)
-am__objects_47 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
-nodist_pdftex_OBJECTS = $(am__objects_47) pdftex-pdftex-pool.$(OBJEXT)
+ $(am__objects_44)
+am__objects_45 = pdftex-pdftexini.$(OBJEXT) pdftex-pdftex0.$(OBJEXT)
+nodist_pdftex_OBJECTS = $(am__objects_45) pdftex-pdftex-pool.$(OBJEXT)
pdftex_OBJECTS = $(dist_pdftex_OBJECTS) $(nodist_pdftex_OBJECTS)
-am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) libmd5.a
pdftex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftex_CXXFLAGS) \
@@ -1539,22 +1543,22 @@
pltotf_OBJECTS = $(nodist_pltotf_OBJECTS)
pltotf_LDADD = $(LDADD)
pltotf_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
-am__objects_48 = pmpost-pmp.$(OBJEXT)
-am__objects_49 = pmpost-pmpmath.$(OBJEXT)
-am__objects_50 = pmpost-pmpmathinterval.$(OBJEXT)
-am__objects_51 = pmpost-pmpmathbinary.$(OBJEXT)
-am__objects_52 = pmpost-pmpmathdecimal.$(OBJEXT)
-am__objects_53 = pmpost-pmpmathdouble.$(OBJEXT)
-am__objects_54 = pmpost-pmpstrings.$(OBJEXT)
-am__objects_55 = pmpost-pmpxout.$(OBJEXT)
-am__objects_56 = pmpost-ppngout.$(OBJEXT)
-am__objects_57 = pmpost-ppsout.$(OBJEXT)
-am__objects_58 = pmpost-psvgout.$(OBJEXT)
-nodist_pmpost_OBJECTS = $(am__objects_48) $(am__objects_49) \
- $(am__objects_50) $(am__objects_51) $(am__objects_52) \
- $(am__objects_53) pmpost-pmpost.$(OBJEXT) $(am__objects_54) \
- $(am__objects_55) $(am__objects_56) $(am__objects_57) \
- $(am__objects_58) pmpost-ptfmin.$(OBJEXT)
+am__objects_46 = pmpost-pmp.$(OBJEXT)
+am__objects_47 = pmpost-pmpmath.$(OBJEXT)
+am__objects_48 = pmpost-pmpmathinterval.$(OBJEXT)
+am__objects_49 = pmpost-pmpmathbinary.$(OBJEXT)
+am__objects_50 = pmpost-pmpmathdecimal.$(OBJEXT)
+am__objects_51 = pmpost-pmpmathdouble.$(OBJEXT)
+am__objects_52 = pmpost-pmpstrings.$(OBJEXT)
+am__objects_53 = pmpost-pmpxout.$(OBJEXT)
+am__objects_54 = pmpost-ppngout.$(OBJEXT)
+am__objects_55 = pmpost-ppsout.$(OBJEXT)
+am__objects_56 = pmpost-psvgout.$(OBJEXT)
+nodist_pmpost_OBJECTS = $(am__objects_46) $(am__objects_47) \
+ $(am__objects_48) $(am__objects_49) $(am__objects_50) \
+ $(am__objects_51) pmpost-pmpost.$(OBJEXT) $(am__objects_52) \
+ $(am__objects_53) $(am__objects_54) $(am__objects_55) \
+ $(am__objects_56) pmpost-ptfmin.$(OBJEXT)
pmpost_OBJECTS = $(nodist_pmpost_OBJECTS)
pmpost_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -1566,17 +1570,17 @@
pooltype_LDADD = $(LDADD)
pooltype_DEPENDENCIES = $(proglib) $(am__DEPENDENCIES_1)
dist_ptex_OBJECTS = ptexdir/ptex-ptexextra.$(OBJEXT)
-am__objects_59 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
-nodist_ptex_OBJECTS = $(am__objects_59) ptex-ptex-pool.$(OBJEXT)
+am__objects_57 = ptex-ptexini.$(OBJEXT) ptex-ptex0.$(OBJEXT)
+nodist_ptex_OBJECTS = $(am__objects_57) ptex-ptex-pool.$(OBJEXT)
ptex_OBJECTS = $(dist_ptex_OBJECTS) $(nodist_ptex_OBJECTS)
-am__DEPENDENCIES_11 = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_10 = libkanji.a $(pproglib) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
am_synctex_OBJECTS = synctexdir/synctex-synctex_main.$(OBJEXT)
synctex_OBJECTS = $(am_synctex_OBJECTS)
-am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- at MINGW32_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1)
-synctex_DEPENDENCIES = $(am__DEPENDENCIES_12) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_13)
+am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ at MINGW32_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
+synctex_DEPENDENCIES = $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_12)
nodist_tangle_OBJECTS = tangle.$(OBJEXT)
tangle_OBJECTS = $(nodist_tangle_OBJECTS)
tangle_LDADD = $(LDADD)
@@ -1587,14 +1591,14 @@
am__dist_tex_SOURCES_DIST = texextra.c synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-tex.h
- at TEX_SYNCTEX_TRUE@am__objects_60 = synctexdir/tex-synctex.$(OBJEXT)
-dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_60)
-am__objects_61 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
-nodist_tex_OBJECTS = $(am__objects_61) tex-tex-pool.$(OBJEXT)
+ at TEX_SYNCTEX_TRUE@am__objects_58 = synctexdir/tex-synctex.$(OBJEXT)
+dist_tex_OBJECTS = tex-texextra.$(OBJEXT) $(am__objects_58)
+am__objects_59 = tex-texini.$(OBJEXT) tex-tex0.$(OBJEXT)
+nodist_tex_OBJECTS = $(am__objects_59) tex-tex-pool.$(OBJEXT)
tex_OBJECTS = $(dist_tex_OBJECTS) $(nodist_tex_OBJECTS)
- at TEX_SYNCTEX_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1)
+ at TEX_SYNCTEX_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1)
tex_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_14)
+ $(am__DEPENDENCIES_13)
nodist_tftopl_OBJECTS = tftopl.$(OBJEXT)
tftopl_OBJECTS = $(nodist_tftopl_OBJECTS)
tftopl_LDADD = $(LDADD)
@@ -1613,42 +1617,42 @@
am_upbibtex_OBJECTS =
nodist_upbibtex_OBJECTS = upbibtex-upbibtex.$(OBJEXT)
upbibtex_OBJECTS = $(am_upbibtex_OBJECTS) $(nodist_upbibtex_OBJECTS)
-am__DEPENDENCIES_15 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_14 = libukanji.a $(pproglib) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1)
am_updvitype_OBJECTS =
nodist_updvitype_OBJECTS = updvitype-updvitype.$(OBJEXT)
updvitype_OBJECTS = $(am_updvitype_OBJECTS) \
$(nodist_updvitype_OBJECTS)
-am__objects_62 = upmpost-pmp.$(OBJEXT)
-am__objects_63 = upmpost-pmpmath.$(OBJEXT)
-am__objects_64 = upmpost-pmpmathinterval.$(OBJEXT)
-am__objects_65 = upmpost-pmpmathbinary.$(OBJEXT)
-am__objects_66 = upmpost-pmpmathdecimal.$(OBJEXT)
-am__objects_67 = upmpost-pmpmathdouble.$(OBJEXT)
-am__objects_68 = upmpost-pmpstrings.$(OBJEXT)
-am__objects_69 = upmpost-pmpxout.$(OBJEXT)
-am__objects_70 = upmpost-ppngout.$(OBJEXT)
-am__objects_71 = upmpost-ppsout.$(OBJEXT)
-am__objects_72 = upmpost-psvgout.$(OBJEXT)
-am__objects_73 = $(am__objects_62) $(am__objects_63) $(am__objects_64) \
- $(am__objects_65) $(am__objects_66) $(am__objects_67) \
- upmpost-pmpost.$(OBJEXT) $(am__objects_68) $(am__objects_69) \
- $(am__objects_70) $(am__objects_71) $(am__objects_72) \
+am__objects_60 = upmpost-pmp.$(OBJEXT)
+am__objects_61 = upmpost-pmpmath.$(OBJEXT)
+am__objects_62 = upmpost-pmpmathinterval.$(OBJEXT)
+am__objects_63 = upmpost-pmpmathbinary.$(OBJEXT)
+am__objects_64 = upmpost-pmpmathdecimal.$(OBJEXT)
+am__objects_65 = upmpost-pmpmathdouble.$(OBJEXT)
+am__objects_66 = upmpost-pmpstrings.$(OBJEXT)
+am__objects_67 = upmpost-pmpxout.$(OBJEXT)
+am__objects_68 = upmpost-ppngout.$(OBJEXT)
+am__objects_69 = upmpost-ppsout.$(OBJEXT)
+am__objects_70 = upmpost-psvgout.$(OBJEXT)
+am__objects_71 = $(am__objects_60) $(am__objects_61) $(am__objects_62) \
+ $(am__objects_63) $(am__objects_64) $(am__objects_65) \
+ upmpost-pmpost.$(OBJEXT) $(am__objects_66) $(am__objects_67) \
+ $(am__objects_68) $(am__objects_69) $(am__objects_70) \
upmpost-ptfmin.$(OBJEXT)
-nodist_upmpost_OBJECTS = $(am__objects_73)
+nodist_upmpost_OBJECTS = $(am__objects_71)
upmpost_OBJECTS = $(nodist_upmpost_OBJECTS)
-am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) libmputil.a
-upmpost_DEPENDENCIES = $(am__DEPENDENCIES_16)
+upmpost_DEPENDENCIES = $(am__DEPENDENCIES_15)
am_uppltotf_OBJECTS =
nodist_uppltotf_OBJECTS = uppltotf-uppltotf.$(OBJEXT)
uppltotf_OBJECTS = $(am_uppltotf_OBJECTS) $(nodist_uppltotf_OBJECTS)
dist_uptex_OBJECTS = uptexdir/uptex-uptexextra.$(OBJEXT)
-am__objects_74 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
-nodist_uptex_OBJECTS = $(am__objects_74) uptex-uptex-pool.$(OBJEXT)
+am__objects_72 = uptex-uptexini.$(OBJEXT) uptex-uptex0.$(OBJEXT)
+nodist_uptex_OBJECTS = $(am__objects_72) uptex-uptex-pool.$(OBJEXT)
uptex_OBJECTS = $(dist_uptex_OBJECTS) $(nodist_uptex_OBJECTS)
am_uptftopl_OBJECTS =
nodist_uptftopl_OBJECTS = uptftopl-uptftopl.$(OBJEXT)
@@ -1686,20 +1690,20 @@
xetexdir/xetex_version.h synctexdir/synctex.c \
synctexdir/synctex.h synctexdir/synctex-common.h \
synctexdir/synctex-xetex.h
- at XETEX_SYNCTEX_TRUE@am__objects_75 = \
+ at XETEX_SYNCTEX_TRUE@am__objects_73 = \
@XETEX_SYNCTEX_TRUE@ synctexdir/xetex-synctex.$(OBJEXT)
dist_xetex_OBJECTS = xetexdir/xetex-xetexextra.$(OBJEXT) \
- $(am__objects_75)
-am__objects_76 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
-nodist_xetex_OBJECTS = $(am__objects_76) xetex-xetex-pool.$(OBJEXT)
+ $(am__objects_73)
+am__objects_74 = xetex-xetexini.$(OBJEXT) xetex-xetex0.$(OBJEXT)
+nodist_xetex_OBJECTS = $(am__objects_74) xetex-xetex-pool.$(OBJEXT)
xetex_OBJECTS = $(dist_xetex_OBJECTS) $(nodist_xetex_OBJECTS)
- at XETEX_MACOSX_FALSE@am__DEPENDENCIES_17 = $(am__DEPENDENCIES_1)
-am__DEPENDENCIES_18 = $(libxetex) $(am__DEPENDENCIES_1) \
+ at XETEX_MACOSX_FALSE@am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1)
+am__DEPENDENCIES_17 = $(libxetex) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) libmd5.a $(am__DEPENDENCIES_17)
-xetex_DEPENDENCIES = $(am__DEPENDENCIES_18) $(am__DEPENDENCIES_2) \
+ $(am__DEPENDENCIES_1) libmd5.a $(am__DEPENDENCIES_16)
+xetex_DEPENDENCIES = $(am__DEPENDENCIES_17) $(am__DEPENDENCIES_2) \
$(am__DEPENDENCIES_1)
xetex_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(xetex_CXXFLAGS) \
@@ -1737,10 +1741,8 @@
./$(DEPDIR)/ctwill.Po ./$(DEPDIR)/cweave.Po \
./$(DEPDIR)/cweb.Po ./$(DEPDIR)/cwebboot.Po \
./$(DEPDIR)/dvicopy.Po ./$(DEPDIR)/dvitype.Po \
- ./$(DEPDIR)/eptex-eptex-pool.Po ./$(DEPDIR)/eptex-eptex0.Po \
- ./$(DEPDIR)/eptex-eptexini.Po ./$(DEPDIR)/etex-etex-pool.Po \
- ./$(DEPDIR)/etex-etex0.Po ./$(DEPDIR)/etex-etexini.Po \
- ./$(DEPDIR)/euptex-euptex-pool.Po \
+ ./$(DEPDIR)/etex-etex-pool.Po ./$(DEPDIR)/etex-etex0.Po \
+ ./$(DEPDIR)/etex-etexini.Po ./$(DEPDIR)/euptex-euptex-pool.Po \
./$(DEPDIR)/euptex-euptex0.Po ./$(DEPDIR)/euptex-euptexini.Po \
./$(DEPDIR)/gftodvi.Po ./$(DEPDIR)/gftopk.Po \
./$(DEPDIR)/gftype.Po ./$(DEPDIR)/himktables.Po \
@@ -1824,7 +1826,6 @@
alephdir/$(DEPDIR)/aleph-aleph.Po \
alephdir/$(DEPDIR)/aleph-alephbis.Po \
alephdir/$(DEPDIR)/aleph-alephextra.Po \
- eptexdir/$(DEPDIR)/eptex-eptexextra.Po \
etexdir/$(DEPDIR)/etex-etexextra.Po \
euptexdir/$(DEPDIR)/euptex-euptexextra.Po \
hitexdir/$(DEPDIR)/hishrink-hilexer.Po \
@@ -2366,7 +2367,6 @@
ptexdir/$(DEPDIR)/libkanji_a-kanji.Po \
ptexdir/$(DEPDIR)/libkanji_a-kanji_dump.Po \
ptexdir/$(DEPDIR)/ptex-ptexextra.Po \
- synctexdir/$(DEPDIR)/eptex-synctex.Po \
synctexdir/$(DEPDIR)/etex-synctex.Po \
synctexdir/$(DEPDIR)/euptex-synctex.Po \
synctexdir/$(DEPDIR)/libluajittex_a-synctex.Po \
@@ -2493,7 +2493,6 @@
$(nodist_ctwill_refsort_SOURCES) \
$(nodist_ctwill_twinx_SOURCES) $(nodist_cweave_SOURCES) \
$(nodist_dvicopy_SOURCES) $(nodist_dvitype_SOURCES) \
- $(dist_eptex_SOURCES) $(nodist_eptex_SOURCES) \
$(dist_etex_SOURCES) $(nodist_etex_SOURCES) \
$(dist_euptex_SOURCES) $(nodist_euptex_SOURCES) \
$(gftodvi_SOURCES) $(nodist_gftodvi_SOURCES) \
@@ -2541,13 +2540,12 @@
$(am__libpdftex_a_SOURCES_DIST) $(EXTRA_libpdftex_a_SOURCES) \
$(libukanji_a_SOURCES) $(libunilib_a_SOURCES) \
$(am__libxetex_a_SOURCES_DIST) $(libsynctex_la_SOURCES) \
- $(dist_aleph_SOURCES) $(am__dist_eptex_SOURCES_DIST) \
- $(am__dist_etex_SOURCES_DIST) $(am__dist_euptex_SOURCES_DIST) \
- $(gftodvi_SOURCES) himktables.c $(md5main_SOURCES) \
- $(dist_mf_SOURCES) $(dist_mf_nowin_SOURCES) \
- $(dist_mflua_SOURCES) $(dist_mfluajit_SOURCES) \
- $(am__dist_pdftex_SOURCES_DIST) $(pdftosrc_SOURCES) \
- $(dist_ptex_SOURCES) $(synctex_SOURCES) \
+ $(dist_aleph_SOURCES) $(am__dist_etex_SOURCES_DIST) \
+ $(am__dist_euptex_SOURCES_DIST) $(gftodvi_SOURCES) \
+ himktables.c $(md5main_SOURCES) $(dist_mf_SOURCES) \
+ $(dist_mf_nowin_SOURCES) $(dist_mflua_SOURCES) \
+ $(dist_mfluajit_SOURCES) $(am__dist_pdftex_SOURCES_DIST) \
+ $(pdftosrc_SOURCES) $(dist_ptex_SOURCES) $(synctex_SOURCES) \
$(am__dist_tex_SOURCES_DIST) $(ttf2afm_SOURCES) \
$(EXTRA_ttf2afm_SOURCES) $(upbibtex_SOURCES) \
$(updvitype_SOURCES) $(uppltotf_SOURCES) $(dist_uptex_SOURCES) \
@@ -2708,6 +2706,7 @@
# Default flags passed to test drivers.
am__common_driver_flags = \
--color-tests "$$am__color_tests" \
+ $$am__collect_skipped_logs \
--enable-hard-errors "$$am__enable_hard_errors" \
--expect-failure "$$am__expect_failure"
# To be inserted before the command running the test. Creates the
@@ -2732,6 +2731,11 @@
elif test -f "$$f"; then dir=; \
else dir="$(srcdir)/"; fi; \
tst=$$dir$$f; log='$@'; \
+if test -n '$(IGNORE_SKIPPED_LOGS)'; then \
+ am__collect_skipped_logs='--collect-skipped-logs no'; \
+else \
+ am__collect_skipped_logs=''; \
+fi; \
if test -n '$(DISABLE_HARD_ERRORS)'; then \
am__enable_hard_errors=no; \
else \
@@ -2757,15 +2761,15 @@
bases=`echo $$bases`
AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)'
RECHECK_LOGS = $(TEST_LOGS)
-am__EXEEXT_43 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
+am__EXEEXT_42 = bibtex.test dvicopy.test dvitype.test gftodvi.test \
gftopk.test gftype.test mft.test patgen.test pktogf.test \
pktype.test pltotf.test pooltype.test tftopl.test vftovp.test \
vptovf.test weave.test twill.test
-am__EXEEXT_44 = $(am__EXEEXT_43) tests/bibtex-openout-test.pl \
+am__EXEEXT_43 = $(am__EXEEXT_42) tests/bibtex-openout-test.pl \
tests/bibtex-longline-test.pl tests/bibtex-mem.test \
tests/bibtex-bigauth.test tests/bibtex-auxinclude.test
- at WEB_TRUE@am__EXEEXT_45 = $(am__EXEEXT_44)
-am__EXEEXT_46 =
+ at WEB_TRUE@am__EXEEXT_44 = $(am__EXEEXT_43)
+am__EXEEXT_45 =
TEST_SUITE_LOG = test-suite.log
am__test_logs1 = $(TESTS:=.log)
am__test_logs2 = $(am__test_logs1:@EXEEXT at .log=.log)
@@ -2792,8 +2796,7 @@
$(srcdir)/alephdir/am/aleph.am $(srcdir)/am/bootstrap.am \
$(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/am/web.am \
$(srcdir)/c-auto.in $(srcdir)/ctangleboot-sh.in \
- $(srcdir)/eptexdir/am/eptex.am $(srcdir)/etexdir/am/etex.am \
- $(srcdir)/euptexdir/am/euptex.am \
+ $(srcdir)/etexdir/am/etex.am $(srcdir)/euptexdir/am/euptex.am \
$(srcdir)/hitexdir/am/hitex.am $(srcdir)/libmd5/am/md5.am \
$(srcdir)/luatexdir/am/libluatex.am \
$(srcdir)/luatexdir/am/libunilib.am \
@@ -2843,8 +2846,8 @@
top_distdir = $(distdir)
am__remove_distdir = \
if test -d "$(distdir)"; then \
- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -rf "$(distdir)" \
+ find "$(distdir)" -type d ! -perm -700 -exec chmod u+rwx {} ';' \
+ ; rm -rf "$(distdir)" \
|| { sleep 5 && rm -rf "$(distdir)"; }; \
else :; fi
am__post_remove_distdir = $(am__remove_distdir)
@@ -2874,7 +2877,7 @@
done; \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
+GZIP_ENV = -9
DIST_TARGETS = dist-gzip
# Exists only to be overridden by the user if desired.
AM_DISTCHECK_DVI_TARGET = dvi
@@ -2881,7 +2884,9 @@
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
+distcleancheck_listfiles = \
+ find . \( -type f -a \! \
+ \( -name .nfs* -o -name .smb* -o -name .__afs* \) \) -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
@@ -2997,7 +3002,7 @@
NMEDIT = @NMEDIT@
OBJCXX = @OBJCXX@
OBJCXXDEPMODE = @OBJCXXDEPMODE@
-OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_116)
+OBJCXXFLAGS = @OBJCXXFLAGS@ $(am__append_111)
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTANGLE = @OTANGLE@
@@ -3070,8 +3075,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -3144,8 +3151,8 @@
libluaharfbuzz.a libluajitharfbuzz.a libxetex.a libsynctex.a \
libmd5.a
EXTRA_LTLIBRARIES = libsynctex.la
-lib_LIBRARIES = $(am__append_128)
-lib_LTLIBRARIES = $(am__append_127)
+lib_LIBRARIES = $(am__append_123)
+lib_LTLIBRARIES = $(am__append_122)
dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5
nodist_man_MANS =
TEST_EXTENSIONS = .pl .test
@@ -3254,52 +3261,50 @@
ptexdir/tests/chcode-euc.pl ptexdir/tests/chcode-sjis.pl \
ptexdir/tests/skipjfmp.pl ptexdir/tests/skipjfmp.tfm \
ptexdir/ptrip/ptrip.diffs ptexdir/ptrip/texmf.cnf \
- $(eptex_web_srcs) $(eptex_ch_srcs) eptexdir/eptex.defines \
- eptexdir/ChangeLog eptexdir/Changes.txt eptexdir/README.txt \
- $(eptex_tests) eptexdir/eptrip/eptrip.diffs \
- eptexdir/eptrip/eptrip.log eptexdir/eptrip/eptrip.tex \
- eptexdir/eptrip/texmf.cnf eptexdir/pdfprimitive.test \
- eptexdir/tests/pdfprimitive-test.tex \
- eptexdir/tests/pdfprimitive-eptex.log $(uptex_web_srcs) \
- $(uptex_ch_srcs) uptexdir/uptex.defines uptexdir/upbibtex.ch \
- uptexdir/updvitype.ch uptexdir/uppltotf.ch \
- uptexdir/uptftopl.ch uptexdir/COPYRIGHT uptexdir/COPYRIGHT.ja \
- uptexdir/ChangeLog $(uptex_tests) $(upweb_tests) \
- tests/enc-u.bbl tests/enc-eu.bbl tests/enc-su.bbl \
- tests/enc-uu.bbl uptexdir/tests/uptex3.tex \
+ $(uptex_web_srcs) $(uptex_ch_srcs) uptexdir/uptex.defines \
+ uptexdir/upbibtex.ch uptexdir/updvitype.ch \
+ uptexdir/uppltotf.ch uptexdir/uptftopl.ch uptexdir/COPYRIGHT \
+ uptexdir/COPYRIGHT.ja uptexdir/ChangeLog $(uptex_tests) \
+ $(upweb_tests) tests/enc-u.bbl tests/enc-eu.bbl \
+ tests/enc-su.bbl tests/enc-uu.bbl uptexdir/tests/uptex3.tex \
uptexdir/tests/uptex3.dvi uptexdir/tests/uptex4.tex \
- uptexdir/tests/uptex4.dvi uptexdir/tests/uptex3a.typ \
- uptexdir/tests/uptex4a.typ uptexdir/tests/umin10.pl \
- uptexdir/tests/umin10.tfm uptexdir/tests/utmin10.pl \
- uptexdir/tests/utmin10.tfm uptexdir/tests/testnewu.pl \
- uptexdir/tests/testnewu.tfm uptexdir/tests/uparse.pl \
- uptexdir/tests/uparse.tfm uptexdir/tests/gkhugeok.tfm \
- uptexdir/tests/gkhugeng.tfm uptexdir/tests/gkhugeng.err \
- uptexdir/tests/gk256g.tfm uptexdir/tests/gk256k.tfm \
- uptexdir/uptrip/uptrip.diffs uptexdir/uptrip/texmf.cnf \
- $(euptex_web_srcs) $(euptex_ch_srcs) euptexdir/euptex.defines \
- euptexdir/COPYRIGHT euptexdir/COPYRIGHT.jis \
- euptexdir/ChangeLog euptexdir/EUPTEX.txt $(euptex_tests) \
+ uptexdir/tests/uptex4.dvi uptexdir/tests/uptex5.tex \
+ uptexdir/tests/uptex5.dvi uptexdir/tests/uptex3a.typ \
+ uptexdir/tests/uptex4a.typ uptexdir/tests/uptex5a.typ \
+ uptexdir/tests/umin10.pl uptexdir/tests/umin10.tfm \
+ uptexdir/tests/utmin10.pl uptexdir/tests/utmin10.tfm \
+ uptexdir/tests/testnewu.pl uptexdir/tests/testnewu.tfm \
+ uptexdir/tests/testnewu8.pl uptexdir/tests/testnewu8.tfm \
+ uptexdir/tests/uparse.pl uptexdir/tests/uparse.tfm \
+ uptexdir/tests/gkhugeok.tfm uptexdir/tests/gkhugeng.tfm \
+ uptexdir/tests/gkhugeng.err uptexdir/tests/gk256g.tfm \
+ uptexdir/tests/gk256k.tfm uptexdir/uptrip/uptrip.diffs \
+ uptexdir/uptrip/texmf.cnf $(euptex_web_srcs) $(euptex_ch_srcs) \
+ euptexdir/euptex.defines euptexdir/COPYRIGHT \
+ euptexdir/COPYRIGHT.jis euptexdir/ChangeLog \
+ euptexdir/EUPTEX.txt $(euptex_tests) \
euptexdir/eptrip/eptrip.log euptexdir/eptrip/eptrip.tex \
euptexdir/euptrip/euptrip.diffs euptexdir/euptrip/texmf.cnf \
euptexdir/pdfprimitive.test \
euptexdir/tests/pdfprimitive-test.tex \
- euptexdir/tests/pdfprimitive-euptex.log hitexdir/ChangeLog \
- $(hitex_web) $(hitex_tests) hitexdir/tests/hello.tex \
- hitexdir/tests/rule.tex pdftexdir/regex/COPYING.LIB \
- pdftexdir/regex/README $(pdftex_ch_srcs) \
- pdftexdir/pdftex.defines pdftexdir/ChangeLog pdftexdir/NEWS \
- pdftexdir/README pdftexdir/change-files.txt $(pdftex_tests) \
- tests/wprob.tex pdftexdir/tests/pdfimage.tex tests/1-4.jpg \
- tests/B.pdf tests/basic.tex tests/lily-ledger-broken.png \
- tests/expanded.tex tests/expanded.txt tests/cnfline.tex \
- tests/partoken-ok.tex tests/partoken-xfail.tex \
- $(ttf2afm_tests) pdftexdir/tests/postV3.afm \
- pdftexdir/tests/postV3.ttf pdftexdir/tests/postV7.afm \
- pdftexdir/tests/postV7.ttf $(pdftosrc_tests) \
- pdftexdir/tests/test-13.pdf pdftexdir/tests/test-13.xref \
- pdftexdir/tests/test-15.pdf pdftexdir/tests/test-15.xref \
- $(libluasocket_sources) luatexdir/luasocket/src/ftp_lua.c \
+ euptexdir/tests/pdfprimitive-euptex.log \
+ euptexdir/tests/ctrlsym.log euptexdir/tests/ctrlsym.tex \
+ hitexdir/ChangeLog $(hitex_web) $(hitex_tests) \
+ hitexdir/tests/hello.tex hitexdir/tests/rule.tex \
+ pdftexdir/regex/COPYING.LIB pdftexdir/regex/README \
+ $(pdftex_ch_srcs) pdftexdir/pdftex.defines pdftexdir/ChangeLog \
+ pdftexdir/NEWS pdftexdir/README pdftexdir/change-files.txt \
+ $(pdftex_tests) tests/wprob.tex pdftexdir/tests/pdfimage.tex \
+ tests/1-4.jpg tests/B.pdf tests/basic.tex \
+ tests/lily-ledger-broken.png tests/expanded.tex \
+ tests/expanded.txt tests/cnfline.tex tests/partoken-ok.tex \
+ tests/partoken-xfail.tex $(ttf2afm_tests) \
+ pdftexdir/tests/postV3.afm pdftexdir/tests/postV3.ttf \
+ pdftexdir/tests/postV7.afm pdftexdir/tests/postV7.ttf \
+ $(pdftosrc_tests) pdftexdir/tests/test-13.pdf \
+ pdftexdir/tests/test-13.xref pdftexdir/tests/test-15.pdf \
+ pdftexdir/tests/test-15.xref $(libluasocket_sources) \
+ luatexdir/luasocket/src/ftp_lua.c \
luatexdir/luasocket/src/headers_lua.c \
luatexdir/luasocket/src/http_lua.c \
luatexdir/luasocket/src/ltn12_lua.c \
@@ -3485,7 +3490,8 @@
xetexdir/unicode-char-prep.pl xetexdir/xewebmac.tex \
$(xetex_tests) xetexdir/tests/bug73.log \
xetexdir/tests/bug73.tex xetexdir/tests/filedump.log \
- xetexdir/tests/filedump.tex omegaware/README \
+ xetexdir/tests/filedump.tex xetexdir/tests/ctrlsym.log \
+ xetexdir/tests/ctrlsym.tex omegaware/README \
omegaware/ChangeLog $(odvicopy_sources) $(odvitype_sources) \
omegaware/ofm2opl.web omegaware/ofm2opl.up \
omegaware/ofm2opl.ch omegaware/opl2ofm.web \
@@ -3545,10 +3551,8 @@
synctexdir/synctex-mem.ch2 synctexdir/synctex-rec.ch0 \
synctexdir/synctex-rec.ch1 synctexdir/synctex-rec.ch2 \
synctexdir/synctex-e-mem.ch0 synctexdir/synctex-e-mem.ch1 \
- synctexdir/synctex-e-rec.ch0 synctexdir/synctex-ep-mem.ch0 \
- synctexdir/synctex-ep-mem.ch1 synctexdir/synctex-ep-rec.ch0 \
- synctexdir/synctex-pdf-rec.ch2 synctexdir/synctex-xe-rec.ch3 \
- $(synctex_tests) libmd5/md5.test
+ synctexdir/synctex-e-rec.ch0 synctexdir/synctex-pdf-rec.ch2 \
+ synctexdir/synctex-xe-rec.ch3 $(synctex_tests) libmd5/md5.test
DISTCLEANFILES = CXXLD.sh tangle.c tangle.h tangle.p tangle-web2c \
tangleboot.c tangleboot.h tangleboot.p tangleboot-web2c \
ctangle.c cweb.c common-ctangle ctangleboot.c cwebboot.c \
@@ -3596,8 +3600,6 @@
ptests/xpagenum.typ ptests/xptex[34]*.typ ptests/xcmr10.tfm \
ptests/xcmr10.pl ptests/xsample*.typ ptests/x*min10.* \
ptests/xchcode*.* ptests/xskipjfmp.* ptrip.diffs \
- $(nodist_eptex_SOURCES) eptex.web eptex.ch eptex-web2c eptex.p \
- eptex.pool eptex-tangle eptrip.diffs pdfprimitive-eptex.* \
$(nodist_uptex_SOURCES) uptex.web uptex.ch uptex-web2c uptex.p \
uptex.pool uptex-tangle $(upweb_programs:=.c) \
$(upweb_programs:=.h) $(upweb_programs:=.p) \
@@ -3605,14 +3607,15 @@
uptests/nissya_bib.* uptests/xexampl.aux uptests/xexampl.bbl \
uptests/xexampl.blg uptests/xenc*.* uptests/fn*.* \
uptests/memtest.bib uptests/memtest?.* uptests/xstory.dvityp \
- uptests/xpagenum.typ uptests/x*ptex[34]*.typ \
+ uptests/xpagenum.typ uptests/x*ptex[345]*.typ \
uptests/xcmr10.tfm uptests/xcmr10.pl uptests/xsample*.typ \
- uptests/x*min10.* uptests/xchcode*.* uptests/xtestnewu.* \
+ uptests/x*min10.* uptests/xchcode*.* uptests/xtestnewu*.* \
uptests/xuparse.* uptests/yuparse.* uptests/ygkhuge*.* \
uptests/ygk256*.* uptests/xskipjfmp.* uptrip.diffs \
$(nodist_euptex_SOURCES) euptex.web euptex.ch euptex-web2c \
euptex.p euptex.pool euptex-tangle euptrip.diffs \
- pdfprimitive-euptex.* $(nodist_hitex_SOURCES) \
+ pdfprimitive-euptex.* eup-ctrlsym.fmt eup-ctrlsym.log \
+ eup-ctrlsym.out eup-ctrlsym.tex $(nodist_hitex_SOURCES) \
$(nodist_hishrink_SOURCES) $(nodist_histretch_SOURCES) \
hiformat-tangle hitex-tangle hello.log rule.log \
$(nodist_pdftex_SOURCES) pdftex-final.ch pdftex-web2c pdftex.p \
@@ -3623,51 +3626,50 @@
$(nodist_libluatex_sources) luaimage.* luajitimage.* \
$(nodist_xetex_SOURCES) xetex.web xetex-final.ch xetex-web2c \
xetex.p xetex.pool xetex-tangle bug73.fmt bug73.log bug73.out \
- bug73.tex filedump.log filedump.out filedump.tex xetests/fn*.* \
- $(omegaware_programs:=.c) $(omegaware_programs:=.h) \
- $(omegaware_programs:=.p) $(omegaware_programs:=-web2c) \
- ofm2opl.web opl2ofm.web ovf2ovp.web ovp2ovf.web \
- omegaware/bad*.* omegaware/tests/charwdr.* \
- omegaware/tests/charwdv.* omegaware/tests/xcheck* \
- omegaware/tests/xlevel1.* omegaware/tests/xlig*.* ofont*vf \
- omegaware/tests/xpagenum.* omegaware/tests/xofont* \
- omegaware/tests/Cherokee.tfm omegaware/tests/OCherokee.ofm \
- omegaware/tests/OCherokee.opl omegaware/tests/OCherokee.ovf \
- omegaware/tests/xCherokee.* omegaware/tests/xOCherokee.* \
- ocftest.* omegaware/tests/xinbmp* omegaware/tests/xoverbmp* \
- omegaware/tests/xrealnum.* omegaware/tests/xrepeated.* \
- omegaware/tests/sample*.ofm omegaware/tests/sample*.ovf \
- omegaware/tests/sample1-h.opl omegaware/tests/xsample*.out \
- omegaware/tests/shortend.* omegaware/tests/specialhex.ofm \
- omegaware/tests/specialhex.opl omegaware/tests/specialhex.ovf \
- omegaware/tests/xspecialhex.* omegaware/tests/yrepeat* \
- omegaware/tests/*yarabic* $(nodist_aleph_SOURCES) aleph.web \
- aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
+ bug73.tex filedump.log filedump.out filedump.tex \
+ xe-ctrlsym.fmt xe-ctrlsym.log xe-ctrlsym.out xe-ctrlsym.tex \
+ xetests/fn*.* $(omegaware_programs:=.c) \
+ $(omegaware_programs:=.h) $(omegaware_programs:=.p) \
+ $(omegaware_programs:=-web2c) ofm2opl.web opl2ofm.web \
+ ovf2ovp.web ovp2ovf.web omegaware/bad*.* \
+ omegaware/tests/charwdr.* omegaware/tests/charwdv.* \
+ omegaware/tests/xcheck* omegaware/tests/xlevel1.* \
+ omegaware/tests/xlig*.* ofont*vf omegaware/tests/xpagenum.* \
+ omegaware/tests/xofont* omegaware/tests/Cherokee.tfm \
+ omegaware/tests/OCherokee.ofm omegaware/tests/OCherokee.opl \
+ omegaware/tests/OCherokee.ovf omegaware/tests/xCherokee.* \
+ omegaware/tests/xOCherokee.* ocftest.* omegaware/tests/xinbmp* \
+ omegaware/tests/xoverbmp* omegaware/tests/xrealnum.* \
+ omegaware/tests/xrepeated.* omegaware/tests/sample*.ofm \
+ omegaware/tests/sample*.ovf omegaware/tests/sample1-h.opl \
+ omegaware/tests/xsample*.out omegaware/tests/shortend.* \
+ omegaware/tests/specialhex.ofm omegaware/tests/specialhex.opl \
+ omegaware/tests/specialhex.ovf omegaware/tests/xspecialhex.* \
+ omegaware/tests/yrepeat* omegaware/tests/*yarabic* \
+ $(nodist_aleph_SOURCES) aleph.web aleph.ch aleph-web2c aleph.p \
+ aleph.pool aleph-tangle
CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LIBRARIES) $(EXTRA_LTLIBRARIES)
TRIPTRAP_CLEAN = $(am__append_8) $(am__append_18) $(am__append_27) \
$(am__append_36) $(am__append_44) $(am__append_60) \
- $(am__append_64) $(am__append_70) $(am__append_75) \
- $(am__append_83)
+ $(am__append_64) $(am__append_70) $(am__append_78)
TRIPTRAP = $(am__append_7) $(am__append_17) $(am__append_26) \
$(am__append_35) $(am__append_43) $(am__append_59) \
- $(am__append_63) $(am__append_69) $(am__append_74) \
- $(am__append_82)
+ $(am__append_63) $(am__append_69) $(am__append_77)
bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \
$(am__append_24) $(am__append_33) $(am__append_41) \
- $(am__append_49) $(am__append_54) $(am__append_67) \
- upbibtex$(EXEEXT):pbibtex updvitype$(EXEEXT):pdvitype \
- uppltotf$(EXEEXT):ppltotf uptftopl$(EXEEXT):ptftopl \
- $(am__append_78) $(am__append_79) $(am__append_80) \
- $(am__append_94) $(am__append_99) $(am__append_104) \
- $(am__append_109)
+ $(am__append_49) $(am__append_54) upbibtex$(EXEEXT):pbibtex \
+ updvitype$(EXEEXT):pdvitype uppltotf$(EXEEXT):ppltotf \
+ uptftopl$(EXEEXT):ptftopl $(am__append_73) $(am__append_74) \
+ $(am__append_75) $(am__append_89) $(am__append_94) \
+ $(am__append_99) $(am__append_104)
install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \
$(am__append_39) $(am__append_47) $(am__append_52) \
- $(am__append_92) $(am__append_97) $(am__append_102) \
- $(am__append_107)
+ $(am__append_87) $(am__append_92) $(am__append_97) \
+ $(am__append_102)
uninstall_exe_links = $(am__append_13) $(am__append_23) \
$(am__append_32) $(am__append_40) $(am__append_48) \
- $(am__append_53) $(am__append_93) $(am__append_98) \
- $(am__append_103) $(am__append_108)
+ $(am__append_53) $(am__append_88) $(am__append_93) \
+ $(am__append_98) $(am__append_103)
NEVER_DIST = `find . $(NEVER_NAMES)` cwebdir/cweave.log \
cwebdir/cweave.trs cwebdir/ctwill.log cwebdir/ctwill.trs \
cwebdir/refsort.log cwebdir/refsort.trs cwebdir/twinx.log \
@@ -3844,18 +3846,18 @@
initex_CPPFLAGS = -DEXEPROG=\"tex.exe\"
nodist_initex_SOURCES = callexe.c
initex_LDADD =
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_132)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_127)
# With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_133)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_128)
# TeX C sources
tex_c_h = texini.c tex0.c texcoerce.h texd.h
nodist_tex_SOURCES = $(tex_c_h) tex-pool.c
-dist_tex_SOURCES = texextra.c $(am__append_135)
+dist_tex_SOURCES = texextra.c $(am__append_130)
# We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_134)
+tex_prereq = texd.h $(am__append_129)
tex_ch_srcs = \
tex.web \
tex.ch \
@@ -4355,10 +4357,10 @@
mplibdir/pngout.w mplibdir/mpmath.w mplibdir/mpmathbinary.w \
mplibdir/mpmathinterval.w mplibdir/mpmathdecimal.w \
mplibdir/mpmathdouble.w mplibdir/mpstrings.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(am__append_136)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) $(am__append_131)
# With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_137)
+etex_LDADD = $(LDADD) $(ZLIB_LIBS) $(ipc_socketlibs) $(am__append_132)
etex_DEPENDENCIES = $(ZLIB_DEPEND)
# e-TeX C sources
@@ -4365,11 +4367,11 @@
etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
nodist_etex_SOURCES = $(etex_c_h) etex-pool.c
dist_etex_SOURCES = etexdir/etexextra.c etexdir/etexextra.h \
- etexdir/etex_version.h $(am__append_139)
+ etexdir/etex_version.h $(am__append_134)
# We must create etexd.h and etexdir/etex_version.h before building the
# etex_OBJECTS.
-etex_prereq = etexd.h etexdir/etex_version.h $(am__append_138)
+etex_prereq = etexd.h etexdir/etex_version.h $(am__append_133)
etex_web_srcs = \
tex.web \
etexdir/etex.ch
@@ -4436,58 +4438,6 @@
ptexdir/pver.test \
ptexdir/wcfname.test
-eptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) -I$(srcdir)/libmd5 \
- $(ZLIB_INCLUDES) $(am__append_140)
-
-# With --enable-ipc, e-pTeX may need to link with -lsocket.
-eptex_LDADD = libkanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
- $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_141)
-eptex_DEPENDENCIES = libkanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND)
-
-# e-pTeX C sources
-eptex_c_h = eptexini.c eptex0.c eptexcoerce.h eptexd.h
-nodist_eptex_SOURCES = $(eptex_c_h) eptex-pool.c
-dist_eptex_SOURCES = eptexdir/eptexextra.c eptexdir/eptexextra.h \
- eptexdir/eptex_version.h $(am__append_143)
-
-# We must create eptexd.h and eptexdir/eptex_version.h before building the eptex_OBJECTS.
-eptex_prereq = eptexd.h etexdir/etex_version.h ptexdir/ptex_version.h \
- eptexdir/eptex_version.h $(am__append_142)
-eptex_web_srcs = \
- tex.web \
- etexdir/etex.ch \
- etexdir/tex.ch0 \
- tex.ch \
- tracingstacklevels.ch \
- partoken.ch \
- locnull-optimize.ch \
- showstream.ch \
- zlib-fmt.ch \
- etexdir/tex.ech
-
-eptex_ch_srcs = \
- eptexdir/eptex-base.ch \
- eptexdir/etex.ch0 \
- ptexdir/ptex-base.ch \
- eptexdir/eptex.ech \
- eptexdir/etex.ch1 \
- $(eptex_ch_synctex) \
- eptexdir/fam256.ch \
- eptexdir/pdfutils.ch \
- eptexdir/suppresserrors.ch \
- eptexdir/unbalanced-braces-eptex.ch \
- eptexdir/char-warning-eptex.ch \
- tex-binpool.ch
-
-
-# e-pTeX Tests
-#
-eptex_tests = \
- eptexdir/eptriptest.test \
- eptexdir/pdfprimitive.test \
- eptexdir/epver.test \
- eptexdir/wcfname.test
-
uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) $(ZLIB_INCLUDES)
uptex_ldadd = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) $(ZLIB_LIBS)
uptex_dependencies = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(ZLIB_DEPEND) $(default_dependencies)
@@ -4561,11 +4511,11 @@
uptexdir/newjfm.test uptexdir/uparse.test uptexdir/gkhuge.test \
uptexdir/gk256.test
euptex_CPPFLAGS = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS) \
- -I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_144)
+ -I$(srcdir)/libmd5 $(ZLIB_INCLUDES) $(am__append_135)
# With --enable-ipc, e-upTeX may need to link with -lsocket.
euptex_LDADD = libukanji.a $(pproglib) $(PTEXENC_LIBS) $(LDADD) \
- $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_145)
+ $(ipc_socketlibs) libmd5.a $(ZLIB_LIBS) $(am__append_136)
euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_dependencies) libmd5.a $(ZLIB_DEPEND)
# e-upTeX C sources
@@ -4572,12 +4522,12 @@
euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c
dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \
- $(am__append_147)
+ $(am__append_138)
# We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS.
euptex_prereq = euptexd.h etexdir/etex_version.h \
uptexdir/ptex_version.h euptexdir/eptex_version.h \
- uptexdir/uptex_version.h $(am__append_146)
+ uptexdir/uptex_version.h $(am__append_137)
euptex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -4594,17 +4544,13 @@
euptexdir/etex.ch0 \
uptexdir/ptex-base.ch \
uptexdir/uptex-m.ch \
- euptexdir/euptex.ch0 \
euptexdir/eptex.ech \
euptexdir/etex.ch1 \
- euptexdir/euptex.ch1 \
$(euptex_ch_synctex) \
euptexdir/fam256.ch \
- euptexdir/pdfstrcmp-eup-pre.ch \
euptexdir/pdfutils.ch \
- euptexdir/pdfstrcmp-eup-post.ch \
euptexdir/suppresserrors.ch \
- eptexdir/unbalanced-braces-eptex.ch \
+ euptexdir/unbalanced-braces-eptex.ch \
euptexdir/char-warning-eptex.ch \
tex-binpool.ch
@@ -4614,6 +4560,7 @@
euptex_tests = \
euptexdir/euptriptest.test euptexdir/eptriptest.test \
euptexdir/pdfprimitive.test \
+ euptexdir/euptex-ctrlsym.test \
euptexdir/eupver.test \
euptexdir/upkcat.test \
euptexdir/wcfname.test euptexdir/wcfname0.test
@@ -4697,7 +4644,7 @@
pdftexdir/writejbig2.c pdftexdir/writejpg.c \
pdftexdir/writepng.c pdftexdir/writet1.c pdftexdir/writet3.c \
pdftexdir/writettf.c pdftexdir/writettf.h pdftexdir/writezip.c \
- $(am__append_87)
+ $(am__append_82)
@MINGW32_TRUE at REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex
EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
@@ -4713,7 +4660,7 @@
# Force Automake to use CXXLD for linking
nodist_EXTRA_pdftex_SOURCES = dummy.cxx
pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir AM_V_P=$(AM_V_P) $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_148)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_139)
pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
# With --enable-ipc, pdfTeX may need to link with -lsocket.
@@ -4726,7 +4673,7 @@
nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c
dist_pdftex_SOURCES = pdftexdir/pdftexextra.c pdftexdir/pdftexextra.h \
pdftexdir/pdftex_version.h pdftexdir/etex_version.h \
- $(am__append_149)
+ $(am__append_140)
pdftex_ch_srcs = \
pdftexdir/pdftex.web \
pdftexdir/tex.ch0 \
@@ -4778,7 +4725,7 @@
#liblua53socket_a_CPPFLAGS = \
# -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket $(LUA_LUA53_INCLUDES)
libluajitsocket_a_CPPFLAGS = \
- -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket $(LUAJIT_INCLUDES)
+ -DLUASOCKET_DEBUG -I$(top_srcdir)/luatexdir/luasocket $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES)
libluasocket_a_CFLAGS = # $(WARNING_CFLAGS)
libluajitsocket_a_CFLAGS = # $(WARNING_CFLAGS)
@@ -4824,8 +4771,8 @@
libluamisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_INCLUDES)
#liblua53misc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) $(PPLIB_INCLUDES) $(LUA_LUA53_INCLUDES)
libluajitmisc_a_CPPFLAGS = $(ZLIB_INCLUDES) $(ZZIPLIB_INCLUDES) \
- $(PPLIB_INCLUDES) $(LUAJIT_INCLUDES) -DLuajitTeX \
- -I$(srcdir)/luatexdir
+ $(PPLIB_INCLUDES) $(LUAJIT_INCLUDES) $(LUAJIT_DEFINES) \
+ -DLuajitTeX -I$(srcdir)/luatexdir
libluamisc_a_CFLAGS = # $(WARNING_CFLAGS)
#liblua53misc_a_CFLAGS = # $(WARNING_CFLAGS)
libluajitmisc_a_CFLAGS = # $(WARNING_CFLAGS)
@@ -5379,7 +5326,8 @@
libluajitharfbuzz_a_DEPENDENCIES = $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND)
libluaharfbuzz_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUA_INCLUDES) $(HARFBUZZ_INCLUDES) $(GRAPHITE2_INCLUDES)
libluajitharfbuzz_a_CPPFLAGS = $(AM_CPPFLAGS) $(LUAJIT_INCLUDES) \
- $(HARFBUZZ_INCLUDES) $(GRAPHITE2_INCLUDES) -DLuajitTeX
+ $(LUAJIT_DEFINES) $(HARFBUZZ_INCLUDES) $(GRAPHITE2_INCLUDES) \
+ -DLuajitTeX
libluaharfbuzz_a_CFLAGS = # $(WARNING_CFLAGS)
libluajitharfbuzz_a_CFLAGS = # $(WARNING_CFLAGS)
libluaharfbuzz_a_SOURCES = \
@@ -5408,18 +5356,18 @@
xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
$(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(HARFBUZZ_INCLUDES) \
$(GRAPHITE2_INCLUDES) $(LIBPNG_INCLUDES) $(ZLIB_INCLUDES) \
- $(PPLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_115) \
- $(am__append_117)
+ $(PPLIB_INCLUDES) -I$(srcdir)/libmd5 $(am__append_110) \
+ $(am__append_112)
xetex_ldadd = $(libxetex) $(HARFBUZZ_LIBS) $(GRAPHITE2_LIBS) \
$(ICU_LIBS) $(ICU_LIBS_EXTRA) $(TECKIT_LIBS) $(LIBPNG_LIBS) \
$(FREETYPE2_LIBS) $(PPLIB_LIBS) $(ZLIB_LIBS) libmd5.a \
- $(am__append_118)
+ $(am__append_113)
xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
$(TECKIT_DEPEND) $(HARFBUZZ_DEPEND) $(GRAPHITE2_DEPEND) \
$(LIBPNG_DEPEND) $(FREETYPE2_DEPEND) $(ZLIB_DEPEND) \
$(PPLIB_DEPEND) libmd5.a
@XETEX_MACOSX_TRUE at xetex_LDFLAGS = -framework ApplicationServices -framework Cocoa
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_150)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_141)
xetex_CFLAGS = $(WARNING_CFLAGS)
xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
@@ -5428,7 +5376,7 @@
nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c
dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h \
xetexdir/etex_version.h xetexdir/xetex_version.h \
- $(am__append_151)
+ $(am__append_142)
xetex_ch_srcs = \
xetexdir/xetex.web \
xetexdir/tex.ch0 \
@@ -5462,7 +5410,7 @@
xetexdir/image/jpegimage.h xetexdir/image/mfileio.c \
xetexdir/image/mfileio.h xetexdir/image/numbers.c \
xetexdir/image/numbers.h xetexdir/image/pngimage.c \
- xetexdir/image/pngimage.h $(am__append_119) $(am__append_120)
+ xetexdir/image/pngimage.h $(am__append_114) $(am__append_115)
# We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -5472,6 +5420,7 @@
xetex_tests = \
xetexdir/xetex-filedump.test \
xetexdir/xetex-bug73.test \
+ xetexdir/xetex-ctrlsym.test \
xetexdir/xetex.test \
xetexdir/wcfname.test
@@ -5568,13 +5517,13 @@
synctex_SOURCES = \
synctexdir/synctex_main.c
-synctex_CPPFLAGS = -I$(srcdir)/synctexdir $(am__append_129)
-synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_130)
+synctex_CPPFLAGS = -I$(srcdir)/synctexdir $(am__append_124)
+synctex_LDADD = $(libsynctex) $(ZLIB_LIBS) $(am__append_125)
libsynctex = $(LTLIBSYNCTEX) $(LIBSYNCTEX)
libsynctex_la_CPPFLAGS = -I$(srcdir)/synctexdir $(ZLIB_INCLUDES) -DSYNCTEX_USE_LOCAL_HEADER
libsynctex_a_CPPFLAGS = $(libsynctex_la_CPPFLAGS)
libsynctex_la_LDFLAGS = -rpath @libdir@ -bindir @bindir@ -no-undefined -version-info $(SYNCTEX_LT_VERSINFO)
-libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_131)
+libsynctex_la_LIBADD = $(ZLIB_LIBS) $(am__append_126)
libsynctex_la_SOURCES = \
synctexdir/synctex_parser.c \
synctexdir/synctex_parser_local.h \
@@ -5606,19 +5555,6 @@
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
@ETEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch0
- at EPTEX_SYNCTEX_TRUE@eptex_ch_synctex = \
- at EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-def.ch0 \
- at EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-mem.ch0 \
- at EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-mem.ch0 \
- at EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-e-mem.ch0 \
- at EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-mem.ch1 \
- at EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch0 \
- at EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch0 \
- at EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-rec.ch1 \
- at EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-rec.ch0 \
- at EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-e-rec.ch0 \
- at EPTEX_SYNCTEX_TRUE@ synctexdir/synctex-p-rec.ch1
-
@EUPTEX_SYNCTEX_TRUE at euptex_ch_synctex = \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-def.ch0 \
@EUPTEX_SYNCTEX_TRUE@ synctexdir/synctex-ep-mem.ch0 \
@@ -5669,7 +5605,7 @@
.SUFFIXES: .c .cc .cin .cpp .cxx .h .hin .lo .log .mm .o .obj .p .pin .pl .pl$(EXEEXT) .test .test$(EXEEXT) .trs
am--refresh: Makefile
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluadir/am/mfluaotfcc.am $(srcdir)/mfluadir/am/mfluapotrace.am $(srcdir)/mfluadir/am/mflualpeg.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mfluajitdir/am/mfluajitlpeg.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/hitexdir/am/hitex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luaharfbuzz.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluadir/am/mfluaotfcc.am $(srcdir)/mfluadir/am/mfluapotrace.am $(srcdir)/mfluadir/am/mflualpeg.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mfluajitdir/am/mfluajitlpeg.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/hitexdir/am/hitex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luaharfbuzz.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -5691,7 +5627,7 @@
echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
esac;
-$(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluadir/am/mfluaotfcc.am $(srcdir)/mfluadir/am/mfluapotrace.am $(srcdir)/mfluadir/am/mflualpeg.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mfluajitdir/am/mfluajitlpeg.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/eptexdir/am/eptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/hitexdir/am/hitex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luaharfbuzz.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__empty):
+$(srcdir)/../../am/dist_hook.am $(srcdir)/am/bootstrap.am $(srcdir)/am/web.am $(srcdir)/am/cweb.am $(srcdir)/am/texmf.am $(srcdir)/mfluadir/am/mflua.am $(srcdir)/mfluadir/am/mfluaotfcc.am $(srcdir)/mfluadir/am/mfluapotrace.am $(srcdir)/mfluadir/am/mflualpeg.am $(srcdir)/mfluajitdir/am/mfluajit.am $(srcdir)/mfluajitdir/am/mfluajitlpeg.am $(srcdir)/mplibdir/am/mplib.am $(srcdir)/pmpostdir/am/pmpost.am $(srcdir)/mplibdir/am/libmputil.am $(srcdir)/mplibdir/am/libmplib.am $(srcdir)/etexdir/am/etex.am $(srcdir)/ptexdir/am/ptex.am $(srcdir)/uptexdir/am/uptex.am $(srcdir)/euptexdir/am/euptex.am $(srcdir)/hitexdir/am/hitex.am $(srcdir)/pdftexdir/am/libpdftex.am $(srcdir)/pdftexdir/am/pdftex.am $(srcdir)/pdftexdir/am/ttf2afm.am $(srcdir)/pdftexdir/am/pdftosrc.am $(srcdir)/luatexdir/am/luasocket.am $(srcdir)/luatexdir/am/luamisc.am $(srcdir)/luatexdir/am/libunilib.am $(srcdir)/luatexdir/am/luafontforge.am $(srcdir)/luatexdir/am/libluatex.am $(srcdir)/luatexdir/am/luaffi.am $(srcdir)/luatexdir/am/luatex.am $(srcdir)/luatexdir/am/luaharfbuzz.am $(srcdir)/xetexdir/am/xetex.am $(srcdir)/omegaware/am/omegaware.am $(srcdir)/alephdir/am/aleph.am $(srcdir)/synctexdir/am/synctex.am $(srcdir)/libmd5/am/md5.am $(srcdir)/../../am/bin_links.am $(am__empty):
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
@@ -5707,12 +5643,12 @@
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) w2c/stamp-h1
w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
- @rm -f w2c/stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h
+ $(AM_V_at)rm -f w2c/stamp-h1
+ $(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h
$(srcdir)/c-auto.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
- rm -f w2c/stamp-h1
- touch $@
+ $(AM_V_GEN)($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+ $(AM_V_at)rm -f w2c/stamp-h1
+ $(AM_V_at)touch $@
ff-config.h: stamp-h2
@test -f $@ || rm -f stamp-h2
@@ -5719,8 +5655,8 @@
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h2
stamp-h2: $(top_srcdir)/luatexdir/luafontloader/ff-config.in $(top_builddir)/config.status
- @rm -f stamp-h2
- cd $(top_builddir) && $(SHELL) ./config.status ff-config.h
+ $(AM_V_at)rm -f stamp-h2
+ $(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status ff-config.h
distclean-hdr:
-rm -f w2c/c-auto.h w2c/stamp-h1 ff-config.h stamp-h2
@@ -5773,25 +5709,15 @@
`; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ cd "$(DESTDIR)$(bindir)" && $(am__rm_f) $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ $(am__rm_f) $(bin_PROGRAMS)
+ test -z "$(EXEEXT)" || $(am__rm_f) $(bin_PROGRAMS:$(EXEEXT)=)
clean-noinstPROGRAMS:
- @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ $(am__rm_f) $(noinst_PROGRAMS)
+ test -z "$(EXEEXT)" || $(am__rm_f) $(noinst_PROGRAMS:$(EXEEXT)=)
install-libLIBRARIES: $(lib_LIBRARIES)
@$(NORMAL_INSTALL)
@list='$(lib_LIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -5822,7 +5748,7 @@
dir='$(DESTDIR)$(libdir)'; $(am__uninstall_files_from_dir)
clean-libLIBRARIES:
- -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES)
+ -$(am__rm_f) $(lib_LIBRARIES)
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@$(NORMAL_INSTALL)
@@ -5849,21 +5775,19 @@
done
clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ -$(am__rm_f) $(lib_LTLIBRARIES)
@list='$(lib_LTLIBRARIES)'; \
locs=`for p in $$list; do echo $$p; done | \
sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
sort -u`; \
- test -z "$$locs" || { \
- echo rm -f $${locs}; \
- rm -f $${locs}; \
- }
+ echo rm -f $${locs}; \
+ $(am__rm_f) $${locs}
luatexdir/luafontloader/fontforge/fontforge/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luafontloader/fontforge/fontforge
- @: > luatexdir/luafontloader/fontforge/fontforge/$(am__dirstamp)
+ @: >>luatexdir/luafontloader/fontforge/fontforge/$(am__dirstamp)
luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)
- @: > luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/$(am__dirstamp)
luatexdir/luafontloader/fontforge/fontforge/libff_a-autohint.$(OBJEXT): \
luatexdir/luafontloader/fontforge/fontforge/$(am__dirstamp) \
luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/$(am__dirstamp)
@@ -5989,10 +5913,10 @@
luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/$(am__dirstamp)
luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luafontloader/fontforge/gutils
- @: > luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp)
+ @: >>luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp)
luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)
- @: > luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp)
luatexdir/luafontloader/fontforge/gutils/libff_a-fsys.$(OBJEXT): \
luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp) \
luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp)
@@ -6000,13 +5924,13 @@
libff.a: $(libff_a_OBJECTS) $(libff_a_DEPENDENCIES) $(EXTRA_libff_a_DEPENDENCIES)
$(AM_V_at)-rm -f libff.a
$(AM_V_AR)$(libff_a_AR) libff.a $(libff_a_OBJECTS) $(libff_a_LIBADD)
- $(AM_V_at)$(RANLIB) libff.a
+ $(AM_V_at)$(libff_a_RANLIB) libff.a
ptexdir/$(am__dirstamp):
@$(MKDIR_P) ptexdir
- @: > ptexdir/$(am__dirstamp)
+ @: >>ptexdir/$(am__dirstamp)
ptexdir/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) ptexdir/$(DEPDIR)
- @: > ptexdir/$(DEPDIR)/$(am__dirstamp)
+ @: >>ptexdir/$(DEPDIR)/$(am__dirstamp)
ptexdir/libkanji_a-kanji.$(OBJEXT): ptexdir/$(am__dirstamp) \
ptexdir/$(DEPDIR)/$(am__dirstamp)
ptexdir/libkanji_a-kanji_dump.$(OBJEXT): ptexdir/$(am__dirstamp) \
@@ -6015,13 +5939,13 @@
libkanji.a: $(libkanji_a_OBJECTS) $(libkanji_a_DEPENDENCIES) $(EXTRA_libkanji_a_DEPENDENCIES)
$(AM_V_at)-rm -f libkanji.a
$(AM_V_AR)$(libkanji_a_AR) libkanji.a $(libkanji_a_OBJECTS) $(libkanji_a_LIBADD)
- $(AM_V_at)$(RANLIB) libkanji.a
+ $(AM_V_at)$(libkanji_a_RANLIB) libkanji.a
luatexdir/luaffi/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luaffi
- @: > luatexdir/luaffi/$(am__dirstamp)
+ @: >>luatexdir/luaffi/$(am__dirstamp)
luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luaffi/$(DEPDIR)
- @: > luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp)
luatexdir/luaffi/libluaffi_a-call.$(OBJEXT): \
luatexdir/luaffi/$(am__dirstamp) \
luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp)
@@ -6038,13 +5962,13 @@
libluaffi.a: $(libluaffi_a_OBJECTS) $(libluaffi_a_DEPENDENCIES) $(EXTRA_libluaffi_a_DEPENDENCIES)
$(AM_V_at)-rm -f libluaffi.a
$(AM_V_AR)$(libluaffi_a_AR) libluaffi.a $(libluaffi_a_OBJECTS) $(libluaffi_a_LIBADD)
- $(AM_V_at)$(RANLIB) libluaffi.a
+ $(AM_V_at)$(libluaffi_a_RANLIB) libluaffi.a
luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luaharfbuzz/src/luaharfbuzz
- @: > luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp)
+ @: >>luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp)
luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)
- @: > luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
luatexdir/luaharfbuzz/src/luaharfbuzz/libluaharfbuzz_a-blob.$(OBJEXT): \
luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
@@ -6091,12 +6015,12 @@
libluaharfbuzz.a: $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_DEPENDENCIES) $(EXTRA_libluaharfbuzz_a_DEPENDENCIES)
$(AM_V_at)-rm -f libluaharfbuzz.a
$(AM_V_AR)$(libluaharfbuzz_a_AR) libluaharfbuzz.a $(libluaharfbuzz_a_OBJECTS) $(libluaharfbuzz_a_LIBADD)
- $(AM_V_at)$(RANLIB) libluaharfbuzz.a
+ $(AM_V_at)$(libluaharfbuzz_a_RANLIB) libluaharfbuzz.a
libluahbtexspecific.a: $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_DEPENDENCIES) $(EXTRA_libluahbtexspecific_a_DEPENDENCIES)
$(AM_V_at)-rm -f libluahbtexspecific.a
$(AM_V_AR)$(libluahbtexspecific_a_AR) libluahbtexspecific.a $(libluahbtexspecific_a_OBJECTS) $(libluahbtexspecific_a_LIBADD)
- $(AM_V_at)$(RANLIB) libluahbtexspecific.a
+ $(AM_V_at)$(libluahbtexspecific_a_RANLIB) libluahbtexspecific.a
luatexdir/luaharfbuzz/src/luaharfbuzz/libluajitharfbuzz_a-blob.$(OBJEXT): \
luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp) \
luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
@@ -6143,27 +6067,27 @@
libluajitharfbuzz.a: $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_DEPENDENCIES) $(EXTRA_libluajitharfbuzz_a_DEPENDENCIES)
$(AM_V_at)-rm -f libluajitharfbuzz.a
$(AM_V_AR)$(libluajitharfbuzz_a_AR) libluajitharfbuzz.a $(libluajitharfbuzz_a_OBJECTS) $(libluajitharfbuzz_a_LIBADD)
- $(AM_V_at)$(RANLIB) libluajitharfbuzz.a
+ $(AM_V_at)$(libluajitharfbuzz_a_RANLIB) libluajitharfbuzz.a
libluajithbtexspecific.a: $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_DEPENDENCIES) $(EXTRA_libluajithbtexspecific_a_DEPENDENCIES)
$(AM_V_at)-rm -f libluajithbtexspecific.a
$(AM_V_AR)$(libluajithbtexspecific_a_AR) libluajithbtexspecific.a $(libluajithbtexspecific_a_OBJECTS) $(libluajithbtexspecific_a_LIBADD)
- $(AM_V_at)$(RANLIB) libluajithbtexspecific.a
+ $(AM_V_at)$(libluajithbtexspecific_a_RANLIB) libluajithbtexspecific.a
luatexdir/luafilesystem/src/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luafilesystem/src
- @: > luatexdir/luafilesystem/src/$(am__dirstamp)
+ @: >>luatexdir/luafilesystem/src/$(am__dirstamp)
luatexdir/luafilesystem/src/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luafilesystem/src/$(DEPDIR)
- @: > luatexdir/luafilesystem/src/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/luafilesystem/src/$(DEPDIR)/$(am__dirstamp)
luatexdir/luafilesystem/src/libluajitmisc_a-lfs.$(OBJEXT): \
luatexdir/luafilesystem/src/$(am__dirstamp) \
luatexdir/luafilesystem/src/$(DEPDIR)/$(am__dirstamp)
luatexdir/luamd5/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luamd5
- @: > luatexdir/luamd5/$(am__dirstamp)
+ @: >>luatexdir/luamd5/$(am__dirstamp)
luatexdir/luamd5/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luamd5/$(DEPDIR)
- @: > luatexdir/luamd5/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/luamd5/$(DEPDIR)/$(am__dirstamp)
luatexdir/luamd5/libluajitmisc_a-md5.$(OBJEXT): \
luatexdir/luamd5/$(am__dirstamp) \
luatexdir/luamd5/$(DEPDIR)/$(am__dirstamp)
@@ -6172,28 +6096,28 @@
luatexdir/luamd5/$(DEPDIR)/$(am__dirstamp)
luatexdir/luapeg/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luapeg
- @: > luatexdir/luapeg/$(am__dirstamp)
+ @: >>luatexdir/luapeg/$(am__dirstamp)
luatexdir/luapeg/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luapeg/$(DEPDIR)
- @: > luatexdir/luapeg/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/luapeg/$(DEPDIR)/$(am__dirstamp)
luatexdir/luapeg/libluajitmisc_a-lpeg.$(OBJEXT): \
luatexdir/luapeg/$(am__dirstamp) \
luatexdir/luapeg/$(DEPDIR)/$(am__dirstamp)
luatexdir/luazip/src/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luazip/src
- @: > luatexdir/luazip/src/$(am__dirstamp)
+ @: >>luatexdir/luazip/src/$(am__dirstamp)
luatexdir/luazip/src/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luazip/src/$(DEPDIR)
- @: > luatexdir/luazip/src/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/luazip/src/$(DEPDIR)/$(am__dirstamp)
luatexdir/luazip/src/libluajitmisc_a-luazip.$(OBJEXT): \
luatexdir/luazip/src/$(am__dirstamp) \
luatexdir/luazip/src/$(DEPDIR)/$(am__dirstamp)
luatexdir/luazlib/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luazlib
- @: > luatexdir/luazlib/$(am__dirstamp)
+ @: >>luatexdir/luazlib/$(am__dirstamp)
luatexdir/luazlib/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luazlib/$(DEPDIR)
- @: > luatexdir/luazlib/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/luazlib/$(DEPDIR)/$(am__dirstamp)
luatexdir/luazlib/libluajitmisc_a-lgzip.$(OBJEXT): \
luatexdir/luazlib/$(am__dirstamp) \
luatexdir/luazlib/$(DEPDIR)/$(am__dirstamp)
@@ -6202,10 +6126,10 @@
luatexdir/luazlib/$(DEPDIR)/$(am__dirstamp)
luatexdir/slnunicode/$(am__dirstamp):
@$(MKDIR_P) luatexdir/slnunicode
- @: > luatexdir/slnunicode/$(am__dirstamp)
+ @: >>luatexdir/slnunicode/$(am__dirstamp)
luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/slnunicode/$(DEPDIR)
- @: > luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp)
luatexdir/slnunicode/libluajitmisc_a-slnunico.$(OBJEXT): \
luatexdir/slnunicode/$(am__dirstamp) \
luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp)
@@ -6213,13 +6137,13 @@
libluajitmisc.a: $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_DEPENDENCIES) $(EXTRA_libluajitmisc_a_DEPENDENCIES)
$(AM_V_at)-rm -f libluajitmisc.a
$(AM_V_AR)$(libluajitmisc_a_AR) libluajitmisc.a $(libluajitmisc_a_OBJECTS) $(libluajitmisc_a_LIBADD)
- $(AM_V_at)$(RANLIB) libluajitmisc.a
+ $(AM_V_at)$(libluajitmisc_a_RANLIB) libluajitmisc.a
luatexdir/luasocket/src/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luasocket/src
- @: > luatexdir/luasocket/src/$(am__dirstamp)
+ @: >>luatexdir/luasocket/src/$(am__dirstamp)
luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luasocket/src/$(DEPDIR)
- @: > luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
luatexdir/luasocket/src/libluajitsocket_a-auxiliar.$(OBJEXT): \
luatexdir/luasocket/src/$(am__dirstamp) \
luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
@@ -6272,13 +6196,13 @@
libluajitsocket.a: $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_DEPENDENCIES) $(EXTRA_libluajitsocket_a_DEPENDENCIES)
$(AM_V_at)-rm -f libluajitsocket.a
$(AM_V_AR)$(libluajitsocket_a_AR) libluajitsocket.a $(libluajitsocket_a_OBJECTS) $(libluajitsocket_a_LIBADD)
- $(AM_V_at)$(RANLIB) libluajitsocket.a
+ $(AM_V_at)$(libluajitsocket_a_RANLIB) libluajitsocket.a
luatexdir/lua/$(am__dirstamp):
@$(MKDIR_P) luatexdir/lua
- @: > luatexdir/lua/$(am__dirstamp)
+ @: >>luatexdir/lua/$(am__dirstamp)
luatexdir/lua/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/lua/$(DEPDIR)
- @: > luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
luatexdir/lua/libluajittex_a-lstrlibext.$(OBJEXT): \
luatexdir/lua/$(am__dirstamp) \
luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
@@ -6287,10 +6211,10 @@
luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
luatexdir/luafontloader/src/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luafontloader/src
- @: > luatexdir/luafontloader/src/$(am__dirstamp)
+ @: >>luatexdir/luafontloader/src/$(am__dirstamp)
luatexdir/luafontloader/src/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/luafontloader/src/$(DEPDIR)
- @: > luatexdir/luafontloader/src/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/luafontloader/src/$(DEPDIR)/$(am__dirstamp)
luatexdir/luafontloader/src/libluajittex_a-ffdummies.$(OBJEXT): \
luatexdir/luafontloader/src/$(am__dirstamp) \
luatexdir/luafontloader/src/$(DEPDIR)/$(am__dirstamp)
@@ -6299,19 +6223,19 @@
luatexdir/luafontloader/src/$(DEPDIR)/$(am__dirstamp)
luatexdir/dvi/$(am__dirstamp):
@$(MKDIR_P) luatexdir/dvi
- @: > luatexdir/dvi/$(am__dirstamp)
+ @: >>luatexdir/dvi/$(am__dirstamp)
luatexdir/dvi/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/dvi/$(DEPDIR)
- @: > luatexdir/dvi/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/dvi/$(DEPDIR)/$(am__dirstamp)
luatexdir/dvi/libluajittex_a-dvigen.$(OBJEXT): \
luatexdir/dvi/$(am__dirstamp) \
luatexdir/dvi/$(DEPDIR)/$(am__dirstamp)
luatexdir/font/$(am__dirstamp):
@$(MKDIR_P) luatexdir/font
- @: > luatexdir/font/$(am__dirstamp)
+ @: >>luatexdir/font/$(am__dirstamp)
luatexdir/font/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/font/$(DEPDIR)
- @: > luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/font/$(DEPDIR)/$(am__dirstamp)
luatexdir/font/libluajittex_a-dofont.$(OBJEXT): \
luatexdir/font/$(am__dirstamp) \
luatexdir/font/$(DEPDIR)/$(am__dirstamp)
@@ -6374,10 +6298,10 @@
luatexdir/font/$(DEPDIR)/$(am__dirstamp)
luatexdir/image/$(am__dirstamp):
@$(MKDIR_P) luatexdir/image
- @: > luatexdir/image/$(am__dirstamp)
+ @: >>luatexdir/image/$(am__dirstamp)
luatexdir/image/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/image/$(DEPDIR)
- @: > luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/image/$(DEPDIR)/$(am__dirstamp)
luatexdir/image/libluajittex_a-pdftoepdf.$(OBJEXT): \
luatexdir/image/$(am__dirstamp) \
luatexdir/image/$(DEPDIR)/$(am__dirstamp)
@@ -6398,10 +6322,10 @@
luatexdir/image/$(DEPDIR)/$(am__dirstamp)
luatexdir/lang/$(am__dirstamp):
@$(MKDIR_P) luatexdir/lang
- @: > luatexdir/lang/$(am__dirstamp)
+ @: >>luatexdir/lang/$(am__dirstamp)
luatexdir/lang/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/lang/$(DEPDIR)
- @: > luatexdir/lang/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/lang/$(DEPDIR)/$(am__dirstamp)
luatexdir/lang/libluajittex_a-hnjalloc.$(OBJEXT): \
luatexdir/lang/$(am__dirstamp) \
luatexdir/lang/$(DEPDIR)/$(am__dirstamp)
@@ -6476,10 +6400,10 @@
luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
luatexdir/pdf/$(am__dirstamp):
@$(MKDIR_P) luatexdir/pdf
- @: > luatexdir/pdf/$(am__dirstamp)
+ @: >>luatexdir/pdf/$(am__dirstamp)
luatexdir/pdf/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/pdf/$(DEPDIR)
- @: > luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
luatexdir/pdf/libluajittex_a-pdfaction.$(OBJEXT): \
luatexdir/pdf/$(am__dirstamp) \
luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
@@ -6548,10 +6472,10 @@
luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
luatexdir/tex/$(am__dirstamp):
@$(MKDIR_P) luatexdir/tex
- @: > luatexdir/tex/$(am__dirstamp)
+ @: >>luatexdir/tex/$(am__dirstamp)
luatexdir/tex/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/tex/$(DEPDIR)
- @: > luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
luatexdir/tex/libluajittex_a-backend.$(OBJEXT): \
luatexdir/tex/$(am__dirstamp) \
luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
@@ -6650,10 +6574,10 @@
luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
luatexdir/utils/$(am__dirstamp):
@$(MKDIR_P) luatexdir/utils
- @: > luatexdir/utils/$(am__dirstamp)
+ @: >>luatexdir/utils/$(am__dirstamp)
luatexdir/utils/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/utils/$(DEPDIR)
- @: > luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
luatexdir/utils/libluajittex_a-avl.$(OBJEXT): \
luatexdir/utils/$(am__dirstamp) \
luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
@@ -6668,10 +6592,10 @@
luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
synctexdir/$(am__dirstamp):
@$(MKDIR_P) synctexdir
- @: > synctexdir/$(am__dirstamp)
+ @: >>synctexdir/$(am__dirstamp)
synctexdir/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) synctexdir/$(DEPDIR)
- @: > synctexdir/$(DEPDIR)/$(am__dirstamp)
+ @: >>synctexdir/$(DEPDIR)/$(am__dirstamp)
synctexdir/libluajittex_a-synctex.$(OBJEXT): \
synctexdir/$(am__dirstamp) \
synctexdir/$(DEPDIR)/$(am__dirstamp)
@@ -6679,7 +6603,7 @@
libluajittex.a: $(libluajittex_a_OBJECTS) $(libluajittex_a_DEPENDENCIES) $(EXTRA_libluajittex_a_DEPENDENCIES)
$(AM_V_at)-rm -f libluajittex.a
$(AM_V_AR)$(libluajittex_a_AR) libluajittex.a $(libluajittex_a_OBJECTS) $(libluajittex_a_LIBADD)
- $(AM_V_at)$(RANLIB) libluajittex.a
+ $(AM_V_at)$(libluajittex_a_RANLIB) libluajittex.a
luatexdir/utils/libluajittexspecific_a-utils.$(OBJEXT): \
luatexdir/utils/$(am__dirstamp) \
luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
@@ -6696,7 +6620,7 @@
libluajittexspecific.a: $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_DEPENDENCIES) $(EXTRA_libluajittexspecific_a_DEPENDENCIES)
$(AM_V_at)-rm -f libluajittexspecific.a
$(AM_V_AR)$(libluajittexspecific_a_AR) libluajittexspecific.a $(libluajittexspecific_a_OBJECTS) $(libluajittexspecific_a_LIBADD)
- $(AM_V_at)$(RANLIB) libluajittexspecific.a
+ $(AM_V_at)$(libluajittexspecific_a_RANLIB) libluajittexspecific.a
luatexdir/luafilesystem/src/libluamisc_a-lfs.$(OBJEXT): \
luatexdir/luafilesystem/src/$(am__dirstamp) \
luatexdir/luafilesystem/src/$(DEPDIR)/$(am__dirstamp)
@@ -6725,7 +6649,7 @@
libluamisc.a: $(libluamisc_a_OBJECTS) $(libluamisc_a_DEPENDENCIES) $(EXTRA_libluamisc_a_DEPENDENCIES)
$(AM_V_at)-rm -f libluamisc.a
$(AM_V_AR)$(libluamisc_a_AR) libluamisc.a $(libluamisc_a_OBJECTS) $(libluamisc_a_LIBADD)
- $(AM_V_at)$(RANLIB) libluamisc.a
+ $(AM_V_at)$(libluamisc_a_RANLIB) libluamisc.a
luatexdir/luasocket/src/libluasocket_a-auxiliar.$(OBJEXT): \
luatexdir/luasocket/src/$(am__dirstamp) \
luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
@@ -6778,7 +6702,7 @@
libluasocket.a: $(libluasocket_a_OBJECTS) $(libluasocket_a_DEPENDENCIES) $(EXTRA_libluasocket_a_DEPENDENCIES)
$(AM_V_at)-rm -f libluasocket.a
$(AM_V_AR)$(libluasocket_a_AR) libluasocket.a $(libluasocket_a_OBJECTS) $(libluasocket_a_LIBADD)
- $(AM_V_at)$(RANLIB) libluasocket.a
+ $(AM_V_at)$(libluasocket_a_RANLIB) libluasocket.a
luatexdir/lua/libluatex_a-lstrlibext.$(OBJEXT): \
luatexdir/lua/$(am__dirstamp) \
luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
@@ -7124,7 +7048,7 @@
libluatex.a: $(libluatex_a_OBJECTS) $(libluatex_a_DEPENDENCIES) $(EXTRA_libluatex_a_DEPENDENCIES)
$(AM_V_at)-rm -f libluatex.a
$(AM_V_AR)$(libluatex_a_AR) libluatex.a $(libluatex_a_OBJECTS) $(libluatex_a_LIBADD)
- $(AM_V_at)$(RANLIB) libluatex.a
+ $(AM_V_at)$(libluatex_a_RANLIB) libluatex.a
luatexdir/utils/libluatexspecific_a-utils.$(OBJEXT): \
luatexdir/utils/$(am__dirstamp) \
luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
@@ -7141,13 +7065,13 @@
libluatexspecific.a: $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_DEPENDENCIES) $(EXTRA_libluatexspecific_a_DEPENDENCIES)
$(AM_V_at)-rm -f libluatexspecific.a
$(AM_V_AR)$(libluatexspecific_a_AR) libluatexspecific.a $(libluatexspecific_a_OBJECTS) $(libluatexspecific_a_LIBADD)
- $(AM_V_at)$(RANLIB) libluatexspecific.a
+ $(AM_V_at)$(libluatexspecific_a_RANLIB) libluatexspecific.a
libmd5/$(am__dirstamp):
@$(MKDIR_P) libmd5
- @: > libmd5/$(am__dirstamp)
+ @: >>libmd5/$(am__dirstamp)
libmd5/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) libmd5/$(DEPDIR)
- @: > libmd5/$(DEPDIR)/$(am__dirstamp)
+ @: >>libmd5/$(DEPDIR)/$(am__dirstamp)
libmd5/a-md5.$(OBJEXT): libmd5/$(am__dirstamp) \
libmd5/$(DEPDIR)/$(am__dirstamp)
@@ -7154,21 +7078,21 @@
libmd5.a: $(libmd5_a_OBJECTS) $(libmd5_a_DEPENDENCIES) $(EXTRA_libmd5_a_DEPENDENCIES)
$(AM_V_at)-rm -f libmd5.a
$(AM_V_AR)$(libmd5_a_AR) libmd5.a $(libmd5_a_OBJECTS) $(libmd5_a_LIBADD)
- $(AM_V_at)$(RANLIB) libmd5.a
+ $(AM_V_at)$(libmd5_a_RANLIB) libmd5.a
libmf.a: $(libmf_a_OBJECTS) $(libmf_a_DEPENDENCIES) $(EXTRA_libmf_a_DEPENDENCIES)
$(AM_V_at)-rm -f libmf.a
$(AM_V_AR)$(libmf_a_AR) libmf.a $(libmf_a_OBJECTS) $(libmf_a_LIBADD)
- $(AM_V_at)$(RANLIB) libmf.a
+ $(AM_V_at)$(libmf_a_RANLIB) libmf.a
luatexdir/lua/libmflua_a-lkpselib.$(OBJEXT): \
luatexdir/lua/$(am__dirstamp) \
luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
mfluadir/$(am__dirstamp):
@$(MKDIR_P) mfluadir
- @: > mfluadir/$(am__dirstamp)
+ @: >>mfluadir/$(am__dirstamp)
mfluadir/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/$(DEPDIR)
- @: > mfluadir/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/$(DEPDIR)/$(am__dirstamp)
mfluadir/libmflua_a-mfluac.$(OBJEXT): mfluadir/$(am__dirstamp) \
mfluadir/$(DEPDIR)/$(am__dirstamp)
@@ -7175,7 +7099,7 @@
libmflua.a: $(libmflua_a_OBJECTS) $(libmflua_a_DEPENDENCIES) $(EXTRA_libmflua_a_DEPENDENCIES)
$(AM_V_at)-rm -f libmflua.a
$(AM_V_AR)$(libmflua_a_AR) libmflua.a $(libmflua_a_OBJECTS) $(libmflua_a_LIBADD)
- $(AM_V_at)$(RANLIB) libmflua.a
+ $(AM_V_at)$(libmflua_a_RANLIB) libmflua.a
luatexdir/lua/libmfluajit_a-lkpselib.$(OBJEXT): \
luatexdir/lua/$(am__dirstamp) \
luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
@@ -7185,13 +7109,13 @@
libmfluajit.a: $(libmfluajit_a_OBJECTS) $(libmfluajit_a_DEPENDENCIES) $(EXTRA_libmfluajit_a_DEPENDENCIES)
$(AM_V_at)-rm -f libmfluajit.a
$(AM_V_AR)$(libmfluajit_a_AR) libmfluajit.a $(libmfluajit_a_OBJECTS) $(libmfluajit_a_LIBADD)
- $(AM_V_at)$(RANLIB) libmfluajit.a
+ $(AM_V_at)$(libmfluajit_a_RANLIB) libmfluajit.a
mfluadir/luapeg/$(am__dirstamp):
@$(MKDIR_P) mfluadir/luapeg
- @: > mfluadir/luapeg/$(am__dirstamp)
+ @: >>mfluadir/luapeg/$(am__dirstamp)
mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/luapeg/$(DEPDIR)
- @: > mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
mfluadir/luapeg/libmfluajitlpeg_a-lpeg.$(OBJEXT): \
mfluadir/luapeg/$(am__dirstamp) \
mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
@@ -7199,7 +7123,7 @@
libmfluajitlpeg.a: $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_DEPENDENCIES) $(EXTRA_libmfluajitlpeg_a_DEPENDENCIES)
$(AM_V_at)-rm -f libmfluajitlpeg.a
$(AM_V_AR)$(libmfluajitlpeg_a_AR) libmfluajitlpeg.a $(libmfluajitlpeg_a_OBJECTS) $(libmfluajitlpeg_a_LIBADD)
- $(AM_V_at)$(RANLIB) libmfluajitlpeg.a
+ $(AM_V_at)$(libmfluajitlpeg_a_RANLIB) libmfluajitlpeg.a
mfluadir/luapeg/libmflualpeg_a-lpeg.$(OBJEXT): \
mfluadir/luapeg/$(am__dirstamp) \
mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
@@ -7207,22 +7131,22 @@
libmflualpeg.a: $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_DEPENDENCIES) $(EXTRA_libmflualpeg_a_DEPENDENCIES)
$(AM_V_at)-rm -f libmflualpeg.a
$(AM_V_AR)$(libmflualpeg_a_AR) libmflualpeg.a $(libmflualpeg_a_OBJECTS) $(libmflualpeg_a_LIBADD)
- $(AM_V_at)$(RANLIB) libmflualpeg.a
+ $(AM_V_at)$(libmflualpeg_a_RANLIB) libmflualpeg.a
mfluadir/otfcc/dep/extern/emyg-dtoa/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/dep/extern/emyg-dtoa
- @: > mfluadir/otfcc/dep/extern/emyg-dtoa/$(am__dirstamp)
+ @: >>mfluadir/otfcc/dep/extern/emyg-dtoa/$(am__dirstamp)
mfluadir/otfcc/dep/extern/emyg-dtoa/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/dep/extern/emyg-dtoa/$(DEPDIR)
- @: > mfluadir/otfcc/dep/extern/emyg-dtoa/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/dep/extern/emyg-dtoa/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/dep/extern/emyg-dtoa/libmfluaotfcc_a-emyg-dtoa.$(OBJEXT): \
mfluadir/otfcc/dep/extern/emyg-dtoa/$(am__dirstamp) \
mfluadir/otfcc/dep/extern/emyg-dtoa/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/dep/extern/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/dep/extern
- @: > mfluadir/otfcc/dep/extern/$(am__dirstamp)
+ @: >>mfluadir/otfcc/dep/extern/$(am__dirstamp)
mfluadir/otfcc/dep/extern/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/dep/extern/$(DEPDIR)
- @: > mfluadir/otfcc/dep/extern/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/dep/extern/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/dep/extern/libmfluaotfcc_a-json.$(OBJEXT): \
mfluadir/otfcc/dep/extern/$(am__dirstamp) \
mfluadir/otfcc/dep/extern/$(DEPDIR)/$(am__dirstamp)
@@ -7234,10 +7158,10 @@
mfluadir/otfcc/dep/extern/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/src/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/src
- @: > mfluadir/otfcc/src/$(am__dirstamp)
+ @: >>mfluadir/otfcc/src/$(am__dirstamp)
mfluadir/otfcc/src/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/src/$(DEPDIR)
- @: > mfluadir/otfcc/src/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/src/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/src/libmfluaotfcc_a-luafunc.$(OBJEXT): \
mfluadir/otfcc/src/$(am__dirstamp) \
mfluadir/otfcc/src/$(DEPDIR)/$(am__dirstamp)
@@ -7246,19 +7170,19 @@
mfluadir/otfcc/src/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/consolidate/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/consolidate
- @: > mfluadir/otfcc/lib/consolidate/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/consolidate/$(am__dirstamp)
mfluadir/otfcc/lib/consolidate/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/consolidate/$(DEPDIR)
- @: > mfluadir/otfcc/lib/consolidate/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/consolidate/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/consolidate/libmfluaotfcc_a-consolidate.$(OBJEXT): \
mfluadir/otfcc/lib/consolidate/$(am__dirstamp) \
mfluadir/otfcc/lib/consolidate/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/consolidate/otl/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/consolidate/otl
- @: > mfluadir/otfcc/lib/consolidate/otl/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/consolidate/otl/$(am__dirstamp)
mfluadir/otfcc/lib/consolidate/otl/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/consolidate/otl/$(DEPDIR)
- @: > mfluadir/otfcc/lib/consolidate/otl/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/consolidate/otl/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/consolidate/otl/libmfluaotfcc_a-gsub-single.$(OBJEXT): \
mfluadir/otfcc/lib/consolidate/otl/$(am__dirstamp) \
mfluadir/otfcc/lib/consolidate/otl/$(DEPDIR)/$(am__dirstamp)
@@ -7294,19 +7218,19 @@
mfluadir/otfcc/lib/consolidate/otl/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/support/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/support
- @: > mfluadir/otfcc/lib/support/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/support/$(am__dirstamp)
mfluadir/otfcc/lib/support/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/support/$(DEPDIR)
- @: > mfluadir/otfcc/lib/support/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/support/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/support/libmfluaotfcc_a-options.$(OBJEXT): \
mfluadir/otfcc/lib/support/$(am__dirstamp) \
mfluadir/otfcc/lib/support/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/support/unicodeconv/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/support/unicodeconv
- @: > mfluadir/otfcc/lib/support/unicodeconv/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/support/unicodeconv/$(am__dirstamp)
mfluadir/otfcc/lib/support/unicodeconv/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/support/unicodeconv/$(DEPDIR)
- @: > mfluadir/otfcc/lib/support/unicodeconv/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/support/unicodeconv/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/support/unicodeconv/libmfluaotfcc_a-unicodeconv.$(OBJEXT): \
mfluadir/otfcc/lib/support/unicodeconv/$(am__dirstamp) \
mfluadir/otfcc/lib/support/unicodeconv/$(DEPDIR)/$(am__dirstamp)
@@ -7315,10 +7239,10 @@
mfluadir/otfcc/lib/support/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/support/buffer/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/support/buffer
- @: > mfluadir/otfcc/lib/support/buffer/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/support/buffer/$(am__dirstamp)
mfluadir/otfcc/lib/support/buffer/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/support/buffer/$(DEPDIR)
- @: > mfluadir/otfcc/lib/support/buffer/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/support/buffer/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/support/buffer/libmfluaotfcc_a-buffer.$(OBJEXT): \
mfluadir/otfcc/lib/support/buffer/$(am__dirstamp) \
mfluadir/otfcc/lib/support/buffer/$(DEPDIR)/$(am__dirstamp)
@@ -7330,55 +7254,55 @@
mfluadir/otfcc/lib/support/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/support/sha1/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/support/sha1
- @: > mfluadir/otfcc/lib/support/sha1/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/support/sha1/$(am__dirstamp)
mfluadir/otfcc/lib/support/sha1/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/support/sha1/$(DEPDIR)
- @: > mfluadir/otfcc/lib/support/sha1/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/support/sha1/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/support/sha1/libmfluaotfcc_a-sha1.$(OBJEXT): \
mfluadir/otfcc/lib/support/sha1/$(am__dirstamp) \
mfluadir/otfcc/lib/support/sha1/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/support/ttinstr/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/support/ttinstr
- @: > mfluadir/otfcc/lib/support/ttinstr/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/support/ttinstr/$(am__dirstamp)
mfluadir/otfcc/lib/support/ttinstr/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/support/ttinstr/$(DEPDIR)
- @: > mfluadir/otfcc/lib/support/ttinstr/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/support/ttinstr/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/support/ttinstr/libmfluaotfcc_a-ttinstr.$(OBJEXT): \
mfluadir/otfcc/lib/support/ttinstr/$(am__dirstamp) \
mfluadir/otfcc/lib/support/ttinstr/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/support/base64/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/support/base64
- @: > mfluadir/otfcc/lib/support/base64/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/support/base64/$(am__dirstamp)
mfluadir/otfcc/lib/support/base64/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/support/base64/$(DEPDIR)
- @: > mfluadir/otfcc/lib/support/base64/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/support/base64/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/support/base64/libmfluaotfcc_a-base64.$(OBJEXT): \
mfluadir/otfcc/lib/support/base64/$(am__dirstamp) \
mfluadir/otfcc/lib/support/base64/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/support/json/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/support/json
- @: > mfluadir/otfcc/lib/support/json/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/support/json/$(am__dirstamp)
mfluadir/otfcc/lib/support/json/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/support/json/$(DEPDIR)
- @: > mfluadir/otfcc/lib/support/json/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/support/json/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/support/json/libmfluaotfcc_a-json-ident.$(OBJEXT): \
mfluadir/otfcc/lib/support/json/$(am__dirstamp) \
mfluadir/otfcc/lib/support/json/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/support/aglfn/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/support/aglfn
- @: > mfluadir/otfcc/lib/support/aglfn/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/support/aglfn/$(am__dirstamp)
mfluadir/otfcc/lib/support/aglfn/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/support/aglfn/$(DEPDIR)
- @: > mfluadir/otfcc/lib/support/aglfn/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/support/aglfn/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/support/aglfn/libmfluaotfcc_a-aglfn.$(OBJEXT): \
mfluadir/otfcc/lib/support/aglfn/$(am__dirstamp) \
mfluadir/otfcc/lib/support/aglfn/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/otf-writer/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/otf-writer
- @: > mfluadir/otfcc/lib/otf-writer/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/otf-writer/$(am__dirstamp)
mfluadir/otfcc/lib/otf-writer/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/otf-writer/$(DEPDIR)
- @: > mfluadir/otfcc/lib/otf-writer/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/otf-writer/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/otf-writer/libmfluaotfcc_a-stat.$(OBJEXT): \
mfluadir/otfcc/lib/otf-writer/$(am__dirstamp) \
mfluadir/otfcc/lib/otf-writer/$(DEPDIR)/$(am__dirstamp)
@@ -7387,10 +7311,10 @@
mfluadir/otfcc/lib/otf-writer/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/otf-reader/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/otf-reader
- @: > mfluadir/otfcc/lib/otf-reader/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/otf-reader/$(am__dirstamp)
mfluadir/otfcc/lib/otf-reader/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/otf-reader/$(DEPDIR)
- @: > mfluadir/otfcc/lib/otf-reader/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/otf-reader/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/otf-reader/libmfluaotfcc_a-otf-reader.$(OBJEXT): \
mfluadir/otfcc/lib/otf-reader/$(am__dirstamp) \
mfluadir/otfcc/lib/otf-reader/$(DEPDIR)/$(am__dirstamp)
@@ -7399,10 +7323,10 @@
mfluadir/otfcc/lib/otf-reader/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/vf/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/vf
- @: > mfluadir/otfcc/lib/vf/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/vf/$(am__dirstamp)
mfluadir/otfcc/lib/vf/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/vf/$(DEPDIR)
- @: > mfluadir/otfcc/lib/vf/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/vf/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/vf/libmfluaotfcc_a-axis.$(OBJEXT): \
mfluadir/otfcc/lib/vf/$(am__dirstamp) \
mfluadir/otfcc/lib/vf/$(DEPDIR)/$(am__dirstamp)
@@ -7414,19 +7338,19 @@
mfluadir/otfcc/lib/vf/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/logger/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/logger
- @: > mfluadir/otfcc/lib/logger/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/logger/$(am__dirstamp)
mfluadir/otfcc/lib/logger/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/logger/$(DEPDIR)
- @: > mfluadir/otfcc/lib/logger/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/logger/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/logger/libmfluaotfcc_a-logger.$(OBJEXT): \
mfluadir/otfcc/lib/logger/$(am__dirstamp) \
mfluadir/otfcc/lib/logger/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/bk/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/bk
- @: > mfluadir/otfcc/lib/bk/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/bk/$(am__dirstamp)
mfluadir/otfcc/lib/bk/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/bk/$(DEPDIR)
- @: > mfluadir/otfcc/lib/bk/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/bk/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/bk/libmfluaotfcc_a-bkgraph.$(OBJEXT): \
mfluadir/otfcc/lib/bk/$(am__dirstamp) \
mfluadir/otfcc/lib/bk/$(DEPDIR)/$(am__dirstamp)
@@ -7435,10 +7359,10 @@
mfluadir/otfcc/lib/bk/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/font/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/font
- @: > mfluadir/otfcc/lib/font/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/font/$(am__dirstamp)
mfluadir/otfcc/lib/font/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/font/$(DEPDIR)
- @: > mfluadir/otfcc/lib/font/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/font/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/font/libmfluaotfcc_a-caryll-font.$(OBJEXT): \
mfluadir/otfcc/lib/font/$(am__dirstamp) \
mfluadir/otfcc/lib/font/$(DEPDIR)/$(am__dirstamp)
@@ -7450,28 +7374,28 @@
mfluadir/otfcc/lib/font/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/json-writer/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/json-writer
- @: > mfluadir/otfcc/lib/json-writer/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/json-writer/$(am__dirstamp)
mfluadir/otfcc/lib/json-writer/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/json-writer/$(DEPDIR)
- @: > mfluadir/otfcc/lib/json-writer/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/json-writer/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/json-writer/libmfluaotfcc_a-json-writer.$(OBJEXT): \
mfluadir/otfcc/lib/json-writer/$(am__dirstamp) \
mfluadir/otfcc/lib/json-writer/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/json-reader/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/json-reader
- @: > mfluadir/otfcc/lib/json-reader/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/json-reader/$(am__dirstamp)
mfluadir/otfcc/lib/json-reader/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/json-reader/$(DEPDIR)
- @: > mfluadir/otfcc/lib/json-reader/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/json-reader/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/json-reader/libmfluaotfcc_a-json-reader.$(OBJEXT): \
mfluadir/otfcc/lib/json-reader/$(am__dirstamp) \
mfluadir/otfcc/lib/json-reader/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/libcff/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/libcff
- @: > mfluadir/otfcc/lib/libcff/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/libcff/$(am__dirstamp)
mfluadir/otfcc/lib/libcff/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/libcff/$(DEPDIR)
- @: > mfluadir/otfcc/lib/libcff/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/libcff/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/libcff/libmfluaotfcc_a-cff-string.$(OBJEXT): \
mfluadir/otfcc/lib/libcff/$(am__dirstamp) \
mfluadir/otfcc/lib/libcff/$(DEPDIR)/$(am__dirstamp)
@@ -7510,10 +7434,10 @@
mfluadir/otfcc/lib/libcff/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/table/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/table
- @: > mfluadir/otfcc/lib/table/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/table/$(am__dirstamp)
mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/table/$(DEPDIR)
- @: > mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/table/libmfluaotfcc_a-vhea.$(OBJEXT): \
mfluadir/otfcc/lib/table/$(am__dirstamp) \
mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp)
@@ -7525,10 +7449,10 @@
mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/table/meta/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/table/meta
- @: > mfluadir/otfcc/lib/table/meta/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/table/meta/$(am__dirstamp)
mfluadir/otfcc/lib/table/meta/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/table/meta/$(DEPDIR)
- @: > mfluadir/otfcc/lib/table/meta/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/table/meta/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/table/meta/libmfluaotfcc_a-read.$(OBJEXT): \
mfluadir/otfcc/lib/table/meta/$(am__dirstamp) \
mfluadir/otfcc/lib/table/meta/$(DEPDIR)/$(am__dirstamp)
@@ -7546,10 +7470,10 @@
mfluadir/otfcc/lib/table/meta/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/table/vdmx/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/table/vdmx
- @: > mfluadir/otfcc/lib/table/vdmx/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/table/vdmx/$(am__dirstamp)
mfluadir/otfcc/lib/table/vdmx/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/table/vdmx/$(DEPDIR)
- @: > mfluadir/otfcc/lib/table/vdmx/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/table/vdmx/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/table/vdmx/libmfluaotfcc_a-type.$(OBJEXT): \
mfluadir/otfcc/lib/table/vdmx/$(am__dirstamp) \
mfluadir/otfcc/lib/table/vdmx/$(DEPDIR)/$(am__dirstamp)
@@ -7606,10 +7530,10 @@
mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/table/glyf/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/table/glyf
- @: > mfluadir/otfcc/lib/table/glyf/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/table/glyf/$(am__dirstamp)
mfluadir/otfcc/lib/table/glyf/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/table/glyf/$(DEPDIR)
- @: > mfluadir/otfcc/lib/table/glyf/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/table/glyf/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/table/glyf/libmfluaotfcc_a-read.$(OBJEXT): \
mfluadir/otfcc/lib/table/glyf/$(am__dirstamp) \
mfluadir/otfcc/lib/table/glyf/$(DEPDIR)/$(am__dirstamp)
@@ -7627,10 +7551,10 @@
mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/table/otl/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/table/otl
- @: > mfluadir/otfcc/lib/table/otl/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/table/otl/$(am__dirstamp)
mfluadir/otfcc/lib/table/otl/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/table/otl/$(DEPDIR)
- @: > mfluadir/otfcc/lib/table/otl/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/table/otl/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/table/otl/libmfluaotfcc_a-coverage.$(OBJEXT): \
mfluadir/otfcc/lib/table/otl/$(am__dirstamp) \
mfluadir/otfcc/lib/table/otl/$(DEPDIR)/$(am__dirstamp)
@@ -7651,10 +7575,10 @@
mfluadir/otfcc/lib/table/otl/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/table/otl/subtables/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/table/otl/subtables
- @: > mfluadir/otfcc/lib/table/otl/subtables/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/table/otl/subtables/$(am__dirstamp)
mfluadir/otfcc/lib/table/otl/subtables/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/table/otl/subtables/$(DEPDIR)
- @: > mfluadir/otfcc/lib/table/otl/subtables/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/table/otl/subtables/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/table/otl/subtables/libmfluaotfcc_a-gsub-single.$(OBJEXT): \
mfluadir/otfcc/lib/table/otl/subtables/$(am__dirstamp) \
mfluadir/otfcc/lib/table/otl/subtables/$(DEPDIR)/$(am__dirstamp)
@@ -7663,10 +7587,10 @@
mfluadir/otfcc/lib/table/otl/subtables/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/table/otl/subtables/chaining/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/table/otl/subtables/chaining
- @: > mfluadir/otfcc/lib/table/otl/subtables/chaining/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/table/otl/subtables/chaining/$(am__dirstamp)
mfluadir/otfcc/lib/table/otl/subtables/chaining/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/otfcc/lib/table/otl/subtables/chaining/$(DEPDIR)
- @: > mfluadir/otfcc/lib/table/otl/subtables/chaining/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/otfcc/lib/table/otl/subtables/chaining/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/table/otl/subtables/chaining/libmfluaotfcc_a-read.$(OBJEXT): mfluadir/otfcc/lib/table/otl/subtables/chaining/$(am__dirstamp) \
mfluadir/otfcc/lib/table/otl/subtables/chaining/$(DEPDIR)/$(am__dirstamp)
mfluadir/otfcc/lib/table/otl/subtables/chaining/libmfluaotfcc_a-common.$(OBJEXT): mfluadir/otfcc/lib/table/otl/subtables/chaining/$(am__dirstamp) \
@@ -7728,13 +7652,13 @@
libmfluaotfcc.a: $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_DEPENDENCIES) $(EXTRA_libmfluaotfcc_a_DEPENDENCIES)
$(AM_V_at)-rm -f libmfluaotfcc.a
$(AM_V_AR)$(libmfluaotfcc_a_AR) libmfluaotfcc.a $(libmfluaotfcc_a_OBJECTS) $(libmfluaotfcc_a_LIBADD)
- $(AM_V_at)$(RANLIB) libmfluaotfcc.a
+ $(AM_V_at)$(libmfluaotfcc_a_RANLIB) libmfluaotfcc.a
mfluadir/potrace/$(am__dirstamp):
@$(MKDIR_P) mfluadir/potrace
- @: > mfluadir/potrace/$(am__dirstamp)
+ @: >>mfluadir/potrace/$(am__dirstamp)
mfluadir/potrace/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluadir/potrace/$(DEPDIR)
- @: > mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
mfluadir/potrace/libmfluapotrace_a-luafunc.$(OBJEXT): \
mfluadir/potrace/$(am__dirstamp) \
mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
@@ -7742,28 +7666,28 @@
libmfluapotrace.a: $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_DEPENDENCIES) $(EXTRA_libmfluapotrace_a_DEPENDENCIES)
$(AM_V_at)-rm -f libmfluapotrace.a
$(AM_V_AR)$(libmfluapotrace_a_AR) libmfluapotrace.a $(libmfluapotrace_a_OBJECTS) $(libmfluapotrace_a_LIBADD)
- $(AM_V_at)$(RANLIB) libmfluapotrace.a
+ $(AM_V_at)$(libmfluapotrace_a_RANLIB) libmfluapotrace.a
libmplibbackends.a: $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_DEPENDENCIES) $(EXTRA_libmplibbackends_a_DEPENDENCIES)
$(AM_V_at)-rm -f libmplibbackends.a
$(AM_V_AR)$(libmplibbackends_a_AR) libmplibbackends.a $(libmplibbackends_a_OBJECTS) $(libmplibbackends_a_LIBADD)
- $(AM_V_at)$(RANLIB) libmplibbackends.a
+ $(AM_V_at)$(libmplibbackends_a_RANLIB) libmplibbackends.a
libmplibcore.a: $(libmplibcore_a_OBJECTS) $(libmplibcore_a_DEPENDENCIES) $(EXTRA_libmplibcore_a_DEPENDENCIES)
$(AM_V_at)-rm -f libmplibcore.a
$(AM_V_AR)$(libmplibcore_a_AR) libmplibcore.a $(libmplibcore_a_OBJECTS) $(libmplibcore_a_LIBADD)
- $(AM_V_at)$(RANLIB) libmplibcore.a
+ $(AM_V_at)$(libmplibcore_a_RANLIB) libmplibcore.a
libmplibextramath.a: $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_DEPENDENCIES) $(EXTRA_libmplibextramath_a_DEPENDENCIES)
$(AM_V_at)-rm -f libmplibextramath.a
$(AM_V_AR)$(libmplibextramath_a_AR) libmplibextramath.a $(libmplibextramath_a_OBJECTS) $(libmplibextramath_a_LIBADD)
- $(AM_V_at)$(RANLIB) libmplibextramath.a
+ $(AM_V_at)$(libmplibextramath_a_RANLIB) libmplibextramath.a
mplibdir/$(am__dirstamp):
@$(MKDIR_P) mplibdir
- @: > mplibdir/$(am__dirstamp)
+ @: >>mplibdir/$(am__dirstamp)
mplibdir/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mplibdir/$(DEPDIR)
- @: > mplibdir/$(DEPDIR)/$(am__dirstamp)
+ @: >>mplibdir/$(DEPDIR)/$(am__dirstamp)
mplibdir/libmputil_a-avl.$(OBJEXT): mplibdir/$(am__dirstamp) \
mplibdir/$(DEPDIR)/$(am__dirstamp)
mplibdir/libmputil_a-decNumber.$(OBJEXT): mplibdir/$(am__dirstamp) \
@@ -7774,13 +7698,13 @@
libmputil.a: $(libmputil_a_OBJECTS) $(libmputil_a_DEPENDENCIES) $(EXTRA_libmputil_a_DEPENDENCIES)
$(AM_V_at)-rm -f libmputil.a
$(AM_V_AR)$(libmputil_a_AR) libmputil.a $(libmputil_a_OBJECTS) $(libmputil_a_LIBADD)
- $(AM_V_at)$(RANLIB) libmputil.a
+ $(AM_V_at)$(libmputil_a_RANLIB) libmputil.a
pdftexdir/$(am__dirstamp):
@$(MKDIR_P) pdftexdir
- @: > pdftexdir/$(am__dirstamp)
+ @: >>pdftexdir/$(am__dirstamp)
pdftexdir/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) pdftexdir/$(DEPDIR)
- @: > pdftexdir/$(DEPDIR)/$(am__dirstamp)
+ @: >>pdftexdir/$(DEPDIR)/$(am__dirstamp)
pdftexdir/libpdftex_a-avl.$(OBJEXT): pdftexdir/$(am__dirstamp) \
pdftexdir/$(DEPDIR)/$(am__dirstamp)
pdftexdir/libpdftex_a-avlstuff.$(OBJEXT): pdftexdir/$(am__dirstamp) \
@@ -7823,10 +7747,10 @@
pdftexdir/$(DEPDIR)/$(am__dirstamp)
pdftexdir/regex/$(am__dirstamp):
@$(MKDIR_P) pdftexdir/regex
- @: > pdftexdir/regex/$(am__dirstamp)
+ @: >>pdftexdir/regex/$(am__dirstamp)
pdftexdir/regex/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) pdftexdir/regex/$(DEPDIR)
- @: > pdftexdir/regex/$(DEPDIR)/$(am__dirstamp)
+ @: >>pdftexdir/regex/$(DEPDIR)/$(am__dirstamp)
pdftexdir/regex/libpdftex_a-regex.$(OBJEXT): \
pdftexdir/regex/$(am__dirstamp) \
pdftexdir/regex/$(DEPDIR)/$(am__dirstamp)
@@ -7845,7 +7769,7 @@
libpdftex.a: $(libpdftex_a_OBJECTS) $(libpdftex_a_DEPENDENCIES) $(EXTRA_libpdftex_a_DEPENDENCIES)
$(AM_V_at)-rm -f libpdftex.a
$(AM_V_AR)$(libpdftex_a_AR) libpdftex.a $(libpdftex_a_OBJECTS) $(libpdftex_a_LIBADD)
- $(AM_V_at)$(RANLIB) libpdftex.a
+ $(AM_V_at)$(libpdftex_a_RANLIB) libpdftex.a
synctexdir/libsynctex_a-synctex_parser.$(OBJEXT): \
synctexdir/$(am__dirstamp) \
synctexdir/$(DEPDIR)/$(am__dirstamp)
@@ -7856,13 +7780,13 @@
libsynctex.a: $(libsynctex_a_OBJECTS) $(libsynctex_a_DEPENDENCIES) $(EXTRA_libsynctex_a_DEPENDENCIES)
$(AM_V_at)-rm -f libsynctex.a
$(AM_V_AR)$(libsynctex_a_AR) libsynctex.a $(libsynctex_a_OBJECTS) $(libsynctex_a_LIBADD)
- $(AM_V_at)$(RANLIB) libsynctex.a
+ $(AM_V_at)$(libsynctex_a_RANLIB) libsynctex.a
uptexdir/$(am__dirstamp):
@$(MKDIR_P) uptexdir
- @: > uptexdir/$(am__dirstamp)
+ @: >>uptexdir/$(am__dirstamp)
uptexdir/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) uptexdir/$(DEPDIR)
- @: > uptexdir/$(DEPDIR)/$(am__dirstamp)
+ @: >>uptexdir/$(DEPDIR)/$(am__dirstamp)
uptexdir/libukanji_a-kanji.$(OBJEXT): uptexdir/$(am__dirstamp) \
uptexdir/$(DEPDIR)/$(am__dirstamp)
uptexdir/libukanji_a-kanji_dump.$(OBJEXT): uptexdir/$(am__dirstamp) \
@@ -7871,13 +7795,13 @@
libukanji.a: $(libukanji_a_OBJECTS) $(libukanji_a_DEPENDENCIES) $(EXTRA_libukanji_a_DEPENDENCIES)
$(AM_V_at)-rm -f libukanji.a
$(AM_V_AR)$(libukanji_a_AR) libukanji.a $(libukanji_a_OBJECTS) $(libukanji_a_LIBADD)
- $(AM_V_at)$(RANLIB) libukanji.a
+ $(AM_V_at)$(libukanji_a_RANLIB) libukanji.a
luatexdir/unilib/$(am__dirstamp):
@$(MKDIR_P) luatexdir/unilib
- @: > luatexdir/unilib/$(am__dirstamp)
+ @: >>luatexdir/unilib/$(am__dirstamp)
luatexdir/unilib/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/unilib/$(DEPDIR)
- @: > luatexdir/unilib/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/unilib/$(DEPDIR)/$(am__dirstamp)
luatexdir/unilib/libunilib_a-ArabicForms.$(OBJEXT): \
luatexdir/unilib/$(am__dirstamp) \
luatexdir/unilib/$(DEPDIR)/$(am__dirstamp)
@@ -7912,13 +7836,13 @@
libunilib.a: $(libunilib_a_OBJECTS) $(libunilib_a_DEPENDENCIES) $(EXTRA_libunilib_a_DEPENDENCIES)
$(AM_V_at)-rm -f libunilib.a
$(AM_V_AR)$(libunilib_a_AR) libunilib.a $(libunilib_a_OBJECTS) $(libunilib_a_LIBADD)
- $(AM_V_at)$(RANLIB) libunilib.a
+ $(AM_V_at)$(libunilib_a_RANLIB) libunilib.a
xetexdir/$(am__dirstamp):
@$(MKDIR_P) xetexdir
- @: > xetexdir/$(am__dirstamp)
+ @: >>xetexdir/$(am__dirstamp)
xetexdir/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) xetexdir/$(DEPDIR)
- @: > xetexdir/$(DEPDIR)/$(am__dirstamp)
+ @: >>xetexdir/$(DEPDIR)/$(am__dirstamp)
xetexdir/libxetex_a-XeTeXFontInst.$(OBJEXT): xetexdir/$(am__dirstamp) \
xetexdir/$(DEPDIR)/$(am__dirstamp)
xetexdir/libxetex_a-XeTeXFontMgr.$(OBJEXT): xetexdir/$(am__dirstamp) \
@@ -7939,10 +7863,10 @@
xetexdir/$(DEPDIR)/$(am__dirstamp)
xetexdir/image/$(am__dirstamp):
@$(MKDIR_P) xetexdir/image
- @: > xetexdir/image/$(am__dirstamp)
+ @: >>xetexdir/image/$(am__dirstamp)
xetexdir/image/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) xetexdir/image/$(DEPDIR)
- @: > xetexdir/image/$(DEPDIR)/$(am__dirstamp)
+ @: >>xetexdir/image/$(DEPDIR)/$(am__dirstamp)
xetexdir/image/libxetex_a-bmpimage.$(OBJEXT): \
xetexdir/image/$(am__dirstamp) \
xetexdir/image/$(DEPDIR)/$(am__dirstamp)
@@ -7970,7 +7894,7 @@
libxetex.a: $(libxetex_a_OBJECTS) $(libxetex_a_DEPENDENCIES) $(EXTRA_libxetex_a_DEPENDENCIES)
$(AM_V_at)-rm -f libxetex.a
$(AM_V_AR)$(libxetex_a_AR) libxetex.a $(libxetex_a_OBJECTS) $(libxetex_a_LIBADD)
- $(AM_V_at)$(RANLIB) libxetex.a
+ $(AM_V_at)$(libxetex_a_RANLIB) libxetex.a
synctexdir/libsynctex_la-synctex_parser.lo: \
synctexdir/$(am__dirstamp) \
synctexdir/$(DEPDIR)/$(am__dirstamp)
@@ -7982,10 +7906,10 @@
$(AM_V_CCLD)$(libsynctex_la_LINK) $(libsynctex_la_OBJECTS) $(libsynctex_la_LIBADD) $(LIBS)
alephdir/$(am__dirstamp):
@$(MKDIR_P) alephdir
- @: > alephdir/$(am__dirstamp)
+ @: >>alephdir/$(am__dirstamp)
alephdir/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) alephdir/$(DEPDIR)
- @: > alephdir/$(DEPDIR)/$(am__dirstamp)
+ @: >>alephdir/$(DEPDIR)/$(am__dirstamp)
alephdir/aleph-aleph.$(OBJEXT): alephdir/$(am__dirstamp) \
alephdir/$(DEPDIR)/$(am__dirstamp)
alephdir/aleph-alephbis.$(OBJEXT): alephdir/$(am__dirstamp) \
@@ -8076,26 +8000,12 @@
dvitype$(EXEEXT): $(dvitype_OBJECTS) $(dvitype_DEPENDENCIES) $(EXTRA_dvitype_DEPENDENCIES)
@rm -f dvitype$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(dvitype_OBJECTS) $(dvitype_LDADD) $(LIBS)
-eptexdir/$(am__dirstamp):
- @$(MKDIR_P) eptexdir
- @: > eptexdir/$(am__dirstamp)
-eptexdir/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) eptexdir/$(DEPDIR)
- @: > eptexdir/$(DEPDIR)/$(am__dirstamp)
-eptexdir/eptex-eptexextra.$(OBJEXT): eptexdir/$(am__dirstamp) \
- eptexdir/$(DEPDIR)/$(am__dirstamp)
-synctexdir/eptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
- synctexdir/$(DEPDIR)/$(am__dirstamp)
-
-eptex$(EXEEXT): $(eptex_OBJECTS) $(eptex_DEPENDENCIES) $(EXTRA_eptex_DEPENDENCIES)
- @rm -f eptex$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(eptex_OBJECTS) $(eptex_LDADD) $(LIBS)
etexdir/$(am__dirstamp):
@$(MKDIR_P) etexdir
- @: > etexdir/$(am__dirstamp)
+ @: >>etexdir/$(am__dirstamp)
etexdir/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) etexdir/$(DEPDIR)
- @: > etexdir/$(DEPDIR)/$(am__dirstamp)
+ @: >>etexdir/$(DEPDIR)/$(am__dirstamp)
etexdir/etex-etexextra.$(OBJEXT): etexdir/$(am__dirstamp) \
etexdir/$(DEPDIR)/$(am__dirstamp)
synctexdir/etex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
@@ -8106,10 +8016,10 @@
$(AM_V_CCLD)$(LINK) $(etex_OBJECTS) $(etex_LDADD) $(LIBS)
euptexdir/$(am__dirstamp):
@$(MKDIR_P) euptexdir
- @: > euptexdir/$(am__dirstamp)
+ @: >>euptexdir/$(am__dirstamp)
euptexdir/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) euptexdir/$(DEPDIR)
- @: > euptexdir/$(DEPDIR)/$(am__dirstamp)
+ @: >>euptexdir/$(DEPDIR)/$(am__dirstamp)
euptexdir/euptex-euptexextra.$(OBJEXT): euptexdir/$(am__dirstamp) \
euptexdir/$(DEPDIR)/$(am__dirstamp)
synctexdir/euptex-synctex.$(OBJEXT): synctexdir/$(am__dirstamp) \
@@ -8136,10 +8046,10 @@
$(AM_V_CCLD)$(LINK) $(himktables_OBJECTS) $(himktables_LDADD) $(LIBS)
hitexdir/$(am__dirstamp):
@$(MKDIR_P) hitexdir
- @: > hitexdir/$(am__dirstamp)
+ @: >>hitexdir/$(am__dirstamp)
hitexdir/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) hitexdir/$(DEPDIR)
- @: > hitexdir/$(DEPDIR)/$(am__dirstamp)
+ @: >>hitexdir/$(DEPDIR)/$(am__dirstamp)
hitexdir/hishrink-hilexer.$(OBJEXT): hitexdir/$(am__dirstamp) \
hitexdir/$(DEPDIR)/$(am__dirstamp)
hitexdir/hishrink-hiparser.$(OBJEXT): hitexdir/$(am__dirstamp) \
@@ -8162,10 +8072,10 @@
$(AM_V_CCLD)$(LINK) $(initex_OBJECTS) $(initex_LDADD) $(LIBS)
luatexdir/$(am__dirstamp):
@$(MKDIR_P) luatexdir
- @: > luatexdir/$(am__dirstamp)
+ @: >>luatexdir/$(am__dirstamp)
luatexdir/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) luatexdir/$(DEPDIR)
- @: > luatexdir/$(DEPDIR)/$(am__dirstamp)
+ @: >>luatexdir/$(DEPDIR)/$(am__dirstamp)
luatexdir/luahbtex-luatex.$(OBJEXT): luatexdir/$(am__dirstamp) \
luatexdir/$(DEPDIR)/$(am__dirstamp)
mplibdir/luahbtex-lmplib.$(OBJEXT): mplibdir/$(am__dirstamp) \
@@ -8226,10 +8136,10 @@
$(AM_V_CCLD)$(mflua_nowin_LINK) $(mflua_nowin_OBJECTS) $(mflua_nowin_LDADD) $(LIBS)
mfluajitdir/$(am__dirstamp):
@$(MKDIR_P) mfluajitdir
- @: > mfluajitdir/$(am__dirstamp)
+ @: >>mfluajitdir/$(am__dirstamp)
mfluajitdir/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) mfluajitdir/$(DEPDIR)
- @: > mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+ @: >>mfluajitdir/$(DEPDIR)/$(am__dirstamp)
mfluajitdir/mfluajit-mfluajitextra.$(OBJEXT): \
mfluajitdir/$(am__dirstamp) \
mfluajitdir/$(DEPDIR)/$(am__dirstamp)
@@ -8449,7 +8359,6 @@
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-rm -f alephdir/*.$(OBJEXT)
- -rm -f eptexdir/*.$(OBJEXT)
-rm -f etexdir/*.$(OBJEXT)
-rm -f euptexdir/*.$(OBJEXT)
-rm -f hitexdir/*.$(OBJEXT)
@@ -8547,9 +8456,6 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cwebboot.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dvicopy.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dvitype.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/eptex-eptex-pool.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/eptex-eptex0.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/eptex-eptexini.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/etex-etex-pool.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/etex-etex0.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/etex-etexini.Po at am__quote@ # am--include-marker
@@ -8675,7 +8581,6 @@
@AMDEP_TRUE@@am__include@ @am__quote at alephdir/$(DEPDIR)/aleph-aleph.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at alephdir/$(DEPDIR)/aleph-alephbis.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at alephdir/$(DEPDIR)/aleph-alephextra.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at eptexdir/$(DEPDIR)/eptex-eptexextra.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at etexdir/$(DEPDIR)/etex-etexextra.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at euptexdir/$(DEPDIR)/euptex-euptexextra.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at hitexdir/$(DEPDIR)/hishrink-hilexer.Po at am__quote@ # am--include-marker
@@ -9218,7 +9123,6 @@
@AMDEP_TRUE@@am__include@ @am__quote at ptexdir/$(DEPDIR)/libkanji_a-kanji.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ptexdir/$(DEPDIR)/libkanji_a-kanji_dump.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at ptexdir/$(DEPDIR)/ptex-ptexextra.Po at am__quote@ # am--include-marker
- at AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/eptex-synctex.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/etex-synctex.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/euptex-synctex.Po at am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote at synctexdir/$(DEPDIR)/libluajittex_a-synctex.Po at am__quote@ # am--include-marker
@@ -9256,7 +9160,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+ @: >>$@
am--depfiles: $(am__depfiles_remade)
@@ -17348,76 +17252,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(call_upmpost_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o call_upmpost-callexe.obj `if test -f 'callexe.c'; then $(CYGPATH_W) 'callexe.c'; else $(CYGPATH_W) '$(srcdir)/callexe.c'; fi`
-eptexdir/eptex-eptexextra.o: eptexdir/eptexextra.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptexdir/eptex-eptexextra.o -MD -MP -MF eptexdir/$(DEPDIR)/eptex-eptexextra.Tpo -c -o eptexdir/eptex-eptexextra.o `test -f 'eptexdir/eptexextra.c' || echo '$(srcdir)/'`eptexdir/eptexextra.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) eptexdir/$(DEPDIR)/eptex-eptexextra.Tpo eptexdir/$(DEPDIR)/eptex-eptexextra.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptexdir/eptexextra.c' object='eptexdir/eptex-eptexextra.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptexdir/eptex-eptexextra.o `test -f 'eptexdir/eptexextra.c' || echo '$(srcdir)/'`eptexdir/eptexextra.c
-
-eptexdir/eptex-eptexextra.obj: eptexdir/eptexextra.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptexdir/eptex-eptexextra.obj -MD -MP -MF eptexdir/$(DEPDIR)/eptex-eptexextra.Tpo -c -o eptexdir/eptex-eptexextra.obj `if test -f 'eptexdir/eptexextra.c'; then $(CYGPATH_W) 'eptexdir/eptexextra.c'; else $(CYGPATH_W) '$(srcdir)/eptexdir/eptexextra.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) eptexdir/$(DEPDIR)/eptex-eptexextra.Tpo eptexdir/$(DEPDIR)/eptex-eptexextra.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptexdir/eptexextra.c' object='eptexdir/eptex-eptexextra.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptexdir/eptex-eptexextra.obj `if test -f 'eptexdir/eptexextra.c'; then $(CYGPATH_W) 'eptexdir/eptexextra.c'; else $(CYGPATH_W) '$(srcdir)/eptexdir/eptexextra.c'; fi`
-
-synctexdir/eptex-synctex.o: synctexdir/synctex.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/eptex-synctex.o -MD -MP -MF synctexdir/$(DEPDIR)/eptex-synctex.Tpo -c -o synctexdir/eptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/eptex-synctex.Tpo synctexdir/$(DEPDIR)/eptex-synctex.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/eptex-synctex.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/eptex-synctex.o `test -f 'synctexdir/synctex.c' || echo '$(srcdir)/'`synctexdir/synctex.c
-
-synctexdir/eptex-synctex.obj: synctexdir/synctex.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT synctexdir/eptex-synctex.obj -MD -MP -MF synctexdir/$(DEPDIR)/eptex-synctex.Tpo -c -o synctexdir/eptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) synctexdir/$(DEPDIR)/eptex-synctex.Tpo synctexdir/$(DEPDIR)/eptex-synctex.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='synctexdir/synctex.c' object='synctexdir/eptex-synctex.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o synctexdir/eptex-synctex.obj `if test -f 'synctexdir/synctex.c'; then $(CYGPATH_W) 'synctexdir/synctex.c'; else $(CYGPATH_W) '$(srcdir)/synctexdir/synctex.c'; fi`
-
-eptex-eptexini.o: eptexini.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptexini.o -MD -MP -MF $(DEPDIR)/eptex-eptexini.Tpo -c -o eptex-eptexini.o `test -f 'eptexini.c' || echo '$(srcdir)/'`eptexini.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptexini.Tpo $(DEPDIR)/eptex-eptexini.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptexini.c' object='eptex-eptexini.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptexini.o `test -f 'eptexini.c' || echo '$(srcdir)/'`eptexini.c
-
-eptex-eptexini.obj: eptexini.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptexini.obj -MD -MP -MF $(DEPDIR)/eptex-eptexini.Tpo -c -o eptex-eptexini.obj `if test -f 'eptexini.c'; then $(CYGPATH_W) 'eptexini.c'; else $(CYGPATH_W) '$(srcdir)/eptexini.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptexini.Tpo $(DEPDIR)/eptex-eptexini.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptexini.c' object='eptex-eptexini.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptexini.obj `if test -f 'eptexini.c'; then $(CYGPATH_W) 'eptexini.c'; else $(CYGPATH_W) '$(srcdir)/eptexini.c'; fi`
-
-eptex-eptex0.o: eptex0.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptex0.o -MD -MP -MF $(DEPDIR)/eptex-eptex0.Tpo -c -o eptex-eptex0.o `test -f 'eptex0.c' || echo '$(srcdir)/'`eptex0.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptex0.Tpo $(DEPDIR)/eptex-eptex0.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptex0.c' object='eptex-eptex0.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptex0.o `test -f 'eptex0.c' || echo '$(srcdir)/'`eptex0.c
-
-eptex-eptex0.obj: eptex0.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptex0.obj -MD -MP -MF $(DEPDIR)/eptex-eptex0.Tpo -c -o eptex-eptex0.obj `if test -f 'eptex0.c'; then $(CYGPATH_W) 'eptex0.c'; else $(CYGPATH_W) '$(srcdir)/eptex0.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptex0.Tpo $(DEPDIR)/eptex-eptex0.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptex0.c' object='eptex-eptex0.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptex0.obj `if test -f 'eptex0.c'; then $(CYGPATH_W) 'eptex0.c'; else $(CYGPATH_W) '$(srcdir)/eptex0.c'; fi`
-
-eptex-eptex-pool.o: eptex-pool.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptex-pool.o -MD -MP -MF $(DEPDIR)/eptex-eptex-pool.Tpo -c -o eptex-eptex-pool.o `test -f 'eptex-pool.c' || echo '$(srcdir)/'`eptex-pool.c
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptex-pool.Tpo $(DEPDIR)/eptex-eptex-pool.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptex-pool.c' object='eptex-eptex-pool.o' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptex-pool.o `test -f 'eptex-pool.c' || echo '$(srcdir)/'`eptex-pool.c
-
-eptex-eptex-pool.obj: eptex-pool.c
- at am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT eptex-eptex-pool.obj -MD -MP -MF $(DEPDIR)/eptex-eptex-pool.Tpo -c -o eptex-eptex-pool.obj `if test -f 'eptex-pool.c'; then $(CYGPATH_W) 'eptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/eptex-pool.c'; fi`
- at am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/eptex-eptex-pool.Tpo $(DEPDIR)/eptex-eptex-pool.Po
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='eptex-pool.c' object='eptex-eptex-pool.obj' libtool=no @AMDEPBACKSLASH@
- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- at am__fastdepCC_FALSE@ $(AM_V_CC at am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(eptex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o eptex-eptex-pool.obj `if test -f 'eptex-pool.c'; then $(CYGPATH_W) 'eptex-pool.c'; else $(CYGPATH_W) '$(srcdir)/eptex-pool.c'; fi`
-
etexdir/etex-etexextra.o: etexdir/etexextra.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(etex_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT etexdir/etex-etexextra.o -MD -MP -MF etexdir/$(DEPDIR)/etex-etexextra.Tpo -c -o etexdir/etex-etexextra.o `test -f 'etexdir/etexextra.c' || echo '$(srcdir)/'`etexdir/etexextra.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) etexdir/$(DEPDIR)/etex-etexextra.Tpo etexdir/$(DEPDIR)/etex-etexextra.Po
@@ -19311,7 +19145,6 @@
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
am--force-recheck:
@:
-
$(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__set_TESTS_bases); \
am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
@@ -19387,10 +19220,37 @@
result_count $$1 "XPASS:" $$xpass "$$red"; \
result_count $$1 "ERROR:" $$error "$$mgn"; \
}; \
+ output_system_information () \
+ { \
+ echo; \
+ { uname -a | $(AWK) '{ \
+ printf "System information (uname -a):"; \
+ for (i = 1; i < NF; ++i) \
+ { \
+ if (i != 2) \
+ printf " %s", $$i; \
+ } \
+ printf "\n"; \
+}'; } 2>&1; \
+ if test -r /etc/os-release; then \
+ echo "Distribution information (/etc/os-release):"; \
+ sed 8q /etc/os-release; \
+ elif test -r /etc/issue; then \
+ echo "Distribution information (/etc/issue):"; \
+ cat /etc/issue; \
+ fi; \
+ }; \
+ please_report () \
+ { \
+echo "Some test(s) failed. Please report this to $(PACKAGE_BUGREPORT),"; \
+echo "together with the test-suite.log file (gzipped) and your system"; \
+echo "information. Thanks."; \
+ }; \
{ \
echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
$(am__rst_title); \
create_testsuite_report --no-color; \
+ output_system_information; \
echo; \
echo ".. contents:: :depth: 2"; \
echo; \
@@ -19410,9 +19270,9 @@
create_testsuite_report --maybe-color; \
echo "$$col$$br$$std"; \
if $$success; then :; else \
- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
if test -n "$(PACKAGE_BUGREPORT)"; then \
- echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
+ please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
fi; \
echo "$$col$$br$$std"; \
fi; \
@@ -19419,17 +19279,16 @@
$$success || exit 1
check-TESTS:
- @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
- @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @$(am__rm_f) $(RECHECK_LOGS)
+ @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
+ @$(am__rm_f) $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
log_list=`for i in $$bases; do echo $$i.log; done`; \
- trs_list=`for i in $$bases; do echo $$i.trs; done`; \
- log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+ log_list=`echo $$log_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
recheck: all
- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @$(am__rm_f) $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
| $(am__list_recheck_tests)` || exit 1; \
@@ -19472,7 +19331,7 @@
distdir-am: $(DISTFILES)
$(am__remove_distdir)
- test -d "$(distdir)" || mkdir "$(distdir)"
+ $(AM_V_at)$(MKDIR_P) "$(distdir)"
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -19586,7 +19445,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -19596,7 +19455,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
*.tar.zst*) \
@@ -19703,155 +19562,153 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
- -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
- -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ -$(am__rm_f) $(TEST_LOGS)
+ -$(am__rm_f) $(TEST_LOGS:.log=.trs)
+ -$(am__rm_f) $(TEST_SUITE_LOG)
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+ -$(am__rm_f) $(CLEANFILES)
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -rm -f alephdir/$(DEPDIR)/$(am__dirstamp)
- -rm -f alephdir/$(am__dirstamp)
- -rm -f eptexdir/$(DEPDIR)/$(am__dirstamp)
- -rm -f eptexdir/$(am__dirstamp)
- -rm -f etexdir/$(DEPDIR)/$(am__dirstamp)
- -rm -f etexdir/$(am__dirstamp)
- -rm -f euptexdir/$(DEPDIR)/$(am__dirstamp)
- -rm -f euptexdir/$(am__dirstamp)
- -rm -f hitexdir/$(DEPDIR)/$(am__dirstamp)
- -rm -f hitexdir/$(am__dirstamp)
- -rm -f libmd5/$(DEPDIR)/$(am__dirstamp)
- -rm -f libmd5/$(am__dirstamp)
- -rm -f luatexdir/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/$(am__dirstamp)
- -rm -f luatexdir/dvi/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/dvi/$(am__dirstamp)
- -rm -f luatexdir/font/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/font/$(am__dirstamp)
- -rm -f luatexdir/image/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/image/$(am__dirstamp)
- -rm -f luatexdir/lang/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/lang/$(am__dirstamp)
- -rm -f luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/lua/$(am__dirstamp)
- -rm -f luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/luaffi/$(am__dirstamp)
- -rm -f luatexdir/luafilesystem/src/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/luafilesystem/src/$(am__dirstamp)
- -rm -f luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/luafontloader/fontforge/fontforge/$(am__dirstamp)
- -rm -f luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp)
- -rm -f luatexdir/luafontloader/src/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/luafontloader/src/$(am__dirstamp)
- -rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp)
- -rm -f luatexdir/luamd5/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/luamd5/$(am__dirstamp)
- -rm -f luatexdir/luapeg/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/luapeg/$(am__dirstamp)
- -rm -f luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/luasocket/src/$(am__dirstamp)
- -rm -f luatexdir/luazip/src/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/luazip/src/$(am__dirstamp)
- -rm -f luatexdir/luazlib/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/luazlib/$(am__dirstamp)
- -rm -f luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/pdf/$(am__dirstamp)
- -rm -f luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/slnunicode/$(am__dirstamp)
- -rm -f luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/tex/$(am__dirstamp)
- -rm -f luatexdir/unilib/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/unilib/$(am__dirstamp)
- -rm -f luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
- -rm -f luatexdir/utils/$(am__dirstamp)
- -rm -f mfluadir/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/$(am__dirstamp)
- -rm -f mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/luapeg/$(am__dirstamp)
- -rm -f mfluadir/otfcc/dep/extern/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/dep/extern/$(am__dirstamp)
- -rm -f mfluadir/otfcc/dep/extern/emyg-dtoa/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/dep/extern/emyg-dtoa/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/bk/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/bk/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/consolidate/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/consolidate/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/consolidate/otl/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/consolidate/otl/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/font/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/font/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/json-reader/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/json-reader/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/json-writer/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/json-writer/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/libcff/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/libcff/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/logger/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/logger/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/otf-reader/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/otf-reader/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/otf-writer/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/otf-writer/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/support/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/support/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/support/aglfn/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/support/aglfn/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/support/base64/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/support/base64/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/support/buffer/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/support/buffer/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/support/json/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/support/json/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/support/sha1/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/support/sha1/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/support/ttinstr/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/support/ttinstr/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/support/unicodeconv/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/support/unicodeconv/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/table/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/table/glyf/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/table/glyf/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/table/meta/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/table/meta/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/table/otl/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/table/otl/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/table/otl/subtables/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/table/otl/subtables/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/table/otl/subtables/chaining/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/table/otl/subtables/chaining/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/table/vdmx/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/table/vdmx/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/vf/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/lib/vf/$(am__dirstamp)
- -rm -f mfluadir/otfcc/src/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/otfcc/src/$(am__dirstamp)
- -rm -f mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluadir/potrace/$(am__dirstamp)
- -rm -f mfluajitdir/$(DEPDIR)/$(am__dirstamp)
- -rm -f mfluajitdir/$(am__dirstamp)
- -rm -f mplibdir/$(DEPDIR)/$(am__dirstamp)
- -rm -f mplibdir/$(am__dirstamp)
- -rm -f pdftexdir/$(DEPDIR)/$(am__dirstamp)
- -rm -f pdftexdir/$(am__dirstamp)
- -rm -f pdftexdir/regex/$(DEPDIR)/$(am__dirstamp)
- -rm -f pdftexdir/regex/$(am__dirstamp)
- -rm -f ptexdir/$(DEPDIR)/$(am__dirstamp)
- -rm -f ptexdir/$(am__dirstamp)
- -rm -f synctexdir/$(DEPDIR)/$(am__dirstamp)
- -rm -f synctexdir/$(am__dirstamp)
- -rm -f uptexdir/$(DEPDIR)/$(am__dirstamp)
- -rm -f uptexdir/$(am__dirstamp)
- -rm -f xetexdir/$(DEPDIR)/$(am__dirstamp)
- -rm -f xetexdir/$(am__dirstamp)
- -rm -f xetexdir/image/$(DEPDIR)/$(am__dirstamp)
- -rm -f xetexdir/image/$(am__dirstamp)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(DISTCLEANFILES)
+ -$(am__rm_f) alephdir/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) alephdir/$(am__dirstamp)
+ -$(am__rm_f) etexdir/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) etexdir/$(am__dirstamp)
+ -$(am__rm_f) euptexdir/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) euptexdir/$(am__dirstamp)
+ -$(am__rm_f) hitexdir/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) hitexdir/$(am__dirstamp)
+ -$(am__rm_f) libmd5/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) libmd5/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/dvi/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/dvi/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/font/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/font/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/image/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/image/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/lang/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/lang/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/lua/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/lua/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luaffi/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luaffi/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luafilesystem/src/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luafilesystem/src/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luafontloader/fontforge/fontforge/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luafontloader/fontforge/fontforge/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luafontloader/fontforge/gutils/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luafontloader/fontforge/gutils/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luafontloader/src/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luafontloader/src/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luaharfbuzz/src/luaharfbuzz/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luaharfbuzz/src/luaharfbuzz/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luamd5/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luamd5/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luapeg/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luapeg/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luasocket/src/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luasocket/src/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luazip/src/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luazip/src/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luazlib/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/luazlib/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/pdf/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/pdf/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/slnunicode/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/slnunicode/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/tex/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/tex/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/unilib/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/unilib/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/utils/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) luatexdir/utils/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/luapeg/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/luapeg/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/dep/extern/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/dep/extern/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/dep/extern/emyg-dtoa/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/dep/extern/emyg-dtoa/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/bk/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/bk/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/consolidate/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/consolidate/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/consolidate/otl/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/consolidate/otl/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/font/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/font/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/json-reader/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/json-reader/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/json-writer/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/json-writer/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/libcff/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/libcff/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/logger/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/logger/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/otf-reader/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/otf-reader/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/otf-writer/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/otf-writer/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/support/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/support/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/support/aglfn/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/support/aglfn/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/support/base64/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/support/base64/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/support/buffer/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/support/buffer/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/support/json/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/support/json/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/support/sha1/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/support/sha1/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/support/ttinstr/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/support/ttinstr/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/support/unicodeconv/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/support/unicodeconv/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/table/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/table/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/table/glyf/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/table/glyf/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/table/meta/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/table/meta/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/table/otl/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/table/otl/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/table/otl/subtables/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/table/otl/subtables/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/table/otl/subtables/chaining/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/table/otl/subtables/chaining/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/table/vdmx/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/table/vdmx/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/vf/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/lib/vf/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/src/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/otfcc/src/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/potrace/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluadir/potrace/$(am__dirstamp)
+ -$(am__rm_f) mfluajitdir/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mfluajitdir/$(am__dirstamp)
+ -$(am__rm_f) mplibdir/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) mplibdir/$(am__dirstamp)
+ -$(am__rm_f) pdftexdir/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) pdftexdir/$(am__dirstamp)
+ -$(am__rm_f) pdftexdir/regex/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) pdftexdir/regex/$(am__dirstamp)
+ -$(am__rm_f) ptexdir/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) ptexdir/$(am__dirstamp)
+ -$(am__rm_f) synctexdir/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) synctexdir/$(am__dirstamp)
+ -$(am__rm_f) uptexdir/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) uptexdir/$(am__dirstamp)
+ -$(am__rm_f) xetexdir/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) xetexdir/$(am__dirstamp)
+ -$(am__rm_f) xetexdir/image/$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) xetexdir/image/$(am__dirstamp)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -19864,7 +19721,7 @@
distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f ./$(DEPDIR)/aleph-aleph-pool.Po
+ -rm -f ./$(DEPDIR)/aleph-aleph-pool.Po
-rm -f ./$(DEPDIR)/aleph-aleph0.Po
-rm -f ./$(DEPDIR)/aleph-alephini.Po
-rm -f ./$(DEPDIR)/bibtex.Po
@@ -19889,9 +19746,6 @@
-rm -f ./$(DEPDIR)/cwebboot.Po
-rm -f ./$(DEPDIR)/dvicopy.Po
-rm -f ./$(DEPDIR)/dvitype.Po
- -rm -f ./$(DEPDIR)/eptex-eptex-pool.Po
- -rm -f ./$(DEPDIR)/eptex-eptex0.Po
- -rm -f ./$(DEPDIR)/eptex-eptexini.Po
-rm -f ./$(DEPDIR)/etex-etex-pool.Po
-rm -f ./$(DEPDIR)/etex-etex0.Po
-rm -f ./$(DEPDIR)/etex-etexini.Po
@@ -20017,7 +19871,6 @@
-rm -f alephdir/$(DEPDIR)/aleph-aleph.Po
-rm -f alephdir/$(DEPDIR)/aleph-alephbis.Po
-rm -f alephdir/$(DEPDIR)/aleph-alephextra.Po
- -rm -f eptexdir/$(DEPDIR)/eptex-eptexextra.Po
-rm -f etexdir/$(DEPDIR)/etex-etexextra.Po
-rm -f euptexdir/$(DEPDIR)/euptex-euptexextra.Po
-rm -f hitexdir/$(DEPDIR)/hishrink-hilexer.Po
@@ -20560,7 +20413,6 @@
-rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji.Po
-rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji_dump.Po
-rm -f ptexdir/$(DEPDIR)/ptex-ptexextra.Po
- -rm -f synctexdir/$(DEPDIR)/eptex-synctex.Po
-rm -f synctexdir/$(DEPDIR)/etex-synctex.Po
-rm -f synctexdir/$(DEPDIR)/euptex-synctex.Po
-rm -f synctexdir/$(DEPDIR)/libluajittex_a-synctex.Po
@@ -20645,7 +20497,7 @@
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -f ./$(DEPDIR)/aleph-aleph-pool.Po
+ -rm -f ./$(DEPDIR)/aleph-aleph-pool.Po
-rm -f ./$(DEPDIR)/aleph-aleph0.Po
-rm -f ./$(DEPDIR)/aleph-alephini.Po
-rm -f ./$(DEPDIR)/bibtex.Po
@@ -20670,9 +20522,6 @@
-rm -f ./$(DEPDIR)/cwebboot.Po
-rm -f ./$(DEPDIR)/dvicopy.Po
-rm -f ./$(DEPDIR)/dvitype.Po
- -rm -f ./$(DEPDIR)/eptex-eptex-pool.Po
- -rm -f ./$(DEPDIR)/eptex-eptex0.Po
- -rm -f ./$(DEPDIR)/eptex-eptexini.Po
-rm -f ./$(DEPDIR)/etex-etex-pool.Po
-rm -f ./$(DEPDIR)/etex-etex0.Po
-rm -f ./$(DEPDIR)/etex-etexini.Po
@@ -20798,7 +20647,6 @@
-rm -f alephdir/$(DEPDIR)/aleph-aleph.Po
-rm -f alephdir/$(DEPDIR)/aleph-alephbis.Po
-rm -f alephdir/$(DEPDIR)/aleph-alephextra.Po
- -rm -f eptexdir/$(DEPDIR)/eptex-eptexextra.Po
-rm -f etexdir/$(DEPDIR)/etex-etexextra.Po
-rm -f euptexdir/$(DEPDIR)/euptex-euptexextra.Po
-rm -f hitexdir/$(DEPDIR)/hishrink-hilexer.Po
@@ -21341,7 +21189,6 @@
-rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji.Po
-rm -f ptexdir/$(DEPDIR)/libkanji_a-kanji_dump.Po
-rm -f ptexdir/$(DEPDIR)/ptex-ptexextra.Po
- -rm -f synctexdir/$(DEPDIR)/eptex-synctex.Po
-rm -f synctexdir/$(DEPDIR)/etex-synctex.Po
-rm -f synctexdir/$(DEPDIR)/euptex-synctex.Po
-rm -f synctexdir/$(DEPDIR)/libluajittex_a-synctex.Po
@@ -22089,44 +21936,6 @@
rm -rf ptripdir
# (end of ptex.am)
-$(eptex_OBJECTS): $(eptex_prereq)
-
-$(eptex_c_h): eptex-web2c
- @$(web2c) eptex
-eptex-web2c: eptex.p $(web2c_texmf) eptexdir/eptex.defines
- @$(web2c) eptex
-
-eptex-pool.c: eptex.pool eptexd.h $(makecpool_stamp)
- $(makecpool) eptex >$@ || rm -f $@
-
-# Tangling e-pTeX
-eptex.p eptex.pool: eptex-tangle
- $(texmf_tangle) eptex eptex
-eptex-tangle: tangle$(EXEEXT) eptex.web eptex.ch tangle-sh
- $(texmf_tangle) eptex eptex
-
-# Extract eptex version
-$(srcdir)/eptexdir/eptex_version.h: @MAINTAINER_MODE_TRUE@ eptexdir/eptex.ech
- $(AM_V_GEN)grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \
- | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@
-
-# Generate eptex.web
-eptex.web: tie$(EXEEXT) $(eptex_web_srcs)
- $(tie_m) $(eptex_web_srcs)
-
-# Generate eptex.ch
-eptex.ch: tie$(EXEEXT) eptex.web $(eptex_ch_srcs)
- $(tie_c) eptex.web $(eptex_ch_srcs)
-eptexdir/eptriptest.log: eptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
-eptexdir/pdfprimitive.log: eptex$(EXEEXT)
-eptexdir/epver.log eptexdir/wcfname.log: eptex$(EXEEXT)
-eptrip.diffs: eptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
- $(triptrap_diffs) $@
-.PHONY: eptrip-clean
-eptrip-clean:
- rm -rf eptripdir
-
-# (end of eptex.am)
$(uptex_OBJECTS): $(uptex_prereq)
$(uptex_c_h): uptex-web2c
@@ -22235,7 +22044,8 @@
euptexdir/euptriptest.log euptexdir/eptriptest.log: \
euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
euptexdir/pdfprimitive.log: euptex$(EXEEXT)
-euptexdir/eupver.log euptexdir/upkcat.log \
+euptexdir/euptex-ctrlsym.log \
+ euptexdir/eupver.log euptexdir/upkcat.log \
euptexdir/wcfname.log euptexdir/wcfname0.log: euptex$(EXEEXT)
euptrip.diffs: euptex$(EXEEXT) dvitype$(EXEEXT) pltotf$(EXEEXT) tftopl$(EXEEXT)
$(triptrap_diffs) $@
@@ -22457,7 +22267,8 @@
xetex-final.ch: tie$(EXEEXT) $(xetex_ch_srcs)
$(tie_c) $(xetex_ch_srcs)
$(libxetex_a_OBJECTS): $(libxetex_prereq)
-xetexdir/xetex-filedump.log xetexdir/xetex-bug73.log xetexdir/xetex.log \
+xetexdir/xetex-filedump.log xetexdir/xetex-bug73.log \
+ xetexdir/xetex-ctrlsym.log xetexdir/xetex.log \
xetexdir/wcfname.log: xetex$(EXEEXT)
# (end of xetex.am)
@@ -22584,3 +22395,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/texk/web2c/ac/web2c.ac
===================================================================
--- branches/stable/source/src/texk/web2c/ac/web2c.ac 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/ac/web2c.ac 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,4 +1,4 @@
-dnl $Id: web2c.ac 69664 2024-02-01 22:56:12Z karl $
+dnl $Id: web2c.ac 70943 2024-04-14 05:29:13Z takuji $
# texk/web2c/ac/web2c.ac: configure.ac fragment for TL subdir
dnl
dnl Copyright 2015-2024 Karl Berry <tex-live at tug.org>
@@ -32,7 +32,6 @@
[[tex], [yes], [no], [TeX], []],
[[etex], [no], [yes], [e-TeX], [zlib]],
[[ptex], [no], [yes], [pTeX], [ptexenc zlib]],
-[[eptex], [no], [yes], [e-pTeX], [ptexenc zlib]],
[[uptex], [no], [yes], [upTeX], [ptexenc zlib]],
[[euptex], [yes], [yes], [e-upTeX], [ptexenc zlib]],
[[aleph], [yes], [], [Aleph], []],
Modified: branches/stable/source/src/texk/web2c/aclocal.m4
===================================================================
--- branches/stable/source/src/texk/web2c/aclocal.m4 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/aclocal.m4 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
+# generated automatically by aclocal 1.17 -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
-# Copyright (C) 2002-2021 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.16'
+[am__api_version='1.17'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.5], [],
+m4_if([$1], [1.17], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,12 +51,12 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.5])dnl
+[AM_AUTOMAKE_VERSION([1.17])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-# Copyright (C) 2011-2021 Free Software Foundation, Inc.
+# Copyright (C) 2011-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -70,16 +70,18 @@
AC_DEFUN([AM_PROG_AR],
[AC_BEFORE([$0], [LT_INIT])dnl
AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
+AC_BEFORE([$0], [AC_PROG_AR])dnl
AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([ar-lib])dnl
AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
: ${AR=ar}
+: ${ARFLAGS=cr}
AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
[AC_LANG_PUSH([C])
am_cv_ar_interface=ar
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
- [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+ [am_ar_try='$AR $ARFLAGS libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
AC_TRY_EVAL([am_ar_try])
if test "$ac_status" -eq 0; then
am_cv_ar_interface=ar
@@ -118,7 +120,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -170,7 +172,7 @@
# AM_COND_IF -*- Autoconf -*-
-# Copyright (C) 2008-2021 Free Software Foundation, Inc.
+# Copyright (C) 2008-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -207,7 +209,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -238,7 +240,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -370,7 +372,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -429,7 +431,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -497,7 +499,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -631,7 +633,7 @@
fi
AC_SUBST([CSCOPE])
-AC_REQUIRE([AM_SILENT_RULES])dnl
+AC_REQUIRE([_AM_SILENT_RULES])dnl
dnl The testsuite driver may need to know about EXEEXT, so add the
dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
@@ -639,47 +641,9 @@
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
+AC_REQUIRE([_AM_PROG_RM_F])
+AC_REQUIRE([_AM_PROG_XARGS_N])
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
-
-END
- AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
- fi
-fi
dnl The trailing newline in this macro's definition is deliberate, for
dnl backward compatibility and to allow trailing 'dnl'-style comments
dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841.
@@ -712,7 +676,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -733,7 +697,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2021 Free Software Foundation, Inc.
+# Copyright (C) 2003-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -755,7 +719,7 @@
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
# From Jim Meyering
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -790,7 +754,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -833,7 +797,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2021 Free Software Foundation, Inc.
+# Copyright (C) 1997-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -867,7 +831,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -896,7 +860,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2021 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -943,12 +907,28 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# _AM_PROG_RM_F
+# ---------------
+# Check whether 'rm -f' without any arguments works.
+# https://bugs.gnu.org/10828
+AC_DEFUN([_AM_PROG_RM_F],
+[am__rm_f_notfound=
+AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='""'])
+AC_SUBST(am__rm_f_notfound)
+])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
# AM_RUN_LOG(COMMAND)
# -------------------
# Run COMMAND, save the exit status in ac_status, and log it.
@@ -962,16 +942,169 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# Copyright (C) 1996-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
+# _AM_SLEEP_FRACTIONAL_SECONDS
+# ----------------------------
+AC_DEFUN([_AM_SLEEP_FRACTIONAL_SECONDS], [dnl
+AC_CACHE_CHECK([whether sleep supports fractional seconds],
+ am_cv_sleep_fractional_seconds, [dnl
+AS_IF([sleep 0.001 2>/dev/null], [am_cv_sleep_fractional_seconds=yes],
+ [am_cv_sleep_fractional_seconds=no])
+])])
+
+# _AM_FILESYSTEM_TIMESTAMP_RESOLUTION
+# -----------------------------------
+# Determine the filesystem's resolution for file modification
+# timestamps. The coarsest we know of is FAT, with a resolution
+# of only two seconds, even with the most recent "exFAT" extensions.
+# The finest (e.g. ext4 with large inodes, XFS, ZFS) is one
+# nanosecond, matching clock_gettime. However, it is probably not
+# possible to delay execution of a shell script for less than one
+# millisecond, due to process creation overhead and scheduling
+# granularity, so we don't check for anything finer than that. (See below.)
+AC_DEFUN([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION], [dnl
+AC_REQUIRE([_AM_SLEEP_FRACTIONAL_SECONDS])
+AC_CACHE_CHECK([filesystem timestamp resolution],
+ am_cv_filesystem_timestamp_resolution, [dnl
+# Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `[ls -t conftest.ts[12]]` &&
+ {
+ test "$[]*" != "X conftest.ts1 conftest.ts2" ||
+ test "$[]*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ _AS_ECHO_UNQUOTED(
+ ["Bad output from ls -t: \"`[ls -t conftest.ts[12]]`\""],
+ [AS_MESSAGE_LOG_FD])
+ AC_MSG_FAILURE([ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.])
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$[]2" = conftest.ts3 &&
+ test "$[]3" = conftest.ts2 &&
+ test "$[]4" = conftest.ts1); then
+ #
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+])])
+
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
+[AC_REQUIRE([_AM_FILESYSTEM_TIMESTAMP_RESOLUTION])
+# This check should not be cached, as it may vary across builds of
+# different projects.
+AC_MSG_CHECKING([whether build environment is sane])
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -990,49 +1123,40 @@
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[]*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ test "$[]2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
- alias in your environment])
- fi
- if test "$[2]" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$[2]" = conftest.file
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
+AC_MSG_RESULT([$am_build_env_is_sane])
+if test "$am_build_env_is_sane" = no; then
+ AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT([yes])
+
# If we didn't sleep, we still need to ensure time stamps of config.status and
# generated files are strictly newer.
am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
+AS_IF([test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1],, [dnl
+ ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
am_sleep_pid=$!
-fi
+])
AC_CONFIG_COMMANDS_PRE(
[AC_MSG_CHECKING([that generated files are newer than configure])
if test -n "$am_sleep_pid"; then
@@ -1043,18 +1167,18 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2021 Free Software Foundation, Inc.
+# Copyright (C) 2009-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# AM_SILENT_RULES([DEFAULT])
-# --------------------------
-# Enable less verbose build rules; with the default set to DEFAULT
-# ("yes" being less verbose, "no" or empty being verbose).
-AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules], [dnl
+# _AM_SILENT_RULES
+# ----------------
+# Enable less verbose build rules support.
+AC_DEFUN([_AM_SILENT_RULES],
+[AM_DEFAULT_VERBOSITY=1
+AC_ARG_ENABLE([silent-rules], [dnl
AS_HELP_STRING(
[--enable-silent-rules],
[less verbose build output (undo: "make V=1")])
@@ -1062,11 +1186,6 @@
[--disable-silent-rules],
[verbose build output (undo: "make V=0")])dnl
])
-case $enable_silent_rules in @%:@ (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
-esac
dnl
dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
dnl do not support nested variable expansions.
@@ -1085,6 +1204,21 @@
else
am_cv_make_support_nested_variables=no
fi])
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+dnl Delay evaluation of AM_DEFAULT_VERBOSITY to the end to allow multiple calls
+dnl to AM_SILENT_RULES to change the default value.
+AC_CONFIG_COMMANDS_PRE([dnl
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
if test $am_cv_make_support_nested_variables = yes; then
dnl Using '$V' instead of '$(V)' breaks IRIX make.
AM_V='$(V)'
@@ -1093,17 +1227,18 @@
AM_V=$AM_DEFAULT_VERBOSITY
AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
fi
-AC_SUBST([AM_V])dnl
-AM_SUBST_NOTMAKE([AM_V])dnl
-AC_SUBST([AM_DEFAULT_V])dnl
-AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
-AM_BACKSLASH='\'
-AC_SUBST([AM_BACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])dnl
])
-# Copyright (C) 2001-2021 Free Software Foundation, Inc.
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Set the default verbosity level to DEFAULT ("yes" being less verbose, "no" or
+# empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_REQUIRE([_AM_SILENT_RULES])
+AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])])
+
+# Copyright (C) 2001-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1131,7 +1266,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2021 Free Software Foundation, Inc.
+# Copyright (C) 2006-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1150,7 +1285,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2021 Free Software Foundation, Inc.
+# Copyright (C) 2004-2024 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1196,15 +1331,19 @@
am_uid=`id -u || echo unknown`
am_gid=`id -g || echo unknown`
AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
- if test $am_uid -le $am_max_uid; then
- AC_MSG_RESULT([yes])
+ if test x$am_uid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current UID is ok, but dist-ustar might not work])
+ elif test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
else
- AC_MSG_RESULT([no])
- _am_tools=none
+ AC_MSG_RESULT([no])
+ _am_tools=none
fi
AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
- if test $am_gid -le $am_max_gid; then
- AC_MSG_RESULT([yes])
+ if test x$gm_gid = xunknown; then
+ AC_MSG_WARN([ancient id detected; assuming current GID is ok, but dist-ustar might not work])
+ elif test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
_am_tools=none
@@ -1281,6 +1420,26 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+# Copyright (C) 2022-2024 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_XARGS_N
+# ----------------
+# Check whether 'xargs -n' works. It should work everywhere, so the fallback
+# is not optimized at all as we never expect to use it.
+AC_DEFUN([_AM_PROG_XARGS_N],
+[AC_CACHE_CHECK([xargs -n works], am_cv_xargs_n_works, [dnl
+AS_IF([test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"], [am_cv_xargs_n_works=yes], [am_cv_xargs_n_works=no])])
+AS_IF([test "$am_cv_xargs_n_works" = yes], [am__xargs_n='xargs -n'], [dnl
+ am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "$@" "$am__xargs_n_arg"; done; }'
+])dnl
+AC_SUBST(am__xargs_n)
+])
+
m4_include([m4/web2c-disable.m4])
m4_include([../../m4/ax_cxx_compile_stdcxx.m4])
m4_include([../../m4/kpse-asm.m4])
@@ -1295,6 +1454,7 @@
m4_include([../../m4/kpse-harfbuzz-flags.m4])
m4_include([../../m4/kpse-icu-flags.m4])
m4_include([../../m4/kpse-kpathsea-flags.m4])
+m4_include([../../m4/kpse-largefile.m4])
m4_include([../../m4/kpse-lex.m4])
m4_include([../../m4/kpse-lib-version.m4])
m4_include([../../m4/kpse-libpng-flags.m4])
Modified: branches/stable/source/src/texk/web2c/c-auto.in
===================================================================
--- branches/stable/source/src/texk/web2c/c-auto.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/c-auto.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -133,6 +133,9 @@
/* Define to 1 if you have the 'memcpy' function. */
#undef HAVE_MEMCPY
+/* Define to 1 if you have the <minix/config.h> header file. */
+#undef HAVE_MINIX_CONFIG_H
+
/* Define to 1 if you have the 'mkdtemp' function. */
#undef HAVE_MKDTEMP
@@ -231,6 +234,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to 1 if you have the <wchar.h> header file. */
+#undef HAVE_WCHAR_H
+
/* Define to 1 if the system has the type '_Bool'. */
#undef HAVE__BOOL
@@ -306,6 +312,98 @@
/* metafont: Define to include Uniterm window support. */
#undef UNITERMWIN
+/* Enable extensions on AIX, Interix, z/OS. */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable general extensions on macOS. */
+#ifndef _DARWIN_C_SOURCE
+# undef _DARWIN_C_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable X/Open compliant socket functions that do not require linking
+ with -lxnet on HP-UX 11.11. */
+#ifndef _HPUX_ALT_XOPEN_SOCKET_API
+# undef _HPUX_ALT_XOPEN_SOCKET_API
+#endif
+/* Identify the host operating system as Minix.
+ This macro does not affect the system headers' behavior.
+ A future release of Autoconf may stop defining this macro. */
+#ifndef _MINIX
+# undef _MINIX
+#endif
+/* Enable general extensions on NetBSD.
+ Enable NetBSD compatibility extensions on Minix. */
+#ifndef _NETBSD_SOURCE
+# undef _NETBSD_SOURCE
+#endif
+/* Enable OpenBSD compatibility extensions on NetBSD.
+ Oddly enough, this does nothing on OpenBSD. */
+#ifndef _OPENBSD_SOURCE
+# undef _OPENBSD_SOURCE
+#endif
+/* Define to 1 if needed for POSIX-compatible behavior. */
+#ifndef _POSIX_SOURCE
+# undef _POSIX_SOURCE
+#endif
+/* Define to 2 if needed for POSIX-compatible behavior. */
+#ifndef _POSIX_1_SOURCE
+# undef _POSIX_1_SOURCE
+#endif
+/* Enable POSIX-compatible threading on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */
+#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */
+#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
+# undef __STDC_WANT_IEC_60559_BFP_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */
+#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
+# undef __STDC_WANT_IEC_60559_DFP_EXT__
+#endif
+/* Enable extensions specified by C23 Annex F. */
+#ifndef __STDC_WANT_IEC_60559_EXT__
+# undef __STDC_WANT_IEC_60559_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */
+#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
+# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
+#endif
+/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015. */
+#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
+# undef __STDC_WANT_IEC_60559_TYPES_EXT__
+#endif
+/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */
+#ifndef __STDC_WANT_LIB_EXT2__
+# undef __STDC_WANT_LIB_EXT2__
+#endif
+/* Enable extensions specified by ISO/IEC 24747:2009. */
+#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
+# undef __STDC_WANT_MATH_SPEC_FUNCS__
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable X/Open extensions. Define to 500 only if necessary
+ to make mbstate_t available. */
+#ifndef _XOPEN_SOURCE
+# undef _XOPEN_SOURCE
+#endif
+
+
/* Version number of package */
#undef VERSION
Modified: branches/stable/source/src/texk/web2c/configure
===================================================================
--- branches/stable/source/src/texk/web2c/configure 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/configure 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for Web2C 2024.
+# Generated by GNU Autoconf 2.72 for Web2C 2025/dev.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -614,8 +614,8 @@
# Identity of this package.
PACKAGE_NAME='Web2C'
PACKAGE_TARNAME='web2c'
-PACKAGE_VERSION='2024'
-PACKAGE_STRING='Web2C 2024'
+PACKAGE_VERSION='2025/dev'
+PACKAGE_STRING='Web2C 2025/dev'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL=''
@@ -828,10 +828,6 @@
UPTEX_SYNCTEX_TRUE
UPTEX_FALSE
UPTEX_TRUE
-EPTEX_SYNCTEX_FALSE
-EPTEX_SYNCTEX_TRUE
-EPTEX_FALSE
-EPTEX_TRUE
PTEX_SYNCTEX_FALSE
PTEX_SYNCTEX_TRUE
PTEX_FALSE
@@ -916,25 +912,11 @@
ac_ct_AR
AR
WARNING_CFLAGS
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-am__nodep
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
+am__xargs_n
+am__rm_f_notfound
AM_BACKSLASH
AM_DEFAULT_VERBOSITY
AM_DEFAULT_V
@@ -942,6 +924,15 @@
CSCOPE
ETAGS
CTAGS
+am__fastdepCC_FALSE
+am__fastdepCC_TRUE
+CCDEPMODE
+am__nodep
+AMDEPBACKSLASH
+AMDEP_FALSE
+AMDEP_TRUE
+am__include
+DEPDIR
am__untar
am__tar
AMTAR
@@ -965,6 +956,13 @@
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
WEB2CVERSION
target_alias
host_alias
@@ -1009,9 +1007,9 @@
ac_subst_files=''
ac_user_opts='
enable_option_checking
+enable_dependency_tracking
enable_silent_rules
enable_maintainer_mode
-enable_dependency_tracking
enable_compiler_warnings
enable_shared
enable_static
@@ -1035,8 +1033,6 @@
enable_etex_synctex
enable_ptex
enable_ptex_synctex
-enable_eptex
-enable_eptex_synctex
enable_uptex
enable_uptex_synctex
enable_euptex
@@ -1670,7 +1666,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 Web2C 2024 to adapt to many kinds of systems.
+'configure' configures Web2C 2025/dev to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1745,7 +1741,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Web2C 2024:";;
+ short | recursive ) echo "Configuration of Web2C 2025/dev:";;
esac
cat <<\_ACEOF
@@ -1753,15 +1749,15 @@
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-dependency-tracking
+ do not reject slow dependency extractors
+ --disable-dependency-tracking
+ speeds up one-time build
--enable-silent-rules less verbose build output (undo: "make V=1")
--disable-silent-rules verbose build output (undo: "make V=0")
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
- --enable-dependency-tracking
- do not reject slow dependency extractors
- --disable-dependency-tracking
- speeds up one-time build
--enable-compiler-warnings=[no|min|yes|max|all]
Turn on compiler warnings [default: yes if
maintainer-mode, min otherwise]
@@ -1782,8 +1778,6 @@
--disable-etex-synctex build e-TeX without SyncTeX support
--enable-ptex compile and install pTeX
--disable-ptex-synctex build pTeX without SyncTeX support
- --enable-eptex compile and install e-pTeX
- --disable-eptex-synctex build e-pTeX without SyncTeX support
--enable-uptex compile and install upTeX
--disable-uptex-synctex build upTeX without SyncTeX support
--disable-euptex do not compile and install e-upTeX
@@ -1976,7 +1970,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Web2C configure 2024
+Web2C configure 2025/dev
generated by GNU Autoconf 2.72
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2030,6 +2024,41 @@
} # ac_fn_c_try_compile
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ eval "$3=yes"
+else case e in #(
+ e) eval "$3=no" ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+eval ac_res=\$$3
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
# ac_fn_c_try_link LINENO
# -----------------------
# Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -2078,41 +2107,6 @@
} # ac_fn_c_try_link
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
- eval "$3=yes"
-else case e in #(
- e) eval "$3=no" ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
-fi
-eval ac_res=\$$3
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
# ac_fn_c_check_func LINENO FUNC VAR
# ----------------------------------
# Tests whether FUNC exists, setting the cache variable VAR accordingly
@@ -2998,7 +2992,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Web2C $as_me 2024, which was
+It was created by Web2C $as_me 2025/dev, which was
generated by GNU Autoconf 2.72. Invocation command line was
$ $0$ac_configure_args_raw
@@ -3269,6 +3263,7 @@
>$cache_file
fi
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
# Test code for whether the C compiler supports C89 (global declarations)
ac_c_conftest_c89_globals='
/* Does the compiler advertise C89 conformance?
@@ -3594,7 +3589,6 @@
}
"
-as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
@@ -3603,6 +3597,8 @@
as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
+as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
+as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
# Test code for whether the C++ compiler supports C++98 (global declarations)
ac_cxx_conftest_cxx98_globals='
// Does the compiler advertise C++98 conformance?
@@ -3821,7 +3817,7 @@
# Auxiliary files required by this configure script.
-ac_aux_files="config.guess config.sub ltmain.sh ar-lib compile missing install-sh"
+ac_aux_files="config.guess config.sub ltmain.sh ar-lib missing install-sh compile"
# Locations in which to look for auxiliary files.
ac_aux_dir_candidates="${srcdir}/../../build-aux"
@@ -3992,579 +3988,33 @@
-WEB2CVERSION=2024
+WEB2CVERSION=2025/dev
-am__api_version='1.16'
+# LuaTeX requires system extensions for socket support.
+# Must be at the very beginning or warnings about compiler tests.
+# SyncTeX and plenty of others unconditionally define GNU_SOURCE,
+# so it's probably more consistent to always use it.
+# Also, we can't easily make it conditional on LuaTeX only because then
+# OBJEXT ends up defined as the empty string (error: no way to make
+# "basechsuffix."), which seems odd, but whatever.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: using system extensions" >&5
+printf "%s\n" "$as_me: using system extensions" >&6;}
- # Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-printf %s "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if test ${ac_cv_path_install+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- # Account for fact that we put trailing slashes in our PATH walk.
-case $as_dir in #((
- ./ | /[cC]/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- rm -rf conftest.one conftest.two conftest.dir
- echo one > conftest.one
- echo two > conftest.two
- mkdir conftest.dir
- if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" &&
- test -s conftest.one && test -s conftest.two &&
- test -s conftest.dir/conftest.one &&
- test -s conftest.dir/conftest.two
- then
- ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
- fi
- done
- done
- ;;
-esac
- done
-IFS=$as_save_IFS
-rm -rf conftest.one conftest.two conftest.dir
- ;;
-esac
-fi
- if test ${ac_cv_path_install+y}; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. Don't cache a
- # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-printf "%s\n" "$INSTALL" >&6; }
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-printf %s "checking whether build environment is sane... " >&6; }
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name. Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
- *[\\\"\#\$\&\'\`$am_lf]*)
- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
- *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
-esac
-# Do 'set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- am_has_slept=no
- for am_try in 1 2; do
- echo "timestamp, slept: $am_has_slept" > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
- if test "$2" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- am_has_slept=yes
- done
- test "$2" = conftest.file
- )
-then
- # Ok.
- :
-else
- as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
- ( sleep 1 ) &
- am_sleep_pid=$!
-fi
-rm -f conftest.file
-
-test "$program_prefix" != NONE &&
- program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
- program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was 's,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
-
-
# Expand $ac_aux_dir to an absolute path.
am_aux_dir=`cd "$ac_aux_dir" && pwd`
-
- if test x"${MISSING+set}" != xset; then
- MISSING="\${SHELL} '$am_aux_dir/missing'"
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --is-lightweight"; then
- am_missing_run="$MISSING "
-else
- am_missing_run=
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
-printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh+set}" != xset; then
- case $am_aux_dir in
- *\ * | *\ *)
- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
- *)
- install_sh="\${SHELL} $am_aux_dir/install-sh"
- esac
-fi
-
-# Installed binaries are usually stripped using 'strip' when the user
-# run "make install-strip". However 'strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the 'STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_STRIP+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$STRIP"; then
- ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi ;;
-esac
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
- ac_ct_STRIP=$STRIP
- # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_STRIP+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$ac_ct_STRIP"; then
- ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_prog_ac_ct_STRIP="strip"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi ;;
-esac
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
- if test "x$ac_ct_STRIP" = x; then
- STRIP=":"
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- STRIP=$ac_ct_STRIP
- fi
-else
- STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
-printf %s "checking for a race-free mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
- if test ${ac_cv_path_mkdir+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_prog in mkdir gmkdir; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
- case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
- 'mkdir ('*'coreutils) '* | \
- *'BusyBox '* | \
- 'mkdir (fileutils) '4.1*)
- ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
- break 3;;
- esac
- done
- done
- done
-IFS=$as_save_IFS
- ;;
-esac
-fi
-
- test -d ./--version && rmdir ./--version
- if test ${ac_cv_path_mkdir+y}; then
- MKDIR_P="$ac_cv_path_mkdir -p"
- else
- # As a last resort, use plain mkdir -p,
- # in the hope it doesn't have the bugs of ancient mkdir.
- MKDIR_P='mkdir -p'
- fi
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-printf "%s\n" "$MKDIR_P" >&6; }
-
-for ac_prog in gawk mawk nawk awk
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_AWK+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) if test -n "$AWK"; then
- ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- case $as_dir in #(((
- '') as_dir=./ ;;
- */) ;;
- *) as_dir=$as_dir/ ;;
- esac
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
- ac_cv_prog_AWK="$ac_prog"
- printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi ;;
-esac
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-printf "%s\n" "$AWK" >&6; }
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-fi
-
-
- test -n "$AWK" && break
-done
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval test \${ac_cv_prog_make_${ac_make}_set+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
- @echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
- *)
- eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make ;;
-esac
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
- SET_MAKE=
-else
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-# Check whether --enable-silent-rules was given.
-if test ${enable_silent_rules+y}
-then :
- enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in # (((
- yes) AM_DEFAULT_VERBOSITY=0;;
- no) AM_DEFAULT_VERBOSITY=1;;
- *) AM_DEFAULT_VERBOSITY=1;;
-esac
-am_make=${MAKE-make}
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-printf %s "checking whether $am_make supports nested variables... " >&6; }
-if test ${am_cv_make_support_nested_variables+y}
-then :
- printf %s "(cached) " >&6
-else case e in #(
- e) if printf "%s\n" 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
- @$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
- am_cv_make_support_nested_variables=yes
-else
- am_cv_make_support_nested_variables=no
-fi ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
- AM_V='$(V)'
- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
- AM_V=$AM_DEFAULT_VERBOSITY
- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AM_BACKSLASH='\'
-
-
-
-
-
-
-
-
-
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
-printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
-cat > confinc.mk << 'END'
-am__doit:
- @echo this is the am__doit target >confinc.out
-.PHONY: am__doit
-END
-am__include="#"
-am__quote=
-# BSD make does it like this.
-echo '.include "confinc.mk" # ignored' > confmf.BSD
-# Other make implementations (GNU, Solaris 10, AIX) do it like this.
-echo 'include confinc.mk # ignored' > confmf.GNU
-_am_result=no
-for s in GNU BSD; do
- { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
- (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
- case $?:`cat confinc.out 2>/dev/null` in #(
- '0:this is the am__doit target') :
- case $s in #(
- BSD) :
- am__include='.include' am__quote='"' ;; #(
- *) :
- am__include='include' am__quote='' ;;
-esac ;; #(
- *) :
- ;;
-esac
- if test "$am__include" != "#"; then
- _am_result="yes ($s style)"
- break
- fi
-done
-rm -f confinc.* confmf.*
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
-printf "%s\n" "${_am_result}" >&6; }
-
-# Check whether --enable-dependency-tracking was given.
-if test ${enable_dependency_tracking+y}
-then :
- enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
- am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
- AMDEP_TRUE=
- AMDEP_FALSE='#'
-else
- AMDEP_TRUE='#'
- AMDEP_FALSE=
-fi
-
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5643,137 +5093,922 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-depcc="$CC" am_compiler_list=
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-printf %s "checking dependency style of $depcc... " >&6; }
-if test ${am_cv_CC_dependencies_compiler_type+y}
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
+do
+ if test $ac_cache; then
+ ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+ if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+ printf "%s\n" "#define $ac_item 1" >> confdefs.h
+ fi
+ ac_header= ac_cache=
+ elif test $ac_header; then
+ ac_cache=$ac_item
+ else
+ ac_header=$ac_item
+ fi
+done
+
+
+
+
+
+
+
+
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
then :
+
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+
+
+
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if test ${ac_cv_safe_to_define___extensions__+y}
+then :
printf %s "(cached) " >&6
else case e in #(
- e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named 'D' -- because '-MD' means "put the output
- # in D".
- rm -rf conftest.dir
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
- am_cv_CC_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+# define __EXTENSIONS__ 1
+ $ac_includes_default
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_safe_to_define___extensions__=yes
+else case e in #(
+ e) ac_cv_safe_to_define___extensions__=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
+printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
+if test ${ac_cv_should_define__xopen_source+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_cv_should_define__xopen_source=no
+ if test $ac_cv_header_wchar_h = yes
+then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #include <wchar.h>
+ mbstate_t x;
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+ #define _XOPEN_SOURCE 500
+ #include <wchar.h>
+ mbstate_t x;
+int
+main (void)
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_should_define__xopen_source=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
+printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+
+ printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+
+ printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
+
+ printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+
+ printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+
+ if test $ac_cv_header_minix_config_h = yes
+then :
+ MINIX=yes
+ printf "%s\n" "#define _MINIX 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
+
+ printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
+
+else case e in #(
+ e) MINIX= ;;
+esac
+fi
+ if test $ac_cv_safe_to_define___extensions__ = yes
+then :
+ printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
+
+fi
+ if test $ac_cv_should_define__xopen_source = yes
+then :
+ printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
+
+fi
+
+
+am__api_version='1.17'
+
+
+ # Find a good install program. We prefer a C program (faster),
+# so one script is as good as another. But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
+# ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+printf %s "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if test ${ac_cv_path_install+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ # Account for fact that we put trailing slashes in our PATH walk.
+case $as_dir in #((
+ ./ | /[cC]/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ rm -rf conftest.one conftest.two conftest.dir
+ echo one > conftest.one
+ echo two > conftest.two
+ mkdir conftest.dir
+ if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" &&
+ test -s conftest.one && test -s conftest.two &&
+ test -s conftest.dir/conftest.one &&
+ test -s conftest.dir/conftest.two
+ then
+ ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
+ fi
+ done
+ done
+ ;;
+esac
+
+ done
+IFS=$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
+ ;;
+esac
+fi
+ if test ${ac_cv_path_install+y}; then
+ INSTALL=$ac_cv_path_install
+ else
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ INSTALL=$ac_install_sh
fi
- am__universal=false
- case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf "%s\n" "$INSTALL" >&6; }
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sleep supports fractional seconds" >&5
+printf %s "checking whether sleep supports fractional seconds... " >&6; }
+if test ${am_cv_sleep_fractional_seconds+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if sleep 0.001 2>/dev/null
+then :
+ am_cv_sleep_fractional_seconds=yes
+else case e in #(
+ e) am_cv_sleep_fractional_seconds=no ;;
+esac
+fi
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_sleep_fractional_seconds" >&5
+printf "%s\n" "$am_cv_sleep_fractional_seconds" >&6; }
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking filesystem timestamp resolution" >&5
+printf %s "checking filesystem timestamp resolution... " >&6; }
+if test ${am_cv_filesystem_timestamp_resolution+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) # Default to the worst case.
+am_cv_filesystem_timestamp_resolution=2
+
+# Only try to go finer than 1 sec if sleep can do it.
+# Don't try 1 sec, because if 0.01 sec and 0.1 sec don't work,
+# - 1 sec is not much of a win compared to 2 sec, and
+# - it takes 2 seconds to perform the test whether 1 sec works.
+#
+# Instead, just use the default 2s on platforms that have 1s resolution,
+# accept the extra 1s delay when using $sleep in the Automake tests, in
+# exchange for not incurring the 2s delay for running the test for all
+# packages.
+#
+am_try_resolutions=
+if test "$am_cv_sleep_fractional_seconds" = yes; then
+ # Even a millisecond often causes a bunch of false positives,
+ # so just try a hundredth of a second. The time saved between .001 and
+ # .01 is not terribly consequential.
+ am_try_resolutions="0.01 0.1 $am_try_resolutions"
+fi
+
+# In order to catch current-generation FAT out, we must *modify* files
+# that already exist; the *creation* timestamp is finer. Use names
+# that make ls -t sort them differently when they have equal
+# timestamps than when they have distinct timestamps, keeping
+# in mind that ls -t prints the *newest* file first.
+rm -f conftest.ts?
+: > conftest.ts1
+: > conftest.ts2
+: > conftest.ts3
+
+# Make sure ls -t actually works. Do 'set' in a subshell so we don't
+# clobber the current shell's arguments. (Outer-level square brackets
+# are removed by m4; they're present so that m4 does not expand
+# <dollar><star>; be careful, easy to get confused.)
+if (
+ set X `ls -t conftest.ts[12]` &&
+ {
+ test "$*" != "X conftest.ts1 conftest.ts2" ||
+ test "$*" != "X conftest.ts2 conftest.ts1";
+ }
+); then :; else
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ printf "%s\n" ""Bad output from ls -t: \"`ls -t conftest.ts[12]`\""" >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "ls -t produces unexpected output.
+Make sure there is not a broken ls alias in your environment.
+See 'config.log' for more details" "$LINENO" 5; }
+fi
+
+for am_try_res in $am_try_resolutions; do
+ # Any one fine-grained sleep might happen to cross the boundary
+ # between two values of a coarser actual resolution, but if we do
+ # two fine-grained sleeps in a row, at least one of them will fall
+ # entirely within a coarse interval.
+ echo alpha > conftest.ts1
+ sleep $am_try_res
+ echo beta > conftest.ts2
+ sleep $am_try_res
+ echo gamma > conftest.ts3
+
+ # We assume that 'ls -t' will make use of high-resolution
+ # timestamps if the operating system supports them at all.
+ if (set X `ls -t conftest.ts?` &&
+ test "$2" = conftest.ts3 &&
+ test "$3" = conftest.ts2 &&
+ test "$4" = conftest.ts1); then
#
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
- # Solaris 10 /bin/sh.
- echo '/* dummy */' > sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ # Ok, ls -t worked. If we're at a resolution of 1 second, we're done,
+ # because we don't need to test make.
+ make_ok=true
+ if test $am_try_res != 1; then
+ # But if we've succeeded so far with a subsecond resolution, we
+ # have one more thing to check: make. It can happen that
+ # everything else supports the subsecond mtimes, but make doesn't;
+ # notably on macOS, which ships make 3.81 from 2006 (the last one
+ # released under GPLv2). https://bugs.gnu.org/68808
+ #
+ # We test $MAKE if it is defined in the environment, else "make".
+ # It might get overridden later, but our hope is that in practice
+ # it does not matter: it is the system "make" which is (by far)
+ # the most likely to be broken, whereas if the user overrides it,
+ # probably they did so with a better, or at least not worse, make.
+ # https://lists.gnu.org/archive/html/automake/2024-06/msg00051.html
+ #
+ # Create a Makefile (real tab character here):
+ rm -f conftest.mk
+ echo 'conftest.ts1: conftest.ts2' >conftest.mk
+ echo ' touch conftest.ts2' >>conftest.mk
+ #
+ # Now, running
+ # touch conftest.ts1; touch conftest.ts2; make
+ # should touch ts1 because ts2 is newer. This could happen by luck,
+ # but most often, it will fail if make's support is insufficient. So
+ # test for several consecutive successes.
+ #
+ # (We reuse conftest.ts[12] because we still want to modify existing
+ # files, not create new ones, per above.)
+ n=0
+ make=${MAKE-make}
+ until test $n -eq 3; do
+ echo one > conftest.ts1
+ sleep $am_try_res
+ echo two > conftest.ts2 # ts2 should now be newer than ts1
+ if $make -f conftest.mk | grep 'up to date' >/dev/null; then
+ make_ok=false
+ break # out of $n loop
+ fi
+ n=`expr $n + 1`
+ done
+ fi
+ #
+ if $make_ok; then
+ # Everything we know to check worked out, so call this resolution good.
+ am_cv_filesystem_timestamp_resolution=$am_try_res
+ break # out of $am_try_res loop
+ fi
+ # Otherwise, we'll go on to check the next resolution.
+ fi
+done
+rm -f conftest.ts?
+# (end _am_filesystem_timestamp_resolution)
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_filesystem_timestamp_resolution" >&5
+printf "%s\n" "$am_cv_filesystem_timestamp_resolution" >&6; }
- # We check with '-c' and '-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle '-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs.
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
- # After this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested.
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok '-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
- none) break ;;
- esac
- if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CC_dependencies_compiler_type=$depmode
- break
- fi
+# This check should not be cached, as it may vary across builds of
+# different projects.
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+printf %s "checking whether build environment is sane... " >&6; }
+# Reject unsafe characters in $srcdir or the absolute working directory
+# name. Accept space and tab only in the latter.
+am_lf='
+'
+case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+esac
+case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
+esac
+
+# Do 'set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+am_build_env_is_sane=no
+am_has_slept=no
+rm -f conftest.file
+for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ if (
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
fi
+ test "$2" = conftest.file
+ ); then
+ am_build_env_is_sane=yes
+ break
+ fi
+ # Just in case.
+ sleep "$am_cv_filesystem_timestamp_resolution"
+ am_has_slept=yes
+done
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_build_env_is_sane" >&5
+printf "%s\n" "$am_build_env_is_sane" >&6; }
+if test "$am_build_env_is_sane" = no; then
+ as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
+fi
+
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if test -e conftest.file || grep 'slept: no' conftest.file >/dev/null 2>&1
+then :
+
+else case e in #(
+ e) ( sleep "$am_cv_filesystem_timestamp_resolution" ) &
+ am_sleep_pid=$!
+ ;;
+esac
+fi
+
+rm -f conftest.file
+
+test "$program_prefix" != NONE &&
+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
+# Double any \ or $.
+# By default was 's,x,x', remove it if useless.
+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
+program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
+
+
+ if test x"${MISSING+set}" != xset; then
+ MISSING="\${SHELL} '$am_aux_dir/missing'"
+fi
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
+else
+ am_missing_run=
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
+fi
+
+if test x"${install_sh+set}" != xset; then
+ case $am_aux_dir in
+ *\ * | *\ *)
+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+ *)
+ install_sh="\${SHELL} $am_aux_dir/install-sh"
+ esac
+fi
+
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the 'STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_STRIP+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$STRIP"; then
+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
done
+IFS=$as_save_IFS
- cd ..
- rm -rf conftest.dir
+fi ;;
+esac
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+printf "%s\n" "$STRIP" >&6; }
else
- am_cv_CC_dependencies_compiler_type=none
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+ ac_ct_STRIP=$STRIP
+ # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_STRIP+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$ac_ct_STRIP"; then
+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_STRIP="strip"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+printf "%s\n" "$ac_ct_STRIP" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+ if test "x$ac_ct_STRIP" = x; then
+ STRIP=":"
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ STRIP=$ac_ct_STRIP
+ fi
+else
+ STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
+printf %s "checking for a race-free mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+ if test ${ac_cv_path_mkdir+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
+ case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir ('*'coreutils) '* | \
+ *'BusyBox '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+ done
+IFS=$as_save_IFS
;;
esac
fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
- am__fastdepCC_TRUE=
- am__fastdepCC_FALSE='#'
+ test -d ./--version && rmdir ./--version
+ if test ${ac_cv_path_mkdir+y}; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
+ else
+ # As a last resort, use plain mkdir -p,
+ # in the hope it doesn't have the bugs of ancient mkdir.
+ MKDIR_P='mkdir -p'
+ fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+printf "%s\n" "$MKDIR_P" >&6; }
+
+for ac_prog in gawk mawk nawk awk
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_AWK+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$AWK"; then
+ ac_cv_prog_AWK="$AWK" # Let the user override the test.
else
- am__fastdepCC_TRUE='#'
- am__fastdepCC_FALSE=
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_AWK="$ac_prog"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi ;;
+esac
fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+printf "%s\n" "$AWK" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+ test -n "$AWK" && break
+done
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval test \${ac_cv_prog_make_${ac_make}_set+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+ @echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+ *)
+ eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make ;;
+esac
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ SET_MAKE=
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+ am__leading_dot=.
+else
+ am__leading_dot=_
+fi
+rmdir .tst 2>/dev/null
+
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
+printf %s "checking whether ${MAKE-make} supports the include directive... " >&6; }
+cat > confinc.mk << 'END'
+am__doit:
+ @echo this is the am__doit target >confinc.out
+.PHONY: am__doit
+END
+am__include="#"
+am__quote=
+# BSD make does it like this.
+echo '.include "confinc.mk" # ignored' > confmf.BSD
+# Other make implementations (GNU, Solaris 10, AIX) do it like this.
+echo 'include confinc.mk # ignored' > confmf.GNU
+_am_result=no
+for s in GNU BSD; do
+ { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
+ (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ case $?:`cat confinc.out 2>/dev/null` in #(
+ '0:this is the am__doit target') :
+ case $s in #(
+ BSD) :
+ am__include='.include' am__quote='"' ;; #(
+ *) :
+ am__include='include' am__quote='' ;;
+esac ;; #(
+ *) :
+ ;;
+esac
+ if test "$am__include" != "#"; then
+ _am_result="yes ($s style)"
+ break
+ fi
+done
+rm -f confinc.* confmf.*
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
+printf "%s\n" "${_am_result}" >&6; }
+
+# Check whether --enable-dependency-tracking was given.
+if test ${enable_dependency_tracking+y}
+then :
+ enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+ am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+ AMDEP_FALSE='#'
+else
+ AMDEP_TRUE='#'
+ AMDEP_FALSE=
+fi
+
+
+AM_DEFAULT_VERBOSITY=1
+# Check whether --enable-silent-rules was given.
+if test ${enable_silent_rules+y}
+then :
+ enableval=$enable_silent_rules;
+fi
+
+am_make=${MAKE-make}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+printf %s "checking whether $am_make supports nested variables... " >&6; }
+if test ${am_cv_make_support_nested_variables+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if printf "%s\n" 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+printf "%s\n" "$am_cv_make_support_nested_variables" >&6; }
+AM_BACKSLASH='\'
+
+am__rm_f_notfound=
+if (rm -f && rm -fr && rm -rf) 2>/dev/null
+then :
+
+else case e in #(
+ e) am__rm_f_notfound='""' ;;
+esac
+fi
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking xargs -n works" >&5
+printf %s "checking xargs -n works... " >&6; }
+if test ${am_cv_xargs_n_works+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test "`echo 1 2 3 | xargs -n2 echo`" = "1 2
+3"
+then :
+ am_cv_xargs_n_works=yes
+else case e in #(
+ e) am_cv_xargs_n_works=no ;;
+esac
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_xargs_n_works" >&5
+printf "%s\n" "$am_cv_xargs_n_works" >&6; }
+if test "$am_cv_xargs_n_works" = yes
+then :
+ am__xargs_n='xargs -n'
+else case e in #(
+ e) am__xargs_n='am__xargs_n () { shift; sed "s/ /\\n/g" | while read am__xargs_n_arg; do "" "$am__xargs_n_arg"; done; }'
+ ;;
+esac
+fi
+
# Check whether --enable-compiler-warnings was given.
if test ${enable_compiler_warnings+y}
then :
@@ -9633,35 +9868,6 @@
esac
}
-ac_header= ac_cache=
-for ac_item in $ac_header_c_list
-do
- if test $ac_cache; then
- ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
- if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
- printf "%s\n" "#define $ac_item 1" >> confdefs.h
- fi
- ac_header= ac_cache=
- elif test $ac_header; then
- ac_cache=$ac_item
- else
- ac_header=$ac_item
- fi
-done
-
-
-
-
-
-
-
-
-if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
-then :
-
-printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
"
if test "x$ac_cv_header_dlfcn_h" = xyes
@@ -9756,6 +9962,8 @@
echo 'tldbg:KPSE_COMMON called (pkg=web2c programs, amopt=)' >&5
echo 'tldbg:KPSE_BASIC called (pkg=web2c programs, amopt=)' >&5
+#
+# am_init_automake
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
@@ -9778,7 +9986,7 @@
# Define the identity of the package.
PACKAGE='web2c'
- VERSION='2024'
+ VERSION='2025/dev'
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -9824,6 +10032,136 @@
+depcc="$CC" am_compiler_list=
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+printf %s "checking dependency style of $depcc... " >&6; }
+if test ${am_cv_CC_dependencies_compiler_type+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_CC_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ am__universal=false
+ case " $depcc " in #(
+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
+ esac
+
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
+ am__obj=sub/conftest.${OBJEXT-o}
+ am__minus_obj="-o $am__obj"
+ case $depmode in
+ gcc)
+ # This depmode causes a compiler race in universal mode.
+ test "$am__universal" = false || continue
+ ;;
+ nosideeffect)
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
+ # not run yet. These depmodes are late enough in the game, and
+ # so weak that their functioning should not be impacted.
+ am__obj=conftest.${OBJEXT-o}
+ am__minus_obj=
+ ;;
+ none) break ;;
+ esac
+ if depmode=$depmode \
+ source=sub/conftest.c object=$am__obj \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thus:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CC_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CC_dependencies_compiler_type=none
+fi
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+ am__fastdepCC_FALSE='#'
+else
+ am__fastdepCC_TRUE='#'
+ am__fastdepCC_FALSE=
+fi
+
+
# Variables for tags utilities; see am/tags.am
if test -z "$CTAGS"; then
CTAGS=ctags
@@ -9839,49 +10177,13 @@
-# POSIX will say in a future version that running "rm -f" with no argument
-# is OK; and we want to be able to make that assumption in our Makefile
-# recipes. So use an aggressive probe to check that the usage we want is
-# actually supported "in the wild" to an acceptable degree.
-# See automake bug#10828.
-# To make any issue more visible, cause the running configure to be aborted
-# by default if the 'rm' program in use doesn't match our expectations; the
-# user can still override this though.
-if rm -f && rm -fr && rm -rf; then : OK; else
- cat >&2 <<'END'
-Oops!
-Your 'rm' program seems unable to run without file operands specified
-on the command line, even when the '-f' option is present. This is contrary
-to the behaviour of most rm programs out there, and not conforming with
-the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
-Please tell bug-automake at gnu.org about your system, including the value
-of your $PATH and any error possibly output before this message. This
-can help us improve future automake versions.
-END
- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
- echo 'Configuration will proceed anyway, since you have set the' >&2
- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
- echo >&2
- else
- cat >&2 <<'END'
-Aborting the configuration process, to ensure you take notice of the issue.
-You can download and install GNU coreutils to get an 'rm' implementation
-that behaves properly: <https://www.gnu.org/software/coreutils/>.
-If you want to complete the configuration process using your problematic
-'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
-to "yes", and re-run configure.
+# am_maintainer_mode
-END
- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
- fi
-fi
-
-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
# Check whether --enable-maintainer-mode was given.
@@ -9906,6 +10208,11 @@
MAINT=$MAINTAINER_MODE_TRUE
+
+# See comments in kpse-setup.m4 about system extensions.
+
+
+# Check whether prototypes work.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler accepts prototypes" >&5
printf %s "checking whether the compiler accepts prototypes... " >&6; }
if test ${kb_cv_c_prototypes+y}
@@ -9939,6 +10246,8 @@
if test "x$kb_cv_c_prototypes" = xno; then
as_fn_error $? "Sorry, your compiler does not understand prototypes." "$LINENO" 5
fi
+
+# kpse_compiler_warnings options.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what warning flags to pass to the C compiler" >&5
printf %s "checking what warning flags to pass to the C compiler... " >&6; }
if test ${kpse_cv_warning_cflags+y}
@@ -9996,6 +10305,9 @@
+# end of kpse_basic macro.
+echo 'tldbg:KPSE_BASIC done (pkg=web2c programs, amopt=)' >&5
+
# am_prog_ar must be called before lt_init.
if test -n "$ac_tool_prefix"; then
@@ -10111,6 +10423,7 @@
fi
: ${AR=ar}
+: ${ARFLAGS=cr}
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
printf %s "checking the archiver ($AR) interface... " >&6; }
@@ -10131,7 +10444,7 @@
_ACEOF
if ac_fn_c_try_compile "$LINENO"
then :
- am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
+ am_ar_try='$AR $ARFLAGS libconftest.a conftest.$ac_objext >&5'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
(eval $am_ar_try) 2>&5
ac_status=$?
@@ -16201,7 +16514,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -19998,7 +20311,7 @@
# icc doesn't choke on unknown options, it will just issue warnings
# or remarks (even with -Werror). So we grep stderr for any message
# that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # When given -MP, icc 7.0 and 7.1 complain thus:
# icc: Command line warning: ignoring option '-M'; no argument required
# The diagnosis changed in icc 8.0:
# icc: Command line remark: option '-MP' not supported
@@ -20294,28 +20607,6 @@
need_ptexenc=yes
need_zlib=yes
}
-# Check whether --enable-eptex was given.
-if test ${enable_eptex+y}
-then :
- enableval=$enable_eptex;
-fi
-case $enable_eptex in #(
- yes | no) :
- ;; #(
- *) :
- enable_eptex=no ;;
-esac
-
-# Check whether --enable-eptex-synctex was given.
-if test ${enable_eptex_synctex+y}
-then :
- enableval=$enable_eptex_synctex;
-fi
-
-test "x$enable_web2c:$enable_eptex" = xyes:yes && {
- need_ptexenc=yes
- need_zlib=yes
-}
# Check whether --enable-uptex was given.
if test ${enable_uptex+y}
then :
@@ -20705,7 +20996,7 @@
-# XeTeX now requires C++11 because ICU does :(.
+# XeTeX requires C++11 because ICU does :(.
if test "x$enable_xetex" = xyes; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++11, since XeTeX is enabled" >&5
printf "%s\n" "$as_me: checking for C++11, since XeTeX is enabled" >&6;}
@@ -22293,6 +22584,72 @@
esac
+if test "x$enable_largefile" != xno; then
+ case $ac_cv_sys_file_offset_bits in #(
+ no) :
+ ;; #(
+ unknown) :
+ case $ac_cv_sys_large_files in #(
+ no | unknown) :
+ ;; #(
+ *) :
+ LUA53_DEFINES="$LUA53_DEFINES -D_LARGE_FILES" ;;
+esac ;; #(
+ *) :
+ LUA53_DEFINES="$LUA53_DEFINES -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" ;;
+esac
+fi
+case $ac_cv_sys_largefile_source in #(
+ no | unknown) :
+ ;; #(
+ *) :
+ LUA53_DEFINES="$LUA53_DEFINES -D_LARGEFILE_SOURCE" ;;
+esac
+
+if test "x$enable_largefile" != xno; then
+ case $ac_cv_sys_file_offset_bits in #(
+ no) :
+ ;; #(
+ unknown) :
+ case $ac_cv_sys_large_files in #(
+ no | unknown) :
+ ;; #(
+ *) :
+ LUA52_DEFINES="$LUA52_DEFINES -D_LARGE_FILES" ;;
+esac ;; #(
+ *) :
+ LUA52_DEFINES="$LUA52_DEFINES -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" ;;
+esac
+fi
+case $ac_cv_sys_largefile_source in #(
+ no | unknown) :
+ ;; #(
+ *) :
+ LUA52_DEFINES="$LUA52_DEFINES -D_LARGEFILE_SOURCE" ;;
+esac
+
+if test "x$enable_largefile" != xno; then
+ case $ac_cv_sys_file_offset_bits in #(
+ no) :
+ ;; #(
+ unknown) :
+ case $ac_cv_sys_large_files in #(
+ no | unknown) :
+ ;; #(
+ *) :
+ LUAJIT_DEFINES="$LUAJIT_DEFINES -D_LARGE_FILES" ;;
+esac ;; #(
+ *) :
+ LUAJIT_DEFINES="$LUAJIT_DEFINES -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" ;;
+esac
+fi
+case $ac_cv_sys_largefile_source in #(
+ no | unknown) :
+ ;; #(
+ *) :
+ LUAJIT_DEFINES="$LUAJIT_DEFINES -D_LARGEFILE_SOURCE" ;;
+esac
+
LIBS=$kpse_save_LIBS
if test "x$kpse_cv_have_win32" = xno; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5
@@ -23098,36 +23455,6 @@
PTEX_SYNCTEX_TRUE='#'
PTEX_SYNCTEX_FALSE=
fi
- if test "x$enable_eptex" = xyes; then
- EPTEX_TRUE=
- EPTEX_FALSE='#'
-else
- EPTEX_TRUE='#'
- EPTEX_FALSE=
-fi
-
-case $enable_native_texlive_build:$enable_eptex_synctex in #(
- yes:yes | no:yes | no:no) :
- ;; #(
- *) :
- if test -z "$enable_eptex_synctex"
-then :
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-eptex-synctex=yes'" >&5
-printf "%s\n" "$as_me: Assuming \`--enable-eptex-synctex=yes'" >&6;}
-else case e in #(
- e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Enforcing \`--enable-eptex-synctex=yes' (native TeX Live build)" >&5
-printf "%s\n" "$as_me: WARNING: Enforcing \`--enable-eptex-synctex=yes' (native TeX Live build)" >&2;} ;;
-esac
-fi
- enable_eptex_synctex=yes ;;
-esac
- if test "x$enable_eptex_synctex" = xyes; then
- EPTEX_SYNCTEX_TRUE=
- EPTEX_SYNCTEX_FALSE='#'
-else
- EPTEX_SYNCTEX_TRUE='#'
- EPTEX_SYNCTEX_FALSE=
-fi
if test "x$enable_uptex" = xyes; then
UPTEX_TRUE=
UPTEX_FALSE='#'
@@ -26125,7 +26452,7 @@
Report bugs to <bug-libtool at gnu.org>."
lt_cl_version="\
-Web2C config.lt 2024
+Web2C config.lt 2025/dev
configured by $0, generated by GNU Autoconf 2.72.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -29180,6 +29507,26 @@
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
printf "%s\n" "done" >&6; }
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+ as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+esac
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -29192,14 +29539,6 @@
as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
- as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
- as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
# Check whether --enable-year2038 was given.
if test ${enable_year2038+y}
then :
@@ -29262,14 +29601,6 @@
as_fn_error $? "conditional \"PTEX_SYNCTEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
-if test -z "${EPTEX_TRUE}" && test -z "${EPTEX_FALSE}"; then
- as_fn_error $? "conditional \"EPTEX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${EPTEX_SYNCTEX_TRUE}" && test -z "${EPTEX_SYNCTEX_FALSE}"; then
- as_fn_error $? "conditional \"EPTEX_SYNCTEX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${UPTEX_TRUE}" && test -z "${UPTEX_FALSE}"; then
as_fn_error $? "conditional \"UPTEX\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -29780,7 +30111,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Web2C $as_me 2024, which was
+This file was extended by Web2C $as_me 2025/dev, which was
generated by GNU Autoconf 2.72. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -29852,7 +30183,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-Web2C config.status 2024
+Web2C config.status 2025/dev
configured by $0, generated by GNU Autoconf 2.72,
with options \\"\$ac_cs_config\\"
Modified: branches/stable/source/src/texk/web2c/configure.ac
===================================================================
--- branches/stable/source/src/texk/web2c/configure.ac 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/configure.ac 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,4 +1,4 @@
-dnl $Id: configure.ac 69664 2024-02-01 22:56:12Z karl $
+dnl $Id: configure.ac 71105 2024-04-28 16:42:00Z karl $
dnl Process this file with Autoconf to produce a configure script for Web2c.
dnl
dnl Copyright 2015-2024 Karl Berry <tex-live at tug.org>
@@ -33,6 +33,17 @@
WEB2CVERSION=tex_live_version()
AC_SUBST([WEB2CVERSION])
+# LuaTeX requires system extensions for socket support.
+# Must be at the very beginning or warnings about compiler tests.
+# SyncTeX and plenty of others unconditionally define GNU_SOURCE,
+# so it's probably more consistent to always use it.
+
+# Also, we can't easily make it conditional on LuaTeX only because then
+# OBJEXT ends up defined as the empty string (error: no way to make
+# "basechsuffix."), which seems odd, but whatever.
+AC_MSG_NOTICE([using system extensions])
+AC_USE_SYSTEM_EXTENSIONS
+
KPSE_COMMON([web2c programs])
AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes])
@@ -46,7 +57,7 @@
KPSE_WEB2C_PREPARE
m4_include([ac/web2c.ac])
-# XeTeX now requires C++11 because ICU does :(.
+# XeTeX requires C++11 because ICU does :(.
if test "x$enable_xetex" = xyes; then
AC_MSG_NOTICE([checking for C++11, since XeTeX is enabled])
AX_CXX_COMPILE_STDCXX([11])
@@ -105,6 +116,9 @@
KPSE_LUA53_DEFINES
KPSE_LUA52_DEFINES
KPSE_LUAJIT_DEFINES
+KPSE_LARGEFILE([LUA53_DEFINES], [_LARGEFILE64_SOURCE])
+KPSE_LARGEFILE([LUA52_DEFINES], [_LARGEFILE64_SOURCE])
+KPSE_LARGEFILE([LUAJIT_DEFINES], [_LARGEFILE64_SOURCE])
LIBS=$kpse_save_LIBS
if test "x$kpse_cv_have_win32" = xno; then
AC_SEARCH_LIBS([gethostbyname], [nsl])
@@ -283,7 +297,7 @@
[#include <kpathsea/config.h>])
if test "x$with_system_kpathsea" = xyes; then
-dnl Although quite unusual, it is possible to build Web2C (TeX & Co)
+dnl It is possible to build Web2C (TeX & Co)
dnl using installed (system) kpathsea headers and library.
dnl In that case we need the location of <kpathsea/paths.h>.
list="/usr/include /usr/local/include `echo $KPATHSEA_INCLUDES | sed 's/-I//g'`"
Modified: branches/stable/source/src/texk/web2c/cwebdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ChangeLog 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/cwebdir/ChangeLog 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,3 +1,68 @@
+2024-07-17 Andreas Scherer <https://ascherer.github.io>
+
+ * twinx.ch: Compile CWEB with G++-14.
+
+2024-07-15 Andreas Scherer <https://ascherer.github.io>
+
+ * texinputs/pdfwebtocfront.tex: Release file resource early.
+
+2024-07-13 Andreas Scherer <https://ascherer.github.io>
+
+ * ctwill-w2c.ch: Avoid double '\date' for CTWILL.
+
+2024-07-10 Andreas Scherer <https://ascherer.github.io>
+
+ * cwebman-w2c.ch: Add link to WEB manual (and line numbers).
+
+2024-07-06 Andreas Scherer <https://ascherer.github.io>
+
+ * cwebman-w2c.ch: Add extra macros for HiTeX.
+
+2024-06-09 Andreas Scherer <https://ascherer.github.io>
+
+ * comm-w2c.ch,
+ * ctang-w2c.ch,
+ * ctwill-w2c.ch,
+ * cweav-w2c.ch: Fix typo (upstream).
+
+2024-06-09 Andreas Scherer <https://ascherer.github.io>
+
+ * comm-mini.ch,
+ * comm-w2c.ch: Section 'Index.' is on Level 1, not 0.
+ * ctwill-w2c.ch,
+ * ../tests/fix-changefile-lines.py: Ignore CWEB @qcomment@> line(s).
+
+2024-06-06 Andreas Scherer <https://ascherer.github.io>
+
+ * comm-w2c.ch,
+ * ctang-w2c.ch,
+ * ctwill-w2c.ch,
+ * cweav-w2c.ch: Add [part.section] l.ine information.
+
+2024-05-25 Andreas Scherer <https://ascherer.github.io>
+
+ * cwebacromac.tex: HiTeX has a three-page table-of-contents.
+ * texinputs/pdfwebtocfront.tex: Add \space in PDF code.
+
+2024-05-25 Andreas Scherer <https://ascherer.github.io>
+
+ * texinputs/pdfwebtocfront.tex: More room for long ToCs.
+
+2024-05-24 Andreas Scherer <https://ascherer.github.io>
+
+ * cwebacromac.tex,
+ * cwebmac.tex,
+ * texinputs/dcwebmac.tex,
+ * texinputs/fcwebmac.tex,
+ * texinputs/icwebmac.tex,
+ * texinputs/pdfctproofmac.tex,
+ * texinputs/pdfctwimac.tex,
+ * texinputs/pdfwebtocfront.tex: Extend and reshuffle \startpdf.
+
+2024-03-13 Andreas Scherer <https://ascherer.github.io>
+
+ * ctwill-mini.ch: Fix page breaks in sections 164 and 173.
+
2024-03-10 Andreas Scherer <https://ascherer.github.io>
* ctwill-hint.ch,
Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-mini.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-mini.ch 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-mini.ch 2024-07-21 17:12:46 UTC (rev 933)
@@ -283,6 +283,6 @@
Section 85/102.
@x
-@** Index.
+@* Index.
@y
@z
Modified: branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/cwebdir/comm-w2c.ch 2024-07-21 17:12:46 UTC (rev 933)
@@ -16,7 +16,7 @@
@q Please send comments, suggestions, etc. to tex-k@@tug.org. @>
- at x
+ at x [0.0] l.25
\def\title{Common code for CTANGLE and CWEAVE (Version 4.11)}
@y
\def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} \ifacro\sanitizecommand\Kpathsea{KPATHSEA}\fi
@@ -23,25 +23,25 @@
\def\title{Common code for CTANGLE and CWEAVE (4.11 [\TeX~Live])}
@z
- at x
+ at x [0.0] l.30
\centerline{(Version 4.11)}
@y
\centerline{(Version 4.11 [\TeX~Live])}
@z
- at x
+ at x [0.0] l.32
\def\botofcontents{\vfill
@y
\def\covernote{\vbox{%
@z
- at x
+ at x [0.0] l.45
}
@y
}}\datecontentspage
@z
- at x
+ at x [1.1] l.51
to both \.{CTANGLE} and \.{CWEAVE}, which roughly concerns the following
@y
to \.{CTANGLE}, \.{CWEAVE}, and \.{CTWILL},
@@ -48,31 +48,31 @@
which roughly concerns the following
@z
- at x
+ at x [1.1] l.57
sometimes use \.{CWEB} to refer to either of the two component
@y
sometimes use \.{CWEB} to refer to any of the three component
@z
- at x
+ at x [1.2] l.72
@i common.h
@y
@i comm-w2c.h
@z
- at x
+ at x [1.18] l.77
|program|.
@y
|program|. And \.{CTWILL} adds some extra twists.
@z
- at x
+ at x [1.18] l.80
boolean program; /* \.{CWEAVE} or \.{CTANGLE}? */
@y
cweb program; /* \.{CTANGLE} or \.{CWEAVE} or \.{CTWILL}? */
@z
- at x
+ at x [1.20] l.99
@<Initialize pointers@>@;
@y
@<Initialize pointers@>@;
@@ -79,7 +79,7 @@
@<Set up \.{PROGNAME} feature and initialize the search path mechanism@>@;
@z
- at x
+ at x [1.20] l.100
@<Set the default options common to \.{CTANGLE} and \.{CWEAVE}@>@;
@y
@<Set locale and bind language catalogs@>@;
@@ -86,73 +86,73 @@
@<Set the default options common to \.{CTANGLE} and \.{CWEAVE}@>@;
@z
- at x
+ at x [3.23] l.165
if ((*(k++) = c) != ' ') limit = k;
@y
if ((*(k++) = c) != ' ' && c != '\r') limit = k;
@z
- at x
+ at x [3.23] l.168
loc=buffer; err_print("! Input line too long");
@y
loc=buffer; err_print(_("! Input line too long"));
@z
- at x
+ at x [4.25] l.197
static char alt_web_file_name[max_file_name_length]; /* alternate name to try */
@y
char *found_filename; /* filename found by |kpse_find_file| */
@z
- at x
+ at x [4.29] l.253
err_print("! Missing @@x in change file");
@y
err_print(_("! Missing @@x in change file"));
@z
- at x
+ at x [4.30] l.264
err_print("! Change file ended after @@x");
@y
err_print(_("! Change file ended after @@x"));
@z
- at x
+ at x [4.32] l.310
err_print("! Change file ended before @@y");
@y
err_print(_("! Change file ended before @@y"));
@z
- at x
+ at x [4.32] l.324
err_print("! CWEB file ended during a change");
@y
err_print(_("! CWEB file ended during a change"));
@z
- at x
+ at x [4.34] l.338
loc=buffer+2; err_print("! Where is the matching @@y?");
@y
loc=buffer+2; err_print(_("! Where is the matching @@y?"));
@z
- at x
+ at x [4.34] l.345
err_print("of the preceding lines failed to match");
@y
err_print(_("of the preceding lines failed to match"));
@z
- at x
+ at x [4.35] l.378
err_print("! Include file name not given");
@y
err_print(_("! Include file name not given"));
@z
- at x
+ at x [4.35] l.383
err_print("! Too many nested includes");
@y
err_print(_("! Too many nested includes"));
@z
- at x
+ at x [4.36] l.393
@ When an \.{@@i} line is found in the |cur_file|, we must temporarily
stop reading it and start reading from the named include file. The
\.{@@i} line should give a complete file name with or without
@@ -174,13 +174,13 @@
@^system dependencies@>
@z
- at x
+ at x [4.36] l.405
err_print("! Include file name too long"); goto restart;}
@y
err_print(_("! Include file name too long")); goto restart;}
@z
- at x
+ at x [4.36] l.408
char temp_file_name[max_file_name_length];
char *cur_file_name_end=cur_file_name+max_file_name_length-1;
char *kk, *k=cur_file_name;
@@ -190,7 +190,7 @@
char *k=cur_file_name;
@z
- at x
+ at x [4.36] l.422
if ((cur_file=fopen(cur_file_name,"r"))!=NULL) {
@y
if ((found_filename=kpse_find_cweb(cur_file_name))!=NULL @|
@@ -204,7 +204,7 @@
} else fatal(_("! Filename too long\n"), found_filename);
@z
- at x
+ at x [4.36] l.426
if ((kk=getenv("CWEBINPUTS"))!=NULL) {
if ((l=strlen(kk))>max_file_name_length-2) too_long();
strcpy(temp_file_name,kk);
@@ -234,25 +234,25 @@
include_depth--; err_print(_("! Cannot open include file")); goto restart;
@z
- at x
+ at x [4.38] l.473
err_print("! Change file ended without @@z");
@y
err_print(_("! Change file ended without @@z"));
@z
- at x
+ at x [4.38] l.489
err_print("! Where is the matching @@z?");
@y
err_print(_("! Where is the matching @@z?"));
@z
- at x
+ at x [4.39] l.509
err_print("! Change file entry did not match");
@y
err_print(_("! Change file entry did not match"));
@z
- at x
+ at x [4.41] l.534
if ((web_file=fopen(web_file_name,"r"))==NULL) {
strcpy(web_file_name,alt_web_file_name);
if ((web_file=fopen(web_file_name,"r"))==NULL)
@@ -271,7 +271,7 @@
} else fatal(_("! Filename too long\n"), found_filename);
@z
- at x
+ at x [4.41] l.542
if ((change_file=fopen(change_file_name,"r"))==NULL)
fatal("! Cannot open change file ", change_file_name);
@y
@@ -287,13 +287,13 @@
} else fatal(_("! Filename too long\n"), found_filename);
@z
- at x
+ at x [5.46] l.619
@d hash_size 353 /* should be prime */
@y
@d hash_size 8501 /* should be prime */
@z
- at x
+ at x [5.51] l.673
if (byte_ptr+l>byte_mem_end) overflow("byte memory");
if (name_ptr>=name_dir_end) overflow("name");
@y
@@ -301,13 +301,13 @@
if (name_ptr>=name_dir_end) overflow(_("name"));
@z
- at x
+ at x [5.51] l.677
if (program==cweave) p->ilk=t, init_node(p);
@y
if (program!=ctangle) p->ilk=t, init_node(p);
@z
- at x
+ at x [5.57] l.806
if (s+name_len>byte_mem_end) overflow("byte memory");
if (name_ptr+1>=name_dir_end) overflow("name");
@y
@@ -315,55 +315,55 @@
if (name_ptr+1>=name_dir_end) overflow(_("name"));
@z
- at x
+ at x [5.58] l.833
if (name_ptr>=name_dir_end) overflow("name");
@y
if (name_ptr>=name_dir_end) overflow(_("name"));
@z
- at x
+ at x [5.58] l.838
if (s+name_len>byte_mem_end) overflow("byte memory");
@y
if (s+name_len>byte_mem_end) overflow(_("byte memory"));
@z
- at x
+ at x [5.60] l.883
printf("%s","\n! Ambiguous prefix: matches <");
@y
printf("%s",_("\n! Ambiguous prefix: matches <"));
@z
- at x
+ at x [5.60] l.886
printf("%s",">\n and <");
@y
printf("%s",_(">\n and <"));
@z
- at x
+ at x [5.62] l.912
printf("%s","\n! New name is a prefix of <");
@y
printf("%s",_("\n! New name is a prefix of <"));
@z
- at x
+ at x [5.62] l.924
printf("%s","\n! New name extends <");
@y
printf("%s",_("\n! New name extends <"));
@z
- at x
+ at x [5.62] l.930
printf("%s","\n! Section name incompatible with <");
@y
printf("%s",_("\n! Section name incompatible with <"));
@z
- at x
+ at x [5.62] l.933
printf("%s",">,\n which abbreviates <");
@y
printf("%s",_(">,\n which abbreviates <"));
@z
- at x
+ at x [6.67] l.1031
printf(". (l. %d of change file)\n", change_line);
else if (cur_line>0) {
if (include_depth==0) printf(". (l. %d)\n", cur_line);
@@ -375,7 +375,7 @@
else printf(_(". (l. %d of include file %s)\n"), cur_line, cur_file_name);
@z
- at x
+ at x [6.68] l.1057
Some implementations may wish to pass the |history| value to the
operating system so that it can be used to govern whether or not other
programs are started. Here, for instance, we pass the operating system
@@ -397,7 +397,7 @@
@d RETURN_FAIL 20 /* Complete or severe failure */
@z
- at x
+ at x [6.68] l.1068
@<Print the job |history|@>@;
@y
@<Print the job |history|@>@;
@@ -404,7 +404,7 @@
@<Remove the temporary file if not already done@>@;
@z
- at x
+ at x [6.68] l.1069
if (history > harmless_message) return EXIT_FAILURE;
else return EXIT_SUCCESS;
@y
@@ -416,7 +416,7 @@
}
@z
- at x
+ at x [6.69] l.1075
case spotless:
if (show_happiness) puts("(No errors were found.)"); break;
case harmless_message:
@@ -436,13 +436,13 @@
puts(_("(That was a fatal error, my friend.)"));
@z
- at x
+ at x [6.71] l.1106
printf("\n! Sorry, %s capacity exceeded",t); fatal("","");
@y
printf(_("\n! Sorry, %s capacity exceeded"),t); fatal("","");
@z
- at x
+ at x [7.73] l.1118
or flags to be turned on (beginning with |"+"|).
@y
or flags to be turned on (beginning with |"+"|).
@@ -450,7 +450,7 @@
see section |@<Handle flag arg...@>| for details.
@z
- at x
+ at x [7.73] l.1130
char scn_file_name[max_file_name_length]; /* name of |scn_file| */
@y
char scn_file_name[max_file_name_length]; /* name of |scn_file| */
@@ -457,13 +457,13 @@
char check_file_name[max_file_name_length]; /* name of |check_file| */
@z
- at x
+ at x [7.74] l.1138
show_banner=show_happiness=show_progress=make_xrefs=true;
@y
make_xrefs=true;
@z
- at x
+ at x [7.75] l.1142
file. It may have an extension, or it may omit the extension to get |".w"| or
|".web"| added. The \TEX/ output file name is formed by replacing the \.{CWEB}
@y
@@ -471,7 +471,7 @@
added. The \TEX/ output file name is formed by replacing the \.{CWEB}
@z
- at x
+ at x [7.75] l.1149
An omitted change file argument means that |"/dev/null"| should be used,
when no changes are desired.
@y
@@ -480,7 +480,7 @@
|_DEV_NULL| (Amiga)---should be used, when no changes are desired.
@z
- at x
+ at x [7.75] l.1165
strcpy(change_file_name,"/dev/null");
@y
strcpy(change_file_name,"/dev/null");
@@ -494,7 +494,7 @@
@^system dependencies@>
@z
- at x
+ at x [7.75] l.1171
if (*s=='.') dot_pos=s++;
else if (*s=='/') dot_pos=NULL,name_pos=++s;
else s++;
@@ -506,7 +506,7 @@
@^system dependencies@>
@z
- at x
+ at x [7.77] l.1186
@ We use all of |*argv| for the |web_file_name| if there is a |'.'| in it,
otherwise we add |".w"|. If this file can't be opened, we prepare an
|alt_web_file_name| by adding |"web"| after the dot.
@@ -515,12 +515,12 @@
otherwise we add |".w"|.
@z
- at x
+ at x [7.77] l.1203
sprintf(alt_web_file_name,"%s.web",*argv);
@y
@z
- at x
+ at x [7.80] l.1246
for(dot_pos=*argv+1;*dot_pos>'\0';dot_pos++)
flags[(eight_bits)*dot_pos]=flag_change;
@y
@@ -554,7 +554,7 @@
}
@z
- at x
+ at x [7.81] l.1249
@ @<Print usage error message and quit@>=
{
if (program==ctangle)
@@ -572,13 +572,13 @@
@.Usage:@>
@z
- at x
+ at x [7.82] l.1261
@ @<Complain about arg...@>= fatal("! Filename too long\n", *argv);
@y
@ @<Complain about arg...@>= fatal(_("! Filename too long\n"), *argv);
@z
- at x
+ at x [8.83] l.1272
FILE *active_file; /* currently active file for \.{CWEAVE} output */
@y
FILE *active_file; /* currently active file for \.{CWEAVE} output */
@@ -585,7 +585,7 @@
FILE *check_file; /* temporary output file */
@z
- at x
+ at x [8.84] l.1274
@ @<Scan arguments and open output files@>=
scan_args();
if (program==ctangle) {
@@ -613,7 +613,7 @@
}
@z
- at x
+ at x [9.85] l.1286
@* Index.
@y
@** Extensions to {\tentex CWEB}. The following sections introduce new or
@@ -648,7 +648,7 @@
char separators[]=SEPARATORS;
@* Temporary file output. Most \CEE/ projects are controlled by a \.{Makefile}
-that automatically takes care of the temporal dependecies between the different
+that automatically takes care of the temporal dependencies between the different
source modules. It may be convenient that \.{CWEB} doesn't create new output
for all existing files, when there are only changes to some of them. Thus the
\.{make} process will only recompile those modules where necessary. You can
@@ -888,5 +888,5 @@
@.cweb.mo@>
}
-@** Index.
+@* Index.
@z
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctang-w2c.ch 2024-07-21 17:12:46 UTC (rev 933)
@@ -16,31 +16,31 @@
@q Please send comments, suggestions, etc. to tex-k@@tug.org. @>
- at x
+ at x [0.0] l.30
\def\title{CTANGLE (Version 4.11)}
@y
\def\title{CTANGLE (Version 4.11 [\TeX~Live])}
@z
- at x
+ at x [0.0] l.34
\centerline{(Version 4.11)}
@y
\centerline{(Version 4.11 [\TeX~Live])}
@z
- at x
+ at x [0.0] l.36
\def\botofcontents{\vfill
@y
\def\covernote{\vbox{%
@z
- at x
+ at x [0.0] l.49
}
@y
}}\datecontentspage
@z
- at x
+ at x [1.1] l.64
@d banner "This is CTANGLE (Version 4.11)"
@y
@d banner "This is CTANGLE, Version 4.11"
@@ -47,19 +47,19 @@
/* will be extended by the \TeX~Live |versionstring| */
@z
- at x
+ at x [1.2] l.90
if (show_banner) puts(banner); /* print a ``banner line'' */
@y
if (show_banner) cb_show_banner(); /* print a ``banner line'' */
@z
- at x
+ at x [1.3] l.101
@i common.h
@y
@i comm-w2c.h
@z
- at x
+ at x [2.20] l.129
@ @d max_texts 4000 /* number of replacement texts, must be less than 10240 */
@d max_toks 270000 /* number of bytes in compressed \CEE/ code */
@y
@@ -67,37 +67,37 @@
@d max_toks 1000000 /* number of bytes in compressed \CEE/ code */
@z
- at x
+ at x [3.29] l.237
if (tok_ptr+2>tok_mem_end) overflow("token");
@y
if (tok_ptr+2>tok_mem_end) overflow(_("token"));
@z
- at x
+ at x [4.35] l.320
if (stack_ptr==stack_end) overflow("stack");
@y
if (stack_ptr==stack_end) overflow(_("stack"));
@z
- at x
+ at x [4.40] l.412
printf("%s","\n! Not present: <");
@y
printf("%s",_("\n! Not present: <"));
@z
- at x
+ at x [5.47] l.510
else overflow("output files");
@y
else overflow(_("output files"));
@z
- at x
+ at x [6.48] l.526
printf("%s","\n! No program text was specified."); mark_harmless();
@y
printf("%s",_("\n! No program text was specified.")); mark_harmless();
@z
- at x
+ at x [6.48] l.532
"\nWriting the output file (%s):" : @|
"\nWriting the output files: (%s)",C_file_name);
@y
@@ -105,13 +105,13 @@
_("\nWriting the output files: (%s)"),C_file_name);
@z
- at x
+ at x [6.48] l.542
printf("%s","Done.");
@y
printf("%s",_("Done."));
@z
- at x
+ at x [6.50] l.556
@<Write all the named output files@>=
for (an_output_file=end_output_files; an_output_file>cur_out_file;) {
an_output_file--;
@@ -154,13 +154,13 @@
strcpy(check_file_name,""); /* We want to get rid of the temporary file */
@z
- at x
+ at x [6.54] l.616
else if (a<050000) confusion("macro defs have strange char");
@y
else if (a<050000) confusion(_("macro defs have strange char"));
@z
- at x
+ at x [6.59] l.703
@ @<Case of an identifier@>=@t\1\quad@>
@y
@ Nowadays, most computer files are encoded in some form of ``Unicode''. A very
@@ -192,7 +192,7 @@
@<Case of an identifier@>=@t\1\quad@>
@z
- at x
+ at x [6.59] l.708
if ((eight_bits)(*j)<0200) C_putc(*j);
@^high-bit character handling@>
else C_printf("%s",translit[(eight_bits)(*j)-0200]);
@@ -209,91 +209,91 @@
else C_putc(*j);
@z
- at x
+ at x [7.67] l.840
err_print("! Input ended in mid-comment");
@y
err_print(_("! Input ended in mid-comment"));
@z
- at x
+ at x [7.67] l.853
err_print("! Section name ended in mid-comment"); loc--;
@y
err_print(_("! Section name ended in mid-comment")); loc--;
@z
- at x
+ at x [8.74] l.1004
err_print("! String didn't end"); loc=limit; break;
@y
err_print(_("! String didn't end")); loc=limit; break;
@z
- at x
+ at x [8.74] l.1008
err_print("! Input ended in middle of string"); loc=buffer; break;
@y
err_print(_("! Input ended in middle of string")); loc=buffer; break;
@z
- at x
+ at x [8.74] l.1026
printf("%s","\n! String too long: ");
@y
printf("%s",_("\n! String too long: "));
@z
- at x
+ at x [8.75] l.1041
case translit_code: err_print("! Use @@l in limbo only"); continue;
@y
case translit_code: err_print(_("! Use @@l in limbo only")); continue;
@z
- at x
+ at x [8.75] l.1046
err_print("! Double @@ should be used in control text");
@y
err_print(_("! Double @@ should be used in control text"));
@z
- at x
+ at x [8.76] l.1070
err_print("! Double @@ should be used in ASCII constant");
@y
err_print(_("! Double @@ should be used in ASCII constant"));
@z
- at x
+ at x [8.76] l.1076
err_print("! String didn't end"); loc=limit-1; break;
@y
err_print(_("! String didn't end")); loc=limit-1; break;
@z
- at x
+ at x [8.79] l.1108
err_print("! Input ended in section name");
@y
err_print(_("! Input ended in section name"));
@z
- at x
+ at x [8.79] l.1121
printf("%s","\n! Section name too long: ");
@y
printf("%s",_("\n! Section name too long: "));
@z
- at x
+ at x [8.80] l.1135
err_print("! Section name didn't end"); break;
@y
err_print(_("! Section name didn't end")); break;
@z
- at x
+ at x [8.80] l.1139
err_print("! Nesting of section names not allowed"); break;
@y
err_print(_("! Nesting of section names not allowed")); break;
@z
- at x
+ at x [8.81] l.1153
if (loc>=limit) err_print("! Verbatim string didn't end");
@y
if (loc>=limit) err_print(_("! Verbatim string didn't end"));
@z
- at x
+ at x [9.82] l.1177
@d app_repl(c) {
if (tok_ptr==tok_mem_end) overflow("token");
else *(tok_ptr++)=(eight_bits)c;
@@ -305,55 +305,55 @@
}
@z
- at x
+ at x [9.83] l.1204
if (text_ptr>text_info_end) overflow("text");
@y
if (text_ptr>text_info_end) overflow(_("text"));
@z
- at x
+ at x [9.86] l.1250
case output_defs_code: if (t!=section_name) err_print("! Misplaced @@h");
@y
case output_defs_code: if (t!=section_name) err_print(_("! Misplaced @@h"));
@z
- at x
+ at x [9.86] l.1268
err_print("! @@d, @@f and @@c are ignored in C text"); continue;
@y
err_print(_("! @@d, @@f and @@c are ignored in C text")); continue;
@z
- at x
+ at x [9.87] l.1278
if (*try_loc=='=') err_print ("! Missing `@@ ' before a named section");
@y
if (*try_loc=='=') err_print (_("! Missing `@@ ' before a named section"));
@z
- at x
+ at x [9.88] l.1295
else err_print("! Double @@ should be used in string");
@y
else err_print(_("! Double @@ should be used in string"));
@z
- at x
+ at x [9.89] l.1344
default: err_print("! Unrecognized escape sequence");
@y
default: err_print(_("! Unrecognized escape sequence"));
@z
- at x
+ at x [10.93] l.1417
err_print("! Definition flushed, must start with identifier");
@y
err_print(_("! Definition flushed, must start with identifier"));
@z
- at x
+ at x [10.100] l.1498
err_print("! Double @@ should be used in control text");
@y
err_print(_("! Double @@ should be used in control text"));
@z
- at x
+ at x [10.100] l.1501
} @=/* otherwise fall through */@>@;
default: err_print("! Double @@ should be used in limbo");
@y
@@ -361,19 +361,19 @@
default: err_print(_("! Double @@ should be used in limbo"));
@z
- at x
+ at x [10.102] l.1516
err_print("! Improper hex number following @@l");
@y
err_print(_("! Improper hex number following @@l"));
@z
- at x
+ at x [10.102] l.1526
err_print("! Replacement string in @@l too long");
@y
err_print(_("! Replacement string in @@l too long"));
@z
- at x
+ at x [10.103] l.1540
puts("\nMemory usage statistics:");
printf("%td names (out of %ld)\n",@^system dependencies@>
(ptrdiff_t)(name_ptr-name_dir),(long)max_names);
@@ -393,7 +393,7 @@
printf(_("%td tokens (out of %ld)\n"),
@z
- at x
+ at x [11.104] l.1551
@** Index.
@y
@** Extensions to {\tentex CWEB}. The following sections introduce new or
@@ -404,7 +404,7 @@
material should nicely integrate with the original ``\&{104.~Index}.''
@* Output file update. Most \CEE/ projects are controlled by a \.{Makefile}
-that automatically takes care of the temporal dependecies between the different
+that automatically takes care of the temporal dependencies between the different
source modules. It may be convenient that \.{CWEB} doesn't create new output
for all existing files, when there are only changes to some of them. Thus the
\.{make} process will only recompile those modules where necessary. You can
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctwill-mini.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctwill-mini.ch 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctwill-mini.ch 2024-07-21 17:12:46 UTC (rev 933)
@@ -1343,7 +1343,7 @@
}
else if (cat1==attr) {
@y
- else reduce(pp,0,else_like,0,65);
+ @+else reduce(pp,0,else_like,0,65);
}
@+ else @/ if (cat1==attr) {
@z
@@ -1353,30 +1353,19 @@
@x
@d force_lines flags['f'] /* should each statement be on its own line? */
@d force_first flags['F'] /* should compound statement start on new line? */
-
-@<Set init...@>=
-force_lines=force_first=true;
@y
@d force_lines flags['f'] /* should each statement be on its own line? */
@-force_lines@> @$force_lines {CTWILL}170 =\\{flags}[\.{'f'}]@>
@d force_first flags['F'] /* should compound statement start on new line? */
@-force_first@> @$force_first {CTWILL}170 =\\{flags}[\.{'F'}]@>
-
-@<Set init...@>=@+force_lines=force_first=true;
@z
Section 173.
@x
-if (cat1==if_like || cat1==else_like || cat1==define_like)
- at y
-if (cat1==if_like || cat1==else_like || cat1==define_like) @/
- at z
-
- at x
} else if (cat1==exp || cat1==function) {
@y
-} else @/ if (cat1==exp || cat1==function) {
+} @+ else @/ if (cat1==exp || cat1==function) {
@z
Section 178.
Modified: branches/stable/source/src/texk/web2c/cwebdir/ctwill-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/ctwill-w2c.ch 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/cwebdir/ctwill-w2c.ch 2024-07-21 17:12:46 UTC (rev 933)
@@ -16,7 +16,7 @@
@q Please send comments, suggestions, etc. to tex-k@@tug.org. @>
- at x
+ at x [0.0] l.1
% This file is part of CWEB.
% This program by Silvio Levy and Donald E. Knuth
% is based on a program by Knuth.
@@ -26,7 +26,7 @@
% It's somewhat flaky, so you probably shouldn't try to use it.
@z
- at x
+ at x [0.0] l.23
% Here is TeX material that gets inserted after \input cwebmac
@y
% Here is TeX material that gets inserted after \input ctwimac
@@ -34,7 +34,7 @@
\datethis % Put timestamp before section 1
@z
- at x
+ at x [0.0] l.35
\def\title{CWEAVE (Version 4.11)}
@y
\def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}} \ifacro\sanitizecommand\Kpathsea{KPATHSEA}\fi
@@ -41,31 +41,31 @@
\def\title{CTWILL (Version 4.11 [\TeX~Live])}
@z
- at x
+ at x [0.0] l.37
\centerline{\titlefont The {\ttitlefont CWEAVE} processor}
@y
\centerline{\titlefont The {\ttitlefont CTWILL} processor}
@z
- at x
+ at x [0.0] l.39
\centerline{(Version 4.11)}
@y
\centerline{(Version 4.11 [\TeX~Live])}
@z
- at x
+ at x [0.0] l.41
\def\botofcontents{\vfill
@y
\def\covernote{\vbox{%
@z
- at x
+ at x [0.0] l.54
}
@y
-}}\datecontentspage
+}}
@z
- at x
+ at x [1.1] l.59
This is the \.{CWEAVE} program by Silvio Levy and Donald E. Knuth,
based on \.{WEAVE} by Knuth.
We are thankful to Steve Avery,
@@ -105,25 +105,25 @@
/* will be extended by the \TeX~Live |versionstring| */
@z
- at x
+ at x [1.2] l.94
program=cweave;
@y
program=ctwill;
@z
- at x
+ at x [1.2] l.98
if (show_banner) puts(banner); /* print a ``banner line'' */
@y
if (show_banner) cb_show_banner(); /* print a ``banner line'' */
@z
- at x
+ at x [1.3] l.112
@i common.h
@y
@i comm-w2c.h
@z
- at x
+ at x [2.21] l.183
turned on during the first phase.
@<Private...@>=
@@ -132,19 +132,19 @@
turned on during the first phase---NOT!
@z
- at x
+ at x [2.23] l.217
@ @d max_refs 30000 /* number of cross-references; must be less than 65536 */
@y
@ @d max_refs 65535 /* number of cross-references; must be less than 65536 */
@z
- at x
+ at x [2.25] l.246
@d append_xref(c) if (xref_ptr==xmem_end) overflow("cross-reference");
@y
@d append_xref(c) if (xref_ptr==xmem_end) overflow(_("cross-reference"));
@z
- at x
+ at x [2.30] l.337
@d max_toks 30000 /* number of symbols in \CEE/ texts being parsed;
must be less than 65536 */
@d max_texts 8000 /* number of phrases in \CEE/ texts being parsed;
@@ -156,7 +156,7 @@
must be less than 10240 */
@z
- at x
+ at x [2.32] l.357
@ Here are the two procedures needed to complete |id_lookup|:
@y
@ Here are the two procedures needed to complete |id_lookup|:
@@ -163,7 +163,7 @@
@s perm_meaning int
@z
- at x
+ at x [2.32] l.374
p->xref=(void *)xmem;
@y
p->xref=(void *)xmem;
@@ -177,7 +177,7 @@
}
@z
- at x
+ at x [2.33] l.377
@ And here's a small helper function to simplify the code.
@d update_node(p) (p)->xref=(void *)xref_ptr
@@ -188,7 +188,7 @@
@d get_meaning(p) (p)-name_dir+cur_meaning
@z
- at x
+ at x [2.34] l.436
id_lookup("extern",NULL,int_like);
@y
@#
@@ -196,7 +196,7 @@
@#
@z
- at x
+ at x [2.34] l.449
id_lookup("int",NULL,raw_int);
@y
@#
@@ -204,7 +204,7 @@
@#
@z
- at x
+ at x [3.36] l.544
@d ord 0207 /* control code for `\.{@@'}' */
@d join 0210 /* control code for `\.{@@\&}' */
@d thin_space 0211 /* control code for `\.{@@,}' */
@@ -248,7 +248,7 @@
@d new_section 0235 /* control code for `\.{@@\ }' and `\.{@@*}' */
@z
- at x
+ at x [3.38] l.587
ccode['\'']=ord;
@y
ccode['\'']=ord;
@@ -256,7 +256,7 @@
ccode['r']=ccode['R']=right_start;
@z
- at x
+ at x [3.40] l.608
static eight_bits skip_TeX(void);
@ @c
@@ -269,7 +269,7 @@
@c
@z
- at x
+ at x [3.41] l.614
if (loc>limit && get_line()==false) return;
@y
if (loc>limit && get_line()==false) return;
@@ -279,7 +279,7 @@
}
@z
- at x
+ at x [4.43] l.670
\yskip\hang |xref_roman|, |xref_wildcard|, |xref_typewriter|, |TeX_string|,
@y
\yskip\hang |xref_roman|, |xref_wildcard|, |xref_typewriter|, |TeX_string|,
@@ -286,37 +286,37 @@
|meaning|, |suppress|,
@z
- at x
+ at x [4.46] l.731
@d right_preproc 0217 /* ends a preprocessor command */
@y
@d right_preproc 0223 /* ends a preprocessor command */
@z
- at x
+ at x [4.57] l.888
err_print("! String didn't end"); loc=limit; break;
@y
err_print(_("! String didn't end")); loc=limit; break;
@z
- at x
+ at x [4.57] l.892
err_print("! Input ended in middle of string"); loc=buffer; break;
@y
err_print(_("! Input ended in middle of string")); loc=buffer; break;
@z
- at x
+ at x [4.57] l.911
printf("%s","\n! String too long: ");
@y
printf("%s",_("\n! String too long: "));
@z
- at x
+ at x [4.59] l.930
case translit_code: err_print("! Use @@l in limbo only"); continue;
@y
case translit_code: err_print(_("! Use @@l in limbo only")); continue;
@z
- at x
+ at x [4.59] l.932
case underline: xref_switch=def_flag; continue;
@y
case underline: xref_switch=def_flag; continue;
@@ -324,7 +324,7 @@
case right_start: right_start_switch=true; continue;
@z
- at x
+ at x [4.59] l.938
case xref_roman: case xref_wildcard: case xref_typewriter: case noop:
@y
case xref_roman: case xref_wildcard: case xref_typewriter: case noop:
@@ -331,31 +331,31 @@
case meaning: case suppress:
@z
- at x
+ at x [4.62] l.968
err_print("! Input ended in section name");
@y
err_print(_("! Input ended in section name"));
@z
- at x
+ at x [4.62] l.981
printf("%s","\n! Section name too long: ");
@y
printf("%s",_("\n! Section name too long: "));
@z
- at x
+ at x [4.63] l.995
err_print("! Section name didn't end"); break;
@y
err_print(_("! Section name didn't end")); break;
@z
- at x
+ at x [4.63] l.999
err_print("! Control codes are forbidden in section name"); break;
@y
err_print(_("! Control codes are forbidden in section name")); break;
@z
- at x
+ at x [4.64] l.1009
skip_restricted(void)
{
@y
@@ -363,19 +363,19 @@
{ int c=ccode[(eight_bits)*(loc-1)];
@z
- at x
+ at x [4.64] l.1016
err_print("! Control text didn't end"); loc=limit;
@y
err_print(_("! Control text didn't end")); loc=limit;
@z
- at x
+ at x [4.64] l.1021
err_print("! Control codes are forbidden in control text");
@y
err_print(_("! Control codes are forbidden in control text"));
@z
- at x
+ at x [4.64] l.1022
@.Control codes are forbidden...@>
@y
@.Control codes are forbidden...@>
@@ -383,13 +383,13 @@
else if (c==suppress && phase==2) @<Suppress mini-index entry@>@;
@z
- at x
+ at x [4.66] l.1036
if (loc>=limit) err_print("! Verbatim string didn't end");
@y
if (loc>=limit) err_print(_("! Verbatim string didn't end"));
@z
- at x
+ at x [5.68] l.1061
skip_limbo(); change_exists=false;
@y
skip_limbo();
@@ -396,36 +396,36 @@
@<Give a default title to the program, if necessary@>@;
@z
- at x
+ at x [5.68] l.1064
changed_section[section_count]=change_exists;
/* the index changes if anything does */
@y
@z
- at x
+ at x [5.70] l.1073
if (++section_count==max_sections) overflow("section number");
@y
if (++section_count==max_sections) overflow(_("section number"));
@z
- at x
+ at x [5.70] l.1074
changed_section[section_count]=changing;
/* it will become |true| if any line changes */
@y
@z
- at x
+ at x [5.70] l.1083
if (changed_section[section_count]) change_exists=true;
@y
@z
- at x
+ at x [5.74] l.1162
case translit_code: err_print("! Use @@l in limbo only"); continue;
@y
case translit_code: err_print(_("! Use @@l in limbo only")); continue;
@z
- at x
+ at x [5.74] l.1167
case xref_roman: case xref_wildcard: case xref_typewriter:
@y
case xref_roman: case xref_wildcard: case xref_typewriter:
@@ -432,19 +432,19 @@
case meaning: case suppress:
@z
- at x
+ at x [5.79] l.1249
err_print("! Missing left identifier of @@s");
@y
err_print(_("! Missing left identifier of @@s"));
@z
- at x
+ at x [5.79] l.1254
err_print("! Missing right identifier of @@s");
@y
err_print(_("! Missing right identifier of @@s"));
@z
- at x
+ at x [5.82] l.1302
printf("%s","\n! Never defined: <");
print_section_name(p); putchar('>'); mark_harmless();
@y
@@ -452,7 +452,7 @@
print_section_name(p); putchar('>'); mark_harmless();
@z
- at x
+ at x [5.82] l.1308
printf("%s","\n! Never used: <");
print_section_name(p); putchar('>'); mark_harmless();
@y
@@ -460,7 +460,7 @@
print_section_name(p); putchar('>'); mark_harmless();
@z
- at x
+ at x [6.89] l.1397
@ In particular, the |finish_line| procedure is called near the very
beginning of phase two. We initialize the output variables in a slightly
tricky way so that the first line of the output file will be
@@ -494,7 +494,7 @@
*out_ptr='c';
@z
- at x
+ at x [6.90] l.1414
@d out(c) {if (out_ptr>=out_buf_end) break_out(); *(++out_ptr)=c;}
@y
@d out(c)
@@ -508,13 +508,13 @@
}
@z
- at x
+ at x [6.94] l.1462
printf("\n! Line had to be broken (output l. %d):\n",out_line);
@y
printf(_("\n! Line had to be broken (output l. %d):\n"),out_line);
@z
- at x
+ at x [6.95] l.1471
|def_flag|, so it cannot have more than five decimal digits. If
the section is changed, we output `\.{\\*}' just after the number.
@y
@@ -521,13 +521,13 @@
|def_flag|, so it cannot have more than five decimal digits.
@z
- at x
+ at x [6.96] l.1485
if (changed_section[n]) out_str("\\*");
@.\\*@>
@y
@z
- at x
+ at x [7.99] l.1543
default: err_print("! Double @@ should be used in limbo");
@y
case right_start: right_start_switch=true; break;
@@ -534,43 +534,43 @@
default: err_print(_("! Double @@ should be used in limbo"));
@z
- at x
+ at x [7.101] l.1585
@d app_tok(c) {if (tok_ptr+2>tok_mem_end) overflow("token"); *(tok_ptr++)=c;}
@y
@d app_tok(c) {if (tok_ptr+2>tok_mem_end) overflow(_("token")); *(tok_ptr++)=c;}
@z
- at x
+ at x [7.101] l.1597
err_print("! Input ended in mid-comment");
@y
err_print(_("! Input ended in mid-comment"));
@z
- at x
+ at x [7.101] l.1602
if (bal>1) err_print("! Missing } in comment");
@y
if (bal>1) err_print(_("! Missing } in comment"));
@z
- at x
+ at x [7.101] l.1618
else {err_print("! Extra } in comment");
@y
else {err_print(_("! Extra } in comment"));
@z
- at x
+ at x [7.102] l.1630
if (bal>1) err_print("! Missing } in comment");
@y
if (bal>1) err_print(_("! Missing } in comment"));
@z
- at x
+ at x [7.103] l.1638
err_print("! Illegal use of @@ in comment");
@y
err_print(_("! Illegal use of @@ in comment"));
@z
- at x
+ at x [8.106] l.1755
@d attr_head 69 /* denotes beginning of attribute */
@y
@d attr_head 69 /* denotes beginning of attribute */
@@ -577,13 +577,13 @@
@d title 70 /* program name or header name in a ``meaning'' */
@z
- at x
+ at x [8.110] l.2129
@i prod.w
@y
@i prod-twill.w
@z
- at x
+ at x [9.113] l.2179
static scrap scrap_info[max_scraps]; /* memory array for scraps */
@y
static scrap scrap_info[max_scraps]; /* memory array for scraps */
@@ -590,7 +590,7 @@
static scrap null_scrap; /* a scrap with empty translation */
@z
- at x
+ at x [9.114] l.2188
@ @<Set init...@>=
@y
@ @<Set init...@>=
@@ -597,13 +597,13 @@
null_scrap.trans=&tok_start[0];
@z
- at x
+ at x [9.116] l.2249
update_terminal();
@y
puts("|"); update_terminal();
@z
- at x
+ at x [9.124] l.2560
the |for| loop below.
@c
@@ -618,7 +618,7 @@
@#
@z
- at x
+ at x [9.124] l.2568
token_pointer tok_loc; /* pointer to |tok_value| */
if ((tok_loc=find_first_ident(p->trans))<=operator_found)
return; /* this should not happen */
@@ -626,12 +626,12 @@
if (tok_loc<=operator_found) return; /* this should not happen */
@z
- at x
+ at x [9.125] l.2597
token_pointer tok_loc; /* where the first identifier appears */
@y
@z
- at x
+ at x [9.128] l.2651
@<Cases for |exp|@>=
if (cat1==lbrace || cat1==int_like || cat1==decl) {
make_underlined(pp); big_app(dindent); big_app1(pp);
@@ -646,7 +646,7 @@
}
@z
- at x
+ at x [9.128] l.2666
make_underlined (pp); squash(pp,2,tag,-1,7);
@y
make_underlined (pp);
@@ -657,7 +657,7 @@
squash(pp,2,tag,-1,7);
@z
- at x
+ at x [9.138] l.2755
@ @<Cases for |decl_head|@>=
if (cat1==comma) {
big_app2(pp); app(opt); app('9'); reduce(pp,2,decl_head,-1,33);
@@ -700,7 +700,7 @@
else if (cat1==semi) squash(pp,2,decl,-1,39);
@z
- at x
+ at x [9.139] l.2777
@ @<Cases for |decl|@>=
if (cat1==decl) {
big_app1_insert(pp,force); reduce(pp,2,decl,-1,40);
@@ -719,13 +719,13 @@
}
@z
- at x
+ at x [9.141] l.2803
make_underlined(pp+1); make_reserved(pp+1);
@y
make_underlined(pp+1); make_reserved(pp+1); make_ministring(pp+1);
@z
- at x
+ at x [9.143] l.2834
@ @<Cases for |fn_decl|@>=
if (cat1==decl) {
big_app1_insert(pp,force); reduce(pp,2,fn_decl,0,51);
@@ -748,7 +748,7 @@
}
@z
- at x
+ at x [9.153] l.2938
big_app1_insert(pp,dindent); reduce(pp,2,fn_decl,0,73);
@y
big_app1(pp); if (indent_param_decl) big_app(dindent);
@@ -755,7 +755,7 @@
big_app1(pp+1); reduce(pp,2,fn_decl,0,73);
@z
- at x
+ at x [9.156] l.2964
big_app1_insert(pp, (cat1==decl || cat1==function) ? big_force :
force_lines ? force : break_space); reduce(pp,2,cat1,-1,76);
@y
@@ -764,7 +764,7 @@
( force_lines ? force : break_space ) ); reduce(pp,2,cat1,-1,76);
@z
- at x
+ at x [9.158] l.2972
if (cat1==define_like) make_underlined(pp+2);
@y
if (cat1==define_like) { /* \#\&{define} is analogous to \&{extern} */
@@ -776,7 +776,7 @@
}
@z
- at x
+ at x [9.167] l.3069
if (cat1==prelangle) reduce(pp+1,0,langle,1,100);
else reduce(pp,0,exp,-2,101);
@y
@@ -784,13 +784,13 @@
else reduce(pp,0,exp,-2,122);
@z
- at x
+ at x [9.168] l.3074
big_app1_insert(pp,' '); reduce(pp,2,else_like,-2,102);
@y
big_app1_insert(pp,' '); reduce(pp,2,else_like,-2,123);
@z
- at x
+ at x [9.173] l.3106
@ @<Cases for |typedef_like|@>=
if ((cat1==int_like || cat1==cast) && (cat2==comma || cat2==semi))
reduce(pp+1,0,exp,-1,115);
@@ -826,37 +826,37 @@
(cat3==semi || cat3==comma)) reduce(pp+2,0,exp,1,202);
@z
- at x
+ at x [9.186] l.3293
overflow("token");
@y
overflow(_("token"));
@z
- at x
+ at x [9.186] l.3297
overflow("text");
@y
overflow(_("text"));
@z
- at x
+ at x [9.190] l.3352
if (tok_ptr+6>tok_mem_end) overflow("token");
@y
if (tok_ptr+6>tok_mem_end) overflow(_("token"));
@z
- at x
+ at x [9.191] l.3358
printf("\nIrreducible scrap sequence in section %d:",(int)section_count);
@y
printf(_("\nIrreducible scrap sequence in section %d:"),(int)section_count);
@z
- at x
+ at x [9.192] l.3368
printf("\nTracing after l. %d:\n",cur_line); mark_harmless();
@y
printf(_("\nTracing after l. %d:\n"),cur_line); mark_harmless();
@z
- at x
+ at x [10.196] l.3454
case ignore: case xref_roman: case xref_wildcard:
@y
case ignore: case xref_roman: case xref_wildcard:
@@ -863,19 +863,19 @@
case meaning: case suppress:
@z
- at x
+ at x [10.197] l.3500
overflow("scrap/token/text");
@y
overflow(_("scrap/token/text"));
@z
- at x
+ at x [10.199] l.3585
else err_print("! Double @@ should be used in strings");
@y
else err_print(_("! Double @@ should be used in strings"));
@z
- at x
+ at x [10.202] l.3650
else app_scrap(p->ilk,maybe_math);
}
}
@@ -886,19 +886,19 @@
@<Flag the usage of this identifier, for the mini-index@>@;
@z
- at x
+ at x [10.203] l.3668
if (next_control!='|') err_print("! Missing '|' after C text");
@y
if (next_control!='|') err_print(_("! Missing '|' after C text"));
@z
- at x
+ at x [10.204] l.3683
to \.{\\PB}. Although \.{cwebmac} ignores \.{\\PB}, other macro packages
@y
to \.{\\PB}. Although \.{ctwimac} ignores \.{\\PB}, other macro packages
@z
- at x
+ at x [10.205] l.3713
app(tok_flag+(int)(p-tok_start));
@y
app(tok_flag+(int)(p-tok_start));
@@ -905,43 +905,43 @@
app(inserted);
@z
- at x
+ at x [11.211] l.3809
if (stack_ptr==stack_end) overflow("stack");
@y
if (stack_ptr==stack_end) overflow(_("stack"));
@z
- at x
+ at x [11.224] l.4132
printf("%s","\n! Illegal control code in section name: <");
@y
printf("%s",_("\n! Illegal control code in section name: <"));
@z
- at x
+ at x [11.225] l.4147
printf("%s","\n! C text in section name didn't end: <");
@y
printf("%s",_("\n! C text in section name didn't end: <"));
@z
- at x
+ at x [11.225] l.4159
if (j>buffer+long_buf_size-3) overflow("buffer");
@y
if (j>buffer+long_buf_size-3) overflow(_("buffer"));
@z
- at x
+ at x [11.226] l.4167
if (j>buffer+long_buf_size-4) overflow("buffer");
@y
if (j>buffer+long_buf_size-4) overflow(_("buffer"));
@z
- at x
+ at x [12.227] l.4182
if (show_progress) printf("%s","\nWriting the output file...");
@y
if (show_progress) printf("%s",_("\nWriting the output file..."));
@z
- at x
+ at x [12.227] l.4184
section_count=0; format_visible=true; copy_limbo();
@y
temp_switch=false; temp_meaning_ptr=temp_meaning_stack;
@@ -949,7 +949,7 @@
section_count=0; format_visible=true; right_start_switch=false; copy_limbo();
@z
- at x
+ at x [12.229] l.4213
static boolean group_found=false; /* has a starred section occurred? */
@ @<Translate the current section@>= {
@@ -966,12 +966,12 @@
top_usage=usage_sentinel;
@z
- at x
+ at x [12.231] l.4231
If the section has changed, we put \.{\\*} just after the section number.
@y
@z
- at x
+ at x [12.231] l.4234
if (*(loc-1)!='*') out_str("\\M");
@y
if (*(loc-1)!='*') {
@@ -983,7 +983,7 @@
}
@z
- at x
+ at x [12.231] l.4249
@.\\N@>
@y
@.\\N@>
@@ -993,7 +993,7 @@
}
@z
- at x
+ at x [12.231] l.4256
out('{'); out_section(section_count); out('}');
@y
out('{'); out_section(section_count); out('}');
@@ -1000,7 +1000,7 @@
flush_buffer(out_ptr,false,false);
@z
- at x
+ at x [12.232] l.4264
case '@@': out('@@'); break;
@y
case '@@': out('@@'); break;
@@ -1008,7 +1008,7 @@
case right_start: right_start_switch=true; break;
@z
- at x
+ at x [12.232] l.4267
case section_name: loc-=2; next_control=get_next(); /* skip to \.{@@>} */
@y
case meaning: case suppress:
@@ -1015,19 +1015,19 @@
case section_name: loc-=2; next_control=get_next(); /* reprocess */
@z
- at x
+ at x [12.232] l.4269
err_print("! TeX string should be in C text only"); break;
@y
err_print(_("! TeX string should be in C text only")); break;
@z
- at x
+ at x [12.232] l.4275
err_print("! You can't do that in TeX text"); break;
@y
err_print(_("! You can't do that in TeX text")); break;
@z
- at x
+ at x [12.233] l.4289
outer_parse(); finish_C(format_visible); format_visible=true;
doing_format=false;
}
@@ -1039,7 +1039,7 @@
}
@z
- at x
+ at x [12.236] l.4341
@<Start a macro...@>= {
@y
@<Start a macro...@>= {
@@ -1046,13 +1046,13 @@
is_macro=true;
@z
- at x
+ at x [12.236] l.4347
err_print("! Improper macro definition");
@y
err_print(_("! Improper macro definition"));
@z
- at x
+ at x [12.236] l.4348
@.Improper macro definition@>
else {
app('$'); app_cur_id(false);
@@ -1064,7 +1064,7 @@
def_diff=(*loc!='(');
@z
- at x
+ at x [12.236] l.4360
} @=/* otherwise fall through */@>@;
default: err_print("! Improper macro definition"); break;
@y
@@ -1072,35 +1072,34 @@
default: err_print(_("! Improper macro definition")); break;
@z
- at x
+ at x [12.237] l.4370
@ @<Start a format...@>= {
doing_format=true;
@y
-
@ @<Start a format...@>= {
doing_format=true;
is_macro=false;
@z
- at x
+ at x [12.237] l.4387
if (scrap_ptr!=scrap_info+2) err_print("! Improper format definition");
@y
if (scrap_ptr!=scrap_info+2) err_print(_("! Improper format definition"));
@z
- at x
+ at x [12.240] l.4422
err_print("! You need an = sign after the section name");
@y
err_print(_("! You need an = sign after the section name"));
@z
- at x
+ at x [12.241] l.4444
err_print("! You can't do that in C text");
@y
err_print(_("! You can't do that in C text"));
@z
- at x
+ at x [12.246] l.4514
out_str("\\fi"); finish_line();
@.\\fi@>
@y
@@ -1111,13 +1110,13 @@
@.\\FI@>
@z
- at x
+ at x [13.247] l.4535
if (show_progress) printf("%s","\nWriting the index...");
@y
if (show_progress) printf("%s",_("\nWriting the index..."));
@z
- at x
+ at x [13.247] l.4537
if (change_exists) {
@<Tell about changed sections@>@;
finish_line(); flush_buffer(out_buf,false,false);
@@ -1126,19 +1125,19 @@
@y
@z
- at x
+ at x [13.247] l.4546
fatal("! Cannot open index file ",idx_file_name);
@y
fatal(_("! Cannot open index file "),idx_file_name);
@z
- at x
+ at x [13.247] l.4558
fatal("! Cannot open section file ",scn_file_name);
@y
fatal(_("! Cannot open section file "),scn_file_name);
@z
- at x
+ at x [13.247] l.4570
fclose(active_file);
@y
fclose(active_file); active_file=tex_file=NULL;
@@ -1145,13 +1144,13 @@
if (check_for_change) @<Update the result when it has changed@>@;
@z
- at x
+ at x [13.247] l.4573
printf("%s","Done.");
@y
printf("%s",_("Done."));
@z
- at x
+ at x [13.249] l.4581
the index section itself.
@<Tell about changed sections@>=
@@ -1170,13 +1169,13 @@
the index section itself---NOT!
@z
- at x
+ at x [13.257] l.4725
if (sort_ptr>=scrap_info_end) overflow("sorting");
@y
if (sort_ptr>=scrap_info_end) overflow(_("sorting"));
@z
- at x
+ at x [13.262] l.4770
@ @<Output the name...@>=
switch (cur_name->ilk) {@+char *p; /* index into |byte_mem| */@+ at t}\6{\4@>
@y
@@ -1187,13 +1186,13 @@
switch (cur_name->ilk) {
@z
- at x
+ at x [13.262] l.4772
case normal: case func_template:
@y
case normal:
@z
- at x
+ at x [13.262] l.4774
else {@+boolean all_caps=true;@+ at t}\6{@>
@y
else {@+boolean all_caps=true;@+char *p;
@@ -1200,7 +1199,7 @@
/* index into |byte_mem| */ @+ at t}\6{@>
@z
- at x
+ at x [13.262] l.4789
case roman: not_an_identifier: out_name(cur_name,false); goto name_done;
case custom:
out_str("$\\");
@@ -1215,13 +1214,13 @@
@.\\\$@>
@z
- at x
+ at x [13.262] l.4799
out_name(cur_name,true);
@y
out_name(cur_name,proofing);
@z
- at x
+ at x [13.269] l.4862
puts("\nMemory usage statistics:");
@.Memory usage statistics:@>
printf("%td names (out of %ld)\n",@^system dependencies@>
@@ -1270,7 +1269,7 @@
(ptrdiff_t)(max_sort_ptr-scrap_info),(long)max_scraps);
@z
- at x
+ at x [14.270] l.4884
@** Index.
@y
@q Section 270. @>
@@ -1927,7 +1926,7 @@
order_decl_stmt=true;
@* Output file update. Most \CEE/ projects are controlled by a \.{Makefile}
-that automatically takes care of the temporal dependecies between the different
+that automatically takes care of the temporal dependencies between the different
source modules. It may be convenient that \.{CWEB} doesn't create new output
for all existing files, when there are only changes to some of them. Thus the
\.{make} process will only recompile those modules where necessary. You can
Modified: branches/stable/source/src/texk/web2c/cwebdir/cweav-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cweav-w2c.ch 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/cwebdir/cweav-w2c.ch 2024-07-21 17:12:46 UTC (rev 933)
@@ -16,31 +16,31 @@
@q Please send comments, suggestions, etc. to tex-k@@tug.org. @>
- at x
+ at x [0.0] l.35
\def\title{CWEAVE (Version 4.11)}
@y
\def\title{CWEAVE (Version 4.11 [\TeX~Live])}
@z
- at x
+ at x [0.0] l.39
\centerline{(Version 4.11)}
@y
\centerline{(Version 4.11 [\TeX~Live])}
@z
- at x
+ at x [0.0] l.41
\def\botofcontents{\vfill
@y
\def\covernote{\vbox{%
@z
- at x
+ at x [0.0] l.54
}
@y
}}\datecontentspage
@z
- at x
+ at x [1.1] l.70
@d banner "This is CWEAVE (Version 4.11)"
@y
@d banner "This is CWEAVE, Version 4.11"
@@ -47,31 +47,31 @@
/* will be extended by the \TeX~Live |versionstring| */
@z
- at x
+ at x [1.2] l.98
if (show_banner) puts(banner); /* print a ``banner line'' */
@y
if (show_banner) cb_show_banner(); /* print a ``banner line'' */
@z
- at x
+ at x [1.3] l.112
@i common.h
@y
@i comm-w2c.h
@z
- at x
+ at x [2.23] l.217
@ @d max_refs 30000 /* number of cross-references; must be less than 65536 */
@y
@ @d max_refs 65535 /* number of cross-references; must be less than 65536 */
@z
- at x
+ at x [2.25] l.246
@d append_xref(c) if (xref_ptr==xmem_end) overflow("cross-reference");
@y
@d append_xref(c) if (xref_ptr==xmem_end) overflow(_("cross-reference"));
@z
- at x
+ at x [2.30] l.337
@d max_toks 30000 /* number of symbols in \CEE/ texts being parsed;
must be less than 65536 */
@d max_texts 8000 /* number of phrases in \CEE/ texts being parsed;
@@ -83,97 +83,97 @@
must be less than 10240 */
@z
- at x
+ at x [4.57] l.888
err_print("! String didn't end"); loc=limit; break;
@y
err_print(_("! String didn't end")); loc=limit; break;
@z
- at x
+ at x [4.57] l.892
err_print("! Input ended in middle of string"); loc=buffer; break;
@y
err_print(_("! Input ended in middle of string")); loc=buffer; break;
@z
- at x
+ at x [4.57] l.911
printf("%s","\n! String too long: ");
@y
printf("%s",_("\n! String too long: "));
@z
- at x
+ at x [4.59] l.930
case translit_code: err_print("! Use @@l in limbo only"); continue;
@y
case translit_code: err_print(_("! Use @@l in limbo only")); continue;
@z
- at x
+ at x [4.62] l.968
err_print("! Input ended in section name");
@y
err_print(_("! Input ended in section name"));
@z
- at x
+ at x [4.62] l.981
printf("%s","\n! Section name too long: ");
@y
printf("%s",_("\n! Section name too long: "));
@z
- at x
+ at x [4.63] l.995
err_print("! Section name didn't end"); break;
@y
err_print(_("! Section name didn't end")); break;
@z
- at x
+ at x [4.63] l.999
err_print("! Control codes are forbidden in section name"); break;
@y
err_print(_("! Control codes are forbidden in section name")); break;
@z
- at x
+ at x [4.64] l.1016
err_print("! Control text didn't end"); loc=limit;
@y
err_print(_("! Control text didn't end")); loc=limit;
@z
- at x
+ at x [4.64] l.1021
err_print("! Control codes are forbidden in control text");
@y
err_print(_("! Control codes are forbidden in control text"));
@z
- at x
+ at x [4.66] l.1036
if (loc>=limit) err_print("! Verbatim string didn't end");
@y
if (loc>=limit) err_print(_("! Verbatim string didn't end"));
@z
- at x
+ at x [5.70] l.1073
if (++section_count==max_sections) overflow("section number");
@y
if (++section_count==max_sections) overflow(_("section number"));
@z
- at x
+ at x [5.74] l.1162
case translit_code: err_print("! Use @@l in limbo only"); continue;
@y
case translit_code: err_print(_("! Use @@l in limbo only")); continue;
@z
- at x
+ at x [5.79] l.1249
err_print("! Missing left identifier of @@s");
@y
err_print(_("! Missing left identifier of @@s"));
@z
- at x
+ at x [5.79] l.1254
err_print("! Missing right identifier of @@s");
@y
err_print(_("! Missing right identifier of @@s"));
@z
- at x
+ at x [5.82] l.1302
printf("%s","\n! Never defined: <");
print_section_name(p); putchar('>'); mark_harmless();
@y
@@ -181,7 +181,7 @@
print_section_name(p); putchar('>'); mark_harmless();
@z
- at x
+ at x [5.82] l.1308
printf("%s","\n! Never used: <");
print_section_name(p); putchar('>'); mark_harmless();
@y
@@ -189,7 +189,7 @@
print_section_name(p); putchar('>'); mark_harmless();
@z
- at x
+ at x [6.89] l.1397
@ In particular, the |finish_line| procedure is called near the very
beginning of phase two. We initialize the output variables in a slightly
tricky way so that the first line of the output file will be
@@ -218,61 +218,61 @@
*out_ptr='c';
@z
- at x
+ at x [6.94] l.1462
printf("\n! Line had to be broken (output l. %d):\n",out_line);
@y
printf(_("\n! Line had to be broken (output l. %d):\n"),out_line);
@z
- at x
+ at x [7.99] l.1543
default: err_print("! Double @@ should be used in limbo");
@y
default: err_print(_("! Double @@ should be used in limbo"));
@z
- at x
+ at x [7.101] l.1585
@d app_tok(c) {if (tok_ptr+2>tok_mem_end) overflow("token"); *(tok_ptr++)=c;}
@y
@d app_tok(c) {if (tok_ptr+2>tok_mem_end) overflow(_("token")); *(tok_ptr++)=c;}
@z
- at x
+ at x [7.101] l.1597
err_print("! Input ended in mid-comment");
@y
err_print(_("! Input ended in mid-comment"));
@z
- at x
+ at x [7.101] l.1602
if (bal>1) err_print("! Missing } in comment");
@y
if (bal>1) err_print(_("! Missing } in comment"));
@z
- at x
+ at x [7.101] l.1618
else {err_print("! Extra } in comment");
@y
else {err_print(_("! Extra } in comment"));
@z
- at x
+ at x [7.102] l.1630
if (bal>1) err_print("! Missing } in comment");
@y
if (bal>1) err_print(_("! Missing } in comment"));
@z
- at x
+ at x [7.103] l.1638
err_print("! Illegal use of @@ in comment");
@y
err_print(_("! Illegal use of @@ in comment"));
@z
- at x
+ at x [8.110] l.2129
@i prod.w
@y
@i prod-cweave.w
@z
- at x
+ at x [9.128] l.2651
@<Cases for |exp|@>=
if (cat1==lbrace || cat1==int_like || cat1==decl) {
make_underlined(pp); big_app(dindent); big_app1(pp);
@@ -286,7 +286,7 @@
}
@z
- at x
+ at x [9.138] l.2755
@ @<Cases for |decl_head|@>=
if (cat1==comma) {
big_app2(pp); app(opt); app('9'); reduce(pp,2,decl_head,-1,33);
@@ -328,7 +328,7 @@
else if (cat1==semi) squash(pp,2,decl,-1,39);
@z
- at x
+ at x [9.139] l.2777
@ @<Cases for |decl|@>=
if (cat1==decl) {
big_app1_insert(pp,force); reduce(pp,2,decl,-1,40);
@@ -347,7 +347,7 @@
}
@z
- at x
+ at x [9.143] l.2834
@ @<Cases for |fn_decl|@>=
if (cat1==decl) {
big_app1_insert(pp,force); reduce(pp,2,fn_decl,0,51);
@@ -370,7 +370,7 @@
}
@z
- at x
+ at x [9.153] l.2938
big_app1_insert(pp,dindent); reduce(pp,2,fn_decl,0,73);
@y
big_app1(pp); if (indent_param_decl) big_app(dindent);
@@ -377,7 +377,7 @@
big_app1(pp+1); reduce(pp,2,fn_decl,0,73);
@z
- at x
+ at x [9.156] l.2964
big_app1_insert(pp, (cat1==decl || cat1==function) ? big_force :
force_lines ? force : break_space); reduce(pp,2,cat1,-1,76);
@y
@@ -386,109 +386,109 @@
( force_lines ? force : break_space ) ); reduce(pp,2,cat1,-1,76);
@z
- at x
+ at x [9.186] l.3293
overflow("token");
@y
overflow(_("token"));
@z
- at x
+ at x [9.186] l.3297
overflow("text");
@y
overflow(_("text"));
@z
- at x
+ at x [9.190] l.3352
if (tok_ptr+6>tok_mem_end) overflow("token");
@y
if (tok_ptr+6>tok_mem_end) overflow(_("token"));
@z
- at x
+ at x [9.191] l.3358
printf("\nIrreducible scrap sequence in section %d:",(int)section_count);
@y
printf(_("\nIrreducible scrap sequence in section %d:"),(int)section_count);
@z
- at x
+ at x [9.192] l.3368
printf("\nTracing after l. %d:\n",cur_line); mark_harmless();
@y
printf(_("\nTracing after l. %d:\n"),cur_line); mark_harmless();
@z
- at x
+ at x [10.197] l.3500
overflow("scrap/token/text");
@y
overflow(_("scrap/token/text"));
@z
- at x
+ at x [10.199] l.3585
else err_print("! Double @@ should be used in strings");
@y
else err_print(_("! Double @@ should be used in strings"));
@z
- at x
+ at x [10.203] l.3668
if (next_control!='|') err_print("! Missing '|' after C text");
@y
if (next_control!='|') err_print(_("! Missing '|' after C text"));
@z
- at x
+ at x [11.211] l.3809
if (stack_ptr==stack_end) overflow("stack");
@y
if (stack_ptr==stack_end) overflow(_("stack"));
@z
- at x
+ at x [11.224] l.4132
printf("%s","\n! Illegal control code in section name: <");
@y
printf("%s",_("\n! Illegal control code in section name: <"));
@z
- at x
+ at x [11.225] l.4147
printf("%s","\n! C text in section name didn't end: <");
@y
printf("%s",_("\n! C text in section name didn't end: <"));
@z
- at x
+ at x [11.225] l.4159
if (j>buffer+long_buf_size-3) overflow("buffer");
@y
if (j>buffer+long_buf_size-3) overflow(_("buffer"));
@z
- at x
+ at x [11.226] l.4167
if (j>buffer+long_buf_size-4) overflow("buffer");
@y
if (j>buffer+long_buf_size-4) overflow(_("buffer"));
@z
- at x
+ at x [12.227] l.4182
if (show_progress) printf("%s","\nWriting the output file...");
@y
if (show_progress) printf("%s",_("\nWriting the output file..."));
@z
- at x
+ at x [12.232] l.4269
err_print("! TeX string should be in C text only"); break;
@y
err_print(_("! TeX string should be in C text only")); break;
@z
- at x
+ at x [12.232] l.4275
err_print("! You can't do that in TeX text"); break;
@y
err_print(_("! You can't do that in TeX text")); break;
@z
- at x
+ at x [12.236] l.4347
err_print("! Improper macro definition");
@y
err_print(_("! Improper macro definition"));
@z
- at x
+ at x [12.236] l.4360
} @=/* otherwise fall through */@>@;
default: err_print("! Improper macro definition"); break;
@y
@@ -496,43 +496,43 @@
default: err_print(_("! Improper macro definition")); break;
@z
- at x
+ at x [12.237] l.4387
if (scrap_ptr!=scrap_info+2) err_print("! Improper format definition");
@y
if (scrap_ptr!=scrap_info+2) err_print(_("! Improper format definition"));
@z
- at x
+ at x [12.240] l.4422
err_print("! You need an = sign after the section name");
@y
err_print(_("! You need an = sign after the section name"));
@z
- at x
+ at x [12.241] l.4444
err_print("! You can't do that in C text");
@y
err_print(_("! You can't do that in C text"));
@z
- at x
+ at x [13.247] l.4535
if (show_progress) printf("%s","\nWriting the index...");
@y
if (show_progress) printf("%s",_("\nWriting the index..."));
@z
- at x
+ at x [13.247] l.4546
fatal("! Cannot open index file ",idx_file_name);
@y
fatal(_("! Cannot open index file "),idx_file_name);
@z
- at x
+ at x [13.247] l.4558
fatal("! Cannot open section file ",scn_file_name);
@y
fatal(_("! Cannot open section file "),scn_file_name);
@z
- at x
+ at x [13.247] l.4570
fclose(active_file);
@y
fclose(active_file); active_file=tex_file=NULL;
@@ -539,19 +539,19 @@
if (check_for_change) @<Update the result when it has changed@>@;
@z
- at x
+ at x [13.247] l.4573
printf("%s","Done.");
@y
printf("%s",_("Done."));
@z
- at x
+ at x [13.257] l.4725
if (sort_ptr>=scrap_info_end) overflow("sorting");
@y
if (sort_ptr>=scrap_info_end) overflow(_("sorting"));
@z
- at x
+ at x [13.269] l.4862
puts("\nMemory usage statistics:");
@.Memory usage statistics:@>
printf("%td names (out of %ld)\n",@^system dependencies@>
@@ -595,7 +595,7 @@
(ptrdiff_t)(max_sort_ptr-scrap_info),(long)max_scraps);
@z
- at x
+ at x [14.270] l.4884
@** Index.
@y
@** Extensions to {\tentex CWEB}. The following sections introduce new or
@@ -626,7 +626,7 @@
order_decl_stmt=true;
@* Output file update. Most \CEE/ projects are controlled by a \.{Makefile}
-that automatically takes care of the temporal dependecies between the different
+that automatically takes care of the temporal dependencies between the different
source modules. It may be convenient that \.{CWEB} doesn't create new output
for all existing files, when there are only changes to some of them. Thus the
\.{make} process will only recompile those modules where necessary. You can
Modified: branches/stable/source/src/texk/web2c/cwebdir/cwebacromac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cwebacromac.tex 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/cwebdir/cwebacromac.tex 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,5 +1,5 @@
% hypertext macros for CWEB listings (in addition to cwebmac.tex)
-% Version 1.1 --- September 2023
+% Version 2.0 --- May 2024
\ifx\ifacrohint\undefined\endinput\fi % these are not standalone macros
\ifluatex % LuaTeX is almost like pdfTeX
\protected\def\pdfliteral {\pdfextension literal}
@@ -15,6 +15,19 @@
\let\pdfoutput=\outputmode
\fi % end of LuaTeX->pdfTeX redirection macros
+% Used in cwebmac.tex, pdfctwimac.tex, pdfproofmac.tex
+\def\tocpages{1} % Most programs have one-page Table-of-Contents
+\def\startpdf{\def\pagemode{/PageMode /UseOutlines}
+ \ifnum\contentspagenumber=0 \advance \pageno by -\tocpages
+ \def\pagelabels{/PageLabels << /Nums [ 0 << /S/D/St \tocpages >>
+ \the\pageno << /P(Contents) >> ] >>}
+ \else \twodigits=\pageno \pageno=\contentspagenumber
+ \advance \pageno by \tocpages \advance \twodigits by -\pageno
+ \def\pagelabels{/PageLabels << /Nums [ 0 << /S/D/St \the\pageno >>
+ \the\twodigits << /S/D/St \contentspagenumber >> ] >>} \fi
+ \ifpdflua\pdfcatalog{\pagemode\space\pagelabels}
+ \else \special{pdf: docview << \pagemode\space\pagelabels >>}\fi}
+
\ifacro % The following are general pdf macros
\def\thewidth{\the\wd0 \space}
\def\theheight{\the\ht\strutbox\space}
Modified: branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/cwebdir/cwebmac.tex 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,8 +1,8 @@
% standard macros for CWEB listings (in addition to plain.tex)
-% Version 4.11 --- October 2023
+% Version 4.12 --- May 2024
\ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros
-\xdef\fmtversion{\fmtversion+CWEB4.11}
-\chardef\cwebversion=4 \chardef\cwebrevision=11
+\xdef\fmtversion{\fmtversion+CWEB4.12}
+\chardef\cwebversion=4 \chardef\cwebrevision=12
\let\:=\. % preserve a way to get the dot accent
% (all other accents will still work as usual)
@@ -215,8 +215,8 @@
\def\T#1{\leavevmode % octal, hex or decimal constant
\hbox{$\def\?{\kern.2em}%$%
\let\ \, % C++ digit separator becomes a little white space
-% \def\$##1{\egroup_{\,\rm##1}\bgroup}% suffix to constant % versions < 3.67
- \def\$##1{\egroup_{\rm##1}\bgroup}% suffix to constant % in version 3.67
+% \def\$##1{\egroup_{\,\rm##1}\bgroup}% suffix to constant %$% versions < 3.67
+ \def\$##1{\egroup_{\rm##1}\bgroup}% suffix to constant %$% in version 3.67
\def\_{\cdot 10^{\aftergroup}}% power of ten (via dirty trick)
\let\~=\oct \let\^=\hex \let\\=\bin {#1}$}}%$%
\def\U{\note{This code is used in section}} % xref for use of a section
@@ -276,8 +276,6 @@
\def\title{\expandafter\uppercase\expandafter{\jobname}}
\def\topofcontents{\centerline{\titlefont\title}\vskip.7in
\vfill} % this material will start the table of contents page
-\def\startpdf{\ifpdf \ifpdflua\pdfcatalog{/PageMode /UseOutlines}
- \else {\special{pdf: docview << /PageMode /UseOutlines >>}}\fi\fi}
\def\botofcontents{\vfill
\centerline{\covernote}} % this material will end the table of contents page
\def\covernote{}
@@ -383,12 +381,12 @@
% \ifodd\pageno\else\titletrue\null\vfill\eject\fi % for duplex printers
\rightskip 0pt \hyphenpenalty 50 \tolerance 200
\setpage \output={\normaloutput\page\lheader\rheader}
- \titletrue % prepare to output the table of contents
+ \ifpdf\startpdf\fi \titletrue % prepare to output the table of contents
\pageno=\contentspagenumber
\def\grouptitle{TABLE OF CONTENTS}
\message{Table of contents:}
\ifhint\HINThome\fi% Mark the Table of contents as home page
- \topofcontents \startpdf
+ \topofcontents
\line{\hfil Section\ifhint\else\hbox to3em{\hss Page}\fi}% No Page in HINT
\let\ZZ=\contentsline
\readcontents\relax % read the contents info
Modified: branches/stable/source/src/texk/web2c/cwebdir/cwebman-w2c.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/cwebman-w2c.ch 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/cwebdir/cwebman-w2c.ch 2024-07-21 17:12:46 UTC (rev 933)
@@ -16,14 +16,15 @@
@q Please send comments, suggestions, etc. to tex-k@@tug.org. @>
- at x
+ at x l.4
\input cwebmac
\pdffalse\acrohintfalse
@y
\input cwebmac
+\ifhint \input hiplainpage \fi
@z
- at x
+ at x l.6
\def\page{\box255 } \normalbottom
@y
\let\page=\pagebody \raggedbottom
@@ -32,7 +33,7 @@
\advance\footnotecount by 1\relax}
@z
- at x
+ at x l.32
\outer\def\section #1.{\penalty-500\bigskip
\centerline{\sectionfont\def\.##1{{\twelvett##1}} #1}\nobreak\vskip 6pt
\everypar{\hskip-\parindent\everypar{}}}
@@ -92,7 +93,7 @@
\fi}
@z
- at x
+ at x l.38
\def\runninghead{{\tentt CWEB} USER MANUAL (VERSION 4.11)}
@y
\def\Kpathsea/{{\mc KPATHSEA\spacefactor1000}}
@@ -99,7 +100,7 @@
\def\runninghead{{\tentt CWEB} USER MANUAL (Version 4.11 [\TeX~Live])}
@z
- at x
+ at x l.52
\vskip 18pt\centerline{(Version 4.11 --- December 2023)}
@y
\vskip 18pt\centerline{(Version 4.11 --- December 2023)%
@@ -106,7 +107,7 @@
\footnote*{This document describes the extended \.{CWEB} (Version 4.11 [\TeX~Live]).}}
@z
- at x
+ at x l.83
Internet page \.{http://www-cs-faculty.stanford.edu/\char`\~knuth/cweb.html}
@y
Internet page
@@ -114,7 +115,7 @@
{http://www-cs-faculty.stanford.edu/\TILDE/knuth/cweb.html}
@z
- at x
+ at x l.88
\.{https://github.com/ascherer/cweb} with the really current news.
@y
\pdfURL{\.{https://github.com/ascherer/cweb}}%
@@ -122,7 +123,7 @@
with the really current news.
@z
- at x
+ at x l.106
should be sent to the \TeX-related mailing list \.{tex-k at tug.org}.
@y
should be sent to the \TeX-related mailing list
@@ -130,7 +131,15 @@
{mailto:tex-k at tug.org}.
@z
- at x
+ at x l.108
+Readers who are familiar with Knuth's memo ``The \.{WEB} System of Structured
+Documentation'' will be able
+ at y
+Readers who are familiar with Knuth's memo ``\pdfURL{The \.{WEB} System of
+Structured Documentation}{../web/webman.pdf}'' will be able
+ at z
+
+ at x l.527
email address in a \.{CWEB} file (e.g., \.{tex-k@@tug.org}).
@y
email address in a \.{CWEB} file (e.g.,
@@ -138,7 +147,7 @@
{mailto:tex-k at tug.org}).
@z
- at x
+ at x l.922
it cannot find them in the current directory.
@y
it cannot find them in the current directory.%
@@ -151,7 +160,7 @@
(This is true for any other input or change file lookup.)}
@z
- at x
+ at x l.1029
except for error messages.
@y
except for error messages.%
@@ -159,7 +168,7 @@
options `\.{b}', `\.{h}', and `\.{p}' are `off' by default.}
@z
- at x
+ at x l.1035
options are currently implemented:
\yskip
@@ -193,7 +202,7 @@
\yskip
@z
- at x
+ at x l.1071
\option x Include indexes and a table of contents in the \TEX/ file
output by \.{CWEAVE}. (On by default.) (Has no effect on \.{CTANGLE}.)
@y
@@ -201,7 +210,7 @@
output by \.{CWEAVE}. (On by default.) (\.{CWEAVE} only.)
@z
- at x
+ at x l.1127
Sometimes things don't work as smoothly, and you get a bunch of
@y
\pdffalse\acrohintfalse
@@ -208,7 +217,7 @@
Sometimes things don't work as smoothly, and you get a bunch of
@z
- at x
+ at x l.1135
`$\\{main}(\\{argc},\39\\{argv}{}$)'.
@y
`$\\{main}(\\{argc},\39\\{argv}{}$)'.
@@ -217,7 +226,7 @@
\ifpdf\acrohinttrue\fi \ifhint\acrohinttrue\fi
@z
- at x
+ at x l.1145
the `\.{@\#}' will put extra space after `$\langle\,$Other locals$\,\rangle$'.
@y
the `\.{@\#}' will put extra space after `$\langle\,$Other locals$\,\rangle$'.%
@@ -225,7 +234,7 @@
to suppress the extra space globally.}
@z
- at x
+ at x l.1147
\section Hypertext and hyperdocumentation.
@y
\vfill\eject
@@ -232,7 +241,7 @@
\section Hypertext and hyperdocumentation.
@z
- at x
+ at x l.1171
from \.{https://hint.userweb.mwn.de/hint/hintview.html}.
@y
from
@@ -240,7 +249,7 @@
{https://hint.userweb.mwn.de/hint/hintview.html}.%
@z
- at x
+ at x l.1180
the program sources at \.{ftp://ftp.cs.stanford.edu/pub/ctwill}.
@y
the program sources at
@@ -250,13 +259,13 @@
\.{ctwill} executable -- and its associated helpers -- out of the box.}
@z
- at x
+ at x l.1184
As an example of a real program written in \.{CWEB}, Appendix~A
@y
As an example of a real program written in \.{CWEB}, \Appendix A
@z
- at x
+ at x l.1189
Appendix B displays the files that set \TEX/ up to accept
the output of \.{CWEAVE}, and Appendix~C discusses how to use some of those
@y
@@ -264,7 +273,7 @@
the output of \.{CWEAVE}, and \Appendix C discusses how to use some of those
@z
- at x
+ at x l.1195
appendices D, E, and~F, which exhibit the complete source code for
\.{CTANGLE} and \.{CWEAVE}.
@@ -280,7 +289,7 @@
\eject\titletrue
@z
- at x
+ at x l.1201
\section Appendix A: Excerpts from a \.{CWEB} Program.
@y
\def\subsections{4}
@@ -288,7 +297,7 @@
\subsection CWEB file format.
@z
- at x
+ at x l.1205
generated sections 27--31 of the file \.{common.w}, which contains
@y
generated sections 27--31 of the file
@@ -295,7 +304,7 @@
\pdfURL{\.{common.w}}{common.pdf}, which contains
@z
- at x
+ at x l.1276
\def\runninghead{APPENDIX A --- TRANSLATION BY {\tentt CTANGLE}}
@y
\def\runninghead{APPENDIX A --- TRANSLATION BY {\tentt CTANGLE}}
@@ -302,7 +311,7 @@
\subsection Translation by CTANGLE.
@z
- at x
+ at x l.1344
\def\runninghead{APPENDIX A --- TRANSLATION BY {\tentt CWEAVE}}
@y
\def\runninghead{APPENDIX A --- TRANSLATION BY {\tentt CWEAVE}}
@@ -309,7 +318,7 @@
\subsection Translation by CWEAVE.
@z
- at x
+ at x l.1433
\def\runninghead{APPENDIX A --- FINAL DOCUMENT}
And here's what the same excerpt looks like when typeset.
@@ -326,7 +335,7 @@
\def\C#1{\5\5\quad$\triangleright\,${\cmntfont#1}$\,\triangleleft$}
@z
- at x
+ at x l.1515
\vfil\eject\titletrue
@y
\vfil\eject\titletrue
@@ -335,13 +344,13 @@
\ifacro\acrohinttrue\fi \ifhint\acrohinttrue\fi
@z
- at x
+ at x l.1617
\.{ { }\\vskip 15pt \\centerline\{(Version 4.11)\}{ }\\vfill\}}\cr}$$
@y
\.{ { }\\vskip 15pt \\centerline\{(Version 4.11)\}{ }\\vfill\}}\cr}$$
@z
- at x
+ at x l.1732
if you have a duplex printer. Appendices D, E, and F of the complete
version of this manual are printed using a commented-out option that
substitutes `$\gets$' for `$=$' in the program listings. Looking at those
@@ -355,7 +364,7 @@
Looking at those
@z
- at x
+ at x l.1784
\point 20. Furthermore, group titles can be converted to an arbitrary
@y
\vfill\eject
@@ -362,7 +371,7 @@
\point 20. Furthermore, group titles can be converted to an arbitrary
@z
- at x
+ at x l.1796
\vfill\end
@y
\point 21. With modern \TeX\ engines like `\.{luatex}', `\.{pdftex}', and
Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/dcwebmac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/dcwebmac.tex 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/dcwebmac.tex 2024-07-21 17:12:46 UTC (rev 933)
@@ -28,6 +28,7 @@
% Version 3.64 [p21] --- Andreas Scherer, Octobre 2005
% Version 3.64 [p22] --- Andreas Scherer, March 2016
% Version 4.9 --- Andreas Scherer, June 2022
+% Version 4.12 --- Andreas Scherer, May 2024
\ifx\undefined\botofcontents\input cwebmac.tex\fi
@@ -81,11 +82,11 @@
% \ifodd\pageno\else\titletrue\null\vfill\eject\fi % for duplex printers
\rightskip 0pt \hyphenpenalty 50 \tolerance 200
\setpage \output={\normaloutput\page\lheader\rheader}
- \titletrue % prepare to output the table of contents
+ \ifpdf\startpdf\fi \titletrue % prepare to output the table of contents
\pageno=\contentspagenumber
\redefcon
\ifhint\HINThome\fi% Mark the Table of contents as home page
- \topofcontents \startpdf
+ \topofcontents
\line{\headerline}
\let\ZZ=\contentsline
\readcontents\relax % read the contents info
Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/fcwebmac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/fcwebmac.tex 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/fcwebmac.tex 2024-07-21 17:12:46 UTC (rev 933)
@@ -28,6 +28,7 @@
% Version 3.64 [p21] --- Andreas Scherer, October 2005
% Version 3.64 [p22] --- Andreas Scherer, March 2016
% Version 4.9 --- Andreas Scherer, June 2022
+% Version 4.12 --- Andreas Scherer, May 2024
% french translations --- Denis Roegel, 18 September 1994
@@ -107,12 +108,12 @@
% \ifodd\pageno\else\titletrue\null\vfill\eject\fi % for duplex printers
\rightskip 0pt \hyphenpenalty 50 \tolerance 200
\setpage \output={\normaloutput\page\lheader\rheader}
- \titletrue % prepare to output the table of contents
+ \ifpdf\startpdf\fi \titletrue % prepare to output the table of contents
\pageno=\contentspagenumber
\def\grouptitle{SOMMAIRE:}
\message{Sommaire:}
\ifhint\HINThome\fi% Mark the Table of contents as home page
- \topofcontents \startpdf
+ \topofcontents
\line{\hfil Section\ifhint\else\hbox to3em{\hss Page}\fi}% No Page in HINT
\let\ZZ=\contentsline
\readcontents\relax % read the contents info
Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/icwebmac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/icwebmac.tex 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/icwebmac.tex 2024-07-21 17:12:46 UTC (rev 933)
@@ -28,6 +28,7 @@
% Version 3.64 [p21] --- Andreas Scherer, October 2005
% Version 3.64 [p22] --- Andreas Scherer, March 2016
% Version 4.9 --- Andreas Scherer, June 2022
+% Version 4.12 --- Andreas Scherer, May 2024
\ifx\undefined\botofcontents\input cwebmac.tex\fi
@@ -133,12 +134,12 @@
% \ifodd\pageno\else\titletrue\null\vfill\eject\fi % for duplex printers
\rightskip 0pt \hyphenpenalty 50 \tolerance 200
\setpage \output={\normaloutput\page\lheader\rheader}
- \titletrue % prepare to output the table of contents
+ \ifpdf\startpdf\fi \titletrue % prepare to output the table of contents
\pageno=\contentspagenumber
\def\grouptitle{INDICE}
\message{Indice:}
\ifhint\HINThome\fi% Mark the Table of contents as home page
- \topofcontents \startpdf
+ \topofcontents
\line{\hfil Sezione\ifhint\else\hbox to3em{\hss Pag.}\fi}% No Page in HINT
\let\ZZ=\contentsline
\readcontents\relax % read the contents info
Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfctproofmac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfctproofmac.tex 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfctproofmac.tex 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,10 +1,10 @@
% standard macros for CWEB listings (in addition to plain.tex)
-% Version 4.11 --- October 2023
+% Version 4.12 --- May 2024
% modified for proofs in CTWILL
% modified for PDF/HINT output with 'tex "\let\pdf+' or '{hi|lua|pdf|xe}tex'
% This file is not copyrighted and can be used freely.
\ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros
-\xdef\fmtversion{\fmtversion+CTWILL4.11+PROOFS+PDF}
+\xdef\fmtversion{\fmtversion+CTWILL4.12+PROOFS+PDF}
\let\:=\. % preserve a way to get the dot accent
% (all other accents will still work as usual)
@@ -216,7 +216,7 @@
\def\T#1{\leavevmode % octal, hex or decimal constant
\hbox{$\def\?{\kern.2em}%$%
\let\ \, % C++ digit separator becomes a little white space
- \def\$##1{\egroup_{\rm##1}\bgroup}% suffix to constant
+ \def\$##1{\egroup_{\rm##1}\bgroup}%$% suffix to constant
\def\_{\cdot 10^{\aftergroup}}% power of ten (via dirty trick)
\let\~=\oct \let\^=\hex \let\\=\bin {#1}$}}%$%
\def\U{\note{This code is used in section}} % xref for use of a section
@@ -274,8 +274,6 @@
\def\title{\expandafter\uppercase\expandafter{\jobname}}
\def\topofcontents{\centerline{\titlefont\title}\vskip.7in
\vfill} % this material will start the table of contents page
-\def\startpdf{\ifpdf \ifpdflua\pdfcatalog{/PageMode /UseOutlines}
- \else {\special{pdf: docview << /PageMode /UseOutlines >>}}\fi\fi}
\def\botofcontents{\vfill
\centerline{\covernote}} % this material will end the table of contents page
\def\covernote{}
@@ -400,12 +398,12 @@
% \ifodd\pageno\else\titletrue\null\vfill\eject\fi % for duplex printers
\rightskip 0pt \hyphenpenalty 50 \tolerance 200
\setpage \output={\normaloutput\page\lheader\rheader}
- \titletrue % prepare to output the table of contents
+ \ifpdf\startpdf\fi \titletrue % prepare to output the table of contents
\pageno=\contentspagenumber
\def\grouptitle{TABLE OF CONTENTS}
\message{Table of contents:}
\ifhint\HINThome\fi% Mark the Table of contents as home page
- \topofcontents \startpdf
+ \topofcontents
\line{\hfil Section\ifhint\else\hbox to3em{\hss Page}\fi}% No Page in HINT
\let\ZZ=\contentsline
\readcontents\relax % read the contents info
Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfctwimac.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfctwimac.tex 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfctwimac.tex 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,11 +1,11 @@
% standard macros for CWEB listings (in addition to plain.tex)
-% Version 4.11 --- October 2023
+% Version 4.12 --- May 2024
% modified for pages produced by CTWILL
% further modified for page size of the MMIXware book
% modified for PDF output with 'tex "\let\pdf+' or '{lua|pdf|xe}tex'
% This file is not copyrighted and can be used freely.
\ifx\renewenvironment\undefined\else\endinput\fi % LaTeX will use other macros
-\xdef\fmtversion{\fmtversion+CTWILL4.11+LNCS+PDF}
+\xdef\fmtversion{\fmtversion+CTWILL4.12+LNCS+PDF}
\let\:=\. % preserve a way to get the dot accent
% (all other accents will still work as usual)
@@ -515,8 +515,6 @@
%\global\advance\pageno by1}
%\def\topofcontents{\centerline{\titlefont\title}\vskip.7in
%\vfill} % this material will start the table of contents page
-%\def\startpdf{\ifpdf \ifpdflua\pdfcatalog{/PageMode /UseOutlines}
- %\else {\special{pdf: docview << /PageMode /UseOutlines >>}}\fi\fi}
%\def\botofcontents{\vfill
%\centerline{\covernote}} % this material will end the table of contents page
%\def\covernote{}
@@ -569,11 +567,11 @@
% \ifodd\pageno\else\titletrue\null\vfill\eject\fi % for duplex printers
%\rightskip 0pt \hyphenpenalty 50 \tolerance 200
%\setpage \output={\normaloutput\page\lheader\rheader}
- %\titletrue % prepare to output the table of contents
+ %\ifpdf\startpdf\fi \titletrue % prepare to output the table of contents
%\pageno=\contentspagenumber
%\def\grouptitle{TABLE OF CONTENTS}
%\message{Table of contents:}
- %\topofcontents \startpdf
+ %\topofcontents
%\line{\hfil Section\hbox to3em{\hss Page}}
%\let\ZZ=\contentsline
%\readcontents\relax % read the contents info
Modified: branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfwebtocfront.tex
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfwebtocfront.tex 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/cwebdir/texinputs/pdfwebtocfront.tex 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,6 +1,6 @@
-% pdfwebtofront.tex
+% pdfwebtocfront.tex
% Code from knuth.drv in https://github.com/oberdiek/latex-tds
-% 2020/06/20 v2.0 by Andreas Scherer.
+% 2024/05/25 v3.1 by Andreas Scherer.
%
% This file is part of project https://github.com/ascherer/cwebbin
% and may be distributed under the MIT License or the LaTeX Project
@@ -7,16 +7,27 @@
% Public License.
%
% Move table-of-contents page to the front in PDF output.
-% Works with pdftex and xetex in connection with either 'webmac.tex'
-% for Pascal/WEB programs or 'cwebmac.tex' for C/CWEB programs.
+% Works with pdftex/xetex/luatex and plain tex/dvipdf in connection
+% with either 'pwebmac.tex' for Pascal/WEB programs or 'cwebmac.tex'
+% for C/CWEB programs.
%
\ifx\detokenize\undefined\endinput\fi
+\ifx\twodigits\undefined\endinput\fi
\def\contentsfile{\jobname.toc} % file that gets table of contents info
\newif\iftexmf\texmffalse % special toc treatment for TeX, Metafont, etc.
\newread\testread
\openin\testread=\contentsfile\relax
\ifeof\testread % First run
-\else % Second run
+\else\closein\testread % Second run
+ % Fix page numbers in the PDF bootmarks with 'Page Labels'
+ \def\tocpages{1} % Most programs have one-page Table-of-Contents
+ \def\tocstart{2} % so we start with (fake) page 2 for the rest
+ \def\pagemode{/PageMode /UseOutlines}
+ \def\pagelabels{/PageLabels << /Nums [
+ \ifnum\contentspagenumber=0 0 << /P(Contents) >> \tocpages << /S/D/St 1 >>
+ \else 0 << /S/D/St \contentspagenumber >> \fi ] >> }
+ \def\startpdf{\ifpdflua\pdfcatalog{\pagemode\space\pagelabels}
+ \else {\special{pdf: docview << \pagemode\space\pagelabels >>}}\fi}
% Redefine '\con' to be invoked before the first '\N' (starred section).
\let\ORGcon\con
\def\con{%
@@ -23,6 +34,9 @@
% reduce size of PDF pages for more screen space
\pdfpagewidth=\pagewidth \advance\pdfpagewidth by 1in
\pdfpageheight=\fullpageheight \advance\pdfpageheight by 1in
+ \iftexmf \advance\pdfpageheight by 0.5in
+ \gtitle={Table of Contents} % overwrite default 'WEB output'
+ \mark{\noexpand\nullsec{\the\gtitle}} \fi
\ifpdflua \pdfhorigin=0.5in \pdfvorigin=0.5in
\else \global\pageshift=-0.5in
\global\hoffset=-0.5in \global\voffset=-0.5in \fi
@@ -34,8 +48,8 @@
}%
% Special variant for 'mf.web' and 'tex.web' (et al.).
% They all define a peculiar version of '\N' in their preamble.
- % And they put their tables-of-contents on a sparse 'page 2' and
- % start the main body on page '3'.
+ % And they put their tables-of-contents on sparse 'Contents' page(s)
+ % and start the main body on page '3'.
\edef\x{\jobname}%
\edef\y{\detokenize{tex}}%
\ifx\x\y \texmftrue\else
@@ -42,19 +56,26 @@
\edef\y{\detokenize{mf}}%
\ifx\x\y \texmftrue\else
\edef\y{\detokenize{pdftex}}%
- \ifx\x\y \texmftrue\else
+ \ifx\x\y \texmftrue \def\tocpages{2}\else
\edef\y{\detokenize{xetex}}%
\ifx\x\y \texmftrue\fi\fi\fi\fi
\iftexmf
+ % These main programs start on page '3' (after any number of ToC pages)
+ \def\pagelabels{/PageLabels << /Nums [
+ 0 << /P(Contents) >> \tocpages << /S/D/St 3 >> ] >> }
\expandafter\let\csname ORGN\expandafter\endcsname
\csname N\endcsname
\expandafter\outer\expandafter\def\csname N\endcsname{%
- \titletrue \con \pageno=2
+ \titletrue \con \pageno=\tocstart
\expandafter\let\csname N\expandafter\endcsname
\csname ORGN\endcsname
\csname N\endcsname
}%
\else % Much more general approach for WEB and CWEB programs.
+ \edef\y{\detokenize{mp}}%
+ % This main program starts on page '3' (after any number of ToC pages)
+ \ifx\x\y \def\pagelabels{/PageLabels << /Nums [
+ 0 << /P(Contents) >> \tocpages << /S/D/St 3 >> ] >> } \fi
% In fact, '\con' will be invoked _inside_ the first '\N' right _after_
% '\MN', but _before_ '\eject'. And '\topofcontents' gets in the twist
% as well.
Modified: branches/stable/source/src/texk/web2c/cwebdir/twinx.ch
===================================================================
--- branches/stable/source/src/texk/web2c/cwebdir/twinx.ch 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/cwebdir/twinx.ch 2024-07-21 17:12:46 UTC (rev 933)
@@ -42,10 +42,12 @@
if((f=fopen(*++argv,"r"))==NULL)
@z
- at x l.28
+ at x l.27
+ strncpy(*argv+strlen(*argv)-3,"idx",3);
f=fopen(*argv,"r");
if (!f)
@y
+ memcpy(*argv+strlen(*argv)-3,"idx",3);
if((f=fopen(*argv,"r"))==NULL)
@z
@@ -157,6 +159,8 @@
} while(fgets(buf,buf_size,f));
@z
+Section 14.
+
@x l.289 C++17 removed 'register' storage class.
while (1) {@+register node *p,*q,*r,*s,*t;
@y
@@ -238,6 +242,8 @@
{@+node *x;
@z
+Section 21.
+
@x l.403 C++17 removed 'register' storage class.
{@+register node *x;
@y
Modified: branches/stable/source/src/texk/web2c/doc/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/doc/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/doc/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,6 +69,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -103,6 +105,7 @@
$(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-largefile.m4 \
$(top_srcdir)/../../m4/kpse-lex.m4 \
$(top_srcdir)/../../m4/kpse-lib-version.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -225,10 +228,9 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
+ { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
}
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
am__DIST_COMMON = $(srcdir)/Makefile.in \
@@ -423,8 +425,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -539,13 +543,13 @@
.texi.dvi:
$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
- $(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
+ $(TEXI2DVI) $(AM_TEXI2FLAGS) -I $(srcdir) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
$<
.texi.pdf:
$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
- $(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
+ $(TEXI2PDF) $(AM_TEXI2FLAGS) -I $(srcdir) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
$<
.texi.html:
@@ -642,11 +646,10 @@
done
mostlyclean-aminfo:
- -rm -rf web2c.t2d web2c.t2p
+ -$(am__rm_rf) web2c.t2d web2c.t2p
clean-aminfo:
- -test -z "web2c.dvi web2c.pdf web2c.ps web2c.html" \
- || rm -rf web2c.dvi web2c.pdf web2c.ps web2c.html
+ -$(am__rm_rf) web2c.dvi web2c.pdf web2c.ps web2c.html
maintainer-clean-aminfo:
@list='$(INFO_DEPS)'; for i in $$list; do \
@@ -727,8 +730,8 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -916,3 +919,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/texk/web2c/etexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/etexdir/ChangeLog 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/etexdir/ChangeLog 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,3 +1,8 @@
+2024-04-14 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * etriptest.test:
+ Filter Web2C year/dev in banner.
+
2024-03-10 Karl Berry <karl at tug.org>
* TL'24 release.
Modified: branches/stable/source/src/texk/web2c/etexdir/etex.ch
===================================================================
--- branches/stable/source/src/texk/web2c/etexdir/etex.ch 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/etexdir/etex.ch 2024-07-21 17:12:46 UTC (rev 933)
@@ -2,7 +2,7 @@
% WEB change file containing code for various features extending TeX;
% to be applied to tex.web in order to define the
% e-TeX program.
-
+
% e-TeX is copyright (C) 1999-2012 by P. Breitenlohner (1994,98 by the NTS
% team); all rights are reserved. Copying of this file is authorized only if
% (1) you are P. Breitenlohner, or if (2) you make absolutely no changes to
@@ -16,9 +16,9 @@
% TeX is a trademark of the American Mathematical Society.
% e-TeX and NTS are trademarks of the NTS group.
-% All line numbers refer to tex.web 3.14159265 as of January 20, 2014.
+% All line numbers refer to tex.web 3.141592653 as of January 29, 2021.
- at x limbo l.1 - this is e-TeX
+ at x [0.0] l.1 - this is e-TeX
% This program is copyright (C) 1982 by D. E. Knuth; all rights are reserved.
% Unlimited copying and redistribution of this file are permitted as long
% as this file is not modified. Modifications are permitted, but only if
@@ -52,7 +52,7 @@
% and sole responsibility of Professor Knuth.
@z
%---------------------------------------
- at x limbo l.51 - e-TeX history
+ at x [0.0] l.54 - e-TeX history
% Although considerable effort has been expended to make the TeX program
% correct and reliable, no warranty is implied; the author disclaims any
% obligation or liability for damages, including but not limited to
@@ -117,7 +117,7 @@
% been a ``labor of love'' and the author hopes that users enjoy it.
@z
%---------------------------------------
- at x limbo l.63 - e-TeX logo, TeXXeT
+ at x [0.0] l.66 - e-TeX logo, TeXXeT
\let\mc=\ninerm % medium caps for names like SAIL
@y
\let\mc=\ninerm % medium caps for names like SAIL
@@ -147,7 +147,7 @@
\fi
@z
%---------------------------------------
- at x limbo l.66 - bug fix (print only changed modules)
+ at x [0.0] l.69 - bug fix (print only changed modules)
\def\pct!{{\char`\%}} % percent sign in ordinary text
@y
\def\pct!{{\char`\%}} % percent sign in ordinary text
@@ -154,7 +154,7 @@
\def\grp{\.{\char'173...\char'175}}
@z
%---------------------------------------
- at x limbo l.82 - e-TeX basic
+ at x [0.0] l.85 - e-TeX basic
\def\title{\TeX82}
@y
\def\title{\eTeX}
@@ -165,7 +165,7 @@
\let\maybe=\iffalse % print only changed modules
@z
%---------------------------------------
- at x [1] m.1 l.93 - this is e-TeX
+ at x [1.1] l.96 - this is e-TeX
This is \TeX, a document compiler intended to produce typesetting of high
@y
This is \eTeX, a program derived from and extending the capabilities of
@@ -172,7 +172,7 @@
\TeX, a document compiler intended to produce typesetting of high
@z
%---------------------------------------
- at x [1] m.2 l.182 - e-TeX basic
+ at x [1.2] l.185 - e-TeX basic
If this program is changed, the resulting system should not be called
@y
This program contains code for various features extending \TeX,
@@ -179,7 +179,7 @@
therefore this program is called `\eTeX' and not
@z
%---------------------------------------
- at x [1] m.2 l.188 - e-TeX basic
+ at x [1.2] l.191 - e-TeX basic
November 1984].
@y
November 1984].
@@ -189,7 +189,7 @@
known as `\eTeX'.
@z
%---------------------------------------
- at x [1] m.2 l.190 - e-TeX basic
+ at x [1.2] l.193 - e-TeX basic
@d banner=='This is TeX, Version 3.141592653' {printed when \TeX\ starts}
@y
@d eTeX_version=2 { \.{\\eTeXversion} }
@@ -210,7 +210,7 @@
@d eTeX_states=1 {number of \eTeX\ state variables in |eqtb|}
@z
%---------------------------------------
- at x [1] m.3 l.209 - e-TeX basic
+ at x [1.3] l.212 - e-TeX basic
scalar types; there are no `\&{var}' parameters, except in the case of files;
@y
scalar types; there are no `\&{var}' parameters, except in the case of files
@@ -217,7 +217,7 @@
--- \eTeX, however, does use `\&{var}' parameters for the |reverse| function;
@z
%---------------------------------------
- at x [1] m.15 l.504 - e-TeX basic
+ at x [1.15] l.507 - e-TeX basic
@d not_found=45 {go here when you've found nothing}
@y
@d not_found=45 {go here when you've found nothing}
@@ -227,7 +227,7 @@
@d not_found4=49 {like |not_found|, when there's more than four}
@z
%---------------------------------------
- at x [10] m.135 l.2895 - e-TeX TeXXeT
+ at x [10.135] l.2901 - e-TeX TeXXeT
|fil|, |fill|, or |filll|). The |subtype| field is not used.
@y
|fil|, |fill|, or |filll|). The |subtype| field is not used in \TeX.
@@ -234,7 +234,7 @@
In \eTeX\ the |subtype| field records the box direction mode |box_lr|.
@z
%---------------------------------------
- at x [10] m.141 l.2980 - e-TeX marks
+ at x [10.141] l.2986 - e-TeX marks
This field occupies a full word instead of a halfword, because
there's nothing to put in the other halfword; it is easier in \PASCAL\ to
use the full word than to risk leaving garbage in the unused half.
@@ -242,7 +242,7 @@
In addition there is a |mark_class| field that contains the mark class.
@z
%---------------------------------------
- at x [10] m.141 l.2986 - e-TeX marks
+ at x [10.141] l.2992 - e-TeX marks
@d mark_ptr(#)==mem[#+1].int {head of the token list for a mark}
@y
@d mark_ptr(#)==link(#+1) {head of the token list for a mark}
@@ -249,7 +249,7 @@
@d mark_class(#)==info(#+1) {the mark class}
@z
%---------------------------------------
- at x [10] m.142 l.2995 - e-TeX marks
+ at x [10.142] l.3001 - e-TeX marks
@d adjust_ptr==mark_ptr {vertical list to be moved out of horizontal list}
@y
@d adjust_ptr(#)==mem[#+1].int
@@ -256,7 +256,7 @@
{vertical list to be moved out of horizontal list}
@z
%---------------------------------------
- at x [10] m.147 l.3084 - e-TeX TeXXeT
+ at x [10.147] l.3090 - e-TeX TeXXeT
the amount of surrounding space inserted by \.{\\mathsurround}.
@y
the amount of surrounding space inserted by \.{\\mathsurround}.
@@ -267,7 +267,7 @@
\.{\\beginL}, \.{\\endL}, \.{\\beginR}, and \.{\\endR} ).
@z
%---------------------------------------
- at x [10] m.147 l.3088 - e-TeX TeXXeT
+ at x [10.147] l.3094 - e-TeX TeXXeT
@d after=1 {|subtype| for math node that winds up a formula}
@y
@d after=1 {|subtype| for math node that winds up a formula}
@@ -287,7 +287,7 @@
@d begin_LR_type(#)==(#-after+before)
@z
%---------------------------------------
- at x [12] m.175 l.3561 - e-TeX TeXXeT
+ at x [12.175] l.3567 - e-TeX TeXXeT
math_node: print_char("$");
@y
math_node: if subtype(p)>=L_code then print("[]")
@@ -294,7 +294,7 @@
else print_char("$");
@z
%---------------------------------------
- at x [12] m.184 l.3728 - e-TeX TeXXeT
+ at x [12.184] l.3734 - e-TeX TeXXeT
begin print(", shifted "); print_scaled(shift_amount(p));
end;
@y
@@ -303,7 +303,7 @@
if eTeX_ex then @<Display if this box is never to be reversed@>;
@z
%---------------------------------------
- at x [12] m.192 l.3826 - e-TeX TeXXeT
+ at x [12.192] l.3832 - e-TeX TeXXeT
begin print_esc("math");
@y
if subtype(p)>after then
@@ -316,7 +316,7 @@
begin print_esc("math");
@z
%---------------------------------------
- at x [12] m.196 l.3859 - e-TeX marks
+ at x [12.196] l.3865 - e-TeX marks
begin print_esc("mark"); print_mark(mark_ptr(p));
@y
begin print_esc("mark");
@@ -326,7 +326,7 @@
print_mark(mark_ptr(p));
@z
%---------------------------------------
- at x [15] m.208 l.4096 - e-TeX saved_items
+ at x [15.208] l.4102 - e-TeX saved_items
@d un_vbox=24 {unglue a box ( \.{\\unvbox}, \.{\\unvcopy} )}
@y
@d un_vbox=24 {unglue a box ( \.{\\unvbox}, \.{\\unvcopy} )}
@@ -333,7 +333,7 @@
{( or \.{\\pagediscards}, \.{\\splitdiscards} )}
@z
%---------------------------------------
- at x [15] m.208 l.4106 - e-TeX TeXXeT
+ at x [15.208] l.4112 - e-TeX TeXXeT
@d valign=33 {vertical table alignment ( \.{\\valign} )}
@y
@d valign=33 {vertical table alignment ( \.{\\valign} )}
@@ -340,7 +340,7 @@
{or text direction directives ( \.{\\beginL}, etc.~)}
@z
%---------------------------------------
- at x [15] m.208 l.4122 - e-TeX middle
+ at x [15.208] l.4128 - e-TeX middle
@d left_right=49 {variable delimiter ( \.{\\left}, \.{\\right} )}
@y
@d left_right=49 {variable delimiter ( \.{\\left}, \.{\\right} )}
@@ -347,7 +347,7 @@
{( or \.{\\middle} )}
@z
%---------------------------------------
- at x [15] m.209 l.4166 - e-TeX basic
+ at x [15.209] l.4172 - e-TeX basic
\.{\\insertpenalties} )}
@y
\.{\\insertpenalties} )}
@@ -354,7 +354,7 @@
{( or \.{\\interactionmode} )}
@z
%---------------------------------------
- at x [15] m.209 l.4168 - e-TeX penalties
+ at x [15.209] l.4174 - e-TeX penalties
@d set_shape=84 {specify fancy paragraph shape ( \.{\\parshape} )}
@y
@d set_shape=84 {specify fancy paragraph shape ( \.{\\parshape} )}
@@ -361,7 +361,7 @@
{(or \.{\\interlinepenalties}, etc.~)}
@z
%---------------------------------------
- at x [15] m.209 l.4178 - e-TeX protected
+ at x [15.209] l.4184 - e-TeX protected
@d prefix=93 {qualify a definition ( \.{\\global}, \.{\\long}, \.{\\outer} )}
@y
@d prefix=93 {qualify a definition ( \.{\\global}, \.{\\long}, \.{\\outer} )}
@@ -368,7 +368,7 @@
{( or \.{\\protected} )}
@z
%---------------------------------------
- at x [15] m.209 l.4181 - e-TeX read_line
+ at x [15.209] l.4187 - e-TeX read_line
@d read_to_cs=96 {read into a control sequence ( \.{\\read} )}
@y
@d read_to_cs=96 {read into a control sequence ( \.{\\read} )}
@@ -375,7 +375,7 @@
{( or \.{\\readline} )}
@z
%---------------------------------------
- at x [15] m.210 l.4196 - e-TeX scan_tokens
+ at x [15.210] l.4202 - e-TeX scan_tokens
@d input=max_command+4 {input a source file ( \.{\\input}, \.{\\endinput} )}
@y
@d input=max_command+4 {input a source file ( \.{\\input}, \.{\\endinput} )}
@@ -382,7 +382,7 @@
{( or \.{\\scantokens} )}
@z
%---------------------------------------
- at x [15] m.210 l.4201 - e-TeX unexpanded
+ at x [15.210] l.4207 - e-TeX unexpanded
@d the=max_command+9 {expand an internal quantity ( \.{\\the} )}
@y
@d the=max_command+9 {expand an internal quantity ( \.{\\the} )}
@@ -389,7 +389,7 @@
{( or \.{\\unexpanded}, \.{\\detokenize} )}
@z
%---------------------------------------
- at x [16] m.212 l.4304 - e-TeX basic
+ at x [16.212] l.4310 - e-TeX basic
user's output routine.
@y
user's output routine.
@@ -402,7 +402,7 @@
recent |left_noad| or |middle_noad| of a |math_left_group|.
@z
%---------------------------------------
- at x [16] m.212 l.4319 - e-TeX basic
+ at x [16.212] l.4325 - e-TeX basic
@!head_field,@!tail_field: pointer;
@y
@!head_field,@!tail_field: pointer;
@@ -409,7 +409,7 @@
@!eTeX_aux_field: pointer;
@z
%---------------------------------------
- at x [16] m.213 l.4326 - e-TeX basic
+ at x [16.213] l.4332 - e-TeX basic
@d tail==cur_list.tail_field {final node on current list}
@y
@d tail==cur_list.tail_field {final node on current list}
@@ -419,7 +419,7 @@
@d delim_ptr==eTeX_aux {most recent left or right noad of a math left group}
@z
%---------------------------------------
- at x [16] m.215 l.4357 - e-TeX basic
+ at x [16.215] l.4363 - e-TeX basic
mode:=vmode; head:=contrib_head; tail:=contrib_head;
@y
mode:=vmode; head:=contrib_head; tail:=contrib_head;
@@ -426,7 +426,7 @@
eTeX_aux:=null;
@z
%---------------------------------------
- at x [16] m.216 l.4373 push_nest - e-TeX basic
+ at x [16.216] l.4379 - push_nest - e-TeX basic
incr(nest_ptr); head:=get_avail; tail:=head; prev_graf:=0; mode_line:=line;
@y
incr(nest_ptr); head:=get_avail; tail:=head; prev_graf:=0; mode_line:=line;
@@ -433,7 +433,7 @@
eTeX_aux:=null;
@z
%---------------------------------------
- at x [17] m.230 l.4736 - e-TeX basic, every_eof
+ at x [17.230] l.4742 - e-TeX basic, every_eof
@d toks_base=local_base+10 {table of 256 token list registers}
@y
@d tex_toks=local_base+10 {end of \TeX's token list parameters}
@@ -445,7 +445,7 @@
@d toks_base=etex_toks {table of 256 token list registers}
@z
%---------------------------------------
- at x [17] m.230 l.4737 - e-TeX basic, penalties
+ at x [17.230] l.4743 - e-TeX basic, penalties
@d box_base=toks_base+256 {table of 256 box registers}
@y
@#
@@ -459,7 +459,7 @@
@d box_base=etex_pens {table of 256 box registers}
@z
%---------------------------------------
- at x [17] m.231 l.4802 - e-TeX basic
+ at x [17.231] l.4808 - e-TeX basic
othercases print_esc("errhelp")
@y
@/@<Cases of |assign_toks| for |print_cmd_chr|@>@/
@@ -466,7 +466,7 @@
othercases print_esc("errhelp")
@z
%---------------------------------------
- at x [17] m.232 l.4820 - e-TeX penalties
+ at x [17.232] l.4826 - e-TeX penalties
eq_level(par_shape_loc):=level_one;@/
@y
eq_level(par_shape_loc):=level_one;@/
@@ -474,7 +474,7 @@
eqtb[k]:=eqtb[par_shape_loc];
@z
%---------------------------------------
- at x [17] m.233 l.4848 - e-TeX penalties
+ at x [17.233] l.4854 - e-TeX penalties
if n=par_shape_loc then
begin print_esc("parshape"); print_char("=");
if par_shape_ptr=null then print_char("0")
@@ -489,7 +489,7 @@
end
@z
%---------------------------------------
- at x [17] m.236 l.4969 - e-TeX basic
+ at x [17.236] l.4975 - e-TeX basic
@d int_pars=55 {total number of integer parameters}
@y
@d tex_int_pars=55 {total number of \TeX's integer parameters}
@@ -510,7 +510,7 @@
@d int_pars=etex_int_pars {total number of integer parameters}
@z
%---------------------------------------
- at x [17] m.236 l.5031 - e-TeX basic
+ at x [17.236] l.5037 - e-TeX basic
@d error_context_lines==int_par(error_context_lines_code)
@y
@d error_context_lines==int_par(error_context_lines_code)
@@ -526,7 +526,7 @@
@d saving_hyph_codes==int_par(saving_hyph_codes_code)
@z
%---------------------------------------
- at x [17] m.237 l.5096 print_param - e-TeX basic
+ at x [17.237] l.5102 - print_param - e-TeX basic
othercases print("[unknown integer parameter!]")
@y
@/@<Cases for |print_param|@>@/
@@ -533,13 +533,13 @@
othercases print("[unknown integer parameter!]")
@z
%---------------------------------------
- at x [18] m.264 l.5627 primitive - e-TeX basic
+ at x [18.264] l.5639 - primitive - e-TeX basic
@!j:small_number; {index into |buffer|}
@y
@!j:0..buf_size; {index into |buffer|}
@z
%---------------------------------------
- at x [18] m.264 l.5631 primitive - e-TeX basic
+ at x [18.264] l.5643 - primitive - e-TeX basic
{we will move |s| into the (empty) |buffer|}
for j:=0 to l-1 do buffer[j]:=so(str_pool[k+j]);
cur_val:=id_lookup(0,l); {|no_new_control_sequence| is |false|}
@@ -552,19 +552,19 @@
cur_val:=id_lookup(first,l); {|no_new_control_sequence| is |false|}
@z
%---------------------------------------
- at x [18] m.265 l.5706 - e-TeX penalties
+ at x [18.265] l.5718 - e-TeX penalties
primitive("parshape",set_shape,0);@/
@y
primitive("parshape",set_shape,par_shape_loc);@/
@z
%---------------------------------------
- at x [18] m.265 l.5723 - e-TeX sparse arrays
+ at x [18.265] l.5735 - e-TeX sparse arrays
primitive("toks",toks_register,0);@/
@y
primitive("toks",toks_register,mem_bot);@/
@z
%---------------------------------------
- at x [18] m.266 l.5756 - e-TeX cond
+ at x [18.266] l.5768 - e-TeX cond
expand_after: print_esc("expandafter");
@y
expand_after: if chr_code=0 then print_esc("expandafter")
@@ -571,7 +571,7 @@
@<Cases of |expandafter| for |print_cmd_chr|@>;
@z
%---------------------------------------
- at x [18] m.266 l.5762 - e-TeX marks
+ at x [18.266] l.5774 - e-TeX marks
mark: print_esc("mark");
@y
mark: begin print_esc("mark");
@@ -579,7 +579,7 @@
end;
@z
%---------------------------------------
- at x [18] m.266 l.5773 - e-TeX read_line
+ at x [18.266] l.5785 - e-TeX read_line
read_to_cs: print_esc("read");
@y
read_to_cs: if chr_code=0 then print_esc("read")
@@ -586,7 +586,7 @@
@<Cases of |read| for |print_cmd_chr|@>;
@z
%---------------------------------------
- at x [18] m.266 l.5777 - e-TeX penalties
+ at x [18.266] l.5789 - e-TeX penalties
set_shape: print_esc("parshape");
@y
set_shape: case chr_code of
@@ -595,7 +595,7 @@
end; {there are no other cases}
@z
%---------------------------------------
- at x [18] m.266 l.5778 - e-TeX unexpanded
+ at x [18.266] l.5790 - e-TeX unexpanded
the: print_esc("the");
@y
the: if chr_code=0 then print_esc("the")
@@ -602,13 +602,13 @@
@<Cases of |the| for |print_cmd_chr|@>;
@z
%---------------------------------------
- at x [18] m.266 l.5779 - e-TeX sparse arrays
+ at x [18.266] l.5791 - e-TeX sparse arrays
toks_register: print_esc("toks");
@y
toks_register: @<Cases of |toks_register| for |print_cmd_chr|@>;
@z
%---------------------------------------
- at x [18] m.266 l.5781 - e-TeX TeXXeT
+ at x [18.266] l.5793 - e-TeX TeXXeT
valign: print_esc("valign");
@y
valign: if chr_code=0 then print_esc("valign")@/
@@ -615,13 +615,13 @@
@<Cases of |valign| for |print_cmd_chr|@>;
@z
%---------------------------------------
- at x [19] m.268 l.5815 - e-TeX sparse arrays
+ at x [19.268] l.5827 - e-TeX sparse arrays
interpreted in one of four ways:
@y
interpreted in one of five ways:
@z
%---------------------------------------
- at x [19] m.268 l.5835 - e-TeX tracing
+ at x [19.268] l.5847 - e-TeX tracing
the entries for that group.
@y
the entries for that group.
@@ -634,7 +634,7 @@
the values of |sa_chain| and |sa_level| respectively.
@z
%---------------------------------------
- at x [19] m.268 l.5845 - e-TeX basic
+ at x [19.268] l.5857 - e-TeX basic
@d level_boundary=3 {|save_type| corresponding to beginning of group}
@y
@d level_boundary=3 {|save_type| corresponding to beginning of group}
@@ -643,19 +643,19 @@
@p at t\4@>@<Declare \eTeX\ procedures for tracing and input@>
@z
%---------------------------------------
- at x [19] m.273 l.5903 - e-TeX tracing
+ at x [19.273] l.5915 - e-TeX tracing
@ The following macro is used to test if there is room for up to six more
@y
@ The following macro is used to test if there is room for up to seven more
@z
%---------------------------------------
- at x [19] m.273 l.5909 check_full_save_stack - e-TeX tracing
+ at x [19.273] l.5921 - check_full_save_stack - e-TeX tracing
if max_save_stack>save_size-6 then overflow("save size",save_size);
@y
if max_save_stack>save_size-7 then overflow("save size",save_size);
@z
%---------------------------------------
- at x [19] m.274 l.5931 new_save_level - e-TeX tracing
+ at x [19.274] l.5943 - new_save_level - e-TeX tracing
begin check_full_save_stack;
@y
begin check_full_save_stack;
@@ -664,7 +664,7 @@
end;
@z
%---------------------------------------
- at x [19] m.274 l.5938 new_save_level - e-TeX tracing
+ at x [19.274] l.5950 - new_save_level - e-TeX tracing
cur_boundary:=save_ptr; incr(cur_level); incr(save_ptr); cur_group:=c;
@y
cur_boundary:=save_ptr; cur_group:=c;
@@ -672,7 +672,7 @@
incr(cur_level); incr(save_ptr);
@z
%---------------------------------------
- at x [19] m.275 l.5956 eq_destroy - e-TeX sparse arrays
+ at x [19.275] l.5968 - eq_destroy - e-TeX sparse arrays
othercases do_nothing
@y
@/@<Cases for |eq_destroy|@>@/
@@ -679,7 +679,7 @@
othercases do_nothing
@z
%---------------------------------------
- at x [19] m.277 l.5978 - e-TeX tracing
+ at x [19.277] l.5990 - e-TeX tracing
the call, since |eq_save| makes the necessary test.
@y
the call, since |eq_save| makes the necessary test.
@@ -688,7 +688,7 @@
tats
@z
%---------------------------------------
- at x [19] m.277 l.5982 eq_define - e-TeX tracing
+ at x [19.277] l.5994 - eq_define - e-TeX tracing
begin if eq_level(p)=cur_level then eq_destroy(eqtb[p])
@y
label exit;
@@ -700,7 +700,7 @@
if eq_level(p)=cur_level then eq_destroy(eqtb[p])
@z
%---------------------------------------
- at x [19] m.277 l.5985 eq_define - e-TeX tracing
+ at x [19.277] l.5997 - eq_define - e-TeX tracing
end;
@y
assign_trace(p,"into")@;@/
@@ -707,7 +707,7 @@
exit:end;
@z
%---------------------------------------
- at x [19] m.278 l.5992 eq_word_define - e-TeX tracing
+ at x [19.278] l.6004 - eq_word_define - e-TeX tracing
begin if xeq_level[p]<>cur_level then
@y
label exit;
@@ -719,7 +719,7 @@
if xeq_level[p]<>cur_level then
@z
%---------------------------------------
- at x [19] m.278 l.5996 eq_word_define - e-TeX tracing
+ at x [19.278] l.6008 - eq_word_define - e-TeX tracing
end;
@y
assign_trace(p,"into")@;@/
@@ -726,7 +726,7 @@
exit:end;
@z
%---------------------------------------
- at x [19] m.279 l.6005 geq_define - e-TeX tracing
+ at x [19.279] l.6017 - geq_define - e-TeX tracing
begin eq_destroy(eqtb[p]);
eq_level(p):=level_one; eq_type(p):=t; equiv(p):=e;
@y
@@ -737,7 +737,7 @@
assign_trace(p,"into")@;@/
@z
%---------------------------------------
- at x [19] m.279 l.6010 geq_word_define - e-TeX tracing
+ at x [19.279] l.6022 - geq_word_define - e-TeX tracing
begin eqtb[p].int:=w; xeq_level[p]:=level_one;
@y
begin assign_trace(p,"globally changing")@;@/
@@ -746,13 +746,13 @@
assign_trace(p,"into")@;@/
@z
%---------------------------------------
- at x [19] m.281 l.6027 - e-TeX tracing
+ at x [19.281] l.6039 - e-TeX tracing
@p at t\4@>@<Declare the procedure called |restore_trace|@>@;@/
@y
@p
@z
%---------------------------------------
- at x [19] m.281 l.6034 unsave - e-TeX optimized \aftergroup
+ at x [19.281] l.6046 - unsave - e-TeX optimized \aftergroup
begin if cur_level>level_one then
@y
@!a:boolean; {have we already processed an \.{\\aftergroup} ?}
@@ -760,7 +760,7 @@
if cur_level>level_one then
@z
%---------------------------------------
- at x [19] m.282 l.6048 - e-TeX sparse arrays
+ at x [19.282] l.6060 - e-TeX sparse arrays
else begin if save_type(save_ptr)=restore_old_value then
@y
else if save_type(save_ptr)=restore_sa then
@@ -769,7 +769,7 @@
else begin if save_type(save_ptr)=restore_old_value then
@z
%---------------------------------------
- at x [19] m.282 l.6056 - e-TeX tracing
+ at x [19.282] l.6068 - e-TeX tracing
done: cur_group:=save_level(save_ptr); cur_boundary:=save_index(save_ptr)
@y
done: @!stat if tracing_groups>0 then group_trace(true);@+tats@;@/
@@ -779,13 +779,13 @@
if eTeX_ex then decr(save_ptr)
@z
%---------------------------------------
- at x [19] m.284 l.6082 - e-TeX tracing
+ at x [19.284] l.6094 - e-TeX tracing
@ @<Declare the procedure called |restore_trace|@>=
@y
@ @<Declare \eTeX\ procedures for tr...@>=
@z
%---------------------------------------
- at x [20] m.289 l.6170 - e-TeX protected
+ at x [20.289] l.6182 - e-TeX protected
@d end_match_token=@'7000 {$2^8\cdot|end_match|$}
@y
@d end_match_token=@'7000 {$2^8\cdot|end_match|$}
@@ -792,19 +792,19 @@
@d protected_token=@'7001 {$2^8\cdot|end_match|+1$}
@z
%---------------------------------------
- at x [20] m.294 l.6295 - e-TeX protected
+ at x [20.294] l.6307 - e-TeX protected
end_match: print("->");
@y
end_match: if c=0 then print("->");
@z
%---------------------------------------
- at x [20] m.296 l.6316 print_meaning - e-TeX marks
+ at x [20.296] l.6328 - print_meaning - e-TeX marks
else if cur_cmd=top_bot_mark then
@y
else if (cur_cmd=top_bot_mark)and(cur_chr<marks_code) then
@z
%---------------------------------------
- at x [21] m.298 l.6390 print_cmd_chr - e-TeX protected
+ at x [21.298] l.6402 - print_cmd_chr - e-TeX protected
procedure print_cmd_chr(@!cmd:quarterword;@!chr_code:halfword);
@y
procedure print_cmd_chr(@!cmd:quarterword;@!chr_code:halfword);
@@ -811,7 +811,7 @@
var n:integer; {temp variable}
@z
%---------------------------------------
- at x [21] m.299 l.6409 show_cur_cmd_chr - e-TeX tracing
+ at x [21.299] l.6421 - show_cur_cmd_chr - e-TeX tracing
@p procedure show_cur_cmd_chr;
@y
@p procedure show_cur_cmd_chr;
@@ -820,7 +820,7 @@
@!p:pointer;
@z
%---------------------------------------
- at x [21] m.299 l.6414 show_cur_cmd_chr - e-TeX tracing
+ at x [21.299] l.6426 - show_cur_cmd_chr - e-TeX tracing
print_cmd_chr(cur_cmd,cur_chr); print_char("}");
@y
print_cmd_chr(cur_cmd,cur_chr);
@@ -842,7 +842,7 @@
print_char("}");
@z
%---------------------------------------
- at x [22] m.303 l.6490 show_context - e-TeX scan_tokens
+ at x [22.303] l.6502 - show_context - e-TeX scan_tokens
the terminal, under control of the procedure |read_toks|.)
@y
the terminal, under control of the procedure |read_toks|.)
@@ -850,7 +850,7 @@
created by the \.{\\scantokens} command.
@z
%---------------------------------------
- at x [22] m.307 l.6687 - e-TeX basic, every_eof
+ at x [22.307] l.6699 - e-TeX basic, every_eof
only if |token_type>=macro|.
@^reference counts@>
@y
@@ -861,7 +861,7 @@
corresponding token types must precede |write_text|.
@z
%---------------------------------------
- at x [22] m.307 l.6708 - e-TeX basic
+ at x [22.307] l.6720 - e-TeX basic
@d write_text=15 {|token_type| code for \.{\\write}}
@y
@#
@@ -872,13 +872,13 @@
@d write_text=toks_base-eTeX_text_offset {|token_type| code for \.{\\write}}
@z
%---------------------------------------
- at x [22] m.311 l.6764 show_context - e-TeX scan_tokens
+ at x [22.311] l.6776 - show_context - e-TeX scan_tokens
if (name>17) or (base_ptr=0) then bottom_line:=true;
@y
if (name>19) or (base_ptr=0) then bottom_line:=true;
@z
%---------------------------------------
- at x [22] m.313 l.6809 - e-TeX scan_tokens
+ at x [22.313] l.6821 - e-TeX scan_tokens
else begin print_nl("l."); print_int(line);
@y
else begin print_nl("l.");
@@ -886,7 +886,7 @@
else print_int(line_stack[index+1]); {input from a pseudo file}
@z
%---------------------------------------
- at x [22] m.314 l.6831 - e-TeX basic
+ at x [22.314] l.6843 - e-TeX basic
write_text: print_nl("<write> ");
@y
every_eof_text: print_nl("<everyeof> ");
@@ -893,7 +893,7 @@
write_text: print_nl("<write> ");
@z
%---------------------------------------
- at x [23] m.326 l.7024 - e-TeX optimized \aftergroup
+ at x [23.326] l.7036 - e-TeX optimized \aftergroup
begin t:=cur_tok; cur_tok:=p; back_input; cur_tok:=t;
@y
begin t:=cur_tok; cur_tok:=p;
@@ -908,7 +908,7 @@
cur_tok:=t;
@z
%---------------------------------------
- at x [23] m.328 l.7052 begin_file_reading - e-TeX every_eof, tracing_nesting
+ at x [23.328] l.7064 - begin_file_reading - e-TeX every_eof, tracing_nesting
incr(in_open); push_input; index:=in_open;
@y
incr(in_open); push_input; index:=in_open;
@@ -916,7 +916,7 @@
grp_stack[index]:=cur_boundary; if_stack[index]:=cond_ptr;
@z
%---------------------------------------
- at x [23] m.329 l.7062 end_file_reading - e-TeX scan_tokens
+ at x [23.329] l.7074 - end_file_reading - e-TeX scan_tokens
if name>17 then a_close(cur_file); {forget it}
@y
if (name=18)or(name=19) then pseudo_close else
@@ -923,7 +923,7 @@
if name>17 then a_close(cur_file); {forget it}
@z
%---------------------------------------
- at x [23] m.331 l.7081 - e-TeX tracing_nesting
+ at x [23.331] l.7093 - e-TeX tracing_nesting
in_open:=0; open_parens:=0; max_buf_stack:=0;
@y
in_open:=0; open_parens:=0; max_buf_stack:=0;
@@ -930,7 +930,7 @@
grp_stack[0]:=0; if_stack[0]:=null;
@z
%---------------------------------------
- at x [24] m.362 l.7553 - e-TeX scan_tokens, every_eof
+ at x [24.362] l.7566 - e-TeX scan_tokens, every_eof
if not force_eof then
@y
if not force_eof then
@@ -946,7 +946,7 @@
else
@z
%---------------------------------------
- at x [24] m.362 l.7556 - e-TeX every_eof
+ at x [24.362] l.7569 - e-TeX every_eof
else force_eof:=true;
@y
else if (every_eof<>null)and not eof_seen[index] then
@@ -956,7 +956,7 @@
else force_eof:=true;
@z
%---------------------------------------
- at x [24] m.362 l.7559 - e-TeX scan_tokens
+ at x [24.362] l.7572 - e-TeX scan_tokens
begin print_char(")"); decr(open_parens);
update_terminal; {show user that file has been read}
@y
@@ -970,7 +970,7 @@
end;
@z
%---------------------------------------
- at x [25] m.366 l.7643 - e-TeX basic
+ at x [25.366] l.7656 - e-TeX basic
@t\4@>@<Declare the procedure called |insert_relax|@>@;@/
@y
@t\4@>@<Declare the procedure called |insert_relax|@>@;@/
@@ -977,7 +977,7 @@
@t\4@>@<Declare \eTeX\ procedures for expanding@>@;@/
@z
%---------------------------------------
- at x [25] m.366 l.7650 expand - e-TeX cond
+ at x [25.366] l.7663 - expand - e-TeX cond
procedure expand;
@y
procedure expand;
@@ -984,7 +984,7 @@
label reswitch;
@z
%---------------------------------------
- at x [25] m.366 l.7661 expand - e-TeX cond
+ at x [25.366] l.7674 - expand - e-TeX cond
if cur_cmd<call then @<Expand a nonmacro@>
@y
reswitch:
@@ -991,7 +991,7 @@
if cur_cmd<call then @<Expand a nonmacro@>
@z
%---------------------------------------
- at x [25] m.367 l.7672 - e-TeX cond
+ at x [25.367] l.7685 - e-TeX cond
expand_after:@<Expand the token after the next token@>;
@y
expand_after:if cur_chr=0 then @<Expand the token after the next token@>
@@ -998,7 +998,7 @@
else @<Negate a boolean conditional and |goto reswitch|@>;
@z
%---------------------------------------
- at x [25] m.377 l.7792 - e-TeX scan_tokens
+ at x [25.377] l.7805 - e-TeX scan_tokens
input: if chr_code=0 then print_esc("input")@+else print_esc("endinput");
@y
input: if chr_code=0 then print_esc("input")
@@ -1006,7 +1006,7 @@
else print_esc("endinput");
@z
%---------------------------------------
- at x [25] m.378 l.7795 - e-TeX scan_tokens
+ at x [25.378] l.7808 - e-TeX scan_tokens
if cur_chr>0 then force_eof:=true
@y
if cur_chr=1 then force_eof:=true
@@ -1013,7 +1013,7 @@
@/@<Cases for |input|@>@/
@z
%---------------------------------------
- at x [25] m.382 l.7851 - e-TeX marks
+ at x [25.382] l.7864 - e-TeX marks
@d top_mark_code=0 {the mark in effect at the previous page break}
@y
@d marks_code==5 {add this for \.{\\topmarks} etc.}
@@ -1021,13 +1021,13 @@
@d top_mark_code=0 {the mark in effect at the previous page break}
@z
%---------------------------------------
- at x [25] m.385 l.7883 - e-TeX marks
+ at x [25.385] l.7896 - e-TeX marks
top_bot_mark: case chr_code of
@y
top_bot_mark: begin case (chr_code mod marks_code) of
@z
%---------------------------------------
- at x [25] m.385 l.7889 - e-TeX marks
+ at x [25.385] l.7902 - e-TeX marks
endcases;
@y
endcases;
@@ -1035,7 +1035,7 @@
end;
@z
%---------------------------------------
- at x [25] m.386 l.7895 - e-TeX marks
+ at x [25.386] l.7908 - e-TeX marks
begin if cur_mark[cur_chr]<>null then
begin_token_list(cur_mark[cur_chr],mark_text);
@y
@@ -1046,7 +1046,7 @@
if cur_ptr<>null then begin_token_list(cur_ptr,mark_text);
@z
%---------------------------------------
- at x [25] m.389 l.7958 macro_call - e-TeX protected
+ at x [25.389] l.7971 - macro_call - e-TeX protected
if info(r)<>end_match_token then
@y
if info(r)=protected_token then r:=link(r);
@@ -1053,7 +1053,7 @@
if info(r)<>end_match_token then
@z
%---------------------------------------
- at x [26] m.409 l.8270 - e-TeX basic
+ at x [26.409] l.8283 - e-TeX basic
@t\4\4@>@<Declare procedures that scan font-related stuff@>
@y
@t\4\4@>@<Declare \eTeX\ procedures for scanning@>@;
@@ -1060,7 +1060,7 @@
@t\4\4@>@<Declare procedures that scan font-related stuff@>
@z
%---------------------------------------
- at x [26] m.411 l.8314 - e-TeX sparse arrays
+ at x [26.411] l.8327 - e-TeX sparse arrays
|glue_val|, or |mu_val|.
@y
|glue_val|, or |mu_val| more than |mem_bot| (dynamic variable-size nodes
@@ -1067,7 +1067,7 @@
cannot have these values)
@z
%---------------------------------------
- at x [26] m.411 l.8317 - e-TeX sparse arrays
+ at x [26.411] l.8330 - e-TeX sparse arrays
primitive("count",register,int_val);
@!@:count_}{\.{\\count} primitive@>
primitive("dimen",register,dimen_val);
@@ -1085,7 +1085,7 @@
primitive("muskip",register,mem_bot+mu_val);
@z
%---------------------------------------
- at x [26] m.412 l.8327 - e-TeX sparse arrays
+ at x [26.412] l.8340 - e-TeX sparse arrays
register: if chr_code=int_val then print_esc("count")
else if chr_code=dimen_val then print_esc("dimen")
else if chr_code=glue_val then print_esc("skip")
@@ -1094,7 +1094,7 @@
register: @<Cases of |register| for |print_cmd_chr|@>;
@z
%---------------------------------------
- at x [26] m.413 l.8343 scan_something_internal - e-TeX basic
+ at x [26.413] l.8356 - scan_something_internal - e-TeX basic
var m:halfword; {|chr_code| part of the operand token}
@y
label exit;
@@ -1104,13 +1104,13 @@
@!i:four_quarters; {character info}
@z
%---------------------------------------
- at x [26] m.413 l.8369 scan_something_internal - e-TeX basic
+ at x [26.413] l.8382 - scan_something_internal - e-TeX basic
end;
@y
exit:end;
@z
%---------------------------------------
- at x [26] m.415 l.8390 - e-TeX sparse arrays
+ at x [26.415] l.8403 - e-TeX sparse arrays
begin scan_eight_bit_int; m:=toks_base+cur_val;
end;
scanned_result(equiv(m))(tok_val);
@@ -1128,7 +1128,7 @@
cur_val_level:=tok_val;
@z
%---------------------------------------
- at x [26] m.416 l.8405 - e-TeX basic
+ at x [26.416] l.8418 - e-TeX basic
|glue_val|, |input_line_no_code|, or |badness_code|.
@y
|glue_val|, |input_line_no_code|, or |badness_code|.
@@ -1136,7 +1136,7 @@
the codes for its extensions: |eTeX_version_code|, \dots\ .
@z
%---------------------------------------
- at x [26] m.416 l.8407 - e-TeX basic
+ at x [26.416] l.8420 - e-TeX basic
@d input_line_no_code=glue_val+1 {code for \.{\\inputlineno}}
@d badness_code=glue_val+2 {code for \.{\\badness}}
@y
@@ -1151,7 +1151,7 @@
@d eTeX_expr=eTeX_mu+1 {first of \eTeX\ codes for expressions}
@z
%---------------------------------------
- at x [26] m.417 l.8440 - e-TeX interaction_mode
+ at x [26.417] l.8453 - e-TeX interaction_mode
@+else print_esc("insertpenalties");
@y
@/@<Cases of |set_page_int| for |print_cmd_chr|@>@/
@@ -1158,7 +1158,7 @@
@+else print_esc("insertpenalties");
@z
%---------------------------------------
- at x [26] m.417 l.8449 - e-TeX basic
+ at x [26.417] l.8462 - e-TeX basic
othercases print_esc("badness")
@y
@/@<Cases of |last_item| for |print_cmd_chr|@>@/
@@ -1165,7 +1165,7 @@
othercases print_esc("badness")
@z
%---------------------------------------
- at x [26] m.419 l.8469 - e-TeX interaction_mode
+ at x [26.419] l.8482 - e-TeX interaction_mode
begin if m=0 then cur_val:=dead_cycles at +else cur_val:=insert_penalties;
@y
begin if m=0 then cur_val:=dead_cycles
@@ -1173,7 +1173,7 @@
else cur_val:=insert_penalties;
@z
%---------------------------------------
- at x [26] m.420 l.8474 - e-TeX sparse arrays
+ at x [26.420] l.8487 - e-TeX sparse arrays
begin scan_eight_bit_int;
if box(cur_val)=null then cur_val:=0 @+else cur_val:=mem[box(cur_val)+m].sc;
@y
@@ -1181,7 +1181,7 @@
if q=null then cur_val:=0 @+else cur_val:=mem[q+m].sc;
@z
%---------------------------------------
- at x [26] m.423 l.8499 - e-TeX penalties
+ at x [26.423] l.8512 - e-TeX penalties
begin if par_shape_ptr=null then cur_val:=0
@y
begin if m>par_shape_loc then @<Fetch a penalties array element@>
@@ -1188,7 +1188,7 @@
else if par_shape_ptr=null then cur_val:=0
@z
%---------------------------------------
- at x [26] m.424 l.8504 - e-TeX \lastnodetype
+ at x [26.424] l.8517 - e-TeX \lastnodetype
@ Here is where \.{\\lastpenalty}, \.{\\lastkern}, and \.{\\lastskip} are
@y
@ Here is where \.{\\lastpenalty}, \.{\\lastkern}, \.{\\lastskip}, and
@@ -1195,7 +1195,7 @@
\.{\\lastnodetype} are
@z
%---------------------------------------
- at x [26] m.424 l.8508 - e-TeX TeXXeT
+ at x [26.424] l.8521 - e-TeX TeXXeT
legal in similar contexts.
@y
legal in similar contexts.
@@ -1204,7 +1204,7 @@
node of the current list.
@z
%---------------------------------------
- at x [26] m.424 l.8510 - e-TeX TeXXeT
+ at x [26.424] l.8523 - e-TeX TeXXeT
@<Fetch an item in the current node...@>=
@y
@d find_effective_tail_eTeX==
@@ -1222,13 +1222,13 @@
@<Fetch an item in the current node...@>=
@z
%---------------------------------------
- at x [26] m.424 l.8511 - e-TeX basic
+ at x [26.424] l.8524 - e-TeX basic
if cur_chr>glue_val then
@y
if m>=input_line_no_code then
@z
%---------------------------------------
- at x [26] m.424 l.8512 - e-TeX basic
+ at x [26.424] l.8525 - e-TeX basic
begin if cur_chr=input_line_no_code then cur_val:=line
else cur_val:=last_badness; {|cur_chr=badness_code|}
@y
@@ -1246,7 +1246,7 @@
end; {there are no other cases}
@z
%---------------------------------------
- at x [26] m.424 l.8517 - e-TeX last_node_type
+ at x [26.424] l.8530 - e-TeX last_node_type
cur_val_level:=cur_chr;
if not is_char_node(tail)and(mode<>0) then
case cur_chr of
@@ -1279,7 +1279,7 @@
else if (mode=vmode)and(tx=head) then
@z
%---------------------------------------
- at x [26] m.424 l.8531 - e-TeX last_node_type
+ at x [26.424] l.8544 - e-TeX last_node_type
glue_val: if last_glue<>max_halfword then cur_val:=last_glue;
@y
glue_val: if last_glue<>max_halfword then cur_val:=last_glue;
@@ -1286,7 +1286,7 @@
last_node_type_code: cur_val:=last_node_type;
@z
%---------------------------------------
- at x [26] m.427 l.8547 - e-TeX sparse arrays
+ at x [26.427] l.8560 - e-TeX sparse arrays
begin scan_eight_bit_int;
case m of
@y
@@ -1308,13 +1308,13 @@
case cur_val_level of
@z
%---------------------------------------
- at x [26] m.427 l.8554 - e-TeX sparse arrays
+ at x [26.427] l.8567 - e-TeX sparse arrays
cur_val_level:=m;
@y
end;
@z
%---------------------------------------
- at x [26] m.461 l.9082 - e-TeX expr
+ at x [26.461] l.9095 - e-TeX expr
exit:end;
@y
exit:end;
@@ -1322,7 +1322,7 @@
@<Declare procedures needed for expressions@>@;
@z
%---------------------------------------
- at x [27] m.464 l.9141 - e-TeX basic
+ at x [27.464] l.9154 - e-TeX basic
@p function str_toks(@!b:pool_pointer):pointer;
@y
@p @t\4@>@<Declare \eTeX\ procedures for token lists@>@;@/
@@ -1329,7 +1329,7 @@
function str_toks(@!b:pool_pointer):pointer;
@z
%---------------------------------------
- at x [27] m.465 l.9166 the_toks - e-TeX unexpanded
+ at x [27.465] l.9179 - the_toks - e-TeX unexpanded
@p function the_toks:pointer;
@y
@p function the_toks:pointer;
@@ -1336,7 +1336,7 @@
label exit;
@z
%---------------------------------------
- at x [27] m.465 l.9170 the_toks - e-TeX unexpanded
+ at x [27.465] l.9183 - the_toks - e-TeX unexpanded
begin get_x_token; scan_something_internal(tok_val,false);
@y
@!c:small_number; {value of |cur_chr|}
@@ -1344,13 +1344,13 @@
get_x_token; scan_something_internal(tok_val,false);
@z
%---------------------------------------
- at x [27] m.465 l.9184 the_toks - e-TeX unexpanded
+ at x [27.465] l.9197 - the_toks - e-TeX unexpanded
end;
@y
exit:end;
@z
%---------------------------------------
- at x [27] m.468 l.9207 - e-TeX basic
+ at x [27.468] l.9220 - e-TeX basic
@d number_code=0 {command code for \.{\\number}}
@y
\eTeX\ adds \.{\\eTeXrevision} such that |job_name_code| remains last.
@@ -1358,7 +1358,7 @@
@d number_code=0 {command code for \.{\\number}}
@z
%---------------------------------------
- at x [27] m.468 l.9212 - e-TeX basic
+ at x [27.468] l.9225 - e-TeX basic
@d job_name_code=5 {command code for \.{\\jobname}}
@y
@d etex_convert_base=5 {base for \eTeX's command codes}
@@ -1367,7 +1367,7 @@
@d job_name_code=etex_convert_codes {command code for \.{\\jobname}}
@z
%---------------------------------------
- at x [27] m.469 l.9235 - e-TeX basic
+ at x [27.469] l.9248 - e-TeX basic
othercases print_esc("jobname")
@y
eTeX_revision_code: print_esc("eTeXrevision");
@@ -1374,7 +1374,7 @@
othercases print_esc("jobname")
@z
%---------------------------------------
- at x [27] m.471 l.9260 - e-TeX basic
+ at x [27.471] l.9273 - e-TeX basic
job_name_code: if job_name=0 then open_log_file;
@y
eTeX_revision_code: do_nothing;
@@ -1381,7 +1381,7 @@
job_name_code: if job_name=0 then open_log_file;
@z
%---------------------------------------
- at x [27] m.472 l.9276 - e-TeX basic
+ at x [27.472] l.9289 - e-TeX basic
job_name_code: print(job_name);
@y
eTeX_revision_code: print(eTeX_revision);
@@ -1388,7 +1388,7 @@
job_name_code: print(job_name);
@z
%---------------------------------------
- at x [27] m.478 l.9386 - e-TeX protected
+ at x [27.478] l.9400 - e-TeX protected
if cur_cmd<=max_command then goto done2;
@y
if cur_cmd>=call then
@@ -1398,13 +1398,13 @@
if cur_cmd<=max_command then goto done2;
@z
%---------------------------------------
- at x [27] m.482 l.9434 read_toks - e-TeX read_line
+ at x [27.482] l.9448 - read_toks - e-TeX read_line
@p procedure read_toks(@!n:integer;@!r:pointer);
@y
@p procedure read_toks(@!n:integer;@!r:pointer;@!j:halfword);
@z
%---------------------------------------
- at x [27] m.483 l.9460 - e-TeX read_line
+ at x [27.483] l.9474 - e-TeX read_line
loop at + begin get_token;
@y
@<Handle \.{\\readline} and |goto done|@>;@/
@@ -1411,7 +1411,7 @@
loop at + begin get_token;
@z
%---------------------------------------
- at x [28] m.487 l.9512 - e-TeX cond
+ at x [28.487] l.9526 - e-TeX cond
@d if_char_code=0 { `\.{\\if}' }
@y
@d unless_code=32 {amount added for `\.{\\unless}' prefix}
@@ -1419,7 +1419,7 @@
@d if_char_code=0 { `\.{\\if}' }
@z
%---------------------------------------
- at x [28] m.488 l.9567 - e-TeX cond
+ at x [28.488] l.9581 - e-TeX cond
if_test: case chr_code of
@y
if_test: begin if chr_code>=unless_code then print_esc("unless");
@@ -1426,7 +1426,7 @@
case chr_code mod unless_code of
@z
%---------------------------------------
- at x [28] m.488 l.9584 - e-TeX cond
+ at x [28.488] l.9598 - e-TeX cond
othercases print_esc("if")
endcases;
@y
@@ -1436,7 +1436,7 @@
end;
@z
%---------------------------------------
- at x [28] m.494 l.9658 pass_text - e-TeX tracing
+ at x [28.494] l.9672 - pass_text - e-TeX tracing
done: scanner_status:=save_scanner_status;
@y
done: scanner_status:=save_scanner_status;
@@ -1443,7 +1443,7 @@
if tracing_ifs>0 then show_cur_cmd_chr;
@z
%---------------------------------------
- at x [28] m.496 l.9674 - e-TeX tracing_nesting
+ at x [28.496] l.9688 - e-TeX tracing_nesting
begin p:=cond_ptr; if_line:=if_line_field(p);
@y
begin if if_stack[in_open]=cond_ptr then if_warning;
@@ -1451,7 +1451,7 @@
p:=cond_ptr; if_line:=if_line_field(p);
@z
%---------------------------------------
- at x [28] m.498 l.9711 conditional - e-TeX cond
+ at x [28.498] l.9725 - conditional - e-TeX cond
begin @<Push the condition stack@>;@+save_cond_ptr:=cond_ptr;this_if:=cur_chr;@/
@<Either process \.{\\ifcase} or set |b| to the value of a boolean condition@>;
@y
@@ -1463,7 +1463,7 @@
if is_unless then b:=not b;
@z
%---------------------------------------
- at x [28] m.501 l.9754 - e-TeX cond
+ at x [28.501] l.9768 - e-TeX cond
if_false_code: b:=false;
@y
if_false_code: b:=false;
@@ -1470,13 +1470,13 @@
@/@<Cases for |conditional|@>@/
@z
%---------------------------------------
- at x [28] m.505 l.9793 - e-TeX sparse arrays
+ at x [28.505] l.9807 - e-TeX sparse arrays
begin scan_eight_bit_int; p:=box(cur_val);
@y
begin scan_register_num; fetch_box(p);
@z
%---------------------------------------
- at x [28] m.510 l.9883 - e-TeX cond
+ at x [28.510] l.9897 - e-TeX cond
if cur_chr>if_limit then
@y
begin if tracing_ifs>0 then if tracing_commands<=1 then show_cur_cmd_chr;
@@ -1483,7 +1483,7 @@
if cur_chr>if_limit then
@z
%---------------------------------------
- at x [28] m.510 l.9894 - e-TeX cond
+ at x [28.510] l.9908 - e-TeX cond
end
@y
end;
@@ -1490,7 +1490,7 @@
end
@z
%---------------------------------------
- at x [29] m.536 l.10348 - e-TeX basic
+ at x [29.536] l.10362 - e-TeX basic
print_two(sys_time div 60); print_char(":"); print_two(sys_time mod 60);
@y
print_two(sys_time div 60); print_char(":"); print_two(sys_time mod 60);
@@ -1499,7 +1499,7 @@
end;
@z
%---------------------------------------
- at x [30] m.581 l.11282 char_warning - e-TeX tracing
+ at x [30.581] l.11299 - char_warning - e-TeX tracing
begin if tracing_lost_chars>0 then
@y
var old_setting: integer; {saved value of |tracing_online|}
@@ -1508,7 +1508,7 @@
if eTeX_ex and(tracing_lost_chars>1) then tracing_online:=1;
@z
%---------------------------------------
- at x [30] m.581 l.11289 char_warning - e-TeX tracing
+ at x [30.581] l.11306 - char_warning - e-TeX tracing
end;
@y
tracing_online:=old_setting;
@@ -1516,7 +1516,7 @@
end;
@z
%---------------------------------------
- at x [32] m.616 l.12257 - e-TeX TeXXeT
+ at x [32.616] l.12274 - e-TeX TeXXeT
this is essentially the depth of |push| commands in the \.{DVI} output.
@y
this is essentially the depth of |push| commands in the \.{DVI} output.
@@ -1539,7 +1539,7 @@
@!@^data structure assumptions@>
@z
%---------------------------------------
- at x [32] m.616 l.12259 - e-TeX TeXXeT
+ at x [32.616] l.12276 - e-TeX TeXXeT
@d synch_h==if cur_h<>dvi_h then
@y
@d reversed=1 {subtype for an |hlist_node| whose hlist has been reversed}
@@ -1555,7 +1555,7 @@
@d synch_h==if cur_h<>dvi_h then
@z
%---------------------------------------
- at x [32] m.619 l.12327 hlist_out - e-TeX TeXXeT
+ at x [32.619] l.12344 - hlist_out - e-TeX TeXXeT
@!edge:scaled; {left edge of sub-box, or right edge of leader space}
@y
@!edge:scaled; {right edge of sub-box or leader space}
@@ -1562,7 +1562,7 @@
@!prev_p:pointer; {one step behind |p|}
@z
%---------------------------------------
- at x [32] m.619 l.12337 hlist_out - e-TeX TeXXeT
+ at x [32.619] l.12354 - hlist_out - e-TeX TeXXeT
save_loc:=dvi_offset+dvi_ptr; base_line:=cur_v; left_edge:=cur_h;
@y
save_loc:=dvi_offset+dvi_ptr; base_line:=cur_v;
@@ -1571,7 +1571,7 @@
left_edge:=cur_h;
@z
%---------------------------------------
- at x [32] m.619 l.12340 hlist_out - e-TeX TeXXeT
+ at x [32.619] l.12357 - hlist_out - e-TeX TeXXeT
prune_movements(save_loc);
@y
@<Finish |hlist_out| for mixed direction typesetting@>;
@@ -1578,7 +1578,7 @@
prune_movements(save_loc);
@z
%---------------------------------------
- at x [32] m.620 l.12359 - e-TeX TeXXeT
+ at x [32.620] l.12376 - e-TeX TeXXeT
p:=link(p);
@y
prev_p:=link(prev_p); {N.B.: not |prev_p:=p|, |p| might be |lig_trick|}
@@ -1585,7 +1585,7 @@
p:=link(p);
@z
%---------------------------------------
- at x [32] m.622 l.12384 - e-TeX TeXXeT
+ at x [32.622] l.12401 - e-TeX TeXXeT
kern_node,math_node:cur_h:=cur_h+width(p);
@y
kern_node:cur_h:=cur_h+width(p);
@@ -1592,7 +1592,7 @@
math_node: @<Handle a math node in |hlist_out|@>;
@z
%---------------------------------------
- at x [32] m.622 l.12386 - e-TeX TeXXeT
+ at x [32.622] l.12403 - e-TeX TeXXeT
othercases do_nothing
@y
@/@<Cases of |hlist_out| that arise in mixed direction text only@>@;
@@ -1599,13 +1599,13 @@
othercases do_nothing
@z
%---------------------------------------
- at x [32] m.622 l.12391 - e-TeX TeXXeT
+ at x [32.622] l.12408 - e-TeX TeXXeT
next_p:p:=link(p);
@y
next_p:prev_p:=p; p:=link(p);
@z
%---------------------------------------
- at x [32] m.623 l.12398 - e-TeX TeXXeT
+ at x [32.623] l.12415 - e-TeX TeXXeT
temp_ptr:=p; edge:=cur_h;
@y
temp_ptr:=p; edge:=cur_h+width(p);
@@ -1612,13 +1612,13 @@
if cur_dir=right_to_left then cur_h:=edge;
@z
%---------------------------------------
- at x [32] m.623 l.12401 - e-TeX TeXXeT
+ at x [32.623] l.12418 - e-TeX TeXXeT
cur_h:=edge+width(p); cur_v:=base_line;
@y
cur_h:=edge; cur_v:=base_line;
@z
%---------------------------------------
- at x [32] m.625 l.12419 - e-TeX TeXXeT
+ at x [32.625] l.12436 - e-TeX TeXXeT
glue_temp:=-billion
@<Move right or output leaders@>=
@@ -1629,7 +1629,7 @@
@d round_glue==g:=glue_ptr(p); rule_wd:=width(g)-cur_g;
@z
%---------------------------------------
- at x [32] m.625 l.12438 - e-TeX TeXXeT
+ at x [32.625] l.12455 - e-TeX TeXXeT
rule_wd:=rule_wd+cur_g;
@y
rule_wd:=rule_wd+cur_g
@@ -1639,7 +1639,7 @@
if eTeX_ex then @<Handle a glue node for mixed direction typesetting@>;
@z
%---------------------------------------
- at x [32] m.626 l.12454 - e-TeX TeXXeT
+ at x [32.626] l.12471 - e-TeX TeXXeT
edge:=cur_h+rule_wd; lx:=0;
@y
if cur_dir=right_to_left then cur_h:=cur_h-10;
@@ -1646,7 +1646,7 @@
edge:=cur_h+rule_wd; lx:=0;
@z
%---------------------------------------
- at x [32] m.626 l.12460 - e-TeX TeXXeT
+ at x [32.626] l.12477 - e-TeX TeXXeT
cur_h:=edge-10; goto next_p;
@y
if cur_dir=right_to_left then cur_h:=edge
@@ -1654,7 +1654,7 @@
goto next_p;
@z
%---------------------------------------
- at x [32] m.628 l.12499 - e-TeX TeXXeT
+ at x [32.628] l.12516 - e-TeX TeXXeT
synch_h; save_h:=dvi_h; temp_ptr:=leader_box;
@y
synch_h; save_h:=dvi_h; temp_ptr:=leader_box;
@@ -1661,7 +1661,7 @@
if cur_dir=right_to_left then cur_h:=cur_h+leader_wd;
@z
%---------------------------------------
- at x [32] m.632 l.12573 - e-TeX TeXXeT
+ at x [32.632] l.12590 - e-TeX TeXXeT
cur_h:=left_edge+shift_amount(p); {shift the box right}
@y
if cur_dir=right_to_left then cur_h:=left_edge-shift_amount(p)
@@ -1668,7 +1668,7 @@
else cur_h:=left_edge+shift_amount(p); {shift the box right}
@z
%---------------------------------------
- at x [32] m.633 l.12585 - e-TeX TeXXeT
+ at x [32.633] l.12602 - e-TeX TeXXeT
begin synch_h; synch_v;
dvi_out(put_rule); dvi_four(rule_ht); dvi_four(rule_wd);
@y
@@ -1678,7 +1678,7 @@
cur_h:=left_edge;
@z
%---------------------------------------
- at x [32] m.637 l.12651 - e-TeX TeXXeT
+ at x [32.637] l.12668 - e-TeX TeXXeT
begin cur_h:=left_edge+shift_amount(leader_box); synch_h; save_h:=dvi_h;@/
@y
begin if cur_dir=right_to_left then
@@ -1687,7 +1687,7 @@
synch_h; save_h:=dvi_h;@/
@z
%---------------------------------------
- at x [32] m.638 l.12688 ship_out - e-TeX TeXXeT
+ at x [32.638] l.12705 - ship_out - e-TeX TeXXeT
@<Ship box |p| out@>;
@y
@<Ship box |p| out@>;
@@ -1694,7 +1694,7 @@
if eTeX_ex then @<Check for LR anomalies at the end of |ship_out|@>;
@z
%---------------------------------------
- at x [33] m.649 l.12909 hpack - e-TeX TeXXeT
+ at x [33.649] l.12926 - hpack - e-TeX TeXXeT
h:=0; @<Clear dimensions to zero@>;
@y
h:=0; @<Clear dimensions to zero@>;
@@ -1701,7 +1701,7 @@
if TeXXeT_en then @<Initialize the LR stack@>;
@z
%---------------------------------------
- at x [33] m.649 l.12919 hpack - e-TeX TeXXeT
+ at x [33.649] l.12936 - hpack - e-TeX TeXXeT
exit: hpack:=r;
@y
exit: if TeXXeT_en then @<Check for LR anomalies at the end of |hpack|@>;
@@ -1708,7 +1708,7 @@
hpack:=r;
@z
%---------------------------------------
- at x [33] m.651 l.12943 - e-TeX TeXXeT
+ at x [33.651] l.12960 - e-TeX TeXXeT
kern_node,math_node: x:=x+width(p);
@y
kern_node: x:=x+width(p);
@@ -1717,7 +1717,7 @@
end;
@z
%---------------------------------------
- at x [34] m.687 l.13514 - e-TeX middle
+ at x [34.687] l.13531 - e-TeX middle
\TeX's \.{\\left} and \.{\\right}. The |nucleus| of such noads is
@y
\TeX's \.{\\left} and \.{\\right} as well as \eTeX's \.{\\middle}.
@@ -1724,7 +1724,7 @@
The |nucleus| of such noads is
@z
%---------------------------------------
- at x [34] m.687 l.13531 - e-TeX middle
+ at x [34.687] l.13548 - e-TeX middle
@d delimiter==nucleus {|delimiter| field in left and right noads}
@y
@d delimiter==nucleus {|delimiter| field in left and right noads}
@@ -1731,7 +1731,7 @@
@d middle_noad==1 {|subtype| of right noad representing \.{\\middle}}
@z
%---------------------------------------
- at x [34] m.696 l.13704 - e-TeX middle
+ at x [34.696] l.13721 - e-TeX middle
right_noad: begin print_esc("right"); print_delimiter(delimiter(p));
end;
end;
@@ -1753,7 +1753,7 @@
end;
@z
%---------------------------------------
- at x [36] m.727 l.14302 - e-TeX middle
+ at x [36.727] l.14319 - e-TeX middle
done_with_noad: r:=q; r_type:=type(r);
@y
done_with_noad: r:=q; r_type:=type(r);
@@ -1762,7 +1762,7 @@
end;
@z
%---------------------------------------
- at x [36] m.760 l.14963 - e-TeX middle
+ at x [36.760] l.14980 - e-TeX middle
r_type:=t;
@y
if type(q)=right_noad then t:=open_noad;
@@ -1769,7 +1769,7 @@
r_type:=t;
@z
%---------------------------------------
- at x [36] m.762 l.15004 make_left_right - e-TeX middle
+ at x [36.762] l.15020 - make_left_right - e-TeX middle
begin if style<script_style then cur_size:=text_size
else cur_size:=16*((style-text_style) div 2);
@y
@@ -1776,7 +1776,7 @@
begin cur_style:=style; @<Set up the values...@>;
@z
%---------------------------------------
- at x [37] m.785 l.15495 align_peek - e-TeX protected
+ at x [37.785] l.15512 - align_peek - e-TeX protected
begin restart: align_state:=1000000; @<Get the next non-blank non-call token@>;
@y
begin restart: align_state:=1000000;
@@ -1784,7 +1784,7 @@
until cur_cmd<>spacer;
@z
%---------------------------------------
- at x [37] m.791 l.15606 fin_col - e-TeX protected
+ at x [37.791] l.15623 - fin_col - e-TeX protected
align_state:=1000000; @<Get the next non-blank non-call token@>;
@y
align_state:=1000000;
@@ -1792,7 +1792,7 @@
until cur_cmd<>spacer;
@z
%---------------------------------------
- at x [37] m.807 l.15868 - e-TeX TeXXeT
+ at x [37.807] l.15886 - e-TeX TeXXeT
begin type(q):=hlist_node; width(q):=width(p);
@y
begin type(q):=hlist_node; width(q):=width(p);
@@ -1799,7 +1799,7 @@
if nest[nest_ptr-1].mode_field=mmode then set_box_lr(q)(dlist); {for |ship_out|}
@z
%---------------------------------------
- at x [37] m.808 l.15886 - e-TeX TeXXeT
+ at x [37.808] l.15904 - e-TeX TeXXeT
n:=span_count(r); t:=width(s); w:=t; u:=hold_head;
@y
n:=span_count(r); t:=width(s); w:=t; u:=hold_head;
@@ -1806,7 +1806,7 @@
set_box_lr(r)(0); {for |ship_out|}
@z
%---------------------------------------
- at x [38] m.814 l.16009 - e-TeX penalties
+ at x [38.814] l.16027 - e-TeX penalties
There is one explicit parameter: |final_widow_penalty| is the amount of
additional penalty to be inserted before the final line of the paragraph.
@y
@@ -1816,13 +1816,13 @@
instead of |widow_penalty|.
@z
%---------------------------------------
- at x [38] m.815 l.16036 line_break - e-TeX penalties
+ at x [38.815] l.16054 - line_break - e-TeX penalties
procedure line_break(@!final_widow_penalty:integer);
@y
procedure line_break(@!d:boolean);
@z
%---------------------------------------
- at x [38] m.815 l.16046 - e-TeX basic
+ at x [38.815] l.16064 - e-TeX basic
end;
@y
end;
@@ -1830,7 +1830,7 @@
@t\4@>@<Declare \eTeX\ procedures for use by |main_control|@>
@z
%---------------------------------------
- at x [38] m.816 l.16066 - e-TeX last_line_fit
+ at x [38.816] l.16084 - e-TeX last_line_fit
link(tail):=new_param_glue(par_fill_skip_code);
@y
link(tail):=new_param_glue(par_fill_skip_code);
@@ -1837,13 +1837,13 @@
last_line_fill:=link(tail);
@z
%---------------------------------------
- at x [38] m.819 l.16131 - e-TeX last_line_fit
+ at x [38.819] l.16149 - e-TeX last_line_fit
@d active_node_size=3 {number of words in active nodes}
@y
@d active_node_size_normal=3 {number of words in normal active nodes}
@z
%---------------------------------------
- at x [38] m.827 l.16294 - e-TeX last_line_fit
+ at x [38.827] l.16314 - e-TeX last_line_fit
background[6]:=shrink(q)+shrink(r);
@y
background[6]:=shrink(q)+shrink(r);
@@ -1850,13 +1850,13 @@
@<Check for special treatment of last line of paragraph@>;
@z
%---------------------------------------
- at x [38] m.829 l.16345 try_break - e-TeX last_line_fit
+ at x [38.829] l.16365 - try_break - e-TeX last_line_fit
label exit,done,done1,continue,deactivate;
@y
label exit,done,done1,continue,deactivate,found,not_found;
@z
%---------------------------------------
- at x [38] m.845 l.16637 - e-TeX last_line_fit
+ at x [38.845] l.16657 - e-TeX last_line_fit
total_demerits(q):=minimal_demerits[fit_class];
@y
total_demerits(q):=minimal_demerits[fit_class];
@@ -1864,7 +1864,7 @@
@<Store \(a)additional data in the new active node@>;
@z
%---------------------------------------
- at x [38] m.846 l.16650 - e-TeX last_line_fit
+ at x [38.846] l.16670 - e-TeX last_line_fit
print(" t="); print_int(total_demerits(q));
@y
print(" t="); print_int(total_demerits(q));
@@ -1871,7 +1871,7 @@
if do_last_line_fit then @<Print additional data in the new active node@>;
@z
%---------------------------------------
- at x [38] m.851 l.16749 - e-TeX last_line_fit
+ at x [38.851] l.16769 - e-TeX last_line_fit
if (b>inf_bad)or(pi=eject_penalty) then
@y
if do_last_line_fit then @<Adjust \(t)the additional data for last line@>;
@@ -1879,7 +1879,7 @@
if (b>inf_bad)or(pi=eject_penalty) then
@z
%---------------------------------------
- at x [38] m.852 l.16773 - e-TeX last_line_fit
+ at x [38.852] l.16793 - e-TeX last_line_fit
begin b:=0; fit_class:=decent_fit; {infinite stretch}
@y
begin if do_last_line_fit then
@@ -1890,7 +1890,7 @@
b:=0; fit_class:=decent_fit; {infinite stretch}
@z
%---------------------------------------
- at x [38] m.855 l.16830 - e-TeX last_line_fit
+ at x [38.855] l.16850 - e-TeX last_line_fit
best_place[fit_class]:=break_node(r); best_pl_line[fit_class]:=l;
@y
best_place[fit_class]:=break_node(r); best_pl_line[fit_class]:=l;
@@ -1898,7 +1898,7 @@
@<Store \(a)additional data for this feasible break@>;
@z
%---------------------------------------
- at x [39] m.863 l.17003 - e-TeX last_line_fit
+ at x [39.863] l.17023 - e-TeX last_line_fit
end;@+tats@/
@y
end;@+tats@/
@@ -1905,7 +1905,7 @@
if do_last_line_fit then @<Adjust \(t)the final line of the paragraph@>;
@z
%---------------------------------------
- at x [39] m.864 l.17014 - e-TeX last_line_fit
+ at x [39.864] l.17034 - e-TeX last_line_fit
line_number(q):=prev_graf+1; total_demerits(q):=0; link(active):=q;
@y
line_number(q):=prev_graf+1; total_demerits(q):=0; link(active):=q;
@@ -1913,7 +1913,7 @@
@<Initialize additional fields of the first active node@>;
@z
%---------------------------------------
- at x [39] m.866 l.17064 - e-TeX TeXXeT
+ at x [39.866] l.17084 - e-TeX TeXXeT
math_node: begin auto_breaking:=(subtype(cur_p)=after); kern_break;
@y
math_node: begin if subtype(cur_p)<L_code then auto_breaking:=odd(subtype(cur_p));
@@ -1920,19 +1920,19 @@
kern_break;
@z
%---------------------------------------
- at x [39] m.876 l.17226 - e-TeX penalties
+ at x [39.876] l.17246 - e-TeX penalties
post_line_break(final_widow_penalty)
@y
post_line_break(d)
@z
%---------------------------------------
- at x [39] m.877 l.17240 post_line_break - e-TeX penalties
+ at x [39.877] l.17260 - post_line_break - e-TeX penalties
procedure post_line_break(@!final_widow_penalty:integer);
@y
procedure post_line_break(@!d:boolean);
@z
%---------------------------------------
- at x [39] m.877 l.17250 post_line_break - e-TeX TeXXeT
+ at x [39.877] l.17270 - post_line_break - e-TeX TeXXeT
begin @<Reverse the links of the relevant passive nodes, setting |cur_p| to the
@y
@!LR_ptr:pointer; {stack of LR codes}
@@ -1940,7 +1940,7 @@
@<Reverse the links of the relevant passive nodes, setting |cur_p| to the
@z
%---------------------------------------
- at x [39] m.877 l.17263 post_line_break - e-TeX TeXXeT
+ at x [39.877] l.17283 - post_line_break - e-TeX TeXXeT
prev_graf:=best_line-1;
@y
prev_graf:=best_line-1;
@@ -1947,7 +1947,7 @@
LR_save:=LR_ptr;
@z
%---------------------------------------
- at x [39] m.879 l.17293 - e-TeX TeXXeT
+ at x [39.879] l.17313 - e-TeX TeXXeT
r:=q; {now |type(q)=glue_node|, |kern_node|, |math_node|, or |penalty_node|}
@y
r:=q; {now |type(q)=glue_node|, |kern_node|, |math_node|, or |penalty_node|}
@@ -1955,7 +1955,7 @@
@<Adjust \(t)the LR stack for the |post_line_break| routine@>;
@z
%---------------------------------------
- at x [39] m.880 l.17310 - e-TeX TeXXeT
+ at x [39.880] l.17330 - e-TeX TeXXeT
@<Modify the end of the line to reflect the nature of the break and to include
\.{\\rightskip}; also set the proper value of |disc_break|@>;
@y
@@ -1967,7 +1967,7 @@
if TeXXeT_en then @<Insert LR nodes at the end of the current line@>;
@z
%---------------------------------------
- at x [39] m.881 l.17333 - e-TeX TeXXeT
+ at x [39.881] l.17353 - e-TeX TeXXeT
else if (type(q)=math_node)or(type(q)=kern_node) then width(q):=0;
@y
else if type(q)=kern_node then width(q):=0
@@ -1977,7 +1977,7 @@
end;
@z
%---------------------------------------
- at x [39] m.890 l.17427 - e-TeX penalties
+ at x [39.890] l.17447 - e-TeX penalties
begin pen:=inter_line_penalty;
if cur_line=prev_graf+1 then pen:=pen+club_penalty;
if cur_line+2=best_line then pen:=pen+final_widow_penalty;
@@ -2008,7 +2008,7 @@
else pen:=pen+widow_penalty;
@z
%---------------------------------------
- at x [40] m.891 l.17455 - e-TeX TeXXeT
+ at x [40.891] l.17475 - e-TeX TeXXeT
implicit kern nodes, and $p_m$ is a glue or penalty or insertion or adjust
@y
implicit kern or text direction nodes, and $p_m$ is a glue or penalty or
@@ -2015,7 +2015,7 @@
insertion or adjust
@z
%---------------------------------------
- at x [40] m.891 l.17494 - e-TeX hyph_codes
+ at x [40.891] l.17514 - e-TeX hyph_codes
cur_lang:=init_cur_lang; l_hyf:=init_l_hyf; r_hyf:=init_r_hyf;
@y
cur_lang:=init_cur_lang; l_hyf:=init_l_hyf; r_hyf:=init_r_hyf;
@@ -2022,7 +2022,7 @@
set_hyph_index;
@z
%---------------------------------------
- at x [40] m.896 l.17557 - e-TeX TeXXeT
+ at x [40.896] l.17578 - e-TeX TeXXeT
else if (type(s)=kern_node)and(subtype(s)=normal) then goto continue
@y
else if (type(s)=kern_node)and(subtype(s)=normal) then goto continue
@@ -2029,7 +2029,7 @@
else if (type(s)=math_node)and(subtype(s)>=L_code) then goto continue
@z
%---------------------------------------
- at x [40] m.896 l.17563 - e-TeX hyph_codes
+ at x [40.896] l.17584 - e-TeX hyph_codes
if lc_code(c)<>0 then
if (lc_code(c)=c)or(uc_hyph>0) then goto done2
@y
@@ -2038,7 +2038,7 @@
if (hc[0]=c)or(uc_hyph>0) then goto done2
@z
%---------------------------------------
- at x [40] m.897 l.17580 - e-TeX hyph_codes
+ at x [40.897] l.17601 - e-TeX hyph_codes
if lc_code(c)=0 then goto done3;
if hn=63 then goto done3;
hb:=s; incr(hn); hu[hn]:=c; hc[hn]:=lc_code(c); hyf_bchar:=non_char;
@@ -2049,7 +2049,7 @@
hb:=s; incr(hn); hu[hn]:=c; hc[hn]:=hc[0]; hyf_bchar:=non_char;
@z
%---------------------------------------
- at x [40] m.898 l.17606 - e-TeX hyph_codes
+ at x [40.898] l.17627 - e-TeX hyph_codes
if lc_code(c)=0 then goto done3;
if j=63 then goto done3;
incr(j); hu[j]:=c; hc[j]:=lc_code(c);@/
@@ -2060,7 +2060,7 @@
incr(j); hu[j]:=c; hc[j]:=hc[0];@/
@z
%---------------------------------------
- at x [40] m.899 l.17623 - e-TeX TeXXeT
+ at x [40.899] l.17644 - e-TeX TeXXeT
othercases goto done1
@y
math_node: if subtype(s)>=L_code then goto done4 at +else goto done1;
@@ -2067,13 +2067,13 @@
othercases goto done1
@z
%---------------------------------------
- at x [42] m.934 l.18245 new_hyph_exceptions - e-TeX hyph_codes
+ at x [42.934] l.18266 - new_hyph_exceptions - e-TeX hyph_codes
label reswitch, exit, found, not_found;
@y
label reswitch, exit, found, not_found, not_found1;
@z
%---------------------------------------
- at x [42] m.934 l.18255 new_hyph_exceptions - e-TeX hyph_codes
+ at x [42.934] l.18276 - new_hyph_exceptions - e-TeX hyph_codes
set_cur_lang;
@y
set_cur_lang;
@@ -2085,7 +2085,7 @@
not_found1:
@z
%---------------------------------------
- at x [42] m.937 l.18287 - e-TeX hyph_codes
+ at x [42.937] l.18308 - e-TeX hyph_codes
else begin if lc_code(cur_chr)=0 then
@y
else begin set_lc_code(cur_chr);
@@ -2092,13 +2092,13 @@
if hc[0]=0 then
@z
%---------------------------------------
- at x [42] m.937 l.18295 - e-TeX hyph_codes
+ at x [42.937] l.18316 - e-TeX hyph_codes
begin incr(n); hc[n]:=lc_code(cur_chr);
@y
begin incr(n); hc[n]:=hc[0];
@z
%---------------------------------------
- at x [43] m.952 l.18583 - e-TeX hyph_codes
+ at x [43.952] l.18604 - e-TeX hyph_codes
trie_root:=compress_trie(trie_root); {identify equivalent subtries}
@y
hyph_root:=compress_trie(hyph_root);
@@ -2105,13 +2105,13 @@
trie_root:=compress_trie(trie_root); {identify equivalent subtries}
@z
%---------------------------------------
- at x [43] m.958 l.18671 - e-TeX hyph_codes
+ at x [43.958] l.18692 - e-TeX hyph_codes
if trie_root=0 then {no patterns were given}
@y
if trie_max=0 then {no patterns were given}
@z
%---------------------------------------
- at x [43] m.958 l.18675 - e-TeX hyph_codes
+ at x [43.958] l.18696 - e-TeX hyph_codes
else begin trie_fix(trie_root); {this fixes the non-holes in |trie|}
@y
else begin if hyph_root>0 then trie_fix(hyph_root);
@@ -2118,7 +2118,7 @@
if trie_root>0 then trie_fix(trie_root); {this fixes the non-holes in |trie|}
@z
%---------------------------------------
- at x [43] m.960 l.18718 new_patterns - e-TeX hyph_codes
+ at x [43.960] l.18739 - new_patterns - e-TeX hyph_codes
brace@>;
@y
brace@>;
@@ -2126,7 +2126,7 @@
@<Store hyphenation codes for current language@>;
@z
%---------------------------------------
- at x [43] m.966 l.18825 init_trie - e-TeX hyph_codes
+ at x [43.966] l.18846 - init_trie - e-TeX hyph_codes
@<Move the data into |trie|@>;
@y
if hyph_root<>0 then @<Pack all stored |hyph_codes|@>;
@@ -2133,7 +2133,7 @@
@<Move the data into |trie|@>;
@z
%---------------------------------------
- at x [44] m.968 l.18841 - e-TeX saved_items
+ at x [44.968] l.18862 - e-TeX saved_items
whenever this is possible without backspacing.
@y
whenever this is possible without backspacing.
@@ -2142,7 +2142,7 @@
otherwise they are collected in a list starting at |split_disc|.
@z
%---------------------------------------
- at x [44] m.968 l.18848 prune_page_top - e-TeX saved_items
+ at x [44.968] l.18869 - prune_page_top - e-TeX saved_items
@p function prune_page_top(@!p:pointer):pointer; {adjust top after page break}
var prev_p:pointer; {lags one step behind |p|}
@!q:pointer; {temporary variable for list manipulation}
@@ -2153,7 +2153,7 @@
@!q,@!r:pointer; {temporary variables for list manipulation}
@z
%---------------------------------------
- at x [44] m.968 l.18859 prune_page_top - e-TeX saved_items
+ at x [44.968] l.18880 - prune_page_top - e-TeX saved_items
link(prev_p):=p; flush_node_list(q);
@y
link(prev_p):=p;
@@ -2164,7 +2164,7 @@
else flush_node_list(q);
@z
%---------------------------------------
- at x [44] m.977 l.19026 vsplit - e-TeX marks, sparse arrays
+ at x [44.977] l.19047 - vsplit - e-TeX marks, sparse arrays
@p function vsplit(@!n:eight_bits; @!h:scaled):pointer;
@y
@p @t\4@>@<Declare the function called |do_marks|@>@;
@@ -2171,13 +2171,13 @@
function vsplit(@!n:halfword; @!h:scaled):pointer;
@z
%---------------------------------------
- at x [44] m.977 l.19032 vsplit - e-TeX sparse arrays
+ at x [44.977] l.19053 - vsplit - e-TeX sparse arrays
begin v:=box(n);
@y
begin cur_val:=n; fetch_box(v);
@z
%---------------------------------------
- at x [44] m.977 l.19033 vsplit - e-TeX marks, saved_items
+ at x [44.977] l.19054 - vsplit - e-TeX marks, saved_items
if split_first_mark<>null then
@y
flush_node_list(split_disc); split_disc:=null;
@@ -2186,7 +2186,7 @@
if split_first_mark<>null then
@z
%---------------------------------------
- at x [44] m.977 l.19041 vsplit - e-TeX saved_items
+ at x [44.977] l.19062 - vsplit - e-TeX saved_items
q:=prune_page_top(q); p:=list_ptr(v); free_node(v,box_node_size);
@y
q:=prune_page_top(q,saving_vdiscards>0);
@@ -2193,7 +2193,7 @@
p:=list_ptr(v); free_node(v,box_node_size);
@z
%---------------------------------------
- at x [44] m.977 l.19042 vsplit - e-TeX sparse arrays
+ at x [44.977] l.19063 - vsplit - e-TeX sparse arrays
if q=null then box(n):=null {the |eq_level| of the box stays the same}
else box(n):=vpack(q,natural);
@y
@@ -2201,7 +2201,7 @@
change_box(q); {the |eq_level| of the box stays the same}
@z
%---------------------------------------
- at x [44] m.979 l.19067 - e-TeX marks
+ at x [44.979] l.19088 - e-TeX marks
if split_first_mark=null then
@y
if mark_class(p)<>0 then @<Update the current marks for |vsplit|@>
@@ -2208,7 +2208,7 @@
else if split_first_mark=null then
@z
%---------------------------------------
- at x [45] m.982 l.19201 - e-TeX last_node_type
+ at x [45.982] l.19222 - e-TeX last_node_type
The variables |last_penalty| and |last_kern| are similar. And
@y
The variables |last_penalty|, |last_kern|, and |last_node_type|
@@ -2215,7 +2215,7 @@
are similar. And
@z
%---------------------------------------
- at x [45] m.982 l.19214 - e-TeX last_node_type
+ at x [45.982] l.19235 - e-TeX last_node_type
@!last_kern:scaled; {used to implement \.{\\lastkern}}
@y
@!last_kern:scaled; {used to implement \.{\\lastkern}}
@@ -2222,7 +2222,7 @@
@!last_node_type:integer; {used to implement \.{\\lastnodetype}}
@z
%---------------------------------------
- at x [45] m.991 l.19353 - e-TeX last_node_type
+ at x [45.991] l.19375 - e-TeX last_node_type
last_glue:=max_halfword; last_penalty:=0; last_kern:=0;
@y
last_glue:=max_halfword; last_penalty:=0; last_kern:=0;
@@ -2229,7 +2229,7 @@
last_node_type:=-1;
@z
%---------------------------------------
- at x [45] m.996 l.19420 - e-TeX last_node_type
+ at x [45.996] l.19442 - e-TeX last_node_type
last_penalty:=0; last_kern:=0;
@y
last_penalty:=0; last_kern:=0;
@@ -2236,7 +2236,7 @@
last_node_type:=type(p)+1;
@z
%---------------------------------------
- at x [45] m.999 l.19454 - e-TeX saved_items
+ at x [45.999] l.19479 - e-TeX saved_items
link(contrib_head):=link(p); link(p):=null; flush_node_list(p)
@y
link(contrib_head):=link(p); link(p):=null;
@@ -2247,7 +2247,7 @@
else flush_node_list(p)
@z
%---------------------------------------
- at x [45] m.1012 l.19697 fire_up - e-TeX marks
+ at x [45.1012] l.19719 - fire_up - e-TeX marks
if bot_mark<>null then
@y
if sa_mark<>null then
@@ -2255,7 +2255,7 @@
if bot_mark<>null then
@z
%---------------------------------------
- at x [45] m.1012 l.19705 fire_up - e-TeX marks
+ at x [45.1012] l.19727 - fire_up - e-TeX marks
if (top_mark<>null)and(first_mark=null) then
@y
if sa_mark<>null then
@@ -2263,7 +2263,7 @@
if (top_mark<>null)and(first_mark=null) then
@z
%---------------------------------------
- at x [45] m.1014 l.19742 - e-TeX marks
+ at x [45.1014] l.19764 - e-TeX marks
else if type(p)=mark_node then @<Update the values of
@y
else if type(p)=mark_node then
@@ -2271,13 +2271,13 @@
else @<Update the values of
@z
%---------------------------------------
- at x [45] m.1021 l.19854 - e-TeX saved_items
+ at x [45.1021] l.19876 - e-TeX saved_items
ins_ptr(p):=prune_page_top(broken_ptr(r));
@y
ins_ptr(p):=prune_page_top(broken_ptr(r),false);
@z
%---------------------------------------
- at x [45] m.1023 l.19890 - e-TeX saved_items
+ at x [45.1023] l.19912 - e-TeX saved_items
ship_out(box(255)); box(255):=null;
@y
flush_node_list(page_disc); page_disc:=null;
@@ -2284,7 +2284,7 @@
ship_out(box(255)); box(255):=null;
@z
%---------------------------------------
- at x [45] m.1026 l.19932 - e-TeX saved_items
+ at x [45.1026] l.19954 - e-TeX saved_items
pop_nest; build_page;
@y
flush_node_list(page_disc); page_disc:=null;
@@ -2291,7 +2291,7 @@
pop_nest; build_page;
@z
%---------------------------------------
- at x [47] m.1070 l.20735 normal_paragraph - e-TeX penalties
+ at x [47.1070] l.20760 - normal_paragraph - e-TeX penalties
if par_shape_ptr<>null then eq_define(par_shape_loc,shape_ref,null);
@y
if par_shape_ptr<>null then eq_define(par_shape_loc,shape_ref,null);
@@ -2299,7 +2299,7 @@
eq_define(inter_line_penalties_loc,shape_ref,null);
@z
%---------------------------------------
- at x [47] m.1071 l.20756 - e-TeX sparse arrays
+ at x [47.1071] l.20781 - e-TeX sparse arrays
|box_flag+255| represent `\.{\\setbox0}' through `\.{\\setbox255}';
codes |box_flag+256| through |box_flag+511| represent `\.{\\global\\setbox0}'
through `\.{\\global\\setbox255}';
@@ -2313,7 +2313,7 @@
through |leader_flag+2| represent `\.{\\leaders}', `\.{\\cleaders}',
@z
%---------------------------------------
- at x [47] m.1071 l.20770 - e-TeX sparse arrays
+ at x [47.1071] l.20795 - e-TeX sparse arrays
@d ship_out_flag==box_flag+512 {context code for `\.{\\shipout}'}
@d leader_flag==box_flag+513 {context code for `\.{\\leaders}'}
@y
@@ -2322,7 +2322,7 @@
@d leader_flag==@'10000200001 {context code for `\.{\\leaders}'}
@z
%---------------------------------------
- at x [47] m.1075 l.20853 box_end - e-TeX sparse arrays
+ at x [47.1075] l.20878 - box_end - e-TeX sparse arrays
var p:pointer; {|ord_noad| for new box in math mode}
@y
var p:pointer; {|ord_noad| for new box in math mode}
@@ -2329,7 +2329,7 @@
@!a:small_number; {global prefix}
@z
%---------------------------------------
- at x [47] m.1077 l.20891 - e-TeX sparse arrays
+ at x [47.1077] l.20916 - e-TeX sparse arrays
if box_context<box_flag+256 then
eq_define(box_base-box_flag+box_context,box_ref,cur_box)
else geq_define(box_base-box_flag-256+box_context,box_ref,cur_box)
@@ -2344,7 +2344,7 @@
end
@z
%---------------------------------------
- at x [47] m.1079 l.20920 begin_box - e-TeX TeXXeT
+ at x [47.1079] l.20945 - begin_box - e-TeX TeXXeT
@!m:quarterword; {the length of a replacement list}
@y
@!r:pointer; {running behind |p|}
@@ -2353,7 +2353,7 @@
@!m:quarterword; {the length of a replacement list}
@z
%---------------------------------------
- at x [47] m.1079 l.20922 begin_box - e-TeX sparse arrays
+ at x [47.1079] l.20947 - begin_box - e-TeX sparse arrays
@!n:eight_bits; {a box number}
begin case cur_chr of
box_code: begin scan_eight_bit_int; cur_box:=box(cur_val);
@@ -2369,7 +2369,7 @@
copy_code: begin scan_register_num; fetch_box(q); cur_box:=copy_node_list(q);
@z
%---------------------------------------
- at x [47] m.1080 l.20940 - e-TeX TeXXeT
+ at x [47.1080] l.20965 - e-TeX TeXXeT
@<If the current list ends with a box node, delete it...@>=
@y
@d fetch_effective_tail_eTeX(#)== {extract |tx|,
@@ -2397,7 +2397,7 @@
@<If the current list ends with a box node, delete it...@>=
@z
%---------------------------------------
- at x [47] m.1080 l.20950 - e-TeX TeXXeT
+ at x [47.1080] l.20975 - e-TeX TeXXeT
else begin if not is_char_node(tail) then
if (type(tail)=hlist_node)or(type(tail)=vlist_node) then
@<Remove the last box, unless it's part of a discretionary@>;
@@ -2410,7 +2410,7 @@
done:end;
@z
%---------------------------------------
- at x [47] m.1081 l.20957 - e-TeX TeXXeT
+ at x [47.1081] l.20982 - e-TeX TeXXeT
begin q:=head;
repeat p:=q;
if not is_char_node(q) then if type(q)=disc_node then
@@ -2428,13 +2428,13 @@
end
@z
%---------------------------------------
- at x [47] m.1082 l.20972 - e-TeX sparse arrays
+ at x [47.1082] l.20997 - e-TeX sparse arrays
begin scan_eight_bit_int; n:=cur_val;
@y
begin scan_register_num; n:=cur_val;
@z
%---------------------------------------
- at x [47] m.1096 l.21156 - e-TeX penalties, TeXXeT
+ at x [47.1096] l.21181 - e-TeX penalties, TeXXeT
else line_break(widow_penalty);
@y
else line_break(false);
@@ -2443,7 +2443,7 @@
end;
@z
%---------------------------------------
- at x [47] m.1101 l.21212 make_mark - e-TeX marks
+ at x [47.1101] l.21237 - make_mark - e-TeX marks
begin p:=scan_toks(false,true); p:=get_node(small_node_size);
@y
@!c:halfword; {the mark class}
@@ -2454,7 +2454,7 @@
mark_class(p):=c;
@z
%---------------------------------------
- at x [47] m.1105 l.21246 delete_last - e-TeX TeXXeT
+ at x [47.1105] l.21271 - delete_last - e-TeX TeXXeT
@!m:quarterword; {the length of a replacement list}
@y
@!r:pointer; {running behind |p|}
@@ -2463,7 +2463,7 @@
@!m:quarterword; {the length of a replacement list}
@z
%---------------------------------------
- at x [47] m.1105 l.21250 delete_last - e-TeX TeXXeT
+ at x [47.1105] l.21275 - delete_last - e-TeX TeXXeT
else begin if not is_char_node(tail) then if type(tail)=cur_chr then
begin q:=head;
repeat p:=q;
@@ -2481,7 +2481,7 @@
flush_node_list(tx);
@z
%---------------------------------------
- at x [47] m.1108 l.21299 - e-TeX saved_items
+ at x [47.1108] l.21324 - e-TeX saved_items
un_vbox: if chr_code=copy_code then print_esc("unvcopy")
@y
un_vbox: if chr_code=copy_code then print_esc("unvcopy")
@@ -2488,13 +2488,13 @@
@<Cases of |un_vbox| for |print_cmd_chr|@>@/
@z
%---------------------------------------
- at x [47] m.1110 l.21309 unpackage - e-TeX saved_items
+ at x [47.1110] l.21334 - unpackage - e-TeX saved_items
label exit;
@y
label done, exit;
@z
%---------------------------------------
- at x [47] m.1110 l.21312 unpackage - e-TeX saved_items, sparse arrays
+ at x [47.1110] l.21337 - unpackage - e-TeX saved_items, sparse arrays
begin c:=cur_chr; scan_eight_bit_int; p:=box(cur_val);
@y
begin if cur_chr>copy_code then @<Handle saved items and |goto done|@>;
@@ -2501,13 +2501,13 @@
c:=cur_chr; scan_register_num; fetch_box(p);
@z
%---------------------------------------
- at x [47] m.1110 l.21324 unpackage - e-TeX sparse arrays
+ at x [47.1110] l.21349 - unpackage - e-TeX sparse arrays
else begin link(tail):=list_ptr(p); box(cur_val):=null;
@y
else begin link(tail):=list_ptr(p); change_box(null);
@z
%---------------------------------------
- at x [47] m.1110 l.21327 unpackage - e-TeX saved_items
+ at x [47.1110] l.21352 - unpackage - e-TeX saved_items
while link(tail)<>null do tail:=link(tail);
@y
done:
@@ -2514,7 +2514,7 @@
while link(tail)<>null do tail:=link(tail);
@z
%---------------------------------------
- at x [47] m.1130 l.21599 - e-TeX TeXXeT
+ at x [47.1130] l.21624 - e-TeX TeXXeT
vmode+halign,hmode+valign:init_align;
@y
vmode+halign:init_align;
@@ -2521,7 +2521,7 @@
hmode+valign:@<Cases of |main_control| for |hmode+valign|@>@; init_align;
@z
%---------------------------------------
- at x [48] m.1138 l.21678 init_math - e-TeX TeXXeT
+ at x [48.1138] l.21703 - init_math - e-TeX TeXXeT
procedure init_math;
label reswitch,found,not_found,done;
var w:scaled; {new or partial |pre_display_size|}
@@ -2534,7 +2534,7 @@
@!x:integer; {new |pre_display_direction|}
@z
%---------------------------------------
- at x [48] m.1145 l.21736 - e-TeX TeXXeT, penalties
+ at x [48.1145] l.21761 - e-TeX TeXXeT, penalties
begin if head=tail then {`\.{\\noindent\$\$}' or `\.{\$\${ }\$\$}'}
begin pop_nest; w:=-max_dimen;
end
@@ -2546,7 +2546,7 @@
else begin line_break(true);@/
@z
%---------------------------------------
- at x [48] m.1145 l.21749 - e-TeX TeXXeT
+ at x [48.1145] l.21774 - e-TeX TeXXeT
eq_word_define(dimen_base+pre_display_size_code,w);
@y
eq_word_define(dimen_base+pre_display_size_code,w);
@@ -2554,7 +2554,7 @@
if eTeX_ex then eq_word_define(int_base+pre_display_direction_code,x);
@z
%---------------------------------------
- at x [48] m.1146 l.21757 - e-TeX TeXXeT
+ at x [48.1146] l.21782 - e-TeX TeXXeT
v:=shift_amount(just_box)+2*quad(cur_font); w:=-max_dimen;
p:=list_ptr(just_box);
@y
@@ -2561,7 +2561,7 @@
@<Prepare for display after a non-empty paragraph@>;
@z
%---------------------------------------
- at x [48] m.1146 l.21772 - e-TeX TeXXeT
+ at x [48.1146] l.21797 - e-TeX TeXXeT
done:
@y
done:
@@ -2568,7 +2568,7 @@
@<Finish the natural width computation@>
@z
%---------------------------------------
- at x [48] m.1147 l.21783 - e-TeX TeXXeT
+ at x [48.1147] l.21808 - e-TeX TeXXeT
kern_node,math_node: d:=width(p);
@y
kern_node: d:=width(p);
@@ -2575,7 +2575,7 @@
@t\4@>@<Cases of `Let |d| be the natural width' that need special treatment@>@;
@z
%---------------------------------------
- at x [48] m.1185 l.22292 - e-TeX middle
+ at x [48.1185] l.22317 - e-TeX middle
if type(q)<>left_noad then confusion("right");
@:this can't happen right}{\quad right@>
info(numerator(incompleat_noad)):=link(q);
@@ -2587,7 +2587,7 @@
link(delim_ptr):=incompleat_noad; link(incompleat_noad):=p;
@z
%---------------------------------------
- at x [48] m.1189 l.22337 - e-TeX middle
+ at x [48.1189] l.22362 - e-TeX middle
else print_esc("right");
@y
@/@<Cases of |left_right| for |print_cmd_chr|@>@/
@@ -2594,7 +2594,7 @@
else print_esc("right");
@z
%---------------------------------------
- at x [48] m.1191 l.22346 math_left_right - e-TeX middle
+ at x [48.1191] l.22371 - math_left_right - e-TeX middle
begin t:=cur_chr;
if (t=right_noad)and(cur_group<>math_left_group) then
@y
@@ -2603,7 +2603,7 @@
if (t<>left_noad)and(cur_group<>math_left_group) then
@z
%---------------------------------------
- at x [48] m.1191 l.22351 math_left_right - e-TeX middle
+ at x [48.1191] l.22376 - math_left_right - e-TeX middle
if t=left_noad then
begin push_math(math_left_group); link(head):=p; tail:=p;
end
@@ -2622,13 +2622,13 @@
else begin
@z
%---------------------------------------
- at x [48] m.1191 l.22357 math_left_right - e-TeX middle
+ at x [48.1191] l.22382 - math_left_right - e-TeX middle
info(nucleus(tail)):=p;
@y
info(nucleus(tail)):=q;
@z
%---------------------------------------
- at x [48] m.1192 l.22365 - e-TeX middle
+ at x [48.1192] l.22390 - e-TeX middle
print_err("Extra "); print_esc("right");
@.Extra \\right.@>
help1("I'm ignoring a \right that had no matching \left.");
@@ -2645,7 +2645,7 @@
end;
@z
%---------------------------------------
- at x [48] m.1194 l.22380 after_math - e-TeX TeXXeT
+ at x [48.1194] l.22405 - after_math - e-TeX TeXXeT
procedure after_math;
@y
@t\4@>@<Declare subprocedures for |after_math|@>@;
@@ -2652,7 +2652,7 @@
procedure after_math;
@z
%---------------------------------------
- at x [48] m.1194 l.22387 after_math - e-TeX TeXXeT
+ at x [48.1194] l.22412 - after_math - e-TeX TeXXeT
begin danger:=false;
@y
begin danger:=false;
@@ -2659,7 +2659,7 @@
@<Retrieve the prototype box@>;
@z
%---------------------------------------
- at x [48] m.1194 l.22394 after_math - e-TeX TeXXeT
+ at x [48.1194] l.22419 - after_math - e-TeX TeXXeT
mlist_to_hlist; a:=hpack(link(temp_head),natural);
@y
mlist_to_hlist; a:=hpack(link(temp_head),natural);
@@ -2666,7 +2666,7 @@
set_box_lr(a)(dlist);
@z
%---------------------------------------
- at x [48] m.1194 l.22397 after_math - e-TeX TeXXeT
+ at x [48.1194] l.22422 - after_math - e-TeX TeXXeT
danger:=false;
@y
danger:=false;
@@ -2673,7 +2673,7 @@
@<Retrieve the prototype box@>;
@z
%---------------------------------------
- at x [48] m.1199 l.22484 - e-TeX TeXXeT
+ at x [48.1199] l.22509 - e-TeX TeXXeT
w:=width(b); z:=display_width; s:=display_indent;
@y
w:=width(b); z:=display_width; s:=display_indent;
@@ -2680,7 +2680,7 @@
if pre_display_direction<0 then s:=-s-z;
@z
%---------------------------------------
- at x [48] m.1199 l.22499 - e-TeX TeXXeT
+ at x [48.1199] l.22524 - e-TeX TeXXeT
resume_after_display
@y
@<Flush the prototype box@>;
@@ -2687,7 +2687,7 @@
resume_after_display
@z
%---------------------------------------
- at x [48] m.1202 l.22541 - e-TeX TeXXeT
+ at x [48.1202] l.22566 - e-TeX TeXXeT
d:=half(z-w);
@y
set_box_lr(b)(dlist);
@@ -2694,19 +2694,19 @@
d:=half(z-w);
@z
%---------------------------------------
- at x [48] m.1203 l.22562 - e-TeX TeXXeT
+ at x [48.1203] l.22587 - e-TeX TeXXeT
begin shift_amount(a):=s; append_to_vlist(a);
@y
begin app_display(j,a,0);
@z
%---------------------------------------
- at x [48] m.1204 l.22572 - e-TeX TeXXeT
+ at x [48.1204] l.22602 - e-TeX TeXXeT
shift_amount(b):=s+d; append_to_vlist(b)
@y
app_display(j,b,d)
@z
%---------------------------------------
- at x [48] m.1205 l.22582 - e-TeX TeXXeT
+ at x [48.1205] l.22607 - e-TeX TeXXeT
shift_amount(a):=s+z-width(a);
append_to_vlist(a);
@y
@@ -2713,7 +2713,7 @@
app_display(j,a,z-width(a));
@z
%---------------------------------------
- at x [48] m.1206 l.22601 - e-TeX TeXXeT
+ at x [48.1206] l.22626 - e-TeX TeXXeT
pop_nest;
@y
flush_node_list(LR_box);
@@ -2720,7 +2720,7 @@
pop_nest;
@z
%---------------------------------------
- at x [49] m.1208 l.22626 - e-TeX protected
+ at x [49.1208] l.22651 - e-TeX protected
control sequence can be defined to be `\.{\\long}' or `\.{\\outer}', and
it might or might not be expanded. The prefixes `\.{\\global}', `\.{\\long}',
@y
@@ -2729,7 +2729,7 @@
`\.{\\global}', `\.{\\long}', `\.{\\protected}',
@z
%---------------------------------------
- at x [49] m.1209 l.22652 - e-TeX protected
+ at x [49.1209] l.22677 - e-TeX protected
else print_esc("global");
@y
@/@<Cases of |prefix| for |print_cmd_chr|@>@/
@@ -2736,7 +2736,7 @@
else print_esc("global");
@z
%---------------------------------------
- at x [49] m.1211 l.22714 prefixed_command - e-TeX tracing
+ at x [49.1211] l.22739 - prefixed_command - e-TeX tracing
@<Discard erroneous prefixes and |return|@>;
@y
@<Discard erroneous prefixes and |return|@>;
@@ -2743,7 +2743,7 @@
if tracing_commands>2 then if eTeX_ex then show_cur_cmd_chr;
@z
%---------------------------------------
- at x [49] m.1212 l.22730 - e-TeX protected
+ at x [49.1212] l.22755 - e-TeX protected
help1("I'll pretend you didn't say \long or \outer or \global.");
@y
help1("I'll pretend you didn't say \long or \outer or \global.");
@@ -2751,7 +2751,7 @@
"I'll pretend you didn't say \long or \outer or \global or \protected.";
@z
%---------------------------------------
- at x [49] m.1213 l.22735 - e-TeX protected
+ at x [49.1213] l.22760 - e-TeX protected
if (cur_cmd<>def)and(a mod 4<>0) then
begin print_err("You can't use `"); print_esc("long"); print("' or `");
print_esc("outer"); print("' with `");
@@ -2772,12 +2772,12 @@
print("' with `");
@z
%---------------------------------------
- at x [49] m.1213 l.22740 - e-TeX protected
+ at x [49.1213] l.22765 - e-TeX protected
help1("I'll pretend you didn't say \long or \outer here.");
@y
@z
%---------------------------------------
- at x [49] m.1218 l.22798 - e-TeX protected
+ at x [49.1218] l.22824 - e-TeX protected
q:=scan_toks(true,e); define(p,call+(a mod 4),def_ref);
@y
q:=scan_toks(true,e);
@@ -2788,7 +2788,7 @@
define(p,call+(a mod 4),def_ref);
@z
%---------------------------------------
- at x [49] m.1221 l.22826 - e-TeX sparse arrays
+ at x [49.1221] l.22852 - e-TeX sparse arrays
if cur_cmd>=call then add_token_ref(cur_chr);
@y
if cur_cmd>=call then add_token_ref(cur_chr)
@@ -2797,7 +2797,7 @@
add_sa_ref(cur_chr);
@z
%---------------------------------------
- at x [49] m.1224 l.22889 - e-TeX sparse arrays
+ at x [49.1224] l.22915 - e-TeX sparse arrays
othercases begin scan_eight_bit_int;
@y
othercases begin scan_register_num;
@@ -2811,19 +2811,19 @@
else
@z
%---------------------------------------
- at x [49] m.1225 l.22902 - e-TeX read_line
+ at x [49.1225] l.22928 - e-TeX read_line
read_to_cs: begin scan_int; n:=cur_val;
@y
read_to_cs: begin j:=cur_chr; scan_int; n:=cur_val;
@z
%---------------------------------------
- at x [49] m.1225 l.22911 - e-TeX read_line
+ at x [49.1225] l.22937 - e-TeX read_line
p:=cur_cs; read_toks(n,p); define(p,call,cur_val);
@y
p:=cur_cs; read_toks(n,p,j); define(p,call,cur_val);
@z
%---------------------------------------
- at x [49] m.1226 l.22920 - e-TeX sparse arrays
+ at x [49.1226] l.22946 - e-TeX sparse arrays
if cur_cmd=toks_register then
begin scan_eight_bit_int; p:=toks_base+cur_val;
end
@@ -2843,7 +2843,7 @@
p:=cur_chr; {|p=every_par_loc| or |output_routine_loc| or \dots}
@z
%---------------------------------------
- at x [49] m.1226 l.22930 - e-TeX sparse arrays
+ at x [49.1226] l.22956 - e-TeX sparse arrays
begin define(p,undefined_cs,null); free_avail(def_ref);
end
else begin if p=output_routine_loc then {enclose in curlies}
@@ -2853,13 +2853,13 @@
else begin if (p=output_routine_loc)and not e then {enclose in curlies}
@z
%---------------------------------------
- at x [49] m.1226 l.22938 - e-TeX sparse arrays
+ at x [49.1226] l.22964 - e-TeX sparse arrays
define(p,call,def_ref);
@y
sa_define(p,def_ref)(p,call,def_ref);
@z
%---------------------------------------
- at x [49] m.1227 l.22943 - e-TeX sparse arrays
+ at x [49.1227] l.22969 - e-TeX sparse arrays
begin if cur_cmd=toks_register then
begin scan_eight_bit_int; cur_cmd:=assign_toks; cur_chr:=toks_base+cur_val;
end;
@@ -2891,7 +2891,7 @@
end
@z
%---------------------------------------
- at x [49] m.1236 l.23059 do_register_command - e-TeX sparse arrays
+ at x [49.1236] l.23085 - do_register_command - e-TeX sparse arrays
begin q:=cur_cmd;
@y
@!e:boolean; {does |l| refer to a sparse array element?}
@@ -2900,7 +2900,7 @@
e:=false; {just in case, will be set |true| for sparse array elements}
@z
%---------------------------------------
- at x [49] m.1236 l.23076 do_register_command - e-TeX sparse arrays
+ at x [49.1236] l.23102 - do_register_command - e-TeX sparse arrays
if p<glue_val then word_define(l,cur_val)
else begin trap_zero_glue; define(l,glue_ref,cur_val);
@y
@@ -2908,7 +2908,7 @@
else begin trap_zero_glue; sa_define(l,cur_val)(l,glue_ref,cur_val);
@z
%---------------------------------------
- at x [49] m.1237 l.23098 - e-TeX sparse arrays
+ at x [49.1237] l.23124 - e-TeX sparse arrays
p:=cur_chr; scan_eight_bit_int;
@y
if (cur_chr<mem_bot)or(cur_chr>lo_mem_stat_max) then
@@ -2921,7 +2921,7 @@
else
@z
%---------------------------------------
- at x [49] m.1237 l.23105 - e-TeX sparse arrays
+ at x [49.1237] l.23131 - e-TeX sparse arrays
end;
found:
@y
@@ -2931,19 +2931,19 @@
else if e then s:=sa_ptr(l)@+else s:=equiv(l)
@z
%---------------------------------------
- at x [49] m.1238 l.23111 - e-TeX sparse arrays
+ at x [49.1238] l.23137 - e-TeX sparse arrays
if q=advance then cur_val:=cur_val+eqtb[l].int;
@y
if q=advance then cur_val:=cur_val+w;
@z
%---------------------------------------
- at x [49] m.1239 l.23118 - e-TeX sparse arrays
+ at x [49.1239] l.23144 - e-TeX sparse arrays
begin q:=new_spec(cur_val); r:=equiv(l);
@y
begin q:=new_spec(cur_val); r:=s;
@z
%---------------------------------------
- at x [49] m.1240 l.23138 - e-TeX sparse arrays
+ at x [49.1240] l.23164 - e-TeX sparse arrays
if p=int_val then cur_val:=mult_integers(eqtb[l].int,cur_val)
else cur_val:=nx_plus_y(eqtb[l].int,cur_val,0)
else cur_val:=x_over_n(eqtb[l].int,cur_val)
@@ -2955,7 +2955,7 @@
else begin r:=new_spec(s);
@z
%---------------------------------------
- at x [49] m.1241 l.23160 - e-TeX sparse arrays
+ at x [49.1241] l.23186 - e-TeX sparse arrays
set_box: begin scan_eight_bit_int;
if global then n:=256+cur_val at +else n:=cur_val;
scan_optional_equals;
@@ -2967,7 +2967,7 @@
if set_box_allowed then scan_box(n)
@z
%---------------------------------------
- at x [49] m.1246 l.23231 alter_integer - e-TeX interaction_mode
+ at x [49.1246] l.23257 - alter_integer - e-TeX interaction_mode
var c:0..1; {0 for \.{\\deadcycles}, 1 for \.{\\insertpenalties}}
begin c:=cur_chr; scan_optional_equals; scan_int;
if c=0 then dead_cycles:=cur_val
@@ -2979,7 +2979,7 @@
@/@<Cases for |alter_integer|@>@/
@z
%---------------------------------------
- at x [49] m.1247 l.23240 alter_box_dimen - e-TeX sparse arrays
+ at x [49.1247] l.23266 - alter_box_dimen - e-TeX sparse arrays
@!b:eight_bits; {box number}
begin c:=cur_chr; scan_eight_bit_int; b:=cur_val; scan_optional_equals;
scan_normal_dimen;
@@ -2991,7 +2991,7 @@
if b<>null then mem[b+c].sc:=cur_val;
@z
%---------------------------------------
- at x [49] m.1248 l.23249 - e-TeX penalties
+ at x [49.1248] l.23275 - e-TeX penalties
set_shape: begin scan_optional_equals; scan_int; n:=cur_val;
if n<=0 then p:=null
@y
@@ -3007,19 +3007,19 @@
end
@z
%---------------------------------------
- at x [49] m.1248 l.23259 - e-TeX penalties
+ at x [49.1248] l.23285 - e-TeX penalties
define(par_shape_loc,shape_ref,p);
@y
define(q,shape_ref,p);
@z
%---------------------------------------
- at x [49] m.1260 l.23346 new_font - e-TeX tracing
+ at x [49.1257] l.23372 - new_font - e-TeX tracing
common_ending: equiv(u):=f; eqtb[font_id_base+f]:=eqtb[u]; font_id_text(f):=t;
@y
common_ending: define(u,set_font,f); eqtb[font_id_base+f]:=eqtb[u]; font_id_text(f):=t;
@z
%---------------------------------------
- at x [49] m.1292 l.23633 - e-TeX show_groups
+ at x [49.1292] l.23659 - e-TeX show_groups
show_lists_code:print_esc("showlists");
@y
show_lists_code:print_esc("showlists");
@@ -3026,7 +3026,7 @@
@<Cases of |xray| for |print_cmd_chr|@>@;@/
@z
%---------------------------------------
- at x [49] m.1293 l.23640 show_whatever - e-TeX show_ifs
+ at x [49.1293] l.23666 - show_whatever - e-TeX show_ifs
var p:pointer; {tail of a token list to show}
@y
var p:pointer; {tail of a token list to show}
@@ -3036,7 +3036,7 @@
@!n:integer; {level of \.{\\if...\\fi} nesting}
@z
%---------------------------------------
- at x [49] m.1293 l.23646 show_whatever - e-TeX show_groups
+ at x [49.1293] l.23672 - show_whatever - e-TeX show_groups
othercases @<Show the current value of some parameter or register,
@y
@<Cases for |show_whatever|@>@;@/
@@ -3043,7 +3043,7 @@
othercases @<Show the current value of some parameter or register,
@z
%---------------------------------------
- at x [49] m.1295 l.23681 - e-TeX protected
+ at x [49.1295] l.23707 - e-TeX protected
call: print("macro");
long_call: print_esc("long macro");
outer_call: print_esc("outer macro");
@@ -3058,7 +3058,7 @@
print("macro");
@z
%---------------------------------------
- at x [49] m.1296 l.23689 - e-TeX sparse arrays
+ at x [49.1296] l.23715 - e-TeX sparse arrays
begin scan_eight_bit_int; begin_diagnostic;
print_nl("> \box"); print_int(cur_val); print_char("=");
if box(cur_val)=null then print("void")
@@ -3069,7 +3069,7 @@
if p=null then print("void")@+else show_box(p);
@z
%---------------------------------------
- at x [50] m.1307 l.23831 - e-TeX basic
+ at x [50.1307] l.23859 - e-TeX basic
dump_int(@$);@/
@y
dump_int(@$);@/
@@ -3076,7 +3076,7 @@
@<Dump the \eTeX\ state@>@/
@z
%---------------------------------------
- at x [50] m.1308 l.23846 - e-TeX basic
+ at x [50.1308] l.23874 - e-TeX basic
if x<>@$ then goto bad_fmt; {check that strings are the same}
@y
if x<>@$ then goto bad_fmt; {check that strings are the same}
@@ -3083,7 +3083,7 @@
@/@<Undump the \eTeX\ state@>@/
@z
%---------------------------------------
- at x [50] m.1311 l.23900 - e-TeX sparse arrays
+ at x [50.1311] l.23928 - e-TeX sparse arrays
dump_int(lo_mem_max); dump_int(rover);
@y
dump_int(lo_mem_max); dump_int(rover);
@@ -3090,7 +3090,7 @@
if eTeX_ex then for k:=int_val to tok_val do dump_int(sa_root[k]);
@z
%---------------------------------------
- at x [50] m.1312 l.23923 - e-TeX sparse arrays
+ at x [50.1312] l.23951 - e-TeX sparse arrays
undump(lo_mem_stat_max+1)(lo_mem_max)(rover);
@y
undump(lo_mem_stat_max+1)(lo_mem_max)(rover);
@@ -3098,7 +3098,7 @@
undump(null)(lo_mem_max)(sa_root[k]);
@z
%---------------------------------------
- at x [50] m.1324 l.24117 - e-TeX hyph_codes
+ at x [50.1324] l.24145 - e-TeX hyph_codes
dump_int(trie_max);
@y
dump_int(trie_max);
@@ -3105,7 +3105,7 @@
dump_int(hyph_start);
@z
%---------------------------------------
- at x [50] m.1325 l.24145 - e-TeX hyph_codes
+ at x [50.1325] l.24173 - e-TeX hyph_codes
undump_size(0)(trie_size)('trie size')(j); @+init trie_max:=j;@+tini
@y
undump_size(0)(trie_size)('trie size')(j); @+init trie_max:=j;@+tini
@@ -3112,7 +3112,7 @@
undump(0)(j)(hyph_start);
@z
%---------------------------------------
- at x [51] m.1335 l.24365 final_cleanup - tracing
+ at x [51.1335] l.24393 - final_cleanup - tracing
print_int(cur_level-level_one); print_char(")");
@y
print_int(cur_level-level_one); print_char(")");
@@ -3119,7 +3119,7 @@
if eTeX_ex then show_save_groups;
@z
%---------------------------------------
- at x [51] m.1335 l.24388 final_cleanup - e-TeX marks, saved_items
+ at x [51.1335] l.24416 - final_cleanup - e-TeX marks, saved_items
if cur_mark[c]<>null then delete_token_ref(cur_mark[c]);
@y
if cur_mark[c]<>null then delete_token_ref(cur_mark[c]);
@@ -3128,7 +3128,7 @@
for c:=last_box_code to vsplit_code do flush_node_list(disc_ptr[c]);
@z
%---------------------------------------
- at x [51] m.1336 l.24398 init_prim - e-TeX basic
+ at x [51.1336] l.24426 - init_prim - e-TeX basic
begin no_new_control_sequence:=false;
@y
begin no_new_control_sequence:=false;
@@ -3135,7 +3135,7 @@
first:=0;
@z
%---------------------------------------
- at x [51] m.1337 l.24413 - e-TeX basic
+ at x [51.1337] l.24441 - e-TeX basic
if (format_ident=0)or(buffer[loc]="&") then
@y
@<Enable \eTeX, if requested@>@;@/
@@ -3142,7 +3142,7 @@
if (format_ident=0)or(buffer[loc]="&") then
@z
%---------------------------------------
- at x [51] m.1337 l.24421 - e-TeX basic
+ at x [51.1337] l.24449 - e-TeX basic
end;
@y
end;
@@ -3149,7 +3149,7 @@
if eTeX_ex then wterm_ln('entering extended mode');
@z
%---------------------------------------
- at x [53] m.1362 l.24762 adv_past - e-TeX hyph_codes
+ at x [53.1362] l.24791 - adv_past - e-TeX hyph_codes
begin cur_lang:=what_lang(#); l_hyf:=what_lhm(#); r_hyf:=what_rhm(#);@+end
@y
begin cur_lang:=what_lang(#); l_hyf:=what_lhm(#); r_hyf:=what_rhm(#);
@@ -3157,7 +3157,7 @@
end
@z
%---------------------------------------
- at x [54] m.1379 l.24956 - e-TeX additions
+ at x [54.1379] l.24985 - e-TeX additions
@* \[54] System-dependent changes.
@y
@* \[53a] The extended features of \eTeX.
@@ -4152,7 +4152,7 @@
All whatsit nodes as well as hlist and vlist nodes containing such nodes
must not be permuted. A sequence of hlist and vlist nodes not containing
whatsit nodes as well as char, ligature, rule, kern, and glue nodes together
-with math nodes not changing the text direction can be explicitly reversed.
+with math nodes not changing the text direction can be explicitly reversed.
Embedded sections of left-to-right text are treated as a unit and all
remaining nodes are irrelevant and can be ignored.
Modified: branches/stable/source/src/texk/web2c/etexdir/etriptest.test
===================================================================
--- branches/stable/source/src/texk/web2c/etexdir/etriptest.test 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/etexdir/etriptest.test 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,5 +1,5 @@
#! /bin/sh -vx
-# $Id: etriptest.test 68954 2023-11-24 10:57:29Z takuji $
+# $Id: etriptest.test 70943 2024-04-14 05:29:13Z takuji $
# Copyright 2023 Japanese TeX Development Community <issue at texjp.org>
# Copyright 2017 Karl Berry <tex-live at tug.org>
# Copyright 2009-2014 Peter Breitenlohner <tex-live at tug.org>
@@ -29,7 +29,7 @@
s,^(trip\.tex ##,**(./trip.tex ##,
s,^## (\./trip\.tex,**(./trip.tex ##,
s/ (TeX Live 20[^)]*)//
- s/ (Web2C 202[3-9])//
+ s/ (Web2C 202[3-9][^)]*)//
s/(preloaded format=.*tex)/(INITEX)/
s/format=trip [^)][^)]*)/format=trip)/
s/) [0-9A-Z: ]*$/)/
Modified: branches/stable/source/src/texk/web2c/help.h
===================================================================
--- branches/stable/source/src/texk/web2c/help.h 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/help.h 2024-07-21 17:12:46 UTC (rev 933)
@@ -350,6 +350,9 @@
" Default OVFFILE is basename of OVPFILE extended with `.ovf'.",
" Default OFMFILE is basename of OVFFILE extended with `.ofm'.",
"",
+#ifdef OMFONTS
+ "-omit-ofm do not output OFMFILE",
+#endif
"-help display this help and exit",
"-verbose display progress reports",
"-version output version information and exit",
Modified: branches/stable/source/src/texk/web2c/lib/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/lib/ChangeLog 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/lib/ChangeLog 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,3 +1,7 @@
+2024-04-14 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * Makefile.am: Remove eptex.
+
2024-01-01 Akira Kakuto <kakuto at jcom.zaq.ne.jp>
* printversion.c: Update copyright year.
Modified: branches/stable/source/src/texk/web2c/lib/Makefile.am
===================================================================
--- branches/stable/source/src/texk/web2c/lib/Makefile.am 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/lib/Makefile.am 2024-07-21 17:12:46 UTC (rev 933)
@@ -10,9 +10,9 @@
@KPATHSEA_RULE@
noinst_LIBRARIES = lib.a
-if EPTEX
+if EUPTEX
noinst_LIBRARIES += libp.a
-endif EPTEX
+endif EUPTEX
EXTRA_LIBRARIES = libp.a
## We don't compile `texmfmp.c'; this file is included from 'texextra.c'
Modified: branches/stable/source/src/texk/web2c/lib/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/lib/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/lib/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -70,6 +70,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -88,7 +90,7 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
- at EPTEX_TRUE@am__append_1 = libp.a
+ at EUPTEX_TRUE@am__append_1 = libp.a
subdir = lib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/web2c-disable.m4 \
@@ -105,6 +107,7 @@
$(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-largefile.m4 \
$(top_srcdir)/../../m4/kpse-lex.m4 \
$(top_srcdir)/../../m4/kpse-lib-version.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -145,12 +148,13 @@
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
-ARFLAGS = cru
+ARFLAGS = cr
AM_V_AR = $(am__v_AR_ at AM_V@)
am__v_AR_ = $(am__v_AR_ at AM_DEFAULT_V@)
am__v_AR_0 = @echo " AR " $@;
am__v_AR_1 =
lib_a_AR = $(AR) $(ARFLAGS)
+lib_a_RANLIB = $(RANLIB)
lib_a_LIBADD =
am_lib_a_OBJECTS = basechsuffix.$(OBJEXT) chartostring.$(OBJEXT) \
coredump.$(OBJEXT) eofeoln.$(OBJEXT) fprintreal.$(OBJEXT) \
@@ -160,6 +164,7 @@
zround.$(OBJEXT)
lib_a_OBJECTS = $(am_lib_a_OBJECTS)
libp_a_AR = $(AR) $(ARFLAGS)
+libp_a_RANLIB = $(RANLIB)
libp_a_LIBADD =
am_libp_a_OBJECTS = libp_a-openclose.$(OBJEXT) \
libp_a-printversion.$(OBJEXT)
@@ -427,8 +432,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -539,17 +546,17 @@
$(am__aclocal_m4_deps):
clean-noinstLIBRARIES:
- -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+ -$(am__rm_f) $(noinst_LIBRARIES)
lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES) $(EXTRA_lib_a_DEPENDENCIES)
$(AM_V_at)-rm -f lib.a
$(AM_V_AR)$(lib_a_AR) lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD)
- $(AM_V_at)$(RANLIB) lib.a
+ $(AM_V_at)$(lib_a_RANLIB) lib.a
libp.a: $(libp_a_OBJECTS) $(libp_a_DEPENDENCIES) $(EXTRA_libp_a_DEPENDENCIES)
$(AM_V_at)-rm -f libp.a
$(AM_V_AR)$(libp_a_AR) libp.a $(libp_a_OBJECTS) $(libp_a_LIBADD)
- $(AM_V_at)$(RANLIB) libp.a
+ $(AM_V_at)$(libp_a_RANLIB) libp.a
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -577,7 +584,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+ @: >>$@
am--depfiles: $(am__depfiles_remade)
@@ -751,8 +758,8 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -763,7 +770,7 @@
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/basechsuffix.Po
+ -rm -f ./$(DEPDIR)/basechsuffix.Po
-rm -f ./$(DEPDIR)/chartostring.Po
-rm -f ./$(DEPDIR)/coredump.Po
-rm -f ./$(DEPDIR)/eofeoln.Po
@@ -825,7 +832,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/basechsuffix.Po
+ -rm -f ./$(DEPDIR)/basechsuffix.Po
-rm -f ./$(DEPDIR)/chartostring.Po
-rm -f ./$(DEPDIR)/coredump.Po
-rm -f ./$(DEPDIR)/eofeoln.Po
@@ -884,3 +891,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/texk/web2c/man/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/man/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/man/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -69,6 +69,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -98,10 +100,11 @@
@ETEX_TRUE at am__append_9 = etex.man
@PDFTEX_TRUE at am__append_10 = $(pdftex_man_sources)
@PDFTEX_TRUE at am__append_11 = pdftex:pdflatex
- at EPTEX_TRUE@am__append_12 = ptex.man ppltotf.man ptftopl.man \
- at EPTEX_TRUE@ pbibtex.man
- at EPTEX_TRUE@am__append_13 = ptex:eptex ptex:euptex ptex:uptex \
- at EPTEX_TRUE@ ppltotf:uppltotf ptftopl:uptftopl pbibtex:upbibtex
+ at EUPTEX_TRUE@am__append_12 = ptex.man ppltotf.man ptftopl.man \
+ at EUPTEX_TRUE@ pbibtex.man
+ at EUPTEX_TRUE@am__append_13 = ptex:eptex ptex:euptex ptex:uptex \
+ at EUPTEX_TRUE@ ppltotf:uppltotf ptftopl:uptftopl \
+ at EUPTEX_TRUE@ pbibtex:upbibtex
@LUATEX_TRUE at am__append_14 = luatex.man
@LUATEX_TRUE at am__append_15 = luatex:texlua luatex:texluac \
@LUATEX_TRUE@ luatex:luahbtex luatex:luajittex \
@@ -127,6 +130,7 @@
$(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-largefile.m4 \
$(top_srcdir)/../../m4/kpse-lex.m4 \
$(top_srcdir)/../../m4/kpse-lib-version.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -207,10 +211,9 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
+ { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
}
man1dir = $(mandir)/man1
am__installdirs = "$(DESTDIR)$(man1dir)"
@@ -408,8 +411,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -647,9 +652,9 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -798,3 +803,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/texk/web2c/omegafonts/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/omegafonts/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/omegafonts/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -70,6 +70,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -108,6 +110,7 @@
$(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-largefile.m4 \
$(top_srcdir)/../../m4/kpse-lex.m4 \
$(top_srcdir)/../../m4/kpse-lib-version.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -299,10 +302,9 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
+ { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
}
am__recheck_rx = ^[ ]*:recheck:[ ]*
am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
@@ -390,6 +392,7 @@
# Default flags passed to test drivers.
am__common_driver_flags = \
--color-tests "$$am__color_tests" \
+ $$am__collect_skipped_logs \
--enable-hard-errors "$$am__enable_hard_errors" \
--expect-failure "$$am__expect_failure"
# To be inserted before the command running the test. Creates the
@@ -414,6 +417,11 @@
elif test -f "$$f"; then dir=; \
else dir="$(srcdir)/"; fi; \
tst=$$dir$$f; log='$@'; \
+if test -n '$(IGNORE_SKIPPED_LOGS)'; then \
+ am__collect_skipped_logs='--collect-skipped-logs no'; \
+else \
+ am__collect_skipped_logs=''; \
+fi; \
if test -n '$(DISABLE_HARD_ERRORS)'; then \
am__enable_hard_errors=no; \
else \
@@ -653,8 +661,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -751,10 +761,11 @@
tests/xofont* tests/Cherokee.tfm tests/OCherokee.ofm \
tests/OCherokee.opl tests/OCherokee.ovf tests/xCherokee.* \
tests/xOCherokee.* tests/xinbmp* tests/xoverbmp* \
- tests/realnum.* tests/xrepeated.* tests/sample*.ofm \
- tests/sample*.ovf tests/sample1-h.opl tests/xsample*.out \
- tests/shortend.* tests/specialhex.ofm tests/specialhex.opl \
- tests/specialhex.ovf tests/xspecialhex.* tests/*yarabic*
+ tests/xoverucs* tests/xadbjpn* tests/realnum.* \
+ tests/xrepeated.* tests/sample*.ofm tests/sample*.ovf \
+ tests/sample1-h.opl tests/xsample*.out tests/shortend.* \
+ tests/specialhex.ofm tests/specialhex.opl tests/specialhex.ovf \
+ tests/xspecialhex.* tests/*yarabic*
linked_programs = ofm2opl opl2ofm ovf2ovp ovp2ovf
bin_links = \
omfonts$(EXEEXT):ofm2opl \
@@ -781,6 +792,7 @@
tests/ofontv5.opl tests/ofontv5.ovp tests/ofontv6.opl \
tests/ofontv6.ovp tests/Cherokee.pl tests/OCherokee.ovp \
tests/inbmp.opl tests/overbmp.opl tests/overbmp.ovp \
+ tests/overucs.opl tests/overucs.ovp adbjpn.opl \
tests/realnum.opl tests/realnum.out tests/repeat.opl \
tests/repeated.opl tests/sample.out tests/sample.ovp \
tests/sample0-h.opl tests/shorten.opl tests/specialhex.ovp \
@@ -858,31 +870,21 @@
`; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ cd "$(DESTDIR)$(bindir)" && $(am__rm_f) $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ $(am__rm_f) $(bin_PROGRAMS)
+ test -z "$(EXEEXT)" || $(am__rm_f) $(bin_PROGRAMS:$(EXEEXT)=)
clean-noinstPROGRAMS:
- @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ $(am__rm_f) $(noinst_PROGRAMS)
+ test -z "$(EXEEXT)" || $(am__rm_f) $(noinst_PROGRAMS:$(EXEEXT)=)
../$(am__dirstamp):
@$(MKDIR_P) ..
- @: > ../$(am__dirstamp)
+ @: >>../$(am__dirstamp)
../$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) ../$(DEPDIR)
- @: > ../$(DEPDIR)/$(am__dirstamp)
+ @: >>../$(DEPDIR)/$(am__dirstamp)
../call_omfonts-callexe.$(OBJEXT): ../$(am__dirstamp) \
../$(DEPDIR)/$(am__dirstamp)
@@ -924,7 +926,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+ @: >>$@
am--depfiles: $(am__depfiles_remade)
@@ -1043,7 +1045,6 @@
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
am--force-recheck:
@:
-
$(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__set_TESTS_bases); \
am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
@@ -1119,10 +1120,37 @@
result_count $$1 "XPASS:" $$xpass "$$red"; \
result_count $$1 "ERROR:" $$error "$$mgn"; \
}; \
+ output_system_information () \
+ { \
+ echo; \
+ { uname -a | $(AWK) '{ \
+ printf "System information (uname -a):"; \
+ for (i = 1; i < NF; ++i) \
+ { \
+ if (i != 2) \
+ printf " %s", $$i; \
+ } \
+ printf "\n"; \
+}'; } 2>&1; \
+ if test -r /etc/os-release; then \
+ echo "Distribution information (/etc/os-release):"; \
+ sed 8q /etc/os-release; \
+ elif test -r /etc/issue; then \
+ echo "Distribution information (/etc/issue):"; \
+ cat /etc/issue; \
+ fi; \
+ }; \
+ please_report () \
+ { \
+echo "Some test(s) failed. Please report this to $(PACKAGE_BUGREPORT),"; \
+echo "together with the test-suite.log file (gzipped) and your system"; \
+echo "information. Thanks."; \
+ }; \
{ \
echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
$(am__rst_title); \
create_testsuite_report --no-color; \
+ output_system_information; \
echo; \
echo ".. contents:: :depth: 2"; \
echo; \
@@ -1142,9 +1170,9 @@
create_testsuite_report --maybe-color; \
echo "$$col$$br$$std"; \
if $$success; then :; else \
- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
if test -n "$(PACKAGE_BUGREPORT)"; then \
- echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
+ please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
fi; \
echo "$$col$$br$$std"; \
fi; \
@@ -1151,17 +1179,16 @@
$$success || exit 1
check-TESTS:
- @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
- @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @$(am__rm_f) $(RECHECK_LOGS)
+ @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
+ @$(am__rm_f) $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
log_list=`for i in $$bases; do echo $$i.log; done`; \
- trs_list=`for i in $$bases; do echo $$i.trs; done`; \
- log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+ log_list=`echo $$log_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
recheck: all
- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @$(am__rm_f) $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
| $(am__list_recheck_tests)` || exit 1; \
@@ -1246,25 +1273,25 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
- -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
- -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ -$(am__rm_f) $(TEST_LOGS)
+ -$(am__rm_f) $(TEST_LOGS:.log=.trs)
+ -$(am__rm_f) $(TEST_SUITE_LOG)
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -rm -f ../$(DEPDIR)/$(am__dirstamp)
- -rm -f ../$(am__dirstamp)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(DISTCLEANFILES)
+ -$(am__rm_f) ../$(DEPDIR)/$(am__dirstamp)
+ -$(am__rm_f) ../$(am__dirstamp)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- -rm -f pl-lexer.c
- -rm -f pl-parser.c
- -rm -f pl-parser.h
+ -$(am__rm_f) pl-lexer.c
+ -$(am__rm_f) pl-parser.c
+ -$(am__rm_f) pl-parser.h
@OTANGLE_FALSE at install-exec-hook:
@OTANGLE_FALSE at uninstall-hook:
clean: clean-am
@@ -1273,7 +1300,7 @@
clean-noinstPROGRAMS mostlyclean-am
distclean: distclean-am
- -rm -f ../$(DEPDIR)/call_omfonts-callexe.Po
+ -rm -f ../$(DEPDIR)/call_omfonts-callexe.Po
-rm -f ./$(DEPDIR)/char_routines.Po
-rm -f ./$(DEPDIR)/dimen_routines.Po
-rm -f ./$(DEPDIR)/error_routines.Po
@@ -1336,7 +1363,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ../$(DEPDIR)/call_omfonts-callexe.Po
+ -rm -f ../$(DEPDIR)/call_omfonts-callexe.Po
-rm -f ./$(DEPDIR)/char_routines.Po
-rm -f ./$(DEPDIR)/dimen_routines.Po
-rm -f ./$(DEPDIR)/error_routines.Po
@@ -1442,3 +1469,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/texk/web2c/otps/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/otps/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/otps/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -72,6 +72,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -108,6 +110,7 @@
$(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-largefile.m4 \
$(top_srcdir)/../../m4/kpse-lex.m4 \
$(top_srcdir)/../../m4/kpse-lib-version.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -186,10 +189,9 @@
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
+ { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
}
SCRIPTS = $(bin_SCRIPTS)
AM_V_P = $(am__v_P_ at AM_V@)
@@ -400,6 +402,7 @@
# Default flags passed to test drivers.
am__common_driver_flags = \
--color-tests "$$am__color_tests" \
+ $$am__collect_skipped_logs \
--enable-hard-errors "$$am__enable_hard_errors" \
--expect-failure "$$am__expect_failure"
# To be inserted before the command running the test. Creates the
@@ -424,6 +427,11 @@
elif test -f "$$f"; then dir=; \
else dir="$(srcdir)/"; fi; \
tst=$$dir$$f; log='$@'; \
+if test -n '$(IGNORE_SKIPPED_LOGS)'; then \
+ am__collect_skipped_logs='--collect-skipped-logs no'; \
+else \
+ am__collect_skipped_logs=''; \
+fi; \
if test -n '$(DISABLE_HARD_ERRORS)'; then \
am__enable_hard_errors=no; \
else \
@@ -687,8 +695,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -836,16 +846,11 @@
`; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ cd "$(DESTDIR)$(bindir)" && $(am__rm_f) $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ $(am__rm_f) $(bin_PROGRAMS)
+ test -z "$(EXEEXT)" || $(am__rm_f) $(bin_PROGRAMS:$(EXEEXT)=)
otp-parser.h: otp-parser.c
@if test ! -f $@; then rm -f otp-parser.c; else :; fi
@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) otp-parser.c; else :; fi
@@ -907,7 +912,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+ @: >>$@
am--depfiles: $(am__depfiles_remade)
@@ -1100,7 +1105,6 @@
am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
am--force-recheck:
@:
-
$(TEST_SUITE_LOG): $(TEST_LOGS)
@$(am__set_TESTS_bases); \
am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
@@ -1176,10 +1180,37 @@
result_count $$1 "XPASS:" $$xpass "$$red"; \
result_count $$1 "ERROR:" $$error "$$mgn"; \
}; \
+ output_system_information () \
+ { \
+ echo; \
+ { uname -a | $(AWK) '{ \
+ printf "System information (uname -a):"; \
+ for (i = 1; i < NF; ++i) \
+ { \
+ if (i != 2) \
+ printf " %s", $$i; \
+ } \
+ printf "\n"; \
+}'; } 2>&1; \
+ if test -r /etc/os-release; then \
+ echo "Distribution information (/etc/os-release):"; \
+ sed 8q /etc/os-release; \
+ elif test -r /etc/issue; then \
+ echo "Distribution information (/etc/issue):"; \
+ cat /etc/issue; \
+ fi; \
+ }; \
+ please_report () \
+ { \
+echo "Some test(s) failed. Please report this to $(PACKAGE_BUGREPORT),"; \
+echo "together with the test-suite.log file (gzipped) and your system"; \
+echo "information. Thanks."; \
+ }; \
{ \
echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
$(am__rst_title); \
create_testsuite_report --no-color; \
+ output_system_information; \
echo; \
echo ".. contents:: :depth: 2"; \
echo; \
@@ -1199,9 +1230,9 @@
create_testsuite_report --maybe-color; \
echo "$$col$$br$$std"; \
if $$success; then :; else \
- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
+ echo "$${col}See $(subdir)/$(TEST_SUITE_LOG) for debugging.$${std}";\
if test -n "$(PACKAGE_BUGREPORT)"; then \
- echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
+ please_report | sed -e "s/^/$${col}/" -e s/'$$'/"$${std}"/; \
fi; \
echo "$$col$$br$$std"; \
fi; \
@@ -1208,17 +1239,16 @@
$$success || exit 1
check-TESTS:
- @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
- @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @$(am__rm_f) $(RECHECK_LOGS)
+ @$(am__rm_f) $(RECHECK_LOGS:.log=.trs)
+ @$(am__rm_f) $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
log_list=`for i in $$bases; do echo $$i.log; done`; \
- trs_list=`for i in $$bases; do echo $$i.trs; done`; \
- log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+ log_list=`echo $$log_list`; \
$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
exit $$?;
recheck: all
- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ @$(am__rm_f) $(TEST_SUITE_LOG)
@set +e; $(am__set_TESTS_bases); \
bases=`for i in $$bases; do echo $$i; done \
| $(am__list_recheck_tests)` || exit 1; \
@@ -1329,30 +1359,30 @@
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
- -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
- -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
- -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+ -$(am__rm_f) $(TEST_LOGS)
+ -$(am__rm_f) $(TEST_LOGS:.log=.trs)
+ -$(am__rm_f) $(TEST_SUITE_LOG)
clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+ -$(am__rm_f) $(CLEANFILES)
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
- -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(DISTCLEANFILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
- -rm -f otp-lexer.c
- -rm -f otp-parser.c
- -rm -f otp-parser.h
+ -$(am__rm_f) otp-lexer.c
+ -$(am__rm_f) otp-parser.c
+ -$(am__rm_f) otp-parser.h
clean: clean-recursive
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-recursive
- -rm -f ./$(DEPDIR)/otp-lexer.Po
+ -rm -f ./$(DEPDIR)/otp-lexer.Po
-rm -f ./$(DEPDIR)/otp-parser.Po
-rm -f ./$(DEPDIR)/otp2ocp.Po
-rm -f ./$(DEPDIR)/outocp.Po
@@ -1402,7 +1432,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-recursive
- -rm -f ./$(DEPDIR)/otp-lexer.Po
+ -rm -f ./$(DEPDIR)/otp-lexer.Po
-rm -f ./$(DEPDIR)/otp-parser.Po
-rm -f ./$(DEPDIR)/otp2ocp.Po
-rm -f ./$(DEPDIR)/outocp.Po
@@ -1461,3 +1491,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/texk/web2c/otps/win32/Makefile.in
===================================================================
--- branches/stable/source/src/texk/web2c/otps/win32/Makefile.in 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/otps/win32/Makefile.in 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.16.5 from Makefile.am.
+# Makefile.in generated by automake 1.17 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2021 Free Software Foundation, Inc.
+# Copyright (C) 1994-2024 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -70,6 +70,8 @@
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+am__rm_f = rm -f $(am__rm_f_notfound)
+am__rm_rf = rm -rf $(am__rm_f_notfound)
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -105,6 +107,7 @@
$(top_srcdir)/../../m4/kpse-harfbuzz-flags.m4 \
$(top_srcdir)/../../m4/kpse-icu-flags.m4 \
$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
+ $(top_srcdir)/../../m4/kpse-largefile.m4 \
$(top_srcdir)/../../m4/kpse-lex.m4 \
$(top_srcdir)/../../m4/kpse-lib-version.m4 \
$(top_srcdir)/../../m4/kpse-libpng-flags.m4 \
@@ -406,8 +409,10 @@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
+am__rm_f_notfound = @am__rm_f_notfound@
am__tar = @am__tar@
am__untar = @am__untar@
+am__xargs_n = @am__xargs_n@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
@@ -532,16 +537,11 @@
`; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(bindir)" && rm -f $$files
+ cd "$(DESTDIR)$(bindir)" && $(am__rm_f) $$files
clean-binPROGRAMS:
- @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
- echo " rm -f" $$list; \
- rm -f $$list
+ $(am__rm_f) $(bin_PROGRAMS)
+ test -z "$(EXEEXT)" || $(am__rm_f) $(bin_PROGRAMS:$(EXEEXT)=)
mkocp$(EXEEXT): $(mkocp_OBJECTS) $(mkocp_DEPENDENCIES) $(EXTRA_mkocp_DEPENDENCIES)
@rm -f mkocp$(EXEEXT)
@@ -562,7 +562,7 @@
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
- @echo '# dummy' >$@-t && $(am__mv) $@-t $@
+ @: >>$@
am--depfiles: $(am__depfiles_remade)
@@ -725,8 +725,8 @@
clean-generic:
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+ -$(am__rm_f) $(CONFIG_CLEAN_FILES)
+ -test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -736,7 +736,7 @@
clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/mkocp-mkocp.Po
+ -rm -f ./$(DEPDIR)/mkocp-mkocp.Po
-rm -f ./$(DEPDIR)/mkofm.Po
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
@@ -783,7 +783,7 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/mkocp-mkocp.Po
+ -rm -f ./$(DEPDIR)/mkocp-mkocp.Po
-rm -f ./$(DEPDIR)/mkofm.Po
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
@@ -827,3 +827,10 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
+# Tell GNU make to disable its built-in pattern rules.
+%:: %,v
+%:: RCS/%,v
+%:: RCS/%
+%:: s.%
+%:: SCCS/s.%
Modified: branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/pdftexdir/ChangeLog 2024-07-21 17:12:46 UTC (rev 933)
@@ -9,6 +9,13 @@
* pdftoepdf.cc (getptexuseunderscore): declare fn.
(write_epdf): use it for FileName, PageNumber, InfoDict.
+2024-04-18 Thanh Han The <hanthethanh at gmail.com>
+
+ * pdftex.web (pdf_begin_string): increase tolerance for finding
+ interword spaces by 1pt, since overfull lines can have smaller
+ spaces than space-space_shrink. Report from Ulrike,
+ https://tug.org/pipermail/pdftex/2024-April/009388.html
+
2024-03-10 Karl Berry <karl at tug.org>
* TL'24 release.
Modified: branches/stable/source/src/texk/web2c/pdftexdir/NEWS
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/NEWS 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/pdftexdir/NEWS 2024-07-21 17:12:46 UTC (rev 933)
@@ -2,6 +2,8 @@
- new primitive \pdfptexuseunderscore: if positive or
if \pdfmajorversion >= 2, the PTEX.Fullbanner and other dictionary
entries use an _ instead of ., as in PTEX_Fullbanner.
+- bugfixes:
+ - increase tolerance for detecting interword spaces in overfull lines.
pdfTeX 3.141592653-2.6-1.40.26 (TeX Live 2024)
- bugfixes:
Modified: branches/stable/source/src/texk/web2c/pdftexdir/tex.ch0
===================================================================
--- branches/stable/source/src/texk/web2c/pdftexdir/tex.ch0 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/pdftexdir/tex.ch0 2024-07-21 17:12:46 UTC (rev 933)
@@ -14,12 +14,12 @@
%
% You should have received a copy of the GNU General Public License along with
% this program. If not, see <http://www.gnu.org/licenses/>.
-%
+%
% Change file to assist in creating the web2c-specific change file.
% This one comes first, resolves inconsistencies between the generated
% pdfetex.web and tex.ch
- at x [1.2] l.188
+ at x [1.2] l.316
@d TeX_banner=='This is TeX, Version 3.141592653' {printed when \TeX\ starts}
@#
@d banner==pdfTeX_banner
@@ -27,7 +27,7 @@
@d banner=='This is TeX, Version 3.141592653' {printed when \TeX\ starts}
@z
- at x [17.236] l.4960 - first web2c, then pdfTeX, then e-TeX additional integer parameters
+ at x [18.254] l.5671 - first web2c, then pdfTeX, then e-TeX additional integer parameters
@d tex_int_pars=55 {total number of \TeX's integer parameters}
@#
@d pdftex_first_integer_code = tex_int_pars {base for \pdfTeX's integer parameters}
Modified: branches/stable/source/src/texk/web2c/synctexdir/ChangeLog
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/ChangeLog 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/synctexdir/ChangeLog 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,3 +1,7 @@
+2024-04-14 TANAKA Takuji <ttk at t-lab.opal.ne.jp>
+
+ * am/synctex.am: Remove eptex.
+
2024-03-10 Karl Berry <karl at tug.org>
* TL'24 release.
Modified: branches/stable/source/src/texk/web2c/synctexdir/am/synctex.am
===================================================================
--- branches/stable/source/src/texk/web2c/synctexdir/am/synctex.am 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/synctexdir/am/synctex.am 2024-07-21 17:12:46 UTC (rev 933)
@@ -151,43 +151,6 @@
synctexdir/synctex-e-mem.ch1 \
synctexdir/synctex-e-rec.ch0
-## SyncTeX infrastructure: e-pTeX
-
-if EPTEX_SYNCTEX
-
-eptex_CPPFLAGS += -I$(srcdir)/synctexdir $(ZLIB_INCLUDES)
-
-eptex_LDADD += $(ZLIB_LIBS)
-eptex_prereq += $(ZLIB_DEPEND)
-
-eptex_ch_synctex = \
- synctexdir/synctex-def.ch0 \
- synctexdir/synctex-ep-mem.ch0 \
- synctexdir/synctex-mem.ch0 \
- synctexdir/synctex-e-mem.ch0 \
- synctexdir/synctex-ep-mem.ch1 \
- synctexdir/synctex-p-rec.ch0 \
- synctexdir/synctex-rec.ch0 \
- synctexdir/synctex-rec.ch1 \
- synctexdir/synctex-ep-rec.ch0 \
- synctexdir/synctex-e-rec.ch0 \
- synctexdir/synctex-p-rec.ch1
-
-dist_eptex_SOURCES += \
- synctexdir/synctex.c \
- synctexdir/synctex.h \
- synctexdir/synctex-common.h \
- synctexdir/synctex-eptex.h
-
-eptex_CPPFLAGS += -D__SyncTeX__ -DSYNCTEX_ENGINE_H=\"synctex-eptex.h\"
-
-endif EPTEX_SYNCTEX
-
-EXTRA_DIST += \
- synctexdir/synctex-ep-mem.ch0 \
- synctexdir/synctex-ep-mem.ch1 \
- synctexdir/synctex-ep-rec.ch0
-
## SyncTeX infrastructure: e-upTeX
if EUPTEX_SYNCTEX
Modified: branches/stable/source/src/texk/web2c/tangle.ch
===================================================================
--- branches/stable/source/src/texk/web2c/tangle.ch 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/tangle.ch 2024-07-21 17:12:46 UTC (rev 933)
@@ -36,15 +36,20 @@
% 11/30/89 (KB) Version 4.
% (more recent changes in the ChangeLog)
- at x [0] Print only changes.
+ at x [0.0] l.34 - Replace program title.
+\def\title{TANGLE}
+ at y
+\def\title{TANGLE changes for C}
+ at z
+
+ at x [0.0] l.43 - Print only changes.
\pageno=\contentspagenumber \advance\pageno by 1
@y
\pageno=\contentspagenumber \advance\pageno by 1
\let\maybe=\iffalse
-\def\title{TANGLE changes for C}
@z
- at x [1] Define my_name
+ at x [1.1] l.70 - Define my_name
@d banner=='This is TANGLE, Version 4.6'
@y
@d my_name=='tangle'
@@ -51,7 +56,7 @@
@d banner=='This is TANGLE, Version 4.6'
@z
- at x [2] Eliminate the |end_of_TANGLE| label.
+ at x [1.2] l.79 - Eliminate the |end_of_TANGLE| label.
calls the `|jump_out|' procedure, which goes to the label |end_of_TANGLE|.
@d end_of_TANGLE = 9999 {go here to wrap it up}
@@ -58,12 +63,12 @@
@y
calls the `|jump_out|' procedure.
@z
- at x
+ at x [1.2] l.85
label end_of_TANGLE; {go here to finish}
@y
@z
- at x [2] Define and call parse_arguments.
+ at x [1.2] l.90 - Define and call parse_arguments.
procedure initialize;
var @<Local variables for initialization@>@/
begin @<Set initial values@>@/
@@ -77,12 +82,8 @@
@<Set initial values@>@/
@z
- at x [8] Constants: increase id lengths, for TeX--XeT and tex2pdf.
+ at x [1.8] l.183 - Constants: increase id lengths, for TeX--XeT and tex2pdf.
@!buf_size=100; {maximum length of input line}
- at y
-@!buf_size=1000; {maximum length of input line}
- at z
- at x
@!max_bytes=45000; {|1/ww| times the number of bytes in identifiers,
strings, and module names; must be less than 65536}
@!max_toks=65000; {|1/zz| times the number of bytes in compressed \PASCAL\ code;
@@ -92,6 +93,7 @@
@!max_texts=2000; {number of replacement texts, must be less than 10240}
@!hash_size=353; {should be prime}
@y
+@!buf_size=1000; {maximum length of input line}
@!max_bytes=65535; {|1/ww| times the number of bytes in identifiers,
strings, and module names; must be less than 65536}
@!max_toks=65535; {|1/zz| times the number of bytes in compressed \PASCAL\ code;
@@ -102,7 +104,7 @@
@!hash_size=8501; {should be prime}
@z
- at x
+ at x [1.8] l.195
@!stack_size=50; {number of simultaneous levels of macro expansion}
@!max_id_length=12; {long identifiers are chopped to this length, which must
not exceed |line_length|}
@@ -119,13 +121,13 @@
% default type `char' may produce signed integers, which are bad array
% indices in C.
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- at x
+ at x [2.12] l.302
@d text_char == char {the data type of characters in text files}
@y
@d text_char == ASCII_code {the data type of characters in text files}
@z
- at x [17] enable maximum character set
+ at x [2.17] l.483 - enable maximum character set
for i:=1 to @'37 do xchr[i]:=' ';
for i:=@'200 to @'377 do xchr[i]:=' ';
@y
@@ -133,7 +135,7 @@
for i:=@'200 to @'377 do xchr[i]:=chr(i);
@z
- at x [20] terminal output: use standard i/o
+ at x [3.20] l.509 - terminal output: use standard i/o
@d print(#)==write(term_out,#) {`|print|' means write on the terminal}
@y
@d term_out==stdout
@@ -140,13 +142,13 @@
@d print(#)==write(term_out,#) {`|print|' means write on the terminal}
@z
- at x
+ at x [3.20] l.516
@<Globals...@>=
@!term_out:text_file; {the terminal as an output file}
@y
@z
- at x [21] init terminal
+ at x [3.21] l.519 - init terminal
@ Different systems have different ways of specifying that the output on a
certain file will appear on the user's terminal. Here is one way to do this
on the \PASCAL\ system that was used in \.{TANGLE}'s initial development:
@@ -163,13 +165,13 @@
{Nothing need be done for C.}
@z
- at x [22] flush terminal buffer
+ at x [3.22] l.532 - flush terminal buffer
@d update_terminal == break(term_out) {empty the terminal output buffer}
@y
@d update_terminal == fflush(term_out) {empty the terminal output buffer}
@z
- at x [24] open input files
+ at x [3.24] l.548 - open input files
begin reset(web_file); reset(change_file);
@y
begin web_file := kpse_open_file(web_name, kpse_web_format);
@@ -176,19 +178,19 @@
if chg_name then change_file := kpse_open_file(chg_name, kpse_web_format);
@z
- at x [26] Open output files (except for the pool file).
+ at x [3.26] l.558 - Open output files (except for the pool file).
@ The following code opens |Pascal_file| and |pool|.
@y
@ The following code opens |Pascal_file|. Opening |pool| will be deferred
until section~\&{64}.
@z
- at x
+ at x [3.26] l.565
rewrite(Pascal_file); rewrite(pool);
@y
rewrite (Pascal_file, pascal_name);
@z
- at x [28] Fix f^.
+ at x [3.28] l.591 - Fix f^.
begin buffer[limit]:=xord[f^]; get(f);
incr(limit);
if buffer[limit-1]<>" " then final_limit:=limit;
@@ -202,13 +204,13 @@
begin while not eoln(f) do vgetc(f);
@z
- at x [31] Fix typo as in weave.web.
+ at x [4.31] l.640 - Fix typo as in weave.web.
procedure error; {prints '\..' and location of error message}
@y
procedure error; {prints `\..' and location of error message}
@z
- at x [34] Fix `jump_out'.
+ at x [4.34] l.681 - Fix `jump_out'.
and jumps out of the program. This is the only non-local |goto| statement
in \.{TANGLE}. It is used when no recovery from a particular error has
been provided.
@@ -235,7 +237,7 @@
end
@z
- at x [38] Provide for a larger `byte_mem' and `tok_mem'. Extra capacity:
+ at x [5.38] l.742 - Provide for a larger `byte_mem' and `tok_mem'. Extra capacity:
@d ww=2 {we multiply the byte capacity by approximately this amount}
@d zz=3 {we multiply the token capacity by approximately this amount}
@y
@@ -243,19 +245,19 @@
@d zz=5 {we multiply the token capacity by approximately this amount}
@z
- at x [38] Provide for larger than 16bit numeric macros.
+ at x [5.38] l.753 - Provide for larger than 16bit numeric macros.
@!equiv: array [0..max_names] of sixteen_bits; {info corresponding to names}
@y
@!equiv: array [0..max_names] of integer; {info corresponding to names}
@z
- at x [47] Provide for larger than 16bit numeric macros.
+ at x [5.47] l.862 - Provide for larger than 16bit numeric macros.
their |equiv| value contains the corresponding numeric value plus $2^{15}$.
@y
their |equiv| value contains the corresponding numeric value plus $2^{30}$.
@z
- at x [47] Add parametric2 macros (macros that use [] to delimit arguments).
+ at x [5.47] l.868 - Add parametric2 macros (macros that use [] to delimit arguments).
\yskip\hang |parametric| identifiers have been defined to be parametric macros;
like simple identifiers, their |equiv| value points to the replacement text.
@y
@@ -263,7 +265,7 @@
be parametric macros; like simple identifiers, their |equiv| value points to
the replacement text.
@z
- at x
+ at x [5.47] l.874
@d parametric=3 {parametric macros have |parametric| ilk}
@y
@d parametric=3 {parametric macros have |parametric| ilk}
@@ -270,25 +272,25 @@
@d parametric2=4 {second type of parametric macros have this |ilk|}
@z
- at x [50] unambig_length is a variable now
+ at x [6.50] l.945 - unambig_length is a variable now
@!chopped_id:array [0..unambig_length] of ASCII_code; {chopped identifier}
@y
@!chopped_id:array [0..max_id_length] of ASCII_code; {chopped identifier}
@z
- at x [53] Add parametric2 macros (macros that use [] to delimit arguments).
+ at x [6.53] l.960 - Add parametric2 macros (macros that use [] to delimit arguments).
|numeric|, |simple|, or |parametric|.
@y
|numeric|, |simple|, |parametric|, or |parametric2|.
@z
- at x [53] unambig_length is a variable.
+ at x [6.53] l.971 - unambig_length is a variable.
@!s:0..unambig_length; {index into |chopped_id|}
@y
@!s:0..max_id_length; {index into |chopped_id|}
@z
- at x [58] Case smashing options/strict checking.
+ at x [6.58] l.1030 - Case smashing options/strict checking.
begin if buffer[i]<>"_" then
begin if buffer[i]>="a" then chopped_id[s]:=buffer[i]-@'40
@y
@@ -300,7 +302,7 @@
chopped_id[s]:=buffer[i]+@'40
@z
- at x [63] Case smashing options/strict checking.
+ at x [6.63] l.1102 - Case smashing options/strict checking.
if c<>"_" then
begin if c>="a" then c:=c-@'40; {merge lowercase with uppercase}
@y
@@ -311,7 +313,7 @@
c:=c+@'40;
@z
- at x [64] Delayed pool file opening / larger numerics.
+ at x [6.64] l.1123 - Delayed pool file opening / larger numerics.
@<Define and output a new string...@>=
begin ilk[p]:=numeric; {strings are like numeric macros}
if l-double_chars=2 then {this string is for a single character}
@@ -330,25 +332,25 @@
l:=l-double_chars-1;
@z
- at x [85] Add parametric2 macros (macros that use [] to delimit arguments).
+ at x [9.85] l.1502 - Add parametric2 macros (macros that use [] to delimit arguments).
begin if ilk[cur_name]=parametric then
@y
begin if (ilk[cur_name]=parametric) or (ilk[cur_name]=parametric2) then
@z
- at x [89] Larger numerics.
+ at x [9.89] l.1586 - Larger numerics.
numeric: begin cur_val:=equiv[a]-@'100000; a:=number;
@y
numeric: begin cur_val:=equiv[a]-@'10000000000; a:=number;
@z
- at x [89] Add parametric2 macros (macros that use [] to delimit arguments).
+ at x [9.89] l.1590 - Add parametric2 macros (macros that use [] to delimit arguments).
parametric: begin @<Put a parameter on the parameter stack,
@y
parametric,parametric2: begin @<Put a parameter on the parameter stack,
@z
- at x [90] Add parametric2 macros (macros that use [] to delimit arguments).
+ at x [9.90] l.1607 - Add parametric2 macros (macros that use [] to delimit arguments).
if (stack_ptr=0)or(tok_mem[zo,cur_byte]<>"(") then
@y
if (stack_ptr=0)or((ilk[a]=parametric)and(tok_mem[zo,cur_byte]<>"("))
@@ -355,12 +357,12 @@
or((ilk[a]=parametric2)and(tok_mem[zo,cur_byte]<>"[")) then
@z
- at x [93] Add parametric2 macros (macros that use [] to delimit arguments).
+ at x [9.93] l.1654 - Add parametric2 macros (macros that use [] to delimit arguments).
bal:=1; incr(cur_byte); {skip the opening `\.('}
@y
bal:=1; incr(cur_byte); {skip the opening `\.(' or `['}
@z
- at x
+ at x [9.93] l.1662
"(": incr(bal);
")": begin decr(bal);
@y
@@ -372,7 +374,7 @@
"]": if ilk[a]=parametric2 then begin decr(bal);
@z
- at x [105] Accept DIV, div, MOD, and mod
+ at x [10.105] l.1937 - Accept DIV, div, MOD, and mod
(((out_contrib[1]="D")and(out_contrib[2]="I")and(out_contrib[3]="V")) or@|
((out_contrib[1]="M")and(out_contrib[2]="O")and(out_contrib[3]="D")) ))or@|
@^uppercase@>
@@ -383,7 +385,7 @@
((out_contrib[1]="m")and(out_contrib[2]="o")and(out_contrib[3]="d")) ))or@|
@z
- at x [110] lowercase ids
+ at x [10.110] l.2005 - lowercase ids
@^uppercase@>
if ((out_buf[out_ptr-3]="D")and(out_buf[out_ptr-2]="I")and
(out_buf[out_ptr-1]="V"))or @/
@@ -400,7 +402,7 @@
(out_buf[out_ptr-1]="d")) then@/ goto bad_case
@z
- at x [114] lowercase operators (`and', `or', etc.)
+ at x [11.114] l.2077 - lowercase operators (`and', `or', etc.)
and_sign: begin out_contrib[1]:="A"; out_contrib[2]:="N"; out_contrib[3]:="D";
@^uppercase@>
send_out(ident,3);
@@ -425,7 +427,7 @@
or_sign: begin out_contrib[1]:="o"; out_contrib[2]:="r"; send_out(ident,2);
@z
- at x [116] Case smashing options.
+ at x [11.116] l.2120 - Case smashing options.
@ Single-character identifiers represent themselves, while longer ones
appear in |byte_mem|. All must be converted to uppercase,
with underlines removed. Extremely long identifiers must be chopped.
@@ -484,36 +486,36 @@
end;
@z
- at x [119] Stretch limits of constants to match what we set for expressions.
+ at x [11.119] l.2199 - Stretch limits of constants to match what we set for expressions.
if n>=@'2000000000 then err_print('! Constant too big')
@y
if n>=@'10000000000 then err_print('! Constant too big')
@z
- at x
+ at x [11.119] l.2208
if n>=@"8000000 then err_print('! Constant too big')
@y
if n>=@"40000000 then err_print('! Constant too big')
@z
- at x [157] Larger numerics.
+ at x [14.157] l.2862 - Larger numerics.
if abs(accumulator)>=@'100000 then
@y
if abs(accumulator)>=@'10000000000 then
@z
- at x [157] Larger numerics.
+ at x [14.157] l.2866 - Larger numerics.
equiv[p]:=accumulator+@'100000; {name |p| now is defined to equal |accumulator|}
@y
equiv[p]:=accumulator+@'10000000000; {name |p| now is defined to equal |accumulator|}
@z
- at x [158] Larger numerics.
+ at x [14.158] l.2889 - Larger numerics.
add_in(equiv[q]-@'100000);
@y
add_in(equiv[q]-@'10000000000);
@z
- at x [165] Add parametric2 macros (macros that use [] to delimit arguments).
+ at x [15.165] l.2964 - Add parametric2 macros (macros that use [] to delimit arguments).
"(": incr(bal);
")": if bal=0 then err_print('! Extra )')
@.Extra )@>
@@ -533,7 +535,7 @@
"#": if (t=parametric)or(t=parametric2) then a:=param;
@z
- at x [166] Add parametric2 macros (macros that use [] to delimit arguments).
+ at x [15.166] l.2988 - Add parametric2 macros (macros that use [] to delimit arguments).
begin if bal=1 then err_print('! Missing )')
else err_print('! Missing ',bal:1,' )''s');
@.Missing n )@>
@@ -560,7 +562,7 @@
end
@z
- at x [173] Add parametric2 macros (macros that use [] to delimit arguments).
+ at x [16.173] l.3107 - Add parametric2 macros (macros that use [] to delimit arguments).
else @<If the next text is `\.{(\#)==}', call |define_macro|
and |goto continue|@>;
@y
@@ -568,7 +570,7 @@
and |goto continue|@>;
@z
- at x [174] Add parametric2 macros (macros that use [] to delimit arguments).
+ at x [16.174] l.3114 - Add parametric2 macros (macros that use [] to delimit arguments).
@ @<If the next text is `\.{(\#)==}'...@>=
if next_control="(" then
begin next_control:=get_next;
@@ -625,7 +627,7 @@
end
@z
- at x [179] make term_in = input
+ at x [17.179] l.3190 - make term_in = input
any error stop will set |debug_cycle| to zero.
@y
any error stop will set |debug_cycle| to zero.
@@ -633,17 +635,17 @@
@d term_in==stdin
@z
- at x
+ at x [17.179] l.3198
@!term_in:text_file; {the user's terminal as an input file}
@y
@z
- at x [180] remove term_in reset
+ at x [17.180] l.3206 - remove term_in reset
reset(term_in,'TTY:','/I'); {open |term_in| as the terminal, don't do a |get|}
@y
@z
- at x [182] write newline just before exit; use value of |history|
+ at x [18.182] l.3248 - write newline just before exit; use value of |history|
print_ln(banner); {print a ``banner line''}
@y
print (banner); {print a ``banner line''}
@@ -650,12 +652,12 @@
print_ln (version_string);
@z
- at x Eliminate the |end_of_TANGLE| label.
+ at x [18.182] l.3252 - Eliminate the |end_of_TANGLE| label.
end_of_TANGLE:
@y
@z
- at x
+ at x [18.182] l.3256
@<Print the job |history|@>;
@y
@<Print the job |history|@>;
@@ -665,7 +667,7 @@
else uexit (0);
@z
- at x [188] System-dependent changes.
+ at x [19.188] l.3308 - System-dependent changes.
This module should be replaced, if necessary, by changes to the program
that are necessary to make \.{TANGLE} work at a particular installation.
It is usually best to design your change file so that all changes to
Added: branches/stable/source/src/texk/web2c/tests/aftergroupout.tex
===================================================================
--- branches/stable/source/src/texk/web2c/tests/aftergroupout.tex (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/aftergroupout.tex 2024-07-21 17:12:46 UTC (rev 933)
@@ -0,0 +1,26 @@
+% $Id: aftergroupout.tex 70752 2024-03-24 22:32:46Z karl $
+% Public domain. Based on a post by David Carlisle to tex-live,
+% https://tug.org/pipermail/tex-live/2024-March/050292.html
+%
+% See ./unbalanced-braces.tex for background.
+%
+\catcode`\{=1 \catcode`\}=2
+\pdfoutput = 1
+\pdfmapline{cmr10 CMR10 <cmr10.pfb}
+\font\f = cmr10 \f
+\hsize=6in
+\vsize=9in
+\parfillskip=0pt plus1fil
+
+% with original TL24 binaries, \aftergroup on the \output routine didn't work.
+\def\xxx{\aftergroup A\global\let\xxx\relax}
+
+\output{\xxx\global\advance\count0 by 1 \shipout\box255}
+
+page1
+
+\penalty-10000
+
+page2
+
+\end
Property changes on: branches/stable/source/src/texk/web2c/tests/aftergroupout.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: branches/stable/source/src/texk/web2c/tests/fix-changefile-lines.py
===================================================================
--- branches/stable/source/src/texk/web2c/tests/fix-changefile-lines.py (rev 0)
+++ branches/stable/source/src/texk/web2c/tests/fix-changefile-lines.py 2024-07-21 17:12:46 UTC (rev 933)
@@ -0,0 +1,234 @@
+#!/usr/bin/env python3
+# $Id: fix-changefile-lines.py 71714 2024-07-05 12:57:53Z ascherer $
+# Applied to tex.ch and mf.ch on 2024-06-03, following the request at:
+# https://tug.org/pipermail/tex-k/2024-June/004064.html
+"""
+Reads a WEB file and a change file and writes a change file to stdout with
+potentially corrected part, section and line numbers.
+Written by Tyge Tiessen, 2024. Public domain.
+"""
+
+import getopt, os, re, sys
+
+USAGE = f"""
+Usage: {os.path.basename(sys.argv[0])} [-i|--init] <web file> <change file>
+
+Reads a WEB file and a change file and writes a change file to stdout with
+potentially corrected part, section and line numbers.
+
+The option '-i' ('--init') forces a '[part.section] l.line' tag after each
+'@x'; this is useful for untagged change files.
+
+Written by Tyge Tiessen, 2024. Public domain.
+""".strip()
+
+
+def main():
+ # Handle command-line options
+ opt_handler = OptHandler()
+
+ # Read WEB file
+ web_reader = WebReader(opt_handler.args[0])
+
+ # Read change file
+ ch_reader = ChangeReader(opt_handler.args[1])
+
+ # Run through the two files in parallel
+ ch_reader.traverse(web_reader, opt_handler)
+
+ for line in ch_reader.get_lines():
+ print(line)
+
+
+class WebReader:
+ """An iterator that produces the lines of a WEB file while keeping track
+ of the current part and section number.
+ """
+
+ def __init__(self, web_file):
+ self._pos = 0
+ self.part_cnt = 0
+ self.section_cnt = 0
+ try:
+ with open(web_file, "r") as file:
+ self._web_lines = [line.rstrip() for line in file]
+ except OSError:
+ eprint(f"Could not open {web_file}")
+ print(USAGE)
+ sys.exit(1)
+
+ def next_line(self):
+ """Returns the triple of current part, section and line numbers, as
+ well as the next line. Updates part and section numbers.
+ """
+ if self._pos >= len(self._web_lines):
+ return None
+ line = self._web_lines[self._pos]
+
+ # Look for starred section == part
+ if line.startswith("@*"):
+ self.part_cnt += 1
+ self.section_cnt += 1
+
+ # Look for unstarred section
+ if line.startswith("@ ") or line == "@":
+ self.section_cnt += 1
+
+ # Prepare return values
+ part = self.part_cnt
+ section = self.section_cnt
+ line_number = self._pos = self._pos + 1
+
+ # Look for '@i'nclude line
+ result = re.match("^@i \"?(\\w+(\\.\\w+)?)\"?", line)
+ if result:
+ inc_reader = WebReader(result[1])
+ while inc_reader.next_line():
+ pass
+ self.part_cnt += inc_reader.part_cnt
+ self.section_cnt += inc_reader.section_cnt
+ # Do not increase 'part' and 'section' just yet
+ # Ignore line count in include file; we're only one step beyond
+
+ return (part, section, line_number), line
+
+
+class ChangeReader:
+ """Reads the lines of a change file while updating the tags with
+ information from the corresponding WEB file.
+ """
+
+ def __init__(self, change_file):
+ self._pos = 0
+ self._chunk_start = None
+ self._match_lines = None
+ try:
+ with open(change_file, "r") as file:
+ self._lines = [line.rstrip() for line in file]
+ except OSError:
+ eprint(f"Could not open {change_file}")
+ print(USAGE)
+ sys.exit(1)
+
+ def advance_to_next_chunk(self):
+ """Find the next change chunk. Store where it starts and
+ the lines to be matched.
+ """
+
+ while self._pos < len(self._lines):
+ line = self._lines[self._pos]
+ if line.startswith("@x"):
+ self._chunk_start = self._pos
+ while True:
+ self._pos += 1
+ if self._pos >= len(self._lines):
+ eprint(f"! Change file ended before @y. (l. {self._pos+1} of change file)")
+ sys.exit(1)
+ line = self._lines[self._pos]
+ if line.startswith("@y"):
+ self._match_lines = self._lines[
+ self._chunk_start + 1 : self._pos
+ ]
+ return True
+ elif line.startswith("@x") or line.startswith("@z"):
+ eprint(f"! Where is the matching @y?. (l. {self._pos+1} of change file)")
+ eprint(line)
+ sys.exit(1)
+ self._pos += 1
+ return False
+
+ def find_match_in_web(self, web_reader):
+ """Find the match for the current change chunk in the WEB file.
+ Returns the part, section, and line number of the first match line in
+ the WEB file.
+ """
+ while True:
+ try:
+ (part, section, line_number), tex_line = web_reader.next_line()
+ except:
+ eprint(f"! Change file entry did not match. (l. {self._chunk_start+2} of change file)")
+ eprint(self._match_lines[0])
+ sys.exit(1)
+ if tex_line == self._match_lines[0]:
+ for i in range(1, len(self._match_lines)):
+ try:
+ _, tex_line = web_reader.next_line()
+ except:
+ tex_line = None
+ if tex_line is None or tex_line != self._match_lines[i]:
+ eprint(f"! Change file entry did not match. (l. {self._chunk_start+2+i} of change file)")
+ eprint(self._match_lines[i])
+ sys.exit(1)
+
+ return part, section, line_number
+
+ def traverse(self, web_reader, opt_handler):
+ """Go through all individual change chunks while updating their tags."""
+ while self.advance_to_next_chunk():
+ part, section, line_number = self.find_match_in_web(web_reader)
+
+ # Replace '@x' line with updated information.
+ new_line = self._lines[self._chunk_start]
+
+ new_line = re.sub(
+ "\\[\\d+\\.\\d+\\]", f"[{part}.{section}]", new_line, 1)
+ new_line = re.sub(
+ "^@x \\[\\d+\\]", f"@x [{section}]", new_line, 1)
+ new_line = re.sub(
+ "l\\.\\d+", f"l.{line_number}", new_line, 1)
+
+ # Force '[part.section] l.line' tag after '@x'; useful for untagged
+ # change files, e.g., CWEB's '*-w2c.ch' monsters.
+ if opt_handler.init_b:
+ new_line = re.sub(
+ "^@x", f"@x [{part}.{section}] l.{line_number}",
+ new_line, 1)
+
+ ch_line = self._lines[self._chunk_start]
+ if new_line[:10] != ch_line[:10]:
+ eprint("Old:")
+ eprint(f" {ch_line}")
+ eprint("New:")
+ eprint(f" {new_line}")
+ eprint()
+
+ self._lines[self._chunk_start] = new_line
+
+ def get_lines(self):
+ return self._lines
+
+
+class OptHandler:
+ """Parses the invocation line and extracts the options.
+ Returns the remaining arguments, i.e., the WEB and Change File names.
+ """
+
+ def __init__(self):
+ # Should we insert tag '[{part}.{section}] l.{line}' after '@x'?
+ self.init_b = False
+
+ try:
+ opts, self.args = getopt.getopt(sys.argv[1:], "i", ["init"])
+ except getopt.GetoptError as err:
+ eprint(f"\n{os.path.basename(sys.argv[0])}: {err}!\n")
+ print(USAGE)
+ sys.exit(1)
+
+ for opt, _ in opts:
+ if opt in ("-i", "--init"):
+ self.init_b = True
+ else:
+ assert False, f"Unhandled option {opt}"
+
+ if len(self.args) != 2:
+ print(USAGE)
+ sys.exit(1)
+
+
+def eprint(*args, **kwargs):
+ """Print to stderr."""
+ print(*args, file=sys.stderr, **kwargs)
+
+
+if __name__ == "__main__":
+ main()
Property changes on: branches/stable/source/src/texk/web2c/tests/fix-changefile-lines.py
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/stable/source/src/texk/web2c/tex.ch
===================================================================
--- branches/stable/source/src/texk/web2c/tex.ch 2024-07-21 17:07:35 UTC (rev 932)
+++ branches/stable/source/src/texk/web2c/tex.ch 2024-07-21 17:12:46 UTC (rev 933)
@@ -1,4 +1,4 @@
-% $Id: tex.ch 68900 2023-11-19 16:03:33Z karl $
+% $Id: tex.ch 71655 2024-06-29 18:09:10Z ascherer $
% tex.ch for C compilation with web2c, derived from various other change files.
% By Tim Morgan, UC Irvine ICS Department, and many others.
%
@@ -47,20 +47,20 @@
%
% Except for MLTeX, the new code in this file is in the public domain.
%
-% The module numbers in this change file refer to TEX.WEB 3.14159 as
-% of March, 1995 (published as Donald E. Knuth, TeX: The Program,
-% Volume B of Computers & Typesetting).
+% The part, module, and line numbers in this change file refer to
+% TEX.WEB 3.141592653 as of January, 2021 (published as Donald E. Knuth,
+% TeX: The Program, Volume B of Computers & Typesetting Jubilee Editions).
- at x [0.0] l.83 - WEAVE: print changes only.
+ at x [0.0] l.88 - WEAVE: print changes only.
\def\?##1]{\hbox to 1in{\hfil##1.\ }}
}
- at y 83
+ at y
\def\?##1]{\hbox{Changes to ##1.\ }}
}
\let\maybe=\iffalse
@z
- at x [1.2] l.185 - MLTeX: add comment about banner line change
+ at x [1.2] l.191 - MLTeX: add comment about banner line change
November 1984].
@y
November 1984].
@@ -72,7 +72,7 @@
@z
- at x [1.2] l.188
+ at x [1.2] l.193
@d banner=='This is TeX, Version 3.141592653' {printed when \TeX\ starts}
@y
@d TeX_banner_k=='This is TeXk, Version 3.141592653' {printed when \TeX\ starts}
@@ -82,7 +82,7 @@
@d banner_k==TeX_banner_k
@z
- at x [1.4] l.233 - program header
+ at x [1.4] l.244 - program header
Actually the heading shown here is not quite normal: The |program| line
does not mention any |output| file, because \ph\ would ask the \TeX\ user
to specify a file name if |output| were specified here.
@@ -91,7 +91,7 @@
@y
@z
- at x [1.4] l.243 - labels in outer block not needed
+ at x [1.4] l.255 - labels in outer block not needed
program TEX; {all file names are defined dynamically}
label @<Labels in the outer block@>@/
@y
@@ -98,7 +98,7 @@
program TEX; {all file names are defined dynamically}
@z
- at x [1.6] l.267 - labels in outer block not needed
+ at x [1.6] l.279 - labels in outer block not needed
@ Three labels must be declared in the main program, so we give them
symbolic names.
@@ -119,7 +119,7 @@
% Here we change these WEB symbols, which are used much as #ifdef's
% are in C, into something which will get translated into actual #ifdef's.
- at x [1.7] l.292 - debug..gubed, stat..tats
+ at x [1.7] l.304 - debug..gubed, stat..tats
@d debug==@{ {change this to `$\\{debug}\equiv\null$' when debugging}
@d gubed==@t@>@} {change this to `$\\{gubed}\equiv\null$' when debugging}
@y
@@ -126,7 +126,7 @@
@d debug==ifdef('TEXMF_DEBUG')
@d gubed==endif('TEXMF_DEBUG')
@z
- at x [1.7] l.297 - debug..gubed, stat..tats
+ at x [1.7] l.309 - debug..gubed, stat..tats
@d stat==@{ {change this to `$\\{stat}\equiv\null$' when gathering
usage statistics}
@d tats==@t@>@} {change this to `$\\{tats}\equiv\null$' when gathering
@@ -136,12 +136,12 @@
@d tats==endif('STAT')
@z
- at x [1.8] Somewhat different for `init...tini'.. 310 m.8
+ at x [1.8] l.322 - Somewhat different for `init...tini'.
the codewords `$|init|\ldots|tini|$'.
@d init== {change this to `$\\{init}\equiv\.{@@\{}$' in the production version}
@d tini== {change this to `$\\{tini}\equiv\.{@@\}}$' in the production version}
- at y 314
+ at y
the codewords `$|init|\ldots|tini|$' for declarations and by the codewords
`$|Init|\ldots|Tini|$' for executable code. This distinction is helpful for
implementations where a run-time switch differentiates between the two
@@ -155,13 +155,13 @@
@f Tini==end
@z
- at x [1.8] l.319 - init...tini is dynamic
+ at x [1.8] l.331 - init...tini is dynamic
@!init @<Initialize table entries (done by \.{INITEX} only)@>@;@+tini
- at y 318
+ at y
@!Init @<Initialize table entries (done by \.{INITEX} only)@>@;@+Tini
@z
- at x [1.11] l.375 - Compile-time constants: most removed for dynamic allocation.
+ at x [1.11] l.389 - Compile-time constants: most removed for dynamic allocation.
@<Constants...@>=
@!mem_max=30000; {greatest index in \TeX's internal |mem| array;
must be strictly less than |max_halfword|;
@@ -291,7 +291,7 @@
@!sup_expand_depth = 10000000;
@z
- at x [1.12] l.427 - Constants that are WEB numeric macros.
+ at x [1.12] l.441 - Constants that are WEB numeric macros.
@d mem_bot=0 {smallest index in the |mem| array dumped by \.{INITEX};
must not be less than |mem_min|}
@d mem_top==30000 {largest index in the |mem| array dumped by \.{INITEX};
@@ -311,7 +311,7 @@
if you change this, you should also change |iinf_hyphen_size|.}
@z
- at x [1.16] l.498 - Use C macros for `incr' and `decr'.
+ at x [1.16] l.512 - Use C macros for `incr' and `decr'.
@d incr(#) == #:=#+1 {increase a variable by unity}
@d decr(#) == #:=#-1 {decrease a variable by unity}
@y
@@ -320,13 +320,13 @@
% The text_char type is used as an array index into xord. The
% default type `char' produces signed integers, which are bad array
% indices in C.
- at x [2.19] l.565 - data type text_char is 8-bit ASCII_code
+ at x [2.19] l.579 - data type text_char is 8-bit ASCII_code
@d text_char == char {the data type of characters in text files}
@y
@d text_char == ASCII_code {the data type of characters in text files}
@z
- at x [2.20] l.579 - printable characters
+ at x [2.20] l.593 - printable characters
@!xchr: array [ASCII_code] of text_char;
{specifies conversion of output characters}
@y
@@ -336,7 +336,7 @@
{ non zero iff character is printable }
@z
- at x [2.23] l.723 - Translate characters if desired, otherwise allow them all.
+ at x [2.23] l.737 - Translate characters if desired, otherwise allow them all.
for i:=0 to @'37 do xchr[i]:=' ';
for i:=@'177 to @'377 do xchr[i]:=' ';
@y
@@ -345,7 +345,7 @@
for i:=@'177 to @'377 do xchr[i]:=i;
@z
- at x [2.24] l.733 - Don't reinitialize xord.
+ at x [2.24] l.749 - Don't reinitialize xord.
for i:=0 to @'176 do xord[xchr[i]]:=i;
@y
for i:=0 to @'176 do xord[xchr[i]]:=i;
@@ -371,7 +371,7 @@
% When echoed to the screen and in the log, character codes
% above '177 in file names are shown wrongly (typically as ^@).
%
- at x [3.26] l.789 - name_of_file is no longer an array
+ at x [3.26] l.803 - name_of_file is no longer an array
@!name_of_file:packed array[1..file_name_size] of char;@;@/
{on some systems this may be a \&{record} variable}
@y
@@ -378,7 +378,7 @@
@!name_of_file:^text_char;
@z
- at x [3.27] l.794 - Do file opening in C.
+ at x [3.27] l.808 - Do file opening in C.
@ The \ph\ compiler with which the present version of \TeX\ was prepared has
extended the rules of \PASCAL\ in a very convenient way. To open file~|f|,
we can write
@@ -438,7 +438,7 @@
@ All of the file opening functions are defined in C.
@z
- at x [3.28] l.850 - Do file closing in C.
+ at x [3.28] l.864 - Do file closing in C.
@ Files can be closed with the \ph\ routine `|close(f)|', which
@:PASCAL H}{\ph@>
@^system dependencies@>
@@ -465,13 +465,13 @@
@ And all the file closing routines as well.
@z
- at x [3.30] l.888 - Array size of input buffer is determined at runtime.
+ at x [3.30] l.903 - Array size of input buffer is determined at runtime.
@!buffer:array[0..buf_size] of ASCII_code; {lines of characters being read}
@y
@!buffer:^ASCII_code; {lines of characters being read}
@z
- at x [3.31] l.933 - Do `input_ln' in C.
+ at x [3.31] l.948 - Do `input_ln' in C.
@p function input_ln(var f:alpha_file;@!bypass_eoln:boolean):boolean;
{inputs the next line or returns |false|}
var last_nonblank:0..buf_size; {|last| with trailing blanks removed}
@@ -502,7 +502,7 @@
% [3.32] `term_in' and `term_out' are standard input and output.
% Declare the variables that used to be constants.
- at x [3.32] l.961 - `term_in' and `term_out' are standard input and output.
+ at x [3.32] l.975 - `term_in' and `term_out' are standard input and output.
@<Glob...@>=
@!term_in:alpha_file; {the terminal as an input file}
@!term_out:alpha_file; {the terminal as an output file}
@@ -589,7 +589,7 @@
@!insert_src_special_every_display : boolean;
@z
- at x [3.33] l.964 - We don't need to open terminal files.
+ at x [3.33] l.979 - We don't need to open terminal files.
@ Here is how to open the terminal files
in \ph. The `\.{/I}' switch suppresses the first |get|.
@:PASCAL H}{\ph@>
@@ -605,7 +605,7 @@
@d t_open_out == {output already open for text output}
@z
- at x [3.34] l.982 - Flushing output to terminal files.
+ at x [3.34] l.998 - Flushing output to terminal files.
these operations can be specified in \ph:
@:PASCAL H}{\ph@>
@^system dependencies@>
@@ -622,7 +622,7 @@
@d clear_terminal == do_nothing
@z
- at x [3.35] l.1017 - needed for e-TeX, but differently
+ at x [3.35] l.1034 - needed for e-TeX, but differently
@<Report overflow of the input buffer, and abort@>=
if format_ident=0 then
begin write_ln(term_out,'Buffer size exceeded!'); goto final_end;
@@ -636,7 +636,7 @@
begin cur_input.loc_field:=first; cur_input.limit_field:=last-1;
@z
- at x [3.37] l.1055 - |init_terminal|, reading the command line.
+ at x [3.37] l.1072 - |init_terminal|, reading the command line.
@ The following program does the required initialization
without retrieving a possible command line.
It should be clear how to modify this routine to deal with command lines,
@@ -664,13 +664,13 @@
end;
@z
- at x [3.37] l.1068 - |init_terminal|, output missing newline.
+ at x [3.37] l.1085 - |init_terminal|, output missing newline.
write(term_out,'! End of file on the terminal... why?');
@y
write_ln(term_out,'! End of file on the terminal... why?');
@z
- at x [4.38] l.1126 - Array size for string pool is determined at runtime.
+ at x [4.38] l.1144 - Array size for string pool is determined at runtime.
@!pool_pointer = 0..pool_size; {for variables that point into |str_pool|}
@!str_number = 0..max_strings; {for variables that point into |str_start|}
@y
@@ -678,7 +678,7 @@
@!str_number = 0..ssup_max_strings; {for variables that point into |str_start|}
@z
- at x [4.39] l.1131 - Dynamically size pool arrays.
+ at x [4.39] l.1149 - Dynamically size pool arrays.
@!str_pool:packed array[pool_pointer] of packed_ASCII_code; {the characters}
@!str_start : array[str_number] of pool_pointer; {the starting pointers}
@y
@@ -686,7 +686,7 @@
@!str_start : ^pool_pointer; {the starting pointers}
@z
- at x [4.47] l.1237 - string recycling
+ at x [4.47] l.1255 - string recycling
@p @!init function get_strings_started:boolean; {initializes the string pool,
@y
@p @t\4@>@<Declare additional routines for string recycling@>@/
@@ -694,7 +694,7 @@
@!init function get_strings_started:boolean; {initializes the string pool,
@z
- at x [4.49] l.1272 -- Change documentation (probably needed in more places)
+ at x [4.49] l.1290 - Change documentation (probably needed in more places)
would like string @'32 to be the single character @'32 instead of the
@y
would like string @'32 to be printed as the single character @'32
@@ -705,7 +705,7 @@
% assignments directly. (`strcpy' and `strlen' work here because
% `pool_name' is a constant string, and thus ends in a null and doesn't
% start with a space.)
- at x [4.51] l.1314 - Open the pool file.
+ at x [4.51] l.1332 - Open the pool file.
name_of_file:=pool_name; {we needn't set |name_length|}
if a_open_in(pool_file) then
@y
@@ -715,12 +715,12 @@
if a_open_in (pool_file, kpse_texpool_format) then
@z
- at x [4.51] l.1322 - Make `TEX.POOL' lowercase, and change how it's read.
+ at x [4.51] l.1340 - Make `TEX.POOL' lowercase, and change how it's read.
else bad_pool('! I can''t read TEX.POOL.')
@y
else bad_pool('! I can''t read ', pool_name, '; bad path?')
@z
- at x [4.52] l.1326 - Make `TEX.POOL' lowercase, and change how it's read.
+ at x [4.52] l.1344 - Make `TEX.POOL' lowercase, and change how it's read.
begin if eof(pool_file) then bad_pool('! TEX.POOL has no check sum.');
@.TEX.POOL has no check sum@>
read(pool_file,m,n); {read two digits of string length}
@@ -729,17 +729,17 @@
@.TEX.POOL has no check sum@>
read(pool_file,m); read(pool_file,n); {read two digits of string length}
@z
- at x [4.52] l.1332 - Make `TEX.POOL' lowercase, and change how it's read.
+ at x [4.52] l.1350 - Make `TEX.POOL' lowercase, and change how it's read.
bad_pool('! TEX.POOL line doesn''t begin with two digits.');
@y
bad_pool('! ', pool_name, ' line doesn''t begin with two digits.');
@z
- at x [4.53] l.1354 - Make `TEX.POOL' lowercase, and change how it's read.
+ at x [4.53] l.1372 - Make `TEX.POOL' lowercase, and change how it's read.
bad_pool('! TEX.POOL check sum doesn''t have nine digits.');
@y
bad_pool('! ', pool_name, ' check sum doesn''t have nine digits.');
@z
- at x [4.53] l.1360 - Make `TEX.POOL' lowercase, and change how it's read.
+ at x [4.53] l.1378 - Make `TEX.POOL' lowercase, and change how it's read.
done: if a<>@$ then bad_pool('! TEX.POOL doesn''t match; TANGLE me again.');
@y
done: if a<>@$ then
@@ -746,13 +746,13 @@
bad_pool('! ', pool_name, ' doesn''t match; tangle me again (or fix the path).');
@z
- at x [5.54] l.1422 - error_line
+ at x [5.54] l.1440 - error_line
@!trick_buf:array[0..error_line] of ASCII_code; {circular buffer for
@y
@!trick_buf:array[0..ssup_error_line] of ASCII_code; {circular buffer for
@z
- at x l.1536 -- If the ``src-specials'' feature is active, change the banner.
+ at x [5.61] l.1574 - If the ``src-specials'' feature is active, change the banner.
wterm(banner);
@y
if src_specials_p or file_line_error_style_p or parse_first_line_p then
@@ -761,7 +761,7 @@
wterm(banner);
@z
- at x [5.61] l.1556 - Print rest of banner.
+ at x [5.61] l.1575 - Print rest of banner.
if format_ident=0 then wterm_ln(' (no format preloaded)')
else begin slow_print(format_ident); print_ln;
end;
@@ -787,7 +787,7 @@
end;
@z
- at x [5.71] term_input: set limit when fatal_error
+ at x [5.71] l.1713 - term_input: set limit when fatal_error
if not input_ln(term_in,true) then fatal_error("End of file on the terminal!");
@y
if not input_ln(term_in,true) then begin
@@ -794,7 +794,7 @@
limit:=0; fatal_error("End of file on the terminal!"); end;
@z
- at x [6.73] l.1732 - Add unspecified_mode.
+ at x [6.73] l.1750 - Add unspecified_mode.
@d error_stop_mode=3 {stops at every opportunity to interact}
@y
@d error_stop_mode=3 {stops at every opportunity to interact}
@@ -801,7 +801,7 @@
@d unspecified_mode=4 {extra value for command-line switch}
@z
- at x [6.73] l.1734 - file:line:error style error messages.
+ at x [6.73] l.1752 - file:line:error style error messages.
print_nl("! "); print(#);
@y
if file_line_error_style_p then print_file_line
@@ -810,7 +810,7 @@
@z
- at x [6.73] l.1738 - Add interaction_option.
+ at x [6.73] l.1756 - Add interaction_option.
@!interaction:batch_mode..error_stop_mode; {current level of interaction}
@y
@!interaction:batch_mode..error_stop_mode; {current level of interaction}
@@ -817,7 +817,7 @@
@!interaction_option:batch_mode..unspecified_mode; {set from command line}
@z
- at x [6.74] l.1740 - Allow override by command line switch.
+ at x [6.74] l.1758 - Allow override by command line switch.
@ @<Set init...@>=interaction:=error_stop_mode;
@y
@ @<Set init...@>=if interaction_option=unspecified_mode then
@@ -830,7 +830,7 @@
% Plus, it's nicer just to do an exit with the appropriate status code
% under Unix. We call it `uexit' because there's a WEB symbol called
% `exit' already. We use a C macro to change `uexit' back to `exit'.
- at x [6.81] l.1852 - Eliminate nonlocal goto, since C doesn't have them.
+ at x [6.81] l.1860 - Eliminate nonlocal goto, since C doesn't have them.
@ The |jump_out| procedure just cuts across all active procedure levels and
goes to |end_of_TEX|. This is the only nontrivial |@!goto| statement in the
whole program. It is used when there is no recovery from a particular error.
@@ -871,7 +871,7 @@
end;
@z
- at x [6.82] l.1866 - halt on error?
+ at x [6.82] l.1884 - halt on error?
print_char("."); show_context;
@y
print_char("."); show_context;
@@ -885,7 +885,7 @@
end;
@z
- at x [6.84] l.1904 - Implement the switch-to-editor option.
+ at x [6.84] l.1908 - Implement the switch-to-editor option.
line ready to be edited. But such an extension requires some system
wizardry, so the present implementation simply types out the name of the
file that should be
@@ -910,7 +910,7 @@
@d edit_file==input_stack[base_ptr]
@z
- at x [6.84] l.1903 - Implement the switch-to-editor option.
+ at x [6.84] l.1923 - Implement the switch-to-editor option.
"E": if base_ptr>0 then if input_stack[base_ptr].name_field>=256 then
begin print_nl("You want to edit file ");
@.You want to edit file x@>
@@ -926,19 +926,19 @@
jump_out;
@z
- at x [6.93] l.2056 - Declare fatal_error as noreturn.
+ at x [6.93] l.2062 - Declare fatal_error as noreturn.
procedure fatal_error(@!s:str_number); {prints |s|, and that's it}
@y
noreturn procedure fatal_error(@!s:str_number); {prints |s|, and that's it}
@z
- at x [6.94] l.2065 - Declare overflow as noreturn.
+ at x [6.94] l.2071 - Declare overflow as noreturn.
procedure overflow(@!s:str_number;@!n:integer); {stop due to finiteness}
@y
noreturn procedure overflow(@!s:str_number;@!n:integer); {stop due to finiteness}
@z
- at x [6.95] l.2084 - Declare confusion as noreturn.
+ at x [6.95] l.2090 - Declare confusion as noreturn.
procedure confusion(@!s:str_number);
@y
noreturn procedure confusion(@!s:str_number);
@@ -946,7 +946,7 @@
% [7.104] `remainder' is a library routine on some systems, so change
% its name to avoid conflicts.
- at x [7.104] l.2227 - avoid name conflicts with lib routine remainder()
+ at x [7.104] l.2248 - avoid name conflicts with lib routine remainder()
|remainder|, holds the remainder after a division.
@<Glob...@>=
@@ -958,7 +958,7 @@
@<Glob...@>=
@z
- at x [7.109] l.2352 - Define glue_ratio in C.
+ at x [7.109] l.2373 - Define glue_ratio in C.
@!glue_ratio=real; {one-word representation of a glue expansion factor}
@y
@z
@@ -965,15 +965,15 @@
% [8.110] Make it easy to change constants. Do not increase
% max_quarterword without changing the memoryword structure in `texmfmem.h'.
- at x [8.110] l.2422 - increase |max_halfword|
+ at x [8.110] l.2428 - increase |max_halfword|
@d min_halfword==0 {smallest allowable value in a |halfword|}
@d max_halfword==65535 {largest allowable value in a |halfword|}
- at y 2424
+ at y
@d min_halfword==-@"FFFFFFF {smallest allowable value in a |halfword|}
@d max_halfword==@"FFFFFFF {largest allowable value in a |halfword|}
@z
- at x [8.111] l.2435 - min_halfword and max_halfword
+ at x [8.111] l.2441 - min_halfword and max_halfword
if (mem_min<min_halfword)or(mem_max>=max_halfword)or@|
(mem_bot-mem_min>max_halfword+1) then bad:=14;
@y
@@ -981,7 +981,7 @@
(mem_top+sup_main_memory>=max_halfword) then bad:=14;
@z
- at x [8.111] l.2437 - max_font_max
+ at x [8.111] l.2443 - max_font_max
if (font_base<min_quarterword)or(font_max>max_quarterword) then bad:=15;
if font_max>font_base+256 then bad:=16;
@y
@@ -989,7 +989,7 @@
if font_max>font_base+max_font_max then bad:=16;
@z
- at x [8.112] l.2450 - Efficiency.
+ at x [8.112] l.2456 - Efficiency.
macros are simplified in the obvious way when |min_quarterword=0|.
@^inner loop@>@^system dependencies@>
@@ -1019,7 +1019,7 @@
% [8.113] We've put the memory structure into the include file
% `texmf.h', since it's too hard to translate automatically.
- at x [8.113] l.2453 - data structures for main memory
+ at x [8.113] l.2474 - data structures for main memory
@!quarterword = min_quarterword..max_quarterword; {1/4 of a word}
@!halfword=min_halfword..max_halfword; {1/2 of a word}
@!two_choices = 1..2; {used when there are two variants in a record}
@@ -1053,7 +1053,7 @@
% [9.116] Change `mem' to `zmem', so we can define mem to be a register
% pointer to the memory array for speed.
- at x [9.116] l.2545 - definition of main memory array
+ at x [9.116] l.2566 - definition of main memory array
@!mem : array[mem_min..mem_max] of memory_word; {the big dynamic storage area}
@y
@!yzmem : ^memory_word; {the big dynamic storage area}
@@ -1060,7 +1060,7 @@
@!zmem : ^memory_word; {the big dynamic storage area}
@z
- at x [10.144] l.3006 - font numbers can be >255 now.
+ at x [10.144] l.3027 - font numbers can be >255 now.
@p function new_ligature(@!f,@!c:quarterword; @!q:pointer):pointer;
@y
@p function new_ligature(@!f:internal_font_number; @!c:quarterword;
@@ -1069,7 +1069,7 @@
% [11.165] Fix the word `free' so that it doesn't conflict with the
% standard C library routine of the same name.
- at x [11.165] l.3364 - avoid conflict with lib function free()
+ at x [11.165] l.3385 - avoid conflict with lib function free()
are debugging.)
@y
are debugging.)
@@ -1077,7 +1077,7 @@
@d free==free_arr
@z
- at x [11.165] l.3367 - dummy |free| and |was_free| arrays
+ at x [11.165] l.3388 - dummy |free| and |was_free| arrays
@!debug @!free: packed array [mem_min..mem_max] of boolean; {free cells}
@t\hskip10pt@>@!was_free: packed array [mem_min..mem_max] of boolean;
@y
@@ -1086,13 +1086,13 @@
@t\hskip10pt@>@!was_free: packed array [0..9] of boolean;
@z
- at x [12.174] l.3526 - Eliminate unsigned comparisons to zero.
+ at x [12.174] l.3547 - Eliminate unsigned comparisons to zero.
begin if (font(p)<font_base)or(font(p)>font_max) then
@y
begin if (font(p)>font_max) then
@z
- at x [12.176] l.3563 - Eliminate unsigned comparisons to zero.
+ at x [12.176] l.3584 - Eliminate unsigned comparisons to zero.
@p procedure print_font_and_char(@!p:integer); {prints |char_node| data}
begin if p>mem_end then print_esc("CLOBBERED.")
else begin if (font(p)<font_base)or(font(p)>font_max) then print_char("*")
@@ -1102,10 +1102,10 @@
else begin if (font(p)>font_max) then print_char("*")
@z
- at x [12.186] l.3747 - Don't worry about strange floating point values.
+ at x [12.186] l.3768 - Don't worry about strange floating point values.
if abs(mem[p+glue_offset].int)<@'4000000 then print("?.?")
else if abs(g)>float_constant(20000) then
- at y 3747
+ at y
{ The Unix |pc| folks removed this restriction with a remark that
invalid bit patterns were vanishingly improbable, so we follow
their example without really understanding it.
@@ -1115,7 +1115,7 @@
@z
- at x [15.209] l.4165 - MLTeX: \charsubdef primitive
+ at x [15.209] l.4186 - MLTeX: \charsubdef primitive
@d shorthand_def=95 {code definition ( \.{\\chardef}, \.{\\countdef}, etc.~)}
@y
@d shorthand_def=95 {code definition ( \.{\\chardef}, \.{\\countdef}, etc.~)}
@@ -1126,7 +1126,7 @@
% can not be translated. For example, messages printed by |print_mode|
% from [16.211] use different word order and [46.1049] use different
% word order and words are declined.
- at x [16.211] l.4256
+ at x [16.211] l.4259
begin if m>0 then
case m div (max_command+1) of
0:print("vertical");
@@ -1172,13 +1172,13 @@
end;
@z
- at x [16.213] l.4321 - texarray
+ at x [16.213] l.4342 - texarray
@!nest:array[0..nest_size] of list_state_record;
@y
@!nest:^list_state_record;
@z
- at x [16.215] l.4344 - remove mem[] reference from initialize.
+ at x [16.215] l.4365 - remove mem[] reference from initialize.
prev_graf:=0; shown_mode:=0;
@<Start a new current page@>;
@y
@@ -1189,7 +1189,7 @@
page_depth:=0; page_max_depth:=0;
@z
- at x [16.219] l.4409 - i18n fix
+ at x [16.219] l.4430 - i18n fix
print_int(nest[p].pg_field); print(" line");
if nest[p].pg_field<>1 then print_char("s");
@y
@@ -1198,7 +1198,7 @@
else print(" line");
@z
- at x [17.220] l.4448 - MLTeX: char_sub_code_base
+ at x [17.220] l.4469 - MLTeX: char_sub_code_base
paragraph shape.
@y
paragraph shape.
@@ -1206,7 +1206,7 @@
substitution definitions.
@z
- at x [17.222] l.4523 - frozen_special, for source specials.
+ at x [17.222] l.4543 - frozen_special, for source specials.
@d frozen_null_font=frozen_control_sequence+10
@y
@d frozen_special=frozen_control_sequence+10
@@ -1214,13 +1214,13 @@
@d frozen_null_font=frozen_control_sequence+11
@z
- at x [17.222] l.4526 - max_font_max
+ at x [17.222] l.4547 - max_font_max
@d undefined_control_sequence=frozen_null_font+257 {dummy location}
@y
@d undefined_control_sequence=frozen_null_font+max_font_max+1 {dummy location}
@z
- at x [17.222] l.4533 - hash_extra
+ at x [17.222] l.4554 - hash_extra
for k:=active_base to undefined_control_sequence-1 do
eqtb[k]:=eqtb[undefined_control_sequence];
@y
@@ -1228,7 +1228,7 @@
eqtb[k]:=eqtb[undefined_control_sequence];
@z
- at x [17.230] l.4731 - MLTeX: char_sub_code_base
+ at x [17.230] l.4752 - MLTeX: char_sub_code_base
@d int_base=math_code_base+256 {beginning of region 5}
@y
@d char_sub_code_base=math_code_base+256 {table of character substitutions}
@@ -1235,7 +1235,7 @@
@d int_base=char_sub_code_base+256 {beginning of region 5}
@z
- at x [17.230] l.4752 - MLTeX: char_sub_code_base
+ at x [17.230] l.4773 - MLTeX: char_sub_code_base
{Note: |math_code(c)| is the true math code plus |min_halfword|}
@y
{Note: |math_code(c)| is the true math code plus |min_halfword|}
@@ -1244,7 +1244,7 @@
@z
% MLTeX: \charsubdefmax and \tracingcharsubdef
- at x [17.236] l.4954
+ at x [17.236] l.4975
@d int_pars=55 {total number of integer parameters}
@y
@d tex_int_pars=55 {total number of \TeX's integer parameters}
@@ -1259,7 +1259,7 @@
@z
% MLTeX: \charsubdefmax and \tracingcharsubdef
- at x [17.236] l.5016
+ at x [17.236] l.5037
@d error_context_lines==int_par(error_context_lines_code)
@y
@d error_context_lines==int_par(error_context_lines_code)
@@ -1270,7 +1270,7 @@
@z
% MLTeX: \charsubdefmax and \tracingcharsubdef
- at x [17.237] l.5080
+ at x [17.237] l.5101
error_context_lines_code:print_esc("errorcontextlines");
@y
error_context_lines_code:print_esc("errorcontextlines");
@@ -1280,7 +1280,7 @@
@z
% MLTeX: \charsubdefmax and \tracingcharsubdef
- at x [17.238] l.5200
+ at x [17.238] l.5221
@!@:error_context_lines_}{\.{\\errorcontextlines} primitive@>
@y
@!@:error_context_lines_}{\.{\\errorcontextlines} primitive@>
@@ -1296,7 +1296,7 @@
end;
@z
- at x [17.240] l.5213 - MLTeX: \charsubdefmax and \tracingcharsubdef
+ at x [17.240] l.5234 - MLTeX: \charsubdefmax and \tracingcharsubdef
for k:=int_base to del_code_base-1 do eqtb[k].int:=0;
@y
for k:=int_base to del_code_base-1 do eqtb[k].int:=0;
@@ -1305,7 +1305,7 @@
{|tracing_char_sub_def:=0| is already done}@/
@z
- at x [17.241] l.5219 - Do `fix_date_and_time' in C.
+ at x [17.241] l.5240 - Do `fix_date_and_time' in C.
@ The following procedure, which is called just before \TeX\ initializes its
input and output, establishes the initial values of the date and time.
@^system dependencies@>
@@ -1335,7 +1335,7 @@
begin date_and_time(sys_time,sys_day,sys_month,sys_year);
@z
- at x [17.252] l.5420 - hash_extra
+ at x [17.252] l.5447 - hash_extra
else if n<glue_base then @<Show equivalent |n|, in region 1 or 2@>
@y
else if (n<glue_base) or ((n>eqtb_size)and(n<=eqtb_top)) then
@@ -1342,13 +1342,13 @@
@<Show equivalent |n|, in region 1 or 2@>
@z
- at x [17.253] l.5435 - Change eqtb to zeqtb.
+ at x [17.253] l.5462 - Change eqtb to zeqtb.
@!eqtb:array[active_base..eqtb_size] of memory_word;
@y
@!zeqtb:^memory_word;
@z
- at x [18.256] l.5483 - hash_extra
+ at x [18.256] l.5510 - hash_extra
@!hash: array[hash_base..undefined_control_sequence-1] of two_halves;
{the hash table}
@!hash_used:pointer; {allocation pointer for |hash|}
@@ -1362,13 +1362,13 @@
@!hash_high:pointer; {pointer to next high hash location}
@z
- at x [18.257] l.5491 - hash_extra
+ at x [18.257] l.5518 - hash_extra
next(hash_base):=0; text(hash_base):=0;
for k:=hash_base+1 to undefined_control_sequence-1 do hash[k]:=hash[hash_base];
@y
@z
- at x [18.258] l.5495 - hash_extra
+ at x [18.258] l.5522 - hash_extra
hash_used:=frozen_control_sequence; {nothing is used}
@y
hash_used:=frozen_control_sequence; {nothing is used}
@@ -1375,7 +1375,7 @@
hash_high:=0;
@z
- at x [18.260] l.5531 - hash_extra
+ at x [18.260] l.5558 - hash_extra
@ @<Insert a new control...@>=
begin if text(p)>0 then
begin repeat if hash_is_full then overflow("hash size",hash_size);
@@ -1401,7 +1401,7 @@
end;
@z
- at x [18.262] l.5583 - hash_extra
+ at x [18.262] l.5610 - hash_extra
else if p>=undefined_control_sequence then print_esc("IMPOSSIBLE.")
@y
else if ((p>=undefined_control_sequence)and(p<=eqtb_size))or(p>eqtb_top) then
@@ -1408,25 +1408,25 @@
print_esc("IMPOSSIBLE.")
@z
- at x [18.262] l.5584 - Remove more unsigned comparisons to zero.
+ at x [18.262] l.5611 - Remove more unsigned comparisons to zero.
else if (text(p)<0)or(text(p)>=str_ptr) then print_esc("NONEXISTENT.")
@y
else if (text(p)>=str_ptr) then print_esc("NONEXISTENT.")
@z
- at x [19.271] l.5872 - texarray
+ at x [19.271] l.5899 - texarray
@!save_stack : array[0..save_size] of memory_word;
@y
@!save_stack : ^memory_word;
@z
- at x [19.283] l.6050 - hash_extra
+ at x [19.283] l.6077 - hash_extra
if p<int_base then
@y
if (p<int_base)or(p>eqtb_size) then
@z
- at x [20.290] l.6158 - hash_extra
+ at x [20.290] l.6185 - hash_extra
if cs_token_flag+undefined_control_sequence>max_halfword then bad:=21;
@y
if cs_token_flag+eqtb_size+hash_extra>max_halfword then bad:=21;
@@ -1433,13 +1433,13 @@
if (hash_offset<0)or(hash_offset>hash_base) then bad:=42;
@z
- at x [22.301] l.6432 - texarray
+ at x [22.301] l.6459 - texarray
@!input_stack : array[0..stack_size] of in_state_record;
@y
@!input_stack : ^in_state_record;
@z
- at x [22.304] l.6536 - texarray; additions for file:line:error style.
+ at x [22.304] l.6563 - texarray; additions for file:line:error style.
@!input_file : array[1..max_in_open] of alpha_file;
@!line : integer; {current line number in the current source file}
@!line_stack : array[1..max_in_open] of integer;
@@ -1451,7 +1451,7 @@
@!full_source_filename_stack : ^str_number;
@z
- at x [22.306] l.6855 - i18n fix
+ at x [22.306] l.6615 - i18n fix
begin print_nl("Runaway ");
@.Runaway...@>
case scanner_status of
@@ -1479,7 +1479,7 @@
end; {there are no other cases}
@z
- at x [22.308] l.6701 - texarray
+ at x [22.308] l.6728 - texarray
@!param_stack:array [0..param_size] of pointer;
{token list pointers for parameters}
@y
@@ -1487,7 +1487,7 @@
{token list pointers for parameters}
@z
- at x [23.328] l.7043 - keep top of source_filename_stack initialized
+ at x [23.328] l.7064 - keep top of source_filename_stack initialized
incr(in_open); push_input; index:=in_open;
@y
incr(in_open); push_input; index:=in_open;
@@ -1494,7 +1494,7 @@
source_filename_stack[index]:=0;full_source_filename_stack[index]:=0;
@z
- at x [23.331] l.7071 - init source file name stacks
+ at x [23.331] l.7092 - init source file name stacks
begin input_ptr:=0; max_in_stack:=0;
@y
begin input_ptr:=0; max_in_stack:=0;
@@ -1501,12 +1501,20 @@
source_filename_stack[0]:=0;full_source_filename_stack[0]:=0;
@z
- at x [24.338] l.7164 - i18n fix
+% Original report: https://tug.org/pipermail/tex-k/2024-March/004021.html
+% TeX bug entry: https://tug.org/texmfbug/newbug.html#B142outer
+ at x [24.336] l.7152 - allow interactive deletion of \outer token
+begin if scanner_status<>normal then
+ at y
+begin if OK_to_interrupt and(scanner_status<>normal) then
+ at z
+
+ at x [24.338] l.7191 - i18n fix
print(" while scanning ");
@y
@z
- at x [24.339] l.7185 - i18n fix
+ at x [24.339] l.7213 - i18n fix
defining:begin print("definition"); info(p):=right_brace_token+"}";
end;
matching:begin print("use"); info(p):=par_token; long_state:=outer_call;
@@ -1561,7 +1569,7 @@
end
@z
- at x [28.501] l.9747 - \eof18
+ at x [28.501] l.9765 - \eof18
if_eof_code: begin scan_four_bit_int; b:=(read_open[cur_val]=closed);
end;
@y
@@ -1571,7 +1579,7 @@
end;
@z
- at x [29.513] l.9951 - Area and extension rules for filenames.
+ at x [29.513] l.9983 - Area and extension rules for filenames.
@ The file names we shall deal with for illustrative purposes have the
following structure: If the name contains `\.>' or `\.:', the file area
consists of all characters up to and including the final such character;
@@ -1588,7 +1596,7 @@
`\..' to the end, otherwise the file extension is null.
@z
- at x [29.513] l.9963 - Area and extension rules for filenames.
+ at x [29.513] l.9995 - Area and extension rules for filenames.
@!area_delimiter:pool_pointer; {the most recent `\.>' or `\.:', if any}
@!ext_delimiter:pool_pointer; {the relevant `\..', if any}
@y
@@ -1596,7 +1604,7 @@
@!ext_delimiter:pool_pointer; {the most recent `\..', if any}
@z
- at x [29.514] l.9973 - TeX area directories.
+ at x [29.514] l.10005 - TeX area directories.
@d TEX_area=="TeXinputs:"
@.TeXinputs@>
@d TEX_font_area=="TeXfonts:"
@@ -1605,13 +1613,13 @@
In C, the default paths are specified separately.
@z
- at x [29.515] l.9995 - filenames: quoted
+ at x [29.515] l.10014 - filenames: quoted
begin area_delimiter:=0; ext_delimiter:=0;
@y
begin area_delimiter:=0; ext_delimiter:=0; quoted_filename:=false;
@z
- at x [29.516] l.9992 - filenames: more_name
+ at x [29.516] l.10024 - filenames: more_name
begin if c=" " then more_name:=false
@y
begin if (c=" ") and stop_at_space and (not quoted_filename) then
@@ -1622,19 +1630,19 @@
end
@z
- at x [29.516] l.9994 - filenames: more_name
+ at x [29.516] l.10026 - filenames: more_name
if (c=">")or(c=":") then
@y
if IS_DIR_SEP(c) then
@z
- at x [29.516] l.9997 - filenames: more_name
+ at x [29.516] l.10029 - filenames: more_name
else if (c=".")and(ext_delimiter=0) then ext_delimiter:=cur_length;
@y
else if c="." then ext_delimiter:=cur_length;
@z
- at x [29.517] l.10002 - end_name: string recycling
+ at x [29.517] l.10034 - end_name: string recycling
@ The third.
@^system dependencies@>
@@ -1654,7 +1662,7 @@
@!must_quote:boolean; {whether we need to quote a string}
@z
- at x [29.517] l.10022 - end_name: spaces in filenames
+ at x [29.517] l.10040 - end_name: spaces in filenames
@:TeX capacity exceeded number of strings}{\quad number of strings@>
@y
@:TeX capacity exceeded number of strings}{\quad number of strings@>
@@ -1713,7 +1721,7 @@
end;
@z
- at x [29.517] l.10011 - end_name: string recycling
+ at x [29.517] l.10044 - end_name: string recycling
end;
if ext_delimiter=0 then
begin cur_ext:=""; cur_name:=make_string;
@@ -1732,7 +1740,7 @@
begin cur_ext:=""; cur_name:=slow_make_string;
@z
- at x [29.517] l.10016 - end_name: string recycling
+ at x [29.517] l.10050 - end_name: string recycling
incr(str_ptr); cur_ext:=make_string;
@y
incr(str_ptr); cur_ext:=make_string;
@@ -1749,7 +1757,7 @@
cur_ext:=slow_make_string; {remake extension string}
@z
- at x [29.518] l.10042 - print_file_name: quote if spaces in names.
+ at x [29.518] l.10056 - print_file_name: quote if spaces in names.
some operating systems put the file area last instead of first.)
@^system dependencies@>
@y
@@ -1771,7 +1779,7 @@
print(so(str_pool[j]))
@z
- at x [29.518] l.10042 - print_file_name: quote if spaces in names.
+ at x [29.518] l.10061 - print_file_name: quote if spaces in names.
begin slow_print(a); slow_print(n); slow_print(e);
@y
var must_quote: boolean; {whether to quote the filename}
@@ -1790,7 +1798,7 @@
if must_quote then print_char("""");
@z
- at x [29.519] l.10051 - have append_to_name skip quotes.
+ at x [29.519] l.10070 - have append_to_name skip quotes.
@d append_to_name(#)==begin c:=#; incr(k);
if k<=file_name_size then name_of_file[k]:=xchr[c];
end
@@ -1802,7 +1810,7 @@
% [29.519] In pack_file_name, leave room for the extra null we append at
% the end of a filename.
- at x [29.519] l.10047 - pack_file_name, leave room for the extra null
+ at x [29.519] l.10078 - pack_file_name, leave room for the extra null
begin k:=0;
@y
begin k:=0;
@@ -1810,13 +1818,13 @@
name_of_file:= xmalloc_array (ASCII_code, length(a)+length(n)+length(e)+1);
@z
- at x [29.519] l.10051 - pack_file_name, append the extra null
+ at x [29.519] l.10083 - pack_file_name, append the extra null
for k:=name_length+1 to file_name_size do name_of_file[k]:=' ';
@y
name_of_file[name_length+1]:=0;
@z
- at x [29.520] l.10060 - filenames: default format.
+ at x [29.520] l.10092 - filenames: default format.
@d format_default_length=20 {length of the |TEX_format_default| string}
@d format_area_length=11 {length of its area part}
@d format_ext_length=4 {length of its `\.{.fmt}' part}
@@ -1829,7 +1837,7 @@
@d format_ext_length=4 {length of its `\.{.fmt}' part}
@z
- at x [29.521] l.10066 - filenames: default format, where `plain.fmt' is.
+ at x [29.520] l.10098 - filenames: default format, where `plain.fmt' is.
@!TEX_format_default:packed array[1..format_default_length] of char;
@ @<Set init...@>=
@@ -1843,7 +1851,7 @@
program.
@z
- at x [29.523] l.10095 - Change to pack_buffered_name as with pack_file_name.
+ at x [29.523] l.10127 - Change to pack_buffered_name as with pack_file_name.
for j:=1 to n do append_to_name(xord[TEX_format_default[j]]);
for j:=a to b do append_to_name(buffer[j]);
for j:=format_default_length-format_ext_length+1 to format_default_length do
@@ -1861,7 +1869,7 @@
name_of_file[name_length+1]:=0;
@z
- at x [29.524] l.10118 - Format file opening: only try once, with path searching.
+ at x [29.524] l.10150 - Format file opening: only try once, with path searching.
pack_buffered_name(0,loc,j-1); {try first without the system file area}
if w_open_in(fmt_file) then goto found;
pack_buffered_name(format_area_length,loc,j-1);
@@ -1872,7 +1880,7 @@
if w_open_in(fmt_file) then goto found;
@z
- at x [29.524] l.10124 - replace `PLAIN' in error messages with `default'.
+ at x [29.524] l.10156 - replace `PLAIN' in error messages with `default'.
wterm_ln('Sorry, I can''t find that format;',' will try PLAIN.');
@y
wterm ('Sorry, I can''t find the format `');
@@ -1882,7 +1890,7 @@
wterm_ln ('''.');
@z
- at x [29.524] l.10132 - replace `PLAIN' in error messages with `default'.
+ at x [29.524] l.10164 - replace `PLAIN' in error messages with `default'.
wterm_ln('I can''t find the PLAIN format file!');
@.I can't find PLAIN...@>
@y
@@ -1892,7 +1900,7 @@
@.I can't find the format...@>
@z
- at x [29.525] l.10170 - make_name_string
+ at x [29.525] l.10184 - make_name_string
begin if (pool_ptr+name_length>pool_size)or(str_ptr=max_strings)or
@y
save_area_delimiter, save_ext_delimiter: pool_pointer;
@@ -1900,7 +1908,7 @@
begin if (pool_ptr+name_length>pool_size)or(str_ptr=max_strings)or
@z
- at x [29.525] l.10174 - make_name_string
+ at x [29.525] l.10188 - make_name_string
make_name_string:=make_string;
@y
make_name_string:=make_string;
@@ -1920,7 +1928,7 @@
area_delimiter:=save_area_delimiter; ext_delimiter:=save_ext_delimiter;
@z
- at x [29.526] l.10193 - look for a left_brace when scanning a file name
+ at x [29.526] l.10206 - look for a left_brace when scanning a file name
@p procedure scan_file_name;
label done;
@y
@@ -1941,7 +1949,7 @@
else
@z
- at x [29.526] l.10194 - stop scanning file name if we're at end-of-line.
+ at x [29.526] l.10213 - stop scanning file name if we're at end-of-line.
if not more_name(cur_chr) then goto done;
@y
{If |cur_chr| is a space and we're not scanning a token list, check
@@ -1951,7 +1959,7 @@
if not more_name(cur_chr) then goto done;
@z
- at x [29.526] l.10203 - scan a bgroup/egroup-delimited file name
+ at x [29.526] l.10216 - scan a bgroup/egroup-delimited file name
done: end_name; name_in_progress:=false;
end;
@y
@@ -1961,7 +1969,7 @@
end;
@z
- at x [29.530] l.10245 - prompt_file_name: prevent empty filenames.
+ at x [29.530] l.10264 - prompt_file_name: prevent empty filenames.
var k:0..buf_size; {index into |buffer|}
@y
var k:0..buf_size; {index into |buffer|}
@@ -1970,7 +1978,7 @@
@!saved_cur_area:str_number; {to catch empty terminal input}
@z
- at x [29.530] l.10252 - prompt_file_name: No default extension is TeX input file.
+ at x [29.530] l.10271 - prompt_file_name: No default extension is TeX input file.
if e=".tex" then show_context;
@y
if (e=".tex") or (e="") then show_context;
@@ -1982,7 +1990,7 @@
print(")"); print_ln;
@z
- at x [29.530] l.10258 - prompt_file_name: prevent empty filenames.
+ at x [29.530] l.10277 - prompt_file_name: prevent empty filenames.
clear_terminal; prompt_input(": "); @<Scan file name in the buffer@>;
if cur_ext="" then cur_ext:=e;
@y
@@ -2000,7 +2008,7 @@
if cur_ext="" then cur_ext:=e;
@z
- at x [29.532] l.10263 - avoid conflict, `logname' in <unistd.h> on some systems.
+ at x [29.532] l.10295 - avoid conflict, `logname' in <unistd.h> on some systems.
@d ensure_dvi_open==if output_file_name=0 then
@y
@d log_name == texmf_log_name
@@ -2007,13 +2015,13 @@
@d ensure_dvi_open==if output_file_name=0 then
@z
- at x [29.534] l.10285 - Adjust for C string conventions.
+ at x [29.534] l.10317 - Adjust for C string conventions.
@!months:packed array [1..36] of char; {abbreviations of month names}
@y
@!months:const_cstring;
@z
- at x [29.534] l.10300 - Filename change for the recorder.
+ at x [29.534] l.10319 - Filename change for the recorder.
if job_name=0 then job_name:="texput";
@.texput@>
@y
@@ -2023,7 +2031,7 @@
recorder_change_filename(stringcast(name_of_file+1));
@z
- at x [29.534] l.10293 - MLTeX: add MLTeX banner after loading fmt file
+ at x [29.534] l.10325 - MLTeX: add MLTeX banner after loading fmt file
@<Print the banner line, including the date and time@>;
@y
@<Print the banner line, including the date and time@>;
@@ -2032,7 +2040,7 @@
end;
@z
- at x
+ at x [29.536] l.10356
begin wlog(banner);
@y
begin
@@ -2043,7 +2051,7 @@
wlog(banner);
@z
- at x [29.536] l.10324 - Print rest of banner.
+ at x [29.536] l.10357 - Print rest of banner.
slow_print(format_ident); print(" ");
@y
wlog(version_string);
@@ -2050,7 +2058,7 @@
slow_print(format_ident); print(" ");
@z
- at x [29.536] l.10327 - Adjust for C string conventions.
+ at x [29.536] l.10359 - Adjust for C string conventions.
months:='JANFEBMARAPRMAYJUNJULAUGSEPOCTNOVDEC';
@y
months := ' JANFEBMARAPRMAYJUNJULAUGSEPOCTNOVDEC';
@@ -2058,7 +2066,7 @@
% Print whether we're using src-specials and other such features.
% Print TCX name if one's given.
- at x [29.536] l.10331
+ at x [29.536] l.10363
end
@y
if shellenabledp then begin
@@ -2094,7 +2102,7 @@
% to open the file with and without the `.tex' extension, regardless of
% whether the file already has an extension. This allows filenames like
% `foo' and `foo.bar.tex', as well as `foo.tex' and `foo.bar'.
- at x [29.537] l.10338 - start_input
+ at x [29.537] l.10373 - start_input
begin scan_file_name; {set |cur_name| to desired file name}
if cur_ext="" then cur_ext:=".tex";
pack_cur_name;
@@ -2117,13 +2125,13 @@
goto done;
@z
- at x [29.537] l.10348 - start_input: don't force ".tex" extension.
+ at x [29.537] l.10383 - start_input: don't force ".tex" extension.
prompt_file_name("input file name",".tex");
@y
prompt_file_name("input file name","");
@z
- at x [29.537] l.10350 - start_input: string recycling
+ at x [29.537] l.10385 - start_input: string recycling
done: name:=a_make_name_string(cur_file);
@y
done: name:=a_make_name_string(cur_file);
@@ -2137,13 +2145,13 @@
end;
@z
- at x [29.537] l.10352 - start_input: was job_name given on the command line?
+ at x [29.537] l.10387 - start_input: was job_name given on the command line?
begin job_name:=cur_name; open_log_file;
@y
begin job_name:=get_job_name(cur_name); open_log_file;
@z
- at x [29.537] l.10356 -
+ at x [29.537] l.10390
if term_offset+length(name)>max_print_line-2 then print_ln
else if (term_offset>0)or(file_offset>0) then print_char(" ");
print_char("("); incr(open_parens); slow_print(name); update_terminal;
@@ -2155,7 +2163,7 @@
slow_print(full_source_filename_stack[in_open]); update_terminal;
@z
- at x [29.537] l.10360 - start_input: don't return filename to string pool.
+ at x [29.537] l.10394 - start_input: don't return filename to string pool.
if name=str_ptr-1 then {conserve string pool space (but see note above)}
begin flush_string; name:=cur_name;
end;
@@ -2162,7 +2170,7 @@
@y
@z
- at x [30.548] l.10673 - texarray
+ at x [30.548] l.10708 - texarray
@!internal_font_number=font_base..font_max; {|font| in a |char_node|}
@!font_index=0..font_mem_size; {index into |font_info|}
@y
@@ -2171,7 +2179,7 @@
@!nine_bits=min_quarterword..non_char;
@z
- at x [30.549] l.10682 - texarray
+ at x [30.549] l.10717 - texarray
@!font_info:array[font_index] of memory_word;
{the big collection of font data}
@!fmem_ptr:font_index; {first unused word of |font_info|}
@@ -2235,7 +2243,7 @@
{|font_bchar| if it doesn't exist in the font, otherwise |non_char|}
@z
- at x [30.550] l.10723 - texarray
+ at x [30.550] l.10758 - texarray
@!char_base:array[internal_font_number] of integer;
{base addresses for |char_info|}
@!width_base:array[internal_font_number] of integer;
@@ -2275,12 +2283,12 @@
{base addresses for font parameters}
@z
- at x [30.551] l.10743 - texarray
+ at x [30.551] l.10778 - texarray
for k:=font_base to font_max do font_used[k]:=false;
@y
@z
- at x [30.552] l.10749 - texarray
+ at x [30.552] l.10784 - texarray
font_ptr:=null_font; fmem_ptr:=7;
font_name[null_font]:="nullfont"; font_area[null_font]:="";
hyphen_char[null_font]:="-"; skew_char[null_font]:=-1;
@@ -2298,7 +2306,7 @@
@y
@z
- at x [30.554] l.10795 - MLTeX: |effective_char| in |char_info|
+ at x [30.554] l.10830 - MLTeX: |effective_char| in |char_info|
as fast as possible under the circumstances.
@^inner loop@>
@@ -2356,7 +2364,7 @@
@#
@z
- at x [30] m.560 l.10876 - MLTeX: |effective_char| in |char_info|
+ at x [30.560] l.10911 - MLTeX: |effective_char| in |char_info|
@p function read_font_info(@!u:pointer;@!nom,@!aire:str_number;
@y
@p @t\4@>@<Declare additional functions for ML\TeX@>@/
@@ -2364,7 +2372,7 @@
function read_font_info(@!u:pointer;@!nom,@!aire:str_number;
@z
- at x [30.560] l.10898 - Check lengths
+ at x [30.560] l.10915 - Check lengths
@!file_opened:boolean; {was |tfm_file| successfully opened?}
@y
@!name_too_long:boolean; {|nom| or |aire| exceeds 255 bytes?}
@@ -2371,7 +2379,7 @@
@!file_opened:boolean; {was |tfm_file| successfully opened?}
@z
- at x [30.561] l.10939 - Check lengths
+ at x [30.561] l.10956 - Check lengths
else print(" not loadable: Metric (TFM) file not found");
@y
else if name_too_long then print(" not loadable: Metric (TFM) file name too long")
@@ -2378,7 +2386,7 @@
else print(" not loadable: Metric (TFM) file not found");
@z
- at x [30.563] l.10961 - Check lengths, don't use TEX_font_area.
+ at x [30.563] l.10978 - Check lengths, don't use TEX_font_area.
if aire="" then pack_file_name(nom,TEX_font_area,".tfm")
else pack_file_name(nom,aire,".tfm");
@y
@@ -2393,7 +2401,7 @@
% tfm file, we read its first byte into `tfm_temp' right away. TeX
% looks at `fbyte' before calling `fget', so it ends up seeing every
% byte. This is Pascal-like I/O.
- at x [30.564] l.10956 - reading the tfm file, define fget & fbyte
+ at x [30.564] l.10991 - reading the tfm file, define fget & fbyte
@d fget==get(tfm_file)
@d fbyte==tfm_file^
@y
@@ -2401,13 +2409,13 @@
@d fbyte==tfm_temp
@z
- at x [30.570] l.11064 - MLTeX: fix for bug while loading font
+ at x [30.570] l.11100 - MLTeX: fix for bug while loading font
begin qw:=char_info(f)(d);
@y
begin qw:=orig_char_info(f)(d);
@z
- at x [30.573] l.11116 - MLTeX: fix for bug while loading font
+ at x [30.573] l.11152 - MLTeX: fix for bug while loading font
qw:=char_info(f)(#); {N.B.: not |qi(#)|}
@y
qw:=orig_char_info(f)(#); {N.B.: not |qi(#)|}
@@ -2416,19 +2424,19 @@
% [30.575] We only want `eof' on the TFM file to be true if we
% previously had EOF, not if we're at EOF now. This is like `feof', and
% unlike our implementation of `eof' elsewhere.
- at x [30.575] l.11180 - Reading the tfm file, replace eof() by feof().
+ at x [30.575] l.11197 - Reading the tfm file, replace eof() by feof().
if eof(tfm_file) then abort;
@y
if feof(tfm_file) then abort;
@z
- at x [30.576] l.11180 - MLTeX: fix for bug while loading font
+ at x [30.576] l.11216 - MLTeX: fix for bug while loading font
begin qw:=char_info(f)(bchar); {N.B.: not |qi(bchar)|}
@y
begin qw:=orig_char_info(f)(bchar); {N.B.: not |qi(bchar)|}
@z
- at x [30.582] l.11276 - MLTeX: call |effective_char| in |new_character|
+ at x [30.582] l.11312 - MLTeX: call |effective_char| in |new_character|
@p function new_character(@!f:internal_font_number;@!c:eight_bits):pointer;
label exit;
var p:pointer; {newly allocated node}
@@ -2448,7 +2456,7 @@
if char_exists(orig_char_info(f)(ec)) then {N.B.: not |char_info|}
@z
- at x [32.592] l.11820 - font numbers can be >255 now.
+ at x [32.592] l.11856 - font numbers can be >255 now.
@!c,@!f:quarterword; {character and font in current |char_node|}
@y
{character and font in current |char_node|}
@@ -2456,7 +2464,7 @@
@!f:internal_font_number;
@z
- at x [32.595] l.11860 - texarray
+ at x [32.595] l.11896 - texarray
@!dvi_buf:array[dvi_index] of eight_bits; {buffer for \.{DVI} output}
@!half_buf:dvi_index; {half of |dvi_buf_size|}
@!dvi_limit:dvi_index; {end of the current half buffer}
@@ -2468,7 +2476,7 @@
@!dvi_ptr:integer; {the next available buffer address}
@z
- at x [32.597] l.11886 - write_dvi done in C.
+ at x [32.597] l.11922 - write_dvi done in C.
@p procedure write_dvi(@!a,@!b:dvi_index);
var k:dvi_index;
begin for k:=a to b do write(dvi_file,dvi_buf[k]);
@@ -2479,7 +2487,7 @@
bytes at a time.
@z
- at x [32.601] l.11911 - check dvi file size
+ at x [32.598] l.11928 - check dvi file size
each time, we use the macro |dvi_out|.
@y
each time, we use the macro |dvi_out|.
@@ -2488,7 +2496,7 @@
to prevent further \.{DVI} output causing infinite recursion.
@z
- at x [32.601] l.11918 - dvi_swap: check dvi file size
+ at x [32.598] l.11935 - dvi_swap: check dvi file size
begin if dvi_limit=dvi_buf_size then
@y
begin if dvi_ptr>(@"7FFFFFFF-dvi_offset) then
@@ -2499,7 +2507,7 @@
if dvi_limit=dvi_buf_size then
@z
- at x [32.602] l.11932 - empty the last bytes: check dvi file size
+ at x [32.599] l.11949 - empty the last bytes: check dvi file size
if dvi_ptr>0 then write_dvi(0,dvi_ptr-1)
@y
if dvi_ptr>(@"7FFFFFFF-dvi_offset) then
@@ -2510,7 +2518,7 @@
if dvi_ptr>0 then write_dvi(0,dvi_ptr-1)
@z
- at x [32.602] l.11944 - Allow for outputting more than 256 fonts.
+ at x [32.602] l.11980 - Allow for outputting more than 256 fonts.
begin dvi_out(fnt_def1);
dvi_out(f-font_base-1);@/
@y
@@ -2524,7 +2532,7 @@
end;
@z
- at x [32.617] l.12280 - Use output_comment if the user set it. Assume it's short enough.
+ at x [32.617] l.12297 - Use output_comment if the user set it. Assume it's short enough.
old_setting:=selector; selector:=new_string;
@y
if output_comment then
@@ -2535,7 +2543,7 @@
old_setting:=selector; selector:=new_string;
@z
- at x [32.617] l.12288 - Use output_comment if the user set it.
+ at x [32.617] l.12305 - Use output_comment if the user set it.
end
@y
end;
@@ -2542,7 +2550,7 @@
end
@z
- at x [32.619] l.12294 - MLTeX: substitute character in |hlist_out|
+ at x [32.619] l.12330 - MLTeX: substitute character in |hlist_out|
procedure hlist_out; {output an |hlist_node| box}
label reswitch, move_past, fin_rule, next_p;
@y
@@ -2550,7 +2558,7 @@
label reswitch, move_past, fin_rule, next_p, continue, found;
@z
- at x [32.620] l.12326 - MLTeX: replace virtual character in |hlist_out|
+ at x [32.620] l.12365 - MLTeX: replace virtual character in |hlist_out|
reaching a non-|char_node|. The program uses the fact that |set_char_0=0|.
@^inner loop@>
@y
@@ -2573,7 +2581,7 @@
@^inner loop@>
@z
- at x [32.620] l.12334 - MLTeX: substitute character during |shipout|
+ at x [32.620] l.12373 - MLTeX: substitute character during |shipout|
if c>=qi(128) then dvi_out(set1);
dvi_out(qo(c));@/
cur_h:=cur_h+char_width(f)(char_info(f)(c));
@@ -2590,7 +2598,7 @@
continue:
@z
- at x [32.622] l.12349 - more >256 font output stuff.
+ at x [32.621] l.12388 - more >256 font output stuff.
else begin dvi_out(fnt1); dvi_out(f-font_base-1);
end;
@y
@@ -2605,7 +2613,7 @@
% We output each portion of the page as we get to it, if we are using
% IPC, so that the previewer (TeXView) can display it immediately. [SPM]
- at x [32.640] l.12723 - IPC
+ at x [32.640] l.12740 - IPC
done:
@y
ifdef ('IPC')
@@ -2632,7 +2640,7 @@
done:
@z
- at x [32.645] l.12766 - check dvi file size
+ at x [32.642] l.12783 - check dvi file size
else begin dvi_out(post); {beginning of the postamble}
@y
else if cur_s<>-2 then
@@ -2639,7 +2647,7 @@
begin dvi_out(post); {beginning of the postamble}
@z
- at x [32.645] l.12775 - Use dvi_offset instead of dvi_buf_size with IPC stuff.
+ at x [32.642] l.12792 - Use dvi_offset instead of dvi_buf_size with IPC stuff.
k:=4+((dvi_buf_size-dvi_ptr) mod 4); {the number of 223's}
@y
ifdef ('IPC')
@@ -2650,13 +2658,13 @@
endifn ('IPC')
@z
- at x [32.645] l.12780 - use print_file_name
+ at x [32.642] l.12797 - use print_file_name
print_nl("Output written on "); slow_print(output_file_name);
@y
print_nl("Output written on "); print_file_name(0, output_file_name, 0);
@z
- at x [32.645] l.12782 - i18n fix
+ at x [32.642] l.12799 - i18n fix
print(" ("); print_int(total_pages); print(" page");
if total_pages<>1 then print_char("s");
@y
@@ -2671,7 +2679,7 @@
% can be substituted => we have to avoid this in math mode
% (for compatibility reasons and to avoid other problems).
%
- at x [35.708] l.13903 - MLTeX: avoid substitution in |var_delimiter|
+ at x [35.708] l.13954 - MLTeX: avoid substitution in |var_delimiter|
if (qo(y)>=font_bc[g])and(qo(y)<=font_ec[g]) then
begin continue: q:=char_info(g)(y);
@y
@@ -2679,19 +2687,19 @@
begin continue: q:=orig_char_info(g)(y);
@z
- at x [36.722] l.14207 - MLTeX: avoid substitution in |fetch|
+ at x [36.722] l.14224 - MLTeX: avoid substitution in |fetch|
cur_i:=char_info(cur_f)(cur_c)
@y
cur_i:=orig_char_info(cur_f)(cur_c)
@z
- at x [36.740] l.14486 - MLTeX: avoid substitution in |make_math_accent|
+ at x [36.740] l.14537 - MLTeX: avoid substitution in |make_math_accent|
i:=char_info(f)(y);
@y
i:=orig_char_info(f)(y);
@z
- at x [36.749] l.14638 - MLTeX: avoid substitution in |make_op|
+ at x [36.749] l.14689 - MLTeX: avoid substitution in |make_op|
begin c:=rem_byte(cur_i); i:=char_info(cur_f)(c);
@y
begin c:=rem_byte(cur_i); i:=orig_char_info(cur_f)(c);
@@ -2713,7 +2721,7 @@
if every_cr<>null then begin_token_list(every_cr,every_cr_text);
@z
- at x [42.920] l.18056 - bigtrie: allow larger hyphenation tries.
+ at x [42.920] l.18111 - bigtrie: allow larger hyphenation tries.
Comparatively few different number sequences $n_0\ldots n_k$ actually occur,
since most of the |n|'s are generally zero. Therefore the number sequences
are encoded in such a way that |trie_op|$(z_k)$ is only one byte long.
@@ -2745,7 +2753,7 @@
and |v:=hyf_next[v]|; repeat, if necessary, until |v=min_trie_op|.
@z
- at x [42.920] l.18068 - bigtrie: allow larger hyphenation tries.
+ at x [42.920] l.18123 - bigtrie: allow larger hyphenation tries.
@!trie_pointer=0..trie_size; {an index into |trie|}
@y
@!trie_pointer=0..ssup_trie_size; {an index into |trie|}
@@ -2752,7 +2760,7 @@
@!trie_opcode=0..ssup_trie_opcode; {a trie opcode}
@z
- at x [42.921] l.18070 - bigtrie: allow larger hyphenation tries.
+ at x [42.921] l.18125 - bigtrie: allow larger hyphenation tries.
@ @d trie_link(#)==trie[#].rh {``downward'' link in a trie}
@d trie_char(#)==trie[#].b1 {character matched at this trie location}
@d trie_op(#)==trie[#].b0 {program for hyphenation at this trie location}
@@ -2768,7 +2776,7 @@
@d trie_op(#)==trie_tro[#] {program for hyphenation at this trie location}
@z
- at x [42.921] l.18075 - bigtrie: allow larger hyphenation tries.
+ at x [42.921] l.18130 - bigtrie: allow larger hyphenation tries.
@!trie:array[trie_pointer] of two_halves; {|trie_link|, |trie_char|, |trie_op|}
@y
{We will dynamically allocate these arrays.}
@@ -2777,19 +2785,19 @@
@!trie_trc:^quarterword; {|trie_char|}
@z
- at x [42.921] l.18078 - bigtrie: allow larger hyphenation tries.
+ at x [42.921] l.18133 - bigtrie: allow larger hyphenation tries.
@!hyf_next:array[1..trie_op_size] of quarterword; {continuation code}
@y
@!hyf_next:array[1..trie_op_size] of trie_opcode; {continuation code}
@z
- at x [42.923] l.18099 - bigtrie: allow larger hyphenation tries.
+ at x [42.923] l.18154 - bigtrie: allow larger hyphenation tries.
begin if trie_op(z)<>min_quarterword then
@y
begin if trie_op(z)<>min_trie_op then
@z
- at x [42.924] l.18112 - bigtrie: allow larger hyphenation tries.
+ at x [42.924] l.18167 - bigtrie: allow larger hyphenation tries.
until v=min_quarterword;
@y
until v=min_trie_op;
@@ -2796,9 +2804,9 @@
@z
%%%%%%%% dynamic hyph_size
- at x 18126 m.925
+ at x [42.925] l.18181
different from $\alpha$, we can conclude that $\alpha$ is not in the table.
- at y 18126
+ at y
different from $\alpha$, we can conclude that $\alpha$ is not in the table.
This is a clever scheme which saves the need for a hash link array.
However, it is difficult to increase the size of the hyphen exception
@@ -2811,19 +2819,19 @@
@z
%%%%%%%% dynamic hyph_size
- at x 18134 m.925
+ at x [42.925] l.18189
@!hyph_pointer=0..hyph_size; {an index into the ordered hash table}
- at y 18134
+ at y
@!hyph_pointer=0..ssup_hyph_size; {index into hyphen exceptions hash table;
enlarging this requires changing (un)dump code}
@z
%%%%%%%% dynamic hyph_size
- at x 18137 m.926
+ at x [42.926] l.18192
@!hyph_word:array[hyph_pointer] of str_number; {exception words}
@!hyph_list:array[hyph_pointer] of pointer; {lists of hyphen positions}
@!hyph_count:hyph_pointer; {the number of words in the exception dictionary}
- at y 18139
+ at y
@!hyph_word: ^str_number; {exception words}
@!hyph_list: ^pointer; {lists of hyphen positions}
@!hyph_link: ^hyph_pointer; {link array for hyphen exceptions hash table}
@@ -2832,12 +2840,12 @@
@z
%%%%%%%% dynamic hyph_size
- at x 18145 m.928
+ at x [42.928] l.18200
for z:=0 to hyph_size do
begin hyph_word[z]:=0; hyph_list[z]:=null;
end;
hyph_count:=0;
- at y 18148
+ at y
for z:=0 to hyph_size do
begin hyph_word[z]:=0; hyph_list[z]:=null; hyph_link[z]:=0;
end;
@@ -2846,7 +2854,7 @@
@z
%%%%%%%% dynamic hyph_size
- at x 18163 m.930
+ at x [42.930] l.18218
h:=hc[1]; incr(hn); hc[hn]:=cur_lang;
for j:=2 to hn do h:=(h+h+hc[j]) mod hyph_size;
loop at + begin @<If the string |hyph_word[h]| is less than \(hc)|hc[1..hn]|,
@@ -2855,7 +2863,7 @@
if h>0 then decr(h)@+else h:=hyph_size;
end;
not_found: decr(hn)
- at y 18170
+ at y
h:=hc[1]; incr(hn); hc[hn]:=cur_lang;
for j:=2 to hn do h:=(h+h+hc[j]) mod hyph_prime;
loop at + begin @<If the string |hyph_word[h]| is less than \(hc)|hc[1..hn]|,
@@ -2867,7 +2875,7 @@
not_found: decr(hn)
@z
- at x [42.931] l.18206 - dynamic hyph_size
+ at x [42.931] l.18227 - dynamic hyph_size
@ @<If the string |hyph_word[h]| is less than \(hc)...@>=
k:=hyph_word[h]; if k=0 then goto not_found;
if length(k)<hn then goto not_found;
@@ -2878,7 +2886,7 @@
k:=hyph_word[h]; if k=0 then goto not_found;
@z
- at x [42.931] l.18211 - dynamic hyph_size
+ at x [42.931] l.18232 - dynamic hyph_size
repeat if so(str_pool[u])<hc[j] then goto not_found;
if so(str_pool[u])>hc[j] then goto done;
@y
@@ -2887,7 +2895,7 @@
@z
%%%%%%%% dynamic hyph_size
- at x 18245 m.934
+ at x [42.934] l.18273
@!s,@!t:str_number; {strings being compared or stored}
@y
@!s:str_number; {strings being compared or stored}
@@ -2894,14 +2902,14 @@
@z
%%%%%%%% dynamic hyph_size
- at x 18274 m.939
+ at x [42.939] l.18329
begin h:=(h+h+hc[j]) mod hyph_size;
- at y 18274
+ at y
begin h:=(h+h+hc[j]) mod hyph_prime;
@z
%%%%%%%% dynamic hyph_size
- at x 18281 m.940
+ at x [42.940] l.18336
@ @<Insert the \(p)pair |(s,p)|...@>=
if hyph_count=hyph_size then overflow("exception dictionary",hyph_size);
@:TeX capacity exceeded exception dictionary}{\quad exception dictionary@>
@@ -2912,7 +2920,7 @@
if h>0 then decr(h)@+else h:=hyph_size;
end;
hyph_word[h]:=s; hyph_list[h]:=p
- at y 18290
+ at y
@ @<Insert the \(p)pair |(s,p)|...@>=
if hyph_next <= hyph_prime then
while (hyph_next>0) and (hyph_word[hyph_next-1]>0) do decr(hyph_next);
@@ -2935,7 +2943,7 @@
found: hyph_word[h]:=s; hyph_list[h]:=p
@z
- at x [42.941] l.18326 - dynamic hyph_size
+ at x [42.941] l.18347 - dynamic hyph_size
@ @<If the string |hyph_word[h]| is less than \(or)...@>=
k:=hyph_word[h];
if length(k)<length(s) then goto found;
@@ -2948,7 +2956,7 @@
if length(k)<>length(s) then goto not_found;
@z
- at x [42.941] l.18331 - dynamic hyph_size
+ at x [42.941] l.18352 - dynamic hyph_size
repeat if str_pool[u]<str_pool[v] then goto found;
if str_pool[u]>str_pool[v] then goto not_found;
@y
@@ -2955,7 +2963,7 @@
repeat if str_pool[u]<>str_pool[v] then goto not_found;
@z
- at x [42.941] l.18335 - dynamic hyph_size
+ at x [42.941] l.18356 - dynamic hyph_size
found:q:=hyph_list[h]; hyph_list[h]:=p; p:=q;@/
t:=hyph_word[h]; hyph_word[h]:=s; s:=t;
not_found:
@@ -2969,37 +2977,37 @@
not_found:
@z
- at x [43.943] l.18332 - bigtrie: Larger tries, also in documentation parts.
+ at x [43.943] l.18387 - bigtrie: Larger tries, also in documentation parts.
|hyf_next[@t$v^\prime$@>]=min_quarterword|.
@y
|hyf_next[@t$v^\prime$@>]=min_trie_op|.
@z
- at x [43.943] l.18336 - bigtrie: Larger tries, also in documentation parts.
+ at x [43.943] l.18391 - bigtrie: Larger tries, also in documentation parts.
$$\hbox{|@t$v^\prime$@>:=new_trie_op(0,1,min_quarterword)|,\qquad
@y
$$\hbox{|@t$v^\prime$@>:=new_trie_op(0,1,min_trie_op)|,\qquad
@z
- at x [43.943] l.18346 - web2c can't parse negative lower bounds in arrays. Sorry.
+ at x [43.943] l.18401 - web2c can't parse negative lower bounds in arrays. Sorry.
@!init @!trie_op_hash:array[-trie_op_size..trie_op_size] of 0..trie_op_size;
@y
@!init @!trie_op_hash:array[neg_trie_op_size..trie_op_size] of 0..trie_op_size;
@z
- at x [43.943] l.18348 - bigtrie: Larger hyphenation tries.
+ at x [43.943] l.18403 - bigtrie: Larger hyphenation tries.
@!trie_used:array[ASCII_code] of quarterword;
@y
@!trie_used:array[ASCII_code] of trie_opcode;
@z
- at x [43.943] l.18352 - bigtrie: Larger hyphenation tries.
+ at x [43.943] l.18407 - bigtrie: Larger hyphenation tries.
@!trie_op_val:array[1..trie_op_size] of quarterword;
@y
@!trie_op_val:array[1..trie_op_size] of trie_opcode;
@z
- at x [43.943] l.18355 - Dynamic trie arrays
+ at x [43.943] l.18410 - Dynamic trie arrays
tini
@y
tini@;
@@ -3007,13 +3015,13 @@
@!small_op:boolean; {flag used while dumping or undumping}
@z
- at x [43.944] l.18358 - bigtrie: Larger tries, also in documentation parts.
+ at x [43.944] l.18413 - bigtrie: Larger tries, also in documentation parts.
|new_trie_op| could return |min_quarterword| (thereby simply ignoring
@y
|new_trie_op| could return |min_trie_op| (thereby simply ignoring
@z
- at x [43.944] l.18365 - bigtrie: Larger hyphenation tries.
+ at x [43.944] l.18420 - bigtrie: Larger hyphenation tries.
function new_trie_op(@!d,@!n:small_number;@!v:quarterword):quarterword;
label exit;
var h:-trie_op_size..trie_op_size; {trial hash location}
@@ -3025,7 +3033,7 @@
@!u:trie_opcode; {trial op code}
@z
- at x [43.944] l.18370 - Another casting problem, and use |neg_trie_op_size|.
+ at x [43.944] l.18425 - Another casting problem, and use |neg_trie_op_size|.
begin h:=abs(n+313*d+361*v+1009*cur_lang) mod (trie_op_size+trie_op_size)
- trie_op_size;
@y
@@ -3033,7 +3041,7 @@
+ neg_trie_op_size;
@z
- at x [43.944] l.18377 - bigtrie: And larger tries again.
+ at x [43.944] l.18432 - bigtrie: And larger tries again.
if u=max_quarterword then
overflow("pattern memory ops per language",
max_quarterword-min_quarterword);
@@ -3046,19 +3054,19 @@
if u>max_op_used then max_op_used:=u;
@z
- at x [43.945] l.18399 - bigtrie: And larger tries again.
+ at x [43.945] l.18454 - bigtrie: And larger tries again.
op_start[0]:=-min_quarterword;
@y
op_start[0]:=-min_trie_op;
@z
- at x [43.946] l.18416 - bigtrie: And larger tries again.
+ at x [43.946] l.18471 - bigtrie: And larger tries again.
for k:=0 to 255 do trie_used[k]:=min_quarterword;
@y
for k:=0 to 255 do trie_used[k]:=min_trie_op;
@z
- at x [43.946] l.18417 - Dynamic trie arrays.
+ at x [43.946] l.18472 - Dynamic trie arrays.
trie_op_ptr:=0;
@y
max_op_used:=min_trie_op;
@@ -3065,7 +3073,7 @@
trie_op_ptr:=0;
@z
- at x [43.947] l.18438 - Dynamically allocate arrays, and a casting problem.
+ at x [43.947] l.18493 - Dynamically allocate arrays, and a casting problem.
@!init @!trie_c:packed array[trie_pointer] of packed_ASCII_code;
{characters to match}
@t\hskip10pt@>@!trie_o:packed array[trie_pointer] of quarterword;
@@ -3093,13 +3101,13 @@
tini
@z
- at x [43.950] l.18521 - Dynamically allocate & larger tries.
+ at x [43.950] l.18576 - Dynamically allocate & larger tries.
@d trie_back(#)==trie[#].lh {backward links in |trie| holes}
@y
@d trie_back(#)==trie_tro[#] {use the opcode field now for backward links}
@z
- at x [43.590] l.18524 - Dynamically allocate & larger tries.
+ at x [43.950] l.18579 - Dynamically allocate & larger tries.
@!init @!trie_taken:packed array[1..trie_size] of boolean;
{does a family start here?}
@t\hskip10pt@>@!trie_min:array[ASCII_code] of trie_pointer;
@@ -3117,13 +3125,13 @@
tini
@z
- at x [43.951] l.18539 - Dynamically allocate.
+ at x [43.951] l.18594 - Dynamically allocate.
trie_not_ready:=true; trie_root:=0; trie_c[0]:=si(0); trie_ptr:=0;
@y
trie_not_ready:=true;
@z
- at x [43.958] l.18634 - bigtrie: Larger tries.
+ at x [43.958] l.18689 - bigtrie: Larger tries.
@<Move the data into |trie|@>=
h.rh:=0; h.b0:=min_quarterword; h.b1:=min_quarterword; {|trie_link:=0|,
|trie_op:=min_quarterword|, |trie_char:=qi(0)|}
@@ -3137,43 +3145,43 @@
@<Move the data into |trie|@>=
@z
- at x [43.958] l.18638 - bigtrie: Larger tries.
+ at x [43.958] l.18693 - bigtrie: Larger tries.
begin for r:=0 to 256 do trie[r]:=h;
@y
begin for r:=0 to 256 do clear_trie;
@z
- at x [43.958] l.18643 - bigtrie: Larger tries.
+ at x [43.958] l.18698 - bigtrie: Larger tries.
repeat s:=trie_link(r); trie[r]:=h; r:=s;
@y
repeat s:=trie_link(r); clear_trie; r:=s;
@z
- at x [43.960] l.18677 - bigtrie: Larger tries.
+ at x [43.960] l.18732 - bigtrie: Larger tries.
@!v:quarterword; {trie op code}
@y
@!v:trie_opcode; {trie op code}
@z
- at x [43.963] l.18749 - bigtrie: Larger tries.
+ at x [43.963] l.18804 - bigtrie: Larger tries.
if trie_o[q]<>min_quarterword then
@y
if trie_o[q]<>min_trie_op then
@z
- at x [43.964] l.18762 - bigtrie: Larger tries.
+ at x [43.964] l.18817 - bigtrie: Larger tries.
trie_c[p]:=si(c); trie_o[p]:=min_quarterword;
@y
trie_c[p]:=si(c); trie_o[p]:=min_trie_op;
@z
- at x [43.965] l.18768 - bigtrie: Larger tries.
+ at x [43.965] l.18823 - bigtrie: Larger tries.
l:=k; v:=min_quarterword;
@y
l:=k; v:=min_trie_op;
@z
- at x [43.966] l.18786 - bigtrie: Larger tries.
+ at x [43.966] l.18841 - bigtrie: Larger tries.
@!h:two_halves; {template used to zero out |trie|'s holes}
@y
@z
@@ -3207,7 +3215,7 @@
% main_loop_move_lig,
%@z
- at x [46.1034] l.20074 - source specials
+ at x [46.1034] l.20132 - source specials
@<Append character |cur_chr|...@>=
@y
@<Append character |cur_chr|...@>=
@@ -3216,7 +3224,7 @@
end;
@z
- at x [46.1036] l.20138 - MLTeX: substitution in |main_control|
+ at x [46.1036] l.20198 - MLTeX: substitution in |main_control|
main_loop_move+2:if(cur_chr<font_bc[main_f])or(cur_chr>font_ec[main_f]) then
@y
main_loop_move+2:
@@ -3224,13 +3232,13 @@
(qo(effective_char(false,main_f,qi(cur_chr)))<font_bc[main_f]) then
@z
- at x [46.1036] l.20141 - MLTeX: substitution in |main_control|
+ at x [46.1036] l.20201 - MLTeX: substitution in |main_control|
main_i:=char_info(main_f)(cur_l);
@y
main_i:=effective_char_info(main_f,cur_l);
@z
- at x [46.1049] l.20407 - i18n fix, see change to [16.211]
+ at x [46.1049] l.20440 - i18n fix, see change to [16.211]
print("' in "); print_mode(mode);
@y
print_in_mode(mode);
@@ -3252,7 +3260,7 @@
if every_hbox<>null then begin_token_list(every_hbox,every_hbox_text);
@z
- at x [47.1091] l.21064 - source specials
+ at x [47.1091] l.21124 - source specials
if indented then
begin tail:=new_null_box; link(head):=tail; width(tail):=par_indent;@+
end;
@@ -3273,7 +3281,7 @@
end;
@z
- at x [48.1142] l.21697 - source specials
+ at x [48.1139] l.21722 - source specials
if every_math<>null then begin_token_list(every_math,every_math_text);
@y
if (insert_src_special_every_math) then insert_src_special;
@@ -3288,7 +3296,7 @@
if every_display<>null then begin_token_list(every_display,every_display_text);
@z
- at x [48.1167] l.22042 - source specials
+ at x [48.1167] l.22114 - source specials
if every_vbox<>null then begin_token_list(every_vbox,every_vbox_text);
@y
if (insert_src_special_every_vbox) then insert_src_special;
@@ -3295,7 +3303,7 @@
if every_vbox<>null then begin_token_list(every_vbox,every_vbox_text);
@z
- at x [49.1215] l.22719 - hash_extra
+ at x [49.1215] l.22793 - hash_extra
if (cur_cs=0)or(cur_cs>frozen_control_sequence) then
@y
if (cur_cs=0)or(cur_cs>eqtb_top)or
@@ -3302,7 +3310,7 @@
((cur_cs>frozen_control_sequence)and(cur_cs<=eqtb_size)) then
@z
- at x [49.1222] l.22794 - MLTeX: \charsubdef primitive
+ at x [49.1222] l.22869 - MLTeX: \charsubdef primitive
@d toks_def_code=6 {|shorthand_def| for \.{\\toksdef}}
@y
@d toks_def_code=6 {|shorthand_def| for \.{\\toksdef}}
@@ -3309,7 +3317,7 @@
@d char_sub_def_code=7 {|shorthand_def| for \.{\\charsubdef}}
@z
- at x [49.1222] l.22810 - MLTeX: \charsubdef primitive
+ at x [49.1222] l.22885 - MLTeX: \charsubdef primitive
@!@:toks_def_}{\.{\\toksdef} primitive@>
@y
@!@:toks_def_}{\.{\\toksdef} primitive@>
@@ -3320,7 +3328,7 @@
end;
@z
- at x [49.1222] l.22820 - MLTeX: \charsubdef primitive
+ at x [49.1223] l.22895 - MLTeX: \charsubdef primitive
othercases print_esc("toksdef")
@y
char_sub_def_code: print_esc("charsubdef");
@@ -3327,7 +3335,7 @@
othercases print_esc("toksdef")
@z
- at x [49.1222] l.22833 - MLTeX: \charsubdef primitive
+ at x [49.1224] l.22908 - MLTeX: \charsubdef primitive
shorthand_def: begin n:=cur_chr; get_r_token; p:=cur_cs; define(p,relax,256);
@y
shorthand_def: if cur_chr=char_sub_def_code then
@@ -3350,9 +3358,9 @@
else begin n:=cur_chr; get_r_token; p:=cur_cs; define(p,relax,256);
@z
- at x [49.1252] l.23230 - INI = VIR, so have to do runtime test.
+ at x [49.1252] l.23309 - INI = VIR, so have to do runtime test.
begin @!init new_patterns; goto done;@;@+tini@/
- at y 23215
+ at y
begin @!Init new_patterns; goto done;@;@+Tini@/
@z
@@ -3360,11 +3368,11 @@
% a) the string is already replaced in |scan_file_name| and therefore
% b) the wrong string will get flushed!!!
%
- at x [49.1257] l.23328 unused variable
+ at x [49.1257] l.23354 - unused variable
@!flushable_string:str_number; {string not yet referenced}
@y
@z
- at x [49.1260] l.23383 new_font: string recycling -- already done
+ at x [49.1260] l.23409 - new_font: string recycling -- already done
flushable_string:=str_ptr-1;
@y
@z
@@ -3383,7 +3391,7 @@
%
% otherwise the wrong string will get removed by |flush_string|!!
%
- at x [49.1260] l.23386 new_font: string recycling -- already done
+ at x [49.1260] l.23412 - new_font: string recycling -- already done
begin if cur_name=flushable_string then
begin flush_string; cur_name:=font_name[f];
end;
@@ -3392,7 +3400,7 @@
begin if s>0 then
@z
- at x [49.1265] if batchmode, mktex... scripts should be silent.
+ at x [49.1265] l.23454 - if batchmode, mktex... scripts should be silent.
interaction:=cur_chr;
@y
interaction:=cur_chr;
@@ -3401,7 +3409,7 @@
else kpse_make_tex_discard_errors := 0;
@z
- at x [49.1275] l.23441 - Same stuff as for \input, this time for \openin.
+ at x [49.1275] l.23519 - Same stuff as for \input, this time for \openin.
if cur_ext="" then cur_ext:=".tex";
pack_cur_name;
if a_open_in(read_file[n]) then read_open[n]:=just_open;
@@ -3413,7 +3421,7 @@
read_open[n]:=just_open;
@z
- at x [50.1301] l.23679 - INI = VIR, so runtime test.
+ at x [50.1301] l.23760 - INI = VIR, so runtime test.
format_ident:=" (INITEX)";
@y
if ini_version then format_ident:=" (INITEX)";
@@ -3421,7 +3429,7 @@
% Eliminate now-unused variable `w' in `store_fmt_file'.
% Add format_engine.
- at x [50.1302] l.23690 - store_fmt_file
+ at x [50.1302] l.23768 - store_fmt_file
@!w: four_quarters; {four ASCII codes}
@y
@!format_engine: ^text_char;
@@ -3428,7 +3436,7 @@
@z
% MLTeX: dump |mltex_p| to fmt file
- at x [50.1302] l.23694
+ at x [50.1302] l.23772
@<Dump constants for consistency check@>;
@y
@<Dump constants for consistency check@>;
@@ -3438,7 +3446,7 @@
% Eliminate now-unused variable `w' in `load_fmt_file'.
% Add format_engine.
% Add dummies for undumping |xord|, |xchr|, and |xprn| into the void.
- at x [50.1303] l.23722 - load_fmt_file
+ at x [50.1303] l.23800 - load_fmt_file
@!w: four_quarters; {four ASCII codes}
@y
@!format_engine: ^text_char;
@@ -3448,7 +3456,7 @@
@z
% MLTeX: undump |mltex_enabled_p| from fmt file
- at x [50.1303] l.23694
+ at x [50.1303] l.23801
begin @<Undump constants for consistency check@>;
@y
begin @<Undump constants for consistency check@>;
@@ -3455,7 +3463,7 @@
@<Undump ML\TeX-specific data@>;
@z
- at x [50.1305] l.23751 - Do dumping and undumping of fmt files in C.
+ at x [50.1305] l.23829 - Do dumping and undumping of fmt files in C.
@d dump_wd(#)==begin fmt_file^:=#; put(fmt_file);@+end
@d dump_int(#)==begin fmt_file^.int:=#; put(fmt_file);@+end
@d dump_hh(#)==begin fmt_file^.hh:=#; put(fmt_file);@+end
@@ -3462,7 +3470,7 @@
@d dump_qqqq(#)==begin fmt_file^.qqqq:=#; put(fmt_file);@+end
@y
@z
- at x [1306]
+ at x [50.1306] l.23843
@d undump_wd(#)==begin get(fmt_file); #:=fmt_file^;@+end
@d undump_int(#)==begin get(fmt_file); #:=fmt_file^.int;@+end
@d undump_hh(#)==begin get(fmt_file); #:=fmt_file^.hh;@+end
@@ -3469,7 +3477,7 @@
@d undump_qqqq(#)==begin get(fmt_file); #:=fmt_file^.qqqq;@+end
@y
@z
- at x [still 1306] debug format file
+ at x [50.1306] l.23850 - debug format file
@d undump_size_end_end(#)==too_small(#)@+else undump_end_end
@y
@d format_debug_end(#)==
@@ -3483,7 +3491,7 @@
too_small(#)@+else format_debug (#)(x); undump_end_end
@z
- at x [50,1307] l.23779 - texarray
+ at x [50.1307] l.23859 - texarray
dump_int(@$);@/
@y
dump_int(@"57325458); {Web2C \TeX's magic constant: "W2TX"}
@@ -3502,13 +3510,13 @@
@z
%%%%%%%% dynamic hyph_size
- at x 23784 m.1307
+ at x [50.1307] l.23864
dump_int(hyph_size)
- at y 23784
+ at y
dump_int(hyph_prime)
@z
- at x [50.1308] l.23793 - texarray
+ at x [50.1308] l.23873 - texarray
x:=fmt_file^.int;
if x<>@$ then goto bad_fmt; {check that strings are the same}
@y
@@ -3563,7 +3571,7 @@
eqtb[x]:=eqtb[undefined_control_sequence];
@z
- at x [50.1308] l.23795 - texarray
+ at x [50.1308] l.23875 - texarray
undump_int(x);
if x<>mem_bot then goto bad_fmt;
undump_int(x);
@@ -3587,15 +3595,15 @@
@z
%%%%%%%% dynamic hyph_size
- at x 23804 m.1308
+ at x [50.1308] l.23884
if x<>hyph_size then goto bad_fmt
- at y 23804
+ at y
if x<>hyph_prime then goto bad_fmt
@z
% [1309] Make dumping/undumping more efficient by doing whole arrays at
% a time, via fread/fwrite in texmfmp.c.
- at x [50.1309] l.23814 - Make dumping/undumping more efficient.
+ at x [50.1309] l.23894 - Make dumping/undumping more efficient.
for k:=0 to str_ptr do dump_int(str_start[k]);
k:=0;
while k+4<pool_ptr do
@@ -3607,7 +3615,7 @@
dump_things(str_pool[0], pool_ptr);
@z
- at x [50.1310] l.23829 - Make dumping/undumping more efficient.
+ at x [50.1310] l.23909 - Make dumping/undumping more efficient.
undump_size(0)(pool_size)('string pool size')(pool_ptr);
undump_size(0)(max_strings)('max strings')(str_ptr);
for k:=0 to str_ptr do undump(0)(pool_ptr)(str_start[k]);
@@ -3629,31 +3637,31 @@
undump_things(str_pool[0], pool_ptr);
@z
- at x [50.1311] l.23850 - Make dumping/undumping more efficient.
+ at x [50.1311] l.23930 - Make dumping/undumping more efficient.
repeat for k:=p to q+1 do dump_wd(mem[k]);
@y
repeat dump_things(mem[p], q+2-p);
@z
- at x [50.1311] l.23855 - Make dumping/undumping more efficient.
+ at x [50.1311] l.23935 - Make dumping/undumping more efficient.
for k:=p to lo_mem_max do dump_wd(mem[k]);
@y
dump_things(mem[p], lo_mem_max+1-p);
@z
- at x [50.1311] l.23858 - Make dumping/undumping more efficient.
+ at x [50.1311] l.23938 - Make dumping/undumping more efficient.
for k:=hi_mem_min to mem_end do dump_wd(mem[k]);
@y
dump_things(mem[hi_mem_min], mem_end+1-hi_mem_min);
@z
- at x [50.1312] l.23873 - Make dumping/undumping more efficient.
+ at x [50.1312] l.23953 - Make dumping/undumping more efficient.
repeat for k:=p to q+1 do undump_wd(mem[k]);
@y
repeat undump_things(mem[p], q+2-p);
@z
- at x [50.1312] l.23955 - Check that p did not become corrupt.
+ at x [50.1312] l.23954 - Check that p did not become corrupt.
p:=q+node_size(q);
if (p>lo_mem_max)or((q>=rlink(q))and(rlink(q)<>rover)) then goto bad_fmt;
@y
@@ -3669,19 +3677,19 @@
p:=q+node_size(q);
@z
- at x [50.1312] l.23878 - Make dumping/undumping more efficient.
+ at x [50.1312] l.23958 - Make dumping/undumping more efficient.
for k:=p to lo_mem_max do undump_wd(mem[k]);
@y
undump_things(mem[p], lo_mem_max+1-p);
@z
- at x [50.1312] l.23888 - Make dumping/undumping more efficient.
+ at x [50.1312] l.23968 - Make dumping/undumping more efficient.
for k:=hi_mem_min to mem_end do undump_wd(mem[k]);
@y
undump_things (mem[hi_mem_min], mem_end+1-hi_mem_min);
@z
- at x [50.1314] l.23899 - hash_extra, source specials
+ at x [50.1314] l.23979 - hash_extra, source specials
undump(hash_base)(frozen_control_sequence)(par_loc);
par_token:=cs_token_flag+par_loc;@/
undump(hash_base)(frozen_control_sequence)(write_loc);@/
@@ -3691,7 +3699,7 @@
undump(hash_base)(hash_top)(write_loc);@/
@z
- at x [50.1315] l.23925 - Make dumping/undumping more efficient - eqtb
+ at x [50.1315] l.24005 - Make dumping/undumping more efficient - eqtb
while k<l do
begin dump_wd(eqtb[k]); incr(k);
end;
@@ -3699,7 +3707,7 @@
dump_things(eqtb[k], l-k);
@z
- at x [50.1316] l.23944 - Make dumping/undumping more efficient - eqtb
+ at x [50.1316] l.24024 - Make dumping/undumping more efficient - eqtb
while k<l do
begin dump_wd(eqtb[k]); incr(k);
end;
@@ -3707,7 +3715,7 @@
dump_things(eqtb[k], l-k);
@z
- at x [50.1316] l.23947 - hash_extra
+ at x [50.1316] l.24027 - hash_extra
k:=j+1; dump_int(k-l);
until k>eqtb_size
@y
@@ -3717,13 +3725,13 @@
{dump |hash_extra| part}
@z
- at x [50.1317] l.23958 - Make dumping/undumping more efficient - eqtb
+ at x [50.1317] l.24034 - Make dumping/undumping more efficient - eqtb
for j:=k to k+x-1 do undump_wd(eqtb[j]);
@y
undump_things(eqtb[k], x);
@z
- at x [50.1317] l.23960 - hash_extra
+ at x [50.1317] l.24040 - hash_extra
until k>eqtb_size
@y
until k>eqtb_size;
@@ -3731,13 +3739,13 @@
{undump |hash_extra| part}
@z
- at x [50.1318] l.23968 - hash_extra
+ at x [50.1318] l.24048 - hash_extra
dump_int(hash_used); cs_count:=frozen_control_sequence-1-hash_used;
- at y 23968
+ at y
dump_int(hash_used); cs_count:=frozen_control_sequence-1-hash_used+hash_high;
@z
- at x [50.1318] l.23972 - Make dumping/undumping more efficient, hash_extra
+ at x [50.1318] l.24052 - Make dumping/undumping more efficient, hash_extra
for p:=hash_used+1 to undefined_control_sequence-1 do dump_hh(hash[p]);
@y
dump_things(hash[hash_used+1], undefined_control_sequence-1-hash_used);
@@ -3744,7 +3752,7 @@
if hash_high>0 then dump_things(hash[eqtb_size+1], hash_high);
@z
- at x [50.1319] l.23980 - Make dumping/undumping more efficient, hash_extra
+ at x [50.1319] l.24060 - Make dumping/undumping more efficient, hash_extra
for p:=hash_used+1 to undefined_control_sequence-1 do undump_hh(hash[p]);
@y
undump_things (hash[hash_used+1], undefined_control_sequence-1-hash_used);
@@ -3759,7 +3767,7 @@
end;
@z
- at x [50.1320] l.23985 - Make dumping/undumping more efficient - tfm
+ at x [50.1320] l.24065 - Make dumping/undumping more efficient - tfm
for k:=0 to fmem_ptr-1 do dump_wd(font_info[k]);
dump_int(font_ptr);
for k:=null_font to font_ptr do
@@ -3770,7 +3778,7 @@
@<Dump the array info for internal font number |k|@>;
@z
- at x [50.1320] l.23991 - i18n fix
+ at x [50.1320] l.24070 - i18n fix
print_int(font_ptr-font_base); print(" preloaded font");
if font_ptr<>font_base+1 then print_char("s")
@y
@@ -3779,7 +3787,7 @@
else print(" preloaded font")
@z
- at x [50.1321] l.23994 - texarray
+ at x [50.1321] l.24074 - texarray
undump_size(7)(font_mem_size)('font mem size')(fmem_ptr);
for k:=0 to fmem_ptr-1 do undump_wd(font_info[k]);
undump_size(font_base)(font_max)('font max')(font_ptr);
@@ -3800,7 +3808,7 @@
% in the same section of the fmt file. But it's a lot faster to
% write the arrays of information out, one whole array at a time.
% So that's the way we handle dumping and undumping font info.
- at x [50.1322] l.24000 - Make dumping/undumping more efficient - tfm
+ at x [50.1322] l.24080 - Make dumping/undumping more efficient - tfm
@ @<Dump the array info for internal font number |k|@>=
begin dump_qqqq(font_check[k]);
dump_int(font_size[k]);
@@ -3867,7 +3875,7 @@
end
@z
- at x [50.1322] l.24031 - Make dumping/undumping more efficient - tfm
+ at x [50.1323] l.24111 - Make dumping/undumping more efficient - tfm
@ @<Undump the array info for internal font number |k|@>=
begin undump_qqqq(font_check[k]);@/
undump_int(font_size[k]);
@@ -3957,12 +3965,12 @@
@z
%%%%%%%% dynamic hyph_size
- at x 24058 m.1324
+ at x [50.1324] l.24138
dump_int(hyph_count);
for k:=0 to hyph_size do if hyph_word[k]<>0 then
begin dump_int(k); dump_int(hyph_word[k]); dump_int(hyph_list[k]);
end;
- at y 24061
+ at y
dump_int(hyph_count);
if hyph_next <= hyph_prime then hyph_next:=hyph_size;
dump_int(hyph_next);{minimum value of |hyphen_size| needed}
@@ -3973,7 +3981,7 @@
end;
@z
- at x [50.1324] l.24063 - i18n fix
+ at x [50.1324] l.24142 - i18n fix
print_ln; print_int(hyph_count); print(" hyphenation exception");
if hyph_count<>1 then print_char("s");
@y
@@ -3982,7 +3990,7 @@
else print(" hyphenation exception");
@z
- at x [50.1324] l.24066 - Make dumping/undumping more efficient - trie
+ at x [50.1324] l.24146 - Make dumping/undumping more efficient - trie
for k:=0 to trie_max do dump_hh(trie[k]);
@y
dump_things(trie_trl[0], trie_max+1);
@@ -3990,7 +3998,7 @@
dump_things(trie_trc[0], trie_max+1);
@z
- at x [50.1324] l.24068 - Make dumping/undumping more efficient - trie
+ at x [50.1324] l.24148 - Make dumping/undumping more efficient - trie
for k:=1 to trie_op_ptr do
begin dump_int(hyf_distance[k]);
dump_int(hyf_num[k]);
@@ -4002,7 +4010,7 @@
dump_things(hyf_next[1], trie_op_ptr);
@z
- at x [50.1324] l.24076 - i18n fix
+ at x [50.1324] l.24155 - i18n fix
print(" has "); print_int(trie_op_ptr); print(" op");
if trie_op_ptr<>1 then print_char("s");
@y
@@ -4012,7 +4020,7 @@
@z
%%%%%%%% dynamic hyph_size
- at x 24087 m.1325
+ at x [50.1325] l.24167
undump(0)(hyph_size)(hyph_count);
for k:=1 to hyph_count do
begin undump(0)(hyph_size)(j);
@@ -4019,7 +4027,7 @@
undump(0)(str_ptr)(hyph_word[j]);
undump(min_halfword)(max_halfword)(hyph_list[j]);
end;
- at y 24092
+ at y
undump_size(0)(hyph_size)('hyph_size')(hyph_count);
undump_size(hyph_prime)(hyph_size)('hyph_size')(hyph_next);
j:=0;
@@ -4041,7 +4049,7 @@
if hyph_next >= hyph_prime then incr(hyph_next);
@z
- at x [50.1325] l.24094 - Make dumping/undumping more efficient - trie
+ at x [50.1325] l.24174 - Make dumping/undumping more efficient - trie
for k:=0 to j do undump_hh(trie[k]);
@y
{These first three haven't been allocated yet unless we're \.{INITEX};
@@ -4054,7 +4062,7 @@
undump_things(trie_trc[0], j+1);
@z
- at x [50.1325] l.24096 - Make dumping/undumping more efficient - trie
+ at x [50.1325] l.24176 - Make dumping/undumping more efficient - trie
for k:=1 to j do
begin undump(0)(63)(hyf_distance[k]); {a |small_number|}
undump(0)(63)(hyf_num[k]);
@@ -4068,7 +4076,7 @@
undump_upper_check_things(max_trie_op, hyf_next[1], j);
@z
- at x [50.1327] l.24117 - Allow command line to override dumped value.
+ at x [50.1327] l.24197 - Allow command line to override dumped value.
undump(batch_mode)(error_stop_mode)(interaction);
@y
undump(batch_mode)(error_stop_mode)(interaction);
@@ -4075,13 +4083,13 @@
if interaction_option<>unspecified_mode then interaction:=interaction_option;
@z
- at x [50.1327] l.24172 - Test for end-of-file already done by undump.
+ at x [50.1327] l.24200 - Test for end-of-file already done by undump.
if (x<>69069)or eof(fmt_file) then goto bad_fmt
@y
if x<>69069 then goto bad_fmt
@z
- at x [51.1332] l.24203 - make the main program a procedure, for eqtb hack.
+ at x [51.1332] l.24283 - make the main program a procedure, for eqtb hack.
@p begin @!{|start_here|}
@y
@d const_chk(#)==begin if # < inf@&# then # := inf@&# else
@@ -4196,7 +4204,7 @@
@+Tini
@z
- at x [51.1332] l.24215 - INI = VIR, so pool init needs runtime test
+ at x [51.1332] l.24295 - INI = VIR, so pool init needs runtime test
@!init if not get_strings_started then goto final_end;
init_prim; {call |primitive| for each primitive}
init_str_ptr:=str_ptr; init_pool_ptr:=pool_ptr; fix_date_and_time;
@@ -4208,7 +4216,7 @@
Tini@/
@z
- at x [51.1332] l.24225 - main
+ at x [51.1332] l.24305 - main
end_of_TEX: close_files_and_terminate;
final_end: ready_already:=0;
end.
@@ -4218,7 +4226,7 @@
end {|main_body|};
@z
- at x [51.1333] l.24254 - Print new line before termination; switch to editor if necessary.
+ at x [51.1333] l.24334 - Print new line before termination; switch to editor if necessary.
slow_print(log_name); print_char(".");
end;
end;
@@ -4231,33 +4239,33 @@
call_edit(str_pool,edit_name_start,edit_name_length,edit_line);
@z
- at x [51.1334] l.24275 - hash_extra
+ at x [51.1334] l.24355 - hash_extra
wlog_ln(' ',cs_count:1,' multiletter control sequences out of ',
hash_size:1);@/
- at y 24276
+ at y
wlog_ln(' ',cs_count:1,' multiletter control sequences out of ',
hash_size:1, '+', hash_extra:1);@/
@z
- at x [51.1335] l.24335 - Only do dump if ini.
+ at x [51.1335] l.24415 - Only do dump if ini.
begin @!init for c:=top_mark_code to split_bot_mark_code do
@y
begin @!Init for c:=top_mark_code to split_bot_mark_code do
@z
- at x [51.1335] l.24337 - Only do dump if ini.
+ at x [51.1335] l.24418 - Only do dump if ini.
store_fmt_file; return;@+tini@/
@y
store_fmt_file; return;@+Tini@/
@z
- at x [51.1337] l.24361 - Handle %&format in all cases.
+ at x [51.1337] l.24441 - Handle %&format in all cases.
if (format_ident=0)or(buffer[loc]="&") then
@y
if (format_ident=0)or(buffer[loc]="&")or dump_line then
@z
- at x [51.1337] l.24366 - Dynamic arrays size.
+ at x [51.1337] l.24447 - Dynamic arrays size.
w_close(fmt_file);
@y
w_close(fmt_file);
@@ -4264,9 +4272,9 @@
eqtb:=zeqtb;
@z
-%% [51] m.1337 l.24371 - MLTeX: add. MLTeX banner after loading fmt file
+%% [51.1337] l.24371 - MLTeX: add. MLTeX banner after loading fmt file
%% (MLTeX change: only "if mltex_enabled_p then ....;")
- at x [51.1337] l.24371 - Allocate hyphenation tries, do char translation, MLTeX
+ at x [51.1337] l.24452 - Allocate hyphenation tries, do char translation, MLTeX
fix_date_and_time;@/
@y
if mltex_enabled_p then
@@ -4339,7 +4347,7 @@
% not possible to portably switch into the debugger while a program is
% running. The best approximation is to do a core dump, then run the
% debugger on it later.
- at x [52.1338] l.24411 - Core-dump in debugging mode on 0 input.
+ at x [52.1338] l.24493 - Core-dump in debugging mode on 0 input.
begin goto breakpoint;@/ {go to every declared label at least once}
breakpoint: m:=0; @{'BREAKPOINT'@}@/
end
@@ -4347,9 +4355,9 @@
dump_core {do something to cause a core dump}
@z
- at x [52.1339] l.24429 - debug - print tfm info
+ at x [52.1339] l.24511 - debug - print tfm info
5: print_word(font_info[n]);
- at y 24397
+ at y
5: begin print_scaled(font_info[n].sc); print_char(" ");@/
print_int(font_info[n].qqqq.b0); print_char(":");@/
print_int(font_info[n].qqqq.b1); print_char(":");@/
@@ -4358,7 +4366,7 @@
end;
@z
- at x [53.1344] l.24544 - source specials
+ at x [53.1344] l.24624 - source specials
primitive("special",extension,special_node);@/
@y
primitive("special",extension,special_node);@/
@@ -4365,7 +4373,7 @@
text(frozen_special):="special"; eqtb[frozen_special]:=eqtb[cur_val];@/
@z
- at x [53.1348] (do_extension) Remove unused variables
+ at x [53.1348] l.24657 - (do_extension) Remove unused variables
var i,@!j,@!k:integer; {all-purpose integers}
@!p,@!q,@!r:pointer; {all-purpose pointers}
@y
@@ -4377,13 +4385,13 @@
% refer to an actual file, though, so we don't need to change the
% write_file or write_open arrays. We provide for disabling this at
% runtime, for paranoids.
- at x [53.1350] l.24609 - system: Allow 18 as a \write stream.
+ at x [53.1350] l.24691 - system: Allow 18 as a \write stream.
else if cur_val>15 then cur_val:=16;
@y
else if (cur_val>15) and (cur_val <> 18) then cur_val:=16;
@z
- at x [53.1370] l.24770 - \write18{foo}
+ at x [53.1370] l.24852 - \write18{foo}
begin @<Expand macros in the token list
@y
@!d:integer; {number of characters in incomplete current string}
@@ -4392,7 +4400,7 @@
begin @<Expand macros in the token list
@z
- at x [53.1370] l.24773 - system: (write_out) \write18{foo} => system(foo).
+ at x [53.1370] l.24855 - system: (write_out) \write18{foo} => system(foo).
if write_open[j] then selector:=j
@y
if j=18 then selector := new_string
@@ -4400,7 +4408,7 @@
@z
% Then call system(3) on that string.
- at x [53.1370] l.24779 - system: (write_out) \write18{foo} => system(foo).
+ at x [53.1370] l.24861 - system: (write_out) \write18{foo} => system(foo).
flush_list(def_ref); selector:=old_setting;
@y
flush_list(def_ref);
@@ -4447,7 +4455,7 @@
selector:=old_setting;
@z
- at x [53.1373] Need new local.
+ at x [53.1373] l.24902 - Need new local.
procedure out_what(@!p:pointer);
var j:small_number; {write stream number}
@y
@@ -4456,7 +4464,7 @@
@!old_setting:0..max_selector;
@z
- at x [53.1374]
+ at x [53.1374] l.24923
else begin if write_open[j] then a_close(write_file[j]);
if subtype(p)=close_node then write_open[j]:=false
@y
@@ -4465,7 +4473,7 @@
if subtype(p)=close_node then do_nothing {already closed}
@z
@@ Diff output truncated at 1234567 characters. @@
More information about the pdftex-commits
mailing list.