Merge branch 'texlive-trunk' r69280

source/ChangeLog

@@ -1,3 +1,9 @@
+2023-12-26  Karl Berry  <[email protected]>
+
+	* reautoconf: don't bother with environment variables;
+	because the autotools have many subprograms, setting PATH
+	is what makes sense.
+
 2023-12-23  Karl Berry  <[email protected]>
 
 	* reautoconf with autoconf-2.72.

source/build-aux/ar-lib

@@ -4,7 +4,7 @@
 me=ar-lib
 scriptversion=2019-07-04.01; # UTC
 
-# Copyright (C) 2010-2023 Free Software Foundation, Inc.
+# Copyright (C) 2010-2024 Free Software Foundation, Inc.
 # Written by Peter Rosin <[email protected]>.
 #
 # This program is free software; you can redistribute it and/or modify

source/build-aux/compile

@@ -3,7 +3,7 @@
 
 scriptversion=2023-11-23.18; # UTC
 
-# Copyright (C) 1999-2023 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
 # Written by Tom Tromey <[email protected]>.
 #
 # This program is free software; you can redistribute it and/or modify

source/build-aux/depcomp

@@ -3,7 +3,7 @@
 
 scriptversion=2023-11-23.18; # UTC
 
-# Copyright (C) 1999-2023 Free Software Foundation, Inc.
+# Copyright (C) 1999-2024 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

source/reautoconf

@@ -38,11 +38,7 @@ Options:
   -v, --verbose   verbosely report processing (default)
       --warn-obsolete  do not pass -Wno-obsolete
 
-Environment variables:
-  TL_AUTOCONF:   program to use instead of autoconf from PATH
-  TL_AUTOHEADER: program to use instead of autoheader from PATH
-  TL_AUTOMAKE:   program to use instead of automake from PATH
-  TL_ACLOCAL:    program to use instead of aclocal from PATH
+All programs are found along PATH.
 
 This script should be invoked only from the top level of the TeX Live
 source tree.
@@ -81,28 +77,17 @@ if test ! -f ./m4/kpse-setup.m4; then
   exit 1
 fi
 
-: ${TL_AUTOCONF=autoconf}
-echo "$0: using \"$TL_AUTOCONF\" = `$TL_AUTOCONF --version | sed 1q`"
-: ${TL_AUTOHEADER=autoheader}
-echo "$0: using \"$TL_AUTOHEADER\" = `$TL_AUTOHEADER --version | sed 1q`"
-: ${TL_AUTOMAKE=automake}
-echo "$0: using \"$TL_AUTOMAKE\" = `$TL_AUTOMAKE --version | sed 1q`"
-: ${TL_ACLOCAL=aclocal}
-echo "$0: using \"$TL_ACLOCAL\" = `$TL_ACLOCAL --version | sed 1q`"
-echo "$0:       if you want to use different versions, set TL_AUTOCONF,"
-echo "$0:               TL_AUTOHEADER, TL_AUTOMAKE, and/or TL_ACLOCAL."
-
-# Give users a chance to quit here
-# and set TL_AUTOCONF, TL_AUTOHEADER, TL_AUTOMAKE, and/or TL_ACLOCAL
+echo "$0: using `autoconf --version | sed 1q`"
+echo "$0: using `autoheader --version | sed 1q`"
+echo "$0: using `autom4te --version | sed 1q`"
+echo "$0: using `automake --version | sed 1q`"
+echo "$0: using `aclocal --version | sed 1q`"
+echo "$0:       if you want to use different versions, set PATH."
+
+# Give users a chance to quit here.
 $do_cmd sleep 4
 $do_say "$0: starting at `date`."
 
-AUTOCONF=$TL_AUTOCONF
-AUTOHEADER=$TL_AUTOHEADER
-AUTOMAKE=$TL_AUTOMAKE
-ACLOCAL=$TL_ACLOCAL
-export AUTOCONF AUTOHEADER AUTOMAKE ACLOCAL
-
 do_it () {
   test x"$do_say" = x: || printf "\f "
   $do_say "$0: running \"$@\""

source/texk/web2c/eptexdir/wcfname.test

@@ -78,7 +78,7 @@ for doc in fn-$fenc fnさざ波-$fenc; do
       { rc=1 ; err1=$err1" $fenc:$ienc:$doc" ; }
   $_kpsewhich -progname=$engine $doc-tmp.tex || rc=12
   mv $job.txt $job.log $testdir/ || rc=14
-  mv $job.txt $testdir/ || : echo "FIXME" # check *.fls
+  mv $job.fls $testdir/ || : echo "FIXME" # check *.fls
   diff $testdir/$job.txt $srcdir/tests/fn-$fenc.txt || \
       { rc=2 ; err2=$err2" $fenc:$ienc:$doc" ; }
   rm -f $testdir/fn±×÷§¶-utf8-tmp.tex

source/texk/web2c/lib/ChangeLog

@@ -1,3 +1,7 @@
+2024-01-01  Akira Kakuto  <[email protected]>
+
+	* printversion.c: Update copyright year.
+
 2023-11-11  Akira Kakuto  <[email protected]>
 
 	* texmfmp.c: Order of lines was incorrect (windows only).

source/texk/web2c/lib/printversion.c

@@ -56,7 +56,7 @@ printversionandexit (const_string banner,
 #endif
 
   if (copyright_holder) {
-    printf ("Copyright 2023 %s.\n", copyright_holder);
+    printf ("Copyright 2024 %s.\n", copyright_holder);
     if (!author)
       author = copyright_holder;
   }

source/texk/web2c/mplibdir/mpxout.w

@@ -656,11 +656,11 @@ static void mpx_mpto(MPX mpx, char *tmpname, char *mptexpre) {
          mpx_copy_mpto(mpx, outfile, FIRST_VERBATIM_TEX);
       else
          mpx_copy_mpto(mpx, outfile, VERBATIM_TEX);
+      verbatim_written = 1;
       fprintf(outfile,"%s", mpx_postverb[mode]);
     } else {
       mpx_error(mpx,"unmatched etex");
     }
-    verbatim_written = 1;
   }
 }