diff -Nru automake-1.16-1.16.1/aclocal.m4 automake-1.16-1.16.5/aclocal.m4 --- automake-1.16-1.16.1/aclocal.m4 2018-03-11 21:21:07.000000000 +0000 +++ automake-1.16-1.16.5/aclocal.m4 2021-10-04 03:07:25.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,24 +14,837 @@ m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, +[m4_warning([this file was generated for autoconf 2.71. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -m4_include([m4/amversion.m4]) -m4_include([m4/auxdir.m4]) -m4_include([m4/cond.m4]) -m4_include([m4/init.m4]) -m4_include([m4/install-sh.m4]) -m4_include([m4/lead-dot.m4]) -m4_include([m4/missing.m4]) -m4_include([m4/options.m4]) -m4_include([m4/prog-cc-c-o.m4]) -m4_include([m4/runlog.m4]) -m4_include([m4/sanity.m4]) -m4_include([m4/silent.m4]) -m4_include([m4/strip.m4]) -m4_include([m4/substnot.m4]) -m4_include([m4/tar.m4]) +# Copyright (C) 2002-2021 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_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# 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' +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], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# 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 +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001-2021 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. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997-2021 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_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996-2021 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. + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.65])dnl +m4_ifdef([_$0_ALREADY_INIT], + [m4_fatal([$0 expanded multiple times +]m4_defn([_$0_ALREADY_INIT]))], + [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi +AC_SUBST([CTAGS]) +if test -z "$ETAGS"; then + ETAGS=etags +fi +AC_SUBST([ETAGS]) +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi +AC_SUBST([CSCOPE]) + +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. +AC_CONFIG_COMMANDS_PRE(dnl +[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! + +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: + +Please tell bug-automake@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: . + +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. +]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001-2021 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_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +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 +AC_SUBST([install_sh])]) + +# Copyright (C) 2003-2021 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. + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[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 +AC_SUBST([am__leading_dot])]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997-2021 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_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +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= + AC_MSG_WARN(['missing' script is too old or missing]) +fi +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001-2021 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_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) + +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Copyright (C) 1999-2021 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_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # 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__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2021 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. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2021 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_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[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=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +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". + 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! +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 ) & + 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 + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) + +# Copyright (C) 2009-2021 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 +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--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. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['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]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + 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 +]) + +# Copyright (C) 2001-2021 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_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# 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. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006-2021 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_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004-2021 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_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' + +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + 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]) + else + 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]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + diff -Nru automake-1.16-1.16.1/bin/aclocal.in automake-1.16-1.16.5/bin/aclocal.in --- automake-1.16-1.16.1/bin/aclocal.in 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/bin/aclocal.in 2021-07-12 02:41:13.000000000 +0000 @@ -1,13 +1,7 @@ -#!@PERL@ -w -# -*- perl -*- +#!@PERL@ +# aclocal - create aclocal.m4 by scanning configure.ac -*- perl -*- # @configure_input@ - -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' - if 0; - -# aclocal - create aclocal.m4 by scanning configure.ac - -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 @@ -25,13 +19,18 @@ # Written by Tom Tromey , and # Alexandre Duret-Lutz . +use 5.006; +use strict; +use warnings FATAL => 'all'; + BEGIN { unshift (@INC, '@datadir@/@PACKAGE@-@APIVERSION@') unless $ENV{AUTOMAKE_UNINSTALLED}; } -use strict; +use File::Basename; +use File::Path (); use Automake::Config; use Automake::General; @@ -40,8 +39,6 @@ use Automake::ChannelDefs; use Automake::XFile; use Automake::FileUtils; -use File::Basename; -use File::Path (); # Some globals. @@ -290,7 +287,7 @@ { # $dest does not exist. We create an empty one just to # run diff, and we erase it afterward. Using the real - # the destination file (rather than a temporary file) is + # destination file (rather than a temporary file) is # good when diff is run with options that display the # file name. # @@ -765,22 +762,19 @@ my %files = map { $map{$_} => 1 } keys %macro_seen; %files = strip_redundant_includes %files; - # When AC_CONFIG_MACRO_DIRS is used, avoid possible spurious warnings - # from autom4te about macros being "m4_require'd but not m4_defun'd"; - # for more background, see: - # https://lists.gnu.org/archive/html/autoconf-patches/2012-11/msg00004.html - # as well as autoconf commit 'v2.69-44-g1ed0548', "warn: allow aclocal - # to silence m4_require warnings". - my $early_m4_code .= "m4_define([m4_require_silent_probe], [-])"; + # Suppress all warnings from this invocation of autom4te. + # In particular we want to avoid spurious warnings about + # macros being "m4_require'd but not m4_defun'd" because + # aclocal.m4 is not yet available. + local $ENV{WARNINGS} = 'none'; my $traces = ($ENV{AUTOM4TE} || '@am_AUTOM4TE@'); $traces .= " --language Autoconf-without-aclocal-m4 "; - $traces = "echo '$early_m4_code' | $traces - "; # Support AC_CONFIG_MACRO_DIRS also with older autoconf. # Note that we can't use '$ac_config_macro_dirs_fallback' here, because - # a bug in option parsing code of autom4te 2.68 and earlier will cause - # it to read standard input last, even if the "-" argument is specified + # a bug in option parsing code of autom4te 2.68 and earlier would cause + # it to read standard input last, even if the "-" argument was specified # early. # FIXME: To be removed in Automake 2.0, once we can assume autoconf # 2.70 or later. @@ -810,7 +804,7 @@ # characters (like newlines). (map { "--trace='$_:\$f::\$n'" } (keys %macro_seen))); - verb "running $traces $configure_ac"; + verb "running WARNINGS=$ENV{WARNINGS} $traces $configure_ac"; my $tracefh = new Automake::XFile ("$traces $configure_ac |"); @@ -1051,15 +1045,11 @@ --verbose don't be silent --version print version number, then exit -W, --warnings=CATEGORY report the warnings falling in CATEGORY +EOF -Warning categories include: - syntax dubious syntactic constructs (default) - unsupported unknown macros (default) - all all the warnings (default) - no-CATEGORY turn off warnings in CATEGORY - none turn off all the warnings - error treat warnings as errors + print Automake::ChannelDefs::usage (), "\n"; + print <<'EOF'; Report bugs to <@PACKAGE_BUGREPORT@>. GNU Automake home page: <@PACKAGE_URL@>. General help using GNU software: . @@ -1088,6 +1078,7 @@ { my $print_and_exit = 0; my $diff_command; + my @warnings = (); my %cli_options = ( @@ -1103,11 +1094,12 @@ 'output=s' => \$output_file, 'print-ac-dir' => \$print_and_exit, 'verbose' => sub { setup_channel 'verb', silent => 0; }, - 'W|warnings=s' => \&parse_warnings, + 'W|warnings=s' => \@warnings, ); use Automake::Getopt (); Automake::Getopt::parse_options %cli_options; + parse_warnings @warnings; if (@ARGV > 0) { diff -Nru automake-1.16-1.16.1/bin/automake.in automake-1.16-1.16.5/bin/automake.in --- automake-1.16-1.16.1/bin/automake.in 2018-03-08 20:27:05.000000000 +0000 +++ automake-1.16-1.16.5/bin/automake.in 2021-09-20 00:53:14.000000000 +0000 @@ -1,12 +1,7 @@ -#!@PERL@ -w -# -*- perl -*- +#!@PERL@ +# automake - create Makefile.in from Makefile.am -*- perl -*- # @configure_input@ - -eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' - if 0; - -# automake - create Makefile.in from Makefile.am -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 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 @@ -27,7 +22,9 @@ package Automake; +use 5.006; use strict; +use warnings FATAL => 'all'; BEGIN { @@ -44,6 +41,10 @@ $ENV{'SHELL'} = '@SHELL@' if exists $ENV{'DJDIR'}; } +use Carp; +use File::Basename; +use File::Spec; + use Automake::Config; BEGIN { @@ -71,9 +72,6 @@ use Automake::RuleDef; use Automake::Wrap 'makefile_wrap'; use Automake::Language; -use File::Basename; -use File::Spec; -use Carp; ## ----------------------- ## ## Subroutine prototypes. ## @@ -201,11 +199,14 @@ # ltconfig appears here for compatibility with old versions of libtool. my @libtool_sometimes = qw(ltconfig ltcf-c.sh ltcf-cxx.sh ltcf-gcj.sh); -# Commonly found files we look for and automatically include in -# DISTFILES. +# Top-level files that can be foo.md instead of foo. We assume that all +# but THANKS are required at strictness level gnu. +my @toplevelmd_ok = qw(AUTHORS ChangeLog INSTALL NEWS README THANKS); + +# Commonly found files we look for and automatically include in DISTFILES. my @common_files = - (qw(ABOUT-GNU ABOUT-NLS AUTHORS BACKLOG COPYING COPYING.DOC COPYING.LIB - COPYING.LESSER ChangeLog INSTALL NEWS README THANKS TODO + (qw(ABOUT-GNU ABOUT-NLS BACKLOG COPYING + COPYING.DOC COPYING.LIB COPYING.LESSER TODO ar-lib compile config.guess config.rpath config.sub depcomp install-sh libversion.in mdate-sh missing mkinstalldirs py-compile texinfo.tex ylwrap), @@ -1841,22 +1842,27 @@ { # Since the next major version of automake (2.0) will # make the behaviour so far only activated with the - # 'subdir-object' option mandatory, it's better if we + # 'subdir-objects' option mandatory, it's better if we # start warning users not using that option. # As suggested by Peter Johansson, we strive to avoid # the warning when it would be irrelevant, i.e., if # all source files sit in "current" directory. + # + # There are problems with making this change; see + # https://bugs.gnu.org/20699 before making + # subdir-objects, let alone unconditional. + # (Making it non-overridable seems especially wrong.) + # msg_var 'unsupported', $var, "source file '$full' is in a subdirectory," . "\nbut option 'subdir-objects' is disabled"; msg 'unsupported', INTERNAL, <<'EOF', uniq_scope => US_GLOBAL; possible forward-incompatibility. -At least a source file is in a subdirectory, but the 'subdir-objects' +At least one source file is in a subdirectory, but the 'subdir-objects' automake option hasn't been enabled. For now, the corresponding output -object file(s) will be placed in the top-level directory. However, -this behaviour will change in future Automake versions: they will -unconditionally cause object files to be placed in the same subdirectory -of the corresponding sources. +object file(s) will be placed in the top-level directory. However, this +behavior may change in a future Automake major version, with object +files being placed in the same subdirectory as the corresponding sources. You are advised to start using 'subdir-objects' option throughout your project, to avoid future incompatibilities. EOF @@ -2390,7 +2396,7 @@ $var->requires_variables ("\@${lt}LIBOBJS\@ used", $lt . 'LIBOBJS') if ! keys %libsources; - foreach my $iter (keys %libsources) + foreach my $iter (sort keys %libsources) { my $dir = ''; if ($iter =~ /^(.*)(\.[cly])$/) @@ -3088,8 +3094,10 @@ if (! $outfile) { - err_am "'$filename' missing \@setfilename"; - return; + # Replace a .texi extension with .info + $outfile = basename($filename); + $outfile =~ s/\.[^.]+$//; + $outfile .= '.info'; } return ($outfile, $vfile); @@ -3711,7 +3719,7 @@ define_variable ('am__tagged_files', '$(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)' - . "@config", INTERNAL); + . " @config", INTERNAL); if (rvar('am__tagged_files')->value_as_list_recursive || var ('ETAGS_ARGS') || var ('SUBDIRS')) @@ -3809,7 +3817,7 @@ { my $archive_defined = option 'no-dist-gzip' ? 0 : 1; $archive_defined ||= - grep { option "dist-$_" } qw(shar zip tarZ bzip2 lzip xz); + grep { option "dist-$_" } qw(shar zip tarZ bzip2 lzip xz zstd); error (option 'no-dist-gzip', "no-dist-gzip specified but no dist-* specified,\n" . "at least one archive format must be enabled") @@ -3828,7 +3836,7 @@ $check_aux = 1; } } - foreach my $cfile (@common_files) + foreach my $cfile (@toplevelmd_ok, @common_files) { if (dir_has_case_matching_file ($relative_dir, $cfile) # The file might be absent, but if it can be built it's ok. @@ -3836,13 +3844,30 @@ { push_dist_common ($cfile); } + elsif (grep { $_ eq $cfile } @toplevelmd_ok) + { # Irritatingly, have to repeat the checks, now for .md files; + # we want to prefer non-.md, so do this second, and only "elsif". + if (dir_has_case_matching_file ($relative_dir, "$cfile.md") + || rule "$cfile.md") + { + push_dist_common ("$cfile.md"); + } + } # Don't use 'elsif' here because a file might meaningfully - # appear in both directories. + # appear in both $relative_dir and $config_aux_dir. if ($check_aux && dir_has_case_matching_file ($config_aux_dir, $cfile)) { push_dist_common ("$config_aux_dir/$cfile") } + elsif ($check_aux && grep { $_ eq $cfile } @toplevelmd_ok) + { + if (dir_has_case_matching_file ($config_aux_dir, "$cfile.md") + || rule "$cfile.md") + { + push_dist_common ("$cfile.md"); + } + } } # We might copy elements from @configure_dist_common to @@ -4258,6 +4283,9 @@ # Use $(install_sh), not $(MKDIR_P) because the latter requires # at least one argument, and $(mkinstalldirs) used to work # even without arguments (e.g. $(mkinstalldirs) $(conditional_dir)). + # Also, $(MKDIR_P) uses the umask for any intermediate directories + # created, whereas we want them to be created with umask 022 + # so that they are mode 755. define_variable ('mkinstalldirs', '$(install_sh) -d', INTERNAL); } @@ -4689,7 +4717,7 @@ DIST_CLEAN, [], MAINTAINER_CLEAN, []); - foreach my $file (keys %clean_files) + foreach my $file (sort keys %clean_files) { my $when = $clean_files{$file}; prog_error 'invalid entry in %clean_files' @@ -4759,7 +4787,7 @@ . "not 'install-hook'"); # Install the -local hooks. - foreach (keys %dependencies) + foreach (sort keys %dependencies) { # Hooks are installed on the -am targets. s/-am$// or next; @@ -4781,7 +4809,7 @@ } # All the required targets are phony. - depend ('.PHONY', keys %required_targets); + depend ('.PHONY', sort keys %required_targets); # Actually output gathered targets. foreach (sort target_cmp keys %dependencies) @@ -4954,7 +4982,7 @@ if ($handle_exeext) { unshift (@test_suffixes, $at_exeext) - unless $test_suffixes[0] eq $at_exeext; + unless @test_suffixes && $test_suffixes[0] eq $at_exeext; } unshift (@test_suffixes, ''); @@ -5111,11 +5139,12 @@ "version '$package_version' doesn't follow " . "Gnits standards"); } - if (defined $1 && -f 'README-alpha') + if (defined $1 && (-f 'README-alpha' || -f 'README-alpha.md')) { # This means we have an alpha release. See # GNITS_VERSION_PATTERN for details. - push_dist_common ('README-alpha'); + my $af = -f 'README-alpha' ? 'README-alpha' : 'README-alpha.md'; + push_dist_common ($af); } } } @@ -5246,16 +5275,21 @@ sinclude => 1, ); + # Suppress all warnings from this invocation of autoconf. + # The user is presumably about to run autoconf themselves + # and will see its warnings then. + local $ENV{WARNINGS} = 'none'; + my $traces = ($ENV{AUTOCONF} || '@am_AUTOCONF@') . " "; # Use a separator unlikely to be used, not ':', the default, which # has a precise meaning for AC_CONFIG_FILES and so on. $traces .= join (' ', map { "--trace=$_" . ':\$f:\$l::\$d::\$n::\${::}%' } - (keys %traced)); + (sort keys %traced)); + verb "running WARNINGS=$ENV{WARNINGS} $traces"; my $tracefh = new Automake::XFile ("$traces $filename |"); - verb "reading $traces"; @cond_stack = (); my $where; @@ -5597,8 +5631,16 @@ if ($relative_dir eq '.') { # In top level (or only) directory. - require_file ("$am_file.am", GNU, - qw/INSTALL NEWS README AUTHORS ChangeLog/); + + foreach my $file (@toplevelmd_ok) + { + next if $file eq 'THANKS'; # gnits, checked below + # if non-.md is absent, and .md is present, require .md; + # otherwise require non-.md. + my $required + = (! -f $file && -f "$file.md") ? "$file.md" : $file; + require_file ("$am_file.am", GNU, $required); + } # Accept one of these three licenses; default to COPYING. # Make sure we do not overwrite an existing license. @@ -5629,7 +5671,10 @@ if ($relative_dir eq '.') { # In top level (or only) directory. - require_file ("$am_file.am", GNITS, 'THANKS'); + my $file = 'THANKS'; + my $required + = (! -f $file && -f "$file.md") ? "$file.md" : $file; + require_file ("$am_file.am", GNITS, $file); } } @@ -5722,13 +5767,24 @@ my $c_file = $vala_file; if ($c_file =~ s/(.*)\.vala$/$1.c/) { - $c_file = "\$(srcdir)/$c_file"; - $output_rules .= "$c_file: \$(srcdir)/${derived}_vala.stamp\n" - . "\t\@if test -f \$@; then :; else rm -f \$(srcdir)/${derived}_vala.stamp; fi\n" + my $built_c_file = "\$(builddir)/$c_file"; + my $built_dir = dirname $built_c_file; + my $base_c_file = basename $c_file; + # + # The -newer test here is checking "C file not older than Vala + # file" (not "C file newer than Vala file"; see + # https://bugs.gnu.org/44772. The log message on the commit + # misleadingly says "reversed". + # + $output_rules .= "$built_c_file: \$(builddir)/${derived}_vala.stamp\n" + . "\t\@if test ! -f \$@ && test \$(srcdir) != \$(builddir) && test -n \"\$\$(find -L \$(srcdir)/$vala_file -prune \! -newer \$(srcdir)/$c_file)\"; then cp -p \$(srcdir)/$c_file $built_c_file; fi\n" + . "\t\@if test -f \$@; then :; else rm -f \$(builddir)/${derived}_vala.stamp; fi\n" . "\t\@if test -f \$@; then :; else \\\n" - . "\t \$(MAKE) \$(AM_MAKEFLAGS) \$(srcdir)/${derived}_vala.stamp; \\\n" + . "\t \$(MAKE) \$(AM_MAKEFLAGS) \$(builddir)/${derived}_vala.stamp; \\\n" + . "\t if test $built_dir != .; then mv $base_c_file $built_dir/; fi \\\n" . "\tfi\n"; - $clean_files{$c_file} = MAINTAINER_CLEAN; + $clean_files{$built_c_file} = DIST_CLEAN; + $clean_files{"\$(srcdir)/$c_file"} = MAINTAINER_CLEAN; } } @@ -5739,14 +5795,14 @@ my $lastflag = ''; foreach my $flag ($flags->value_as_list_recursive) { - if (grep (/$lastflag/, ('-H', '-h', '--header', '--internal-header', - '--vapi', '--internal-vapi', '--gir'))) + if (grep (/^$lastflag$/, ('-H', '-h', '--header', '--internal-header', + '--vapi', '--internal-vapi', '--gir'))) { - my $headerfile = "\$(srcdir)/$flag"; - $output_rules .= "$headerfile: \$(srcdir)/${derived}_vala.stamp\n" - . "\t\@if test -f \$@; then :; else rm -f \$(srcdir)/${derived}_vala.stamp; fi\n" + my $headerfile = "\$(builddir)/$flag"; + $output_rules .= "$headerfile: \$(builddir)/${derived}_vala.stamp\n" + . "\t\@if test -f \$@; then :; else rm -f \$(builddir)/${derived}_vala.stamp; fi\n" . "\t\@if test -f \$@; then :; else \\\n" - . "\t \$(MAKE) \$(AM_MAKEFLAGS) \$(srcdir)/${derived}_vala.stamp; \\\n" + . "\t \$(MAKE) \$(AM_MAKEFLAGS) \$(builddir)/${derived}_vala.stamp; \\\n" . "\tfi\n"; # valac is not used when building from dist tarballs @@ -5754,6 +5810,21 @@ push_dist_common ($headerfile); $clean_files{$headerfile} = MAINTAINER_CLEAN; } + if (grep (/$lastflag/, ('--library'))) + { + my $headerfile = "\$(builddir)/$flag"; + $output_rules .= "$headerfile.vapi: \$(builddir)/${derived}_vala.stamp\n" + . "\t\@if test -f \$@; then :; else rm -f \$(builddir)/${derived}_vala.stamp; fi\n" + . "\t\@if test -f \$@; then :; else \\\n" + . "\t \$(MAKE) \$(AM_MAKEFLAGS) \$(builddir)/${derived}_vala.stamp; \\\n" + . "\tfi\n"; + + # valac is not used when building from dist tarballs + # distribute the generated files + my $vapi = "$headerfile.vapi"; + push_dist_common ($vapi); + $clean_files{$headerfile.'.vapi'} = MAINTAINER_CLEAN; + } $lastflag = $flag; } } @@ -5777,10 +5848,10 @@ my $verbose = verbose_flag ('VALAC'); my $silent = silent_flag (); - my $stampfile = "\$(srcdir)/${derived}_vala.stamp"; + my $stampfile = "\$(builddir)/${derived}_vala.stamp"; $output_rules .= - "\$(srcdir)/${derived}_vala.stamp: @vala_sources\n". + "\$(builddir)/${derived}_vala.stamp: @vala_sources\n". # Since the C files generated from the vala sources depend on the # ${derived}_vala.stamp file, we must ensure its timestamp is older than # those of the C files generated by the valac invocation below (this is @@ -5788,7 +5859,7 @@ # Thus we need to create the stamp file *before* invoking valac, and to # move it to its final location only after valac has been invoked. "\t${silent}rm -f \$\@ && echo stamp > \$\@-t\n". - "\t${verbose}\$(am__cd) \$(srcdir) && $compile @vala_sources\n". + "\t${verbose}$compile \$^\n". "\t${silent}mv -f \$\@-t \$\@\n"; push_dist_common ($stampfile); @@ -5803,7 +5874,7 @@ { my ($self) = @_; - foreach my $prog (keys %known_programs) + foreach my $prog (sort keys %known_programs) { lang_vala_finish_target ($self, $prog); } @@ -6289,8 +6360,12 @@ my ($linker, $target) = @_; # If the user wrote a custom link command, we don't define ours. - return "${target}_LINK" - if set_seen "${target}_LINK"; + my $custom_link = "${target}_LINK"; + if (set_seen ($custom_link)) + { + my $verbose = $custom_link if var (verbose_var ($custom_link)); + return ($custom_link, $verbose); + } my $xlink = $linker ? $linker : 'LINK'; @@ -6791,6 +6866,8 @@ 'GZIP' => ! option 'no-dist-gzip', 'SHAR' => !! option 'dist-shar', 'ZIP' => !! option 'dist-zip', + 'ZSTD' => !! option 'dist-zstd', + 'DIST_BUILT_SOURCES' => !! option 'dist-built-sources', 'INSTALL-INFO' => ! option 'no-installinfo', 'INSTALL-MAN' => ! option 'no-installman', @@ -7965,13 +8042,26 @@ handle_all ($makefile); # FIXME: Gross! - if (var ('lib_LTLIBRARIES') && var ('bin_PROGRAMS')) - { - $output_rules .= "install-binPROGRAMS: install-libLTLIBRARIES\n\n"; - } - if (var ('nobase_lib_LTLIBRARIES') && var ('bin_PROGRAMS')) - { - $output_rules .= "install-binPROGRAMS: install-nobase_libLTLIBRARIES\n\n"; + my $have_lt1 = !!var("lib_LTLIBRARIES"); + my $have_lt2 = !!var("nobase_lib_LTLIBRARIES"); + for my $var (variables("PROGRAMS"), variables("LTLIBRARIES")) + { + if ($var->name eq "lib_LTLIBRARIES" + || $var->name eq "nobase_lib_LTLIBRARIES" + || substr($var->name, 0, 7) eq "noinst_") + { + next; + } + my $shortname = $var->name; + $shortname =~ tr{_}{}d; + if ($have_lt1) + { + $output_rules .= "install-$shortname: install-libLTLIBRARIES\n\n"; + } + if ($have_lt2) + { + $output_rules .= "install-$shortname: install-nobase_libLTLIBRARIES\n\n"; + } } handle_install; @@ -8110,14 +8200,17 @@ -f, --force-missing force update of standard files "; - Automake::ChannelDefs::usage; + print Automake::ChannelDefs::usage (), "\n"; print "\nFiles automatically distributed if found " . "(always):\n"; print_autodist_files @common_files; print "\nFiles automatically distributed if found " . + "(as .md if needed):\n"; + print_autodist_files (map { "${_}[.md]" } @toplevelmd_ok); + print "\nFiles automatically distributed if found " . "(under certain conditions):\n"; - print_autodist_files @common_sometimes; + print_autodist_files @common_sometimes, 'README-alpha[.md]'; print ' Report bugs to <@PACKAGE_BUGREPORT@>. @@ -8180,10 +8273,7 @@ set_strictness ($strict); my $cli_where = new Automake::Location; set_global_option ('no-dependencies', $cli_where) if $ignore_deps; - for my $warning (@warnings) - { - parse_warnings ('-W', $warning); - } + parse_warnings @warnings; return unless @ARGV; diff -Nru automake-1.16-1.16.1/bin/local.mk automake-1.16-1.16.5/bin/local.mk --- automake-1.16-1.16.1/bin/local.mk 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/bin/local.mk 2021-07-19 00:52:29.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- makefile-automake -*- -## Copyright (C) 1995-2018 Free Software Foundation, Inc. +## Copyright (C) 1995-2021 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 diff -Nru automake-1.16-1.16.1/bootstrap automake-1.16-1.16.5/bootstrap --- automake-1.16-1.16.1/bootstrap 2018-02-27 22:59:31.000000000 +0000 +++ automake-1.16-1.16.5/bootstrap 2021-07-19 00:59:02.000000000 +0000 @@ -2,7 +2,7 @@ # This script helps bootstrap automake, when checked out from git. # -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # Originally written by Pavel Roskin September 2002. # # This program is free software; you can redistribute it and/or modify @@ -42,7 +42,7 @@ datadir=. # This should be automatically updated by the 'update-copyright' # rule of our Makefile. -RELEASE_YEAR=2018 +RELEASE_YEAR=2021 # Override SHELL. This is required on DJGPP so that Perl's system() # uses bash, not COMMAND.COM which doesn't quote arguments properly. diff -Nru automake-1.16-1.16.1/ChangeLog automake-1.16-1.16.5/ChangeLog --- automake-1.16-1.16.1/ChangeLog 2018-03-11 22:12:29.000000000 +0000 +++ automake-1.16-1.16.5/ChangeLog 2021-10-04 03:23:18.000000000 +0000 @@ -1,3 +1,1777 @@ +2021-10-03 Jim Meyering + + version 1.16.5 + + * configure.ac (AC_INIT): Bump version number to 1.16.5. + * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). + * NEWS: Record release version. + +2021-10-03 Jim Meyering + + maint: don't use obsolescent "egrep" + + * maintainer/syntax-checks.mk (sc_perl_local): Use grep -E + in place of "egrep". + +2021-10-03 Jim Meyering + + maint: remove trailing white space from a few files + + * NEWS: Remove trailing white space. + * NEWS-2.0: Likewise. + * contrib/checklinkx: Likewise. + * doc/local.mk (chlx_args): Likewise. + * m4/python.m4: Likewise. + * t/test-extensions-empty.sh: Likewise. + +2021-09-28 Karl Berry + + doc: show "RUNNING: " example using [AM_]TESTS_ENVIRONMENT. + + This change addresses https://bugs.gnu.org/49309. + + * doc/automake.texi (Testsuite Environment Overrides): new + subsubsection, separating out [AM_]TESTS_ENVIRONMENT description. + Add example to get "RUNNING: " when a test starts. + +2021-09-28 Karl Berry + + doc: tweak Yacc/Lex text; subnode for the yacc linking hack. + + * doc/automake.texi (Alternative): remove obsolete footnote. + (Yacc and Lex): tweak wording, more consistent capitalization. + (Linking Multiple Yacc Parsers): new subsection. + + Also add @shortcontents. + Also update texinfo-master-menu (for the first time in ages). + +2021-09-26 Karl Berry + + maint: Update files from upstream with 'make fetch'. + + * lib/config.sub: Update. + +2021-09-19 Jim Meyering + + maint: Post-release administrivia + + * configure.ac (AC_INIT): Bump version number to 1.16h. + * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). + +2021-09-19 Jim Meyering + + maint: adjust version for snapshot + + * configure.ac (AC_INIT): Bump version number to 1.16g for snapshot. + * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). + +2021-09-19 Karl Berry + + python: only use Python's sys.* values if the new option + + --with-python-sys-prefix is specified; otherwise, return to + previous behavior of using the GNU ${prefix} and ${exec_prefix}. + + * doc/automake.texi (Python): document the new behavior. + * m4/python.m4 (AM_PATH_PYTHON): conditionalize use of Python's + sys.* values on the new option --with-python-sys-prefix. + * t/python-prefix.sh: doc update. + * t/python-vars.sh: test both GNU and Python prefix values. + * NEWS: mention this. + +2021-09-18 Karl Berry + + doc: update NEWS for yyerror const arg; update THANKS. + + * THANKS: update with missed recent committer. + * NEWS: mention yyerror decl in our tests now uses const. + +2021-09-11 Akim Demaille + + tests: let yacc's yyerror take its argument as a const string + + Some of yacc error messages are const strings; it makes no sense for + yyerror to take a 'char *', it should be a 'const char *' as POSIX now + requires. + + Fixes all the failures reported by Kiyoshi Kanazawa. + + See bug#50469 . + + * t/cond35.sh, t/silent-many-languages.sh, t/silent-yacc-headers.sh, + * t/silent-yacc.sh, t/subpkg-yacc.sh, t/suffix10.tap, t/yacc-basic.sh, + * t/yacc-clean.sh, t/yacc-d-basic.sh, t/yacc-d-vpath.sh, + * t/yacc-deleted-headers.sh, t/yacc-depend.sh, t/yacc-depend2.sh, + * t/yacc-dist-nobuild-subdir.sh, t/yacc-dist-nobuild.sh, t/yacc-dry.sh, + * t/yacc-line.sh, t/yacc-misc.sh, t/yacc-mix-c-cxx.sh, t/yacc-nodist.sh, + * t/yacc-pr204.sh, t/yacc-subdir.sh, t/yacc-vpath.sh, + * t/yflags-cmdline-override.sh, t/yflags-force-override.sh + (yyerror): From 'char *' to 'const char *'. + Enforce consistency: prefer '{}' to '{ return; }'. + +2021-09-10 Jan Engelhardt + + automake: consistently depend on install-libLTLIBRARIES. + + Report and patch: + https://lists.gnu.org/archive/html/automake/2021-08/msg00016.html + + * bin/automake.in (generate_makefile): depend on + install-libLTLIBRARIES for all PROGRAMS and LTLIBRARIES, + such as install-pkglibLTLIBRARIES. + * NEWS: mention this. + +2021-08-17 Nick Bowler + + automake: fatal error on second AM_INIT_AUTOMAKE. + + This change addresses https://bugs.gnu.org/50046. + Patch posted: + https://lists.gnu.org/archive/html/automake-patches/2021-08/msg00000.html + + * m4/init.m4: Make attempts to expand AM_INIT_AUTOMAKE more than + once a fatal error at m4 time. + +2021-08-08 Karl Berry + + maint: Update doc/help2man. + + * doc/help2man: update to 1.48.24 + +2021-08-07 Karl Berry + + maint: Update doc/help2man. + + * doc/help2man: update to 1.48.2. + +2021-08-07 Dimitri Papadopoulos + + doc: typos from codespell. + + * HACKING: typo from codespell. + * doc/local.mk: likewise. + * lib/am/header-vars.am: likewise. + * lib/am/lisp.am: likewise. + * t/cond24.sh: likewise. + * t/cond36.sh: likewise. + * t/dist-auxdir-many-subdirs.sh: likewise. + * t/link_override.sh: likewise. + * t/parallel-tests-console-output.sh: likewise. + * t/subobj11a.sh: likewise. + * t/subobj11b.sh: likewise. + +2021-07-26 Karl Berry + + cosmetics: py-compile consistently use test, not [ ... ]; indentation. + + * lib/py-compile: consistently use test rather than [ ... ]; + use consistent sh indentation; check exit status consistently. + +2021-07-26 Jim Meyering + + maint: Post-release administrivia + + * configure.ac (AC_INIT): Bump version number to 1.16f. + * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). + +2021-07-25 Jim Meyering + + version 1.16.4 + + * configure.ac (AC_INIT): Bump version number to 1.16.4. + * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). + * NEWS: Record release version. + +2021-07-22 Karl Berry + + maint: Update files from upstream with 'make fetch'. + + * lib/gendocs.sh: Update. + +2021-07-18 Jim Meyering + + maint: adjust version, post-snapshot + + * configure.ac (AC_INIT): Bump version number to 1.16e for snapshot. + * m4/amversion.m4: Regenerate. + +2021-07-18 Jim Meyering + + maint: adjust version for snapshot + + * configure.ac (AC_INIT): Bump version number to 1.16d for snapshot. + * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). + +2021-07-18 Jim Meyering + + doc: NEWS tweak + + * NEWS: Indent consistently. + +2021-07-17 Karl Berry + + doc: update HACKING. + + * HACKING: update for some current realities. + +2021-07-15 Jacob Bachmeyer + + tests: use testsuite/ directory in DejaGnu tests + + Patch posted: + https://lists.gnu.org/archive/html/automake-patches/2021-07/msg00009.html + + * t/check12.sh: Consistently use the directory name, testsuite/, + for all DejaGnu tests, and always use recursive make to run + DejaGnu, for backward and forward compatibility. + * t/dejagnu3.sh: Likewise. + * t/dejagnu4.sh: Likewise. + * t/dejagnu5.sh: Likewise. + * t/dejagnu6.sh: Likewise. + * t/dejagnu7.sh: Likewise. + * t/dejagnu-absolute-builddir.sh: Likewise. + * t/dejagnu-relative-srcdir.sh: Likewise. + * t/dejagnu-siteexp-extend.sh: Likewise. + * t/dejagnu-siteexp-useredit.sh: Likewise. + * NEWS: mention this. + * THANKS: new contributor. + +2021-07-15 Nick Gasson + + automake: silent make output for custom link commands. + + Patch posted: + https://lists.gnu.org/archive/html/automake-patches/2021-07/msg00010.html + + * bin/automake.in (define_per_target_linker_variable): Use + AM_V_${target}_LINK if defined as the verbose variable name for + custom link commands. + * doc/automake.texi (Program and Library Variables): Document the new + variable. + * t/link_override.sh: Add extra checks for silent make rules. + * NEWS: Mention this. + * THANKS: new contributor. + +2021-07-11 meyering + + maint: avoid syntax-check failures + + * maintainer/syntax-checks.mk (toupper): Tighten the regexp + to avoid a new false-match in t/python-prefix.sh. + * t/instmany-python.sh: Use run_make in place of some $MAKE uses. + * t/python-prefix.sh: Likewise. + * t/python-vars.sh: Likewise. + +2021-07-11 Jim Meyering + + maint: make update-copyright + +2021-07-11 Allison Karlitskaya + + maint: tweak comment wording + + * doc/automake.texi (List of Automake options): Nit. + * t/dist-no-built-sources.sh: Likewise. + +2021-07-11 Jim Meyering + + no-dist-built-sources: fix-up + + * bin/automake.in (preprocess_file): Process new option here, + (handle_dist): ... not here. + * lib/Automake/Options.pm (_is_valid_easy_option): + Remove pure-dist. + * lib/am/distdir.am: Don't factor out the duplicate-looking + $(MAKE)... command. Otherwise, many dist-using tests would fail + for me, e.g., t/aclocal-amflags.sh. + +2021-07-11 Jim Meyering + + test: disable use of ksh in a test that would otherwise hang + + * t/tests-environment-fd-redirect.sh: This test would hang when + using ksh93 from Fedora 34 and CentOS 8. Comments demonstrate + the issue reported as https://github.com/ksh93/ksh/issues/316 + +2021-07-11 Karl Berry + + doc: update THANKS. + + * THANKS: mention contributors over the past couple years. + +2021-07-09 Allison Karlitskaya + + dist: add new "dist-no-built-sources" automake option. + + Fixes automake bug https://debbugs.gnu.org/49317. + + * bin/automake.in: implement new option "no-dist-built-sources" to + omit the dependency of distdir on $(BUILT_SOURCES). (Allison's + original patch used the option name dist-pure; trivially renamed.) + * lib/am/distdir.am (distdir) [DIST_BUILT_SOURCES]: conditionalize + the dependency. + * lib/Automake/Options.pm (_is_valid_easy_option): list it. + * doc/automake.texi (List of Automake options): document it. + * NEWS: mention it. + * t/dist-no-built-sources.sh: test it. + * t/list-of-tests.mk (handwritten_TESTS): add it. + +2021-07-07 Karl Berry + + maint: missed commits. + + * INSTALL: Update from gnulib via make fetch. + * NEWS: mention config.{guess,sub} restoration of `...`. + +2021-07-05 Karl Berry + + maint: Update files from upstream with 'make fetch' + + * lib/INSTALL: Update. + * lib/config.guess: Likewise. + * lib/config.sub: Likewise. + * lib/gendocs.sh: Likewise. + * lib/gendocs_template: Likewise. + * lib/gitlog-to-changelog: Likewise. + * lib/gnupload: Likewise. + * lib/texinfo.tex: Likewise. + * lib/update-copyright: Likewise. + +2021-07-05 Karl Berry + + tests: forgot to remove dev exit 33 from new test. + + * t/toplevelmd.sh: normal ending. + +2021-07-01 Karl Berry + + dist: accept .md versions for README et al. + + This change was suggested by madmurphy; some ideas were taken + from the patch he provided. + https://lists.gnu.org/archive/html/automake-patches/2021-06/msg00005.html + + * bin/automake.in (@toplevelmd_ok): new global, listing the files + for which we will accept .md versions. + (@common_files): remove those files from there. + (handle_dist): check for .md if non-.md is absent. + (handle_minor_options): check for README-alpha.md. + (check_gnu_standards): accept .md version if present. + (check_gnits_standards): likewise. + (usage): output list of .md-accepted files. + * doc/automake.texi (Basics of Distribution): document. + + * t/toplevelmd.sh: new test. + * t/list-of-tests.mk (handwritten_tests): add it. + * NEWS: mention new feature. + +2021-06-08 Karl Berry + + doc: omit "really" from manual. + + * doc/automake.texi: remove or replace "really". + +2021-06-07 Karl Berry + + doc: --always-make doesn't work. + + * doc/automake.texi (Rebuilding): the GNU Make option + --always-make does not work with Automake. + Report from Johan Persson, + https://lists.gnu.org/archive/html/automake/2021-06/msg00002.html. + Also, use "GNU Make" (capital M) more consistently. + +2021-05-18 Karl Berry + + doc: wording. + + * README: + * t/python-virtualenv.sh: + * doc/automake.texi: wording, typos, etc. + +2021-05-18 Karl Berry + + doc: move future 2.0 incompatibilities to separate file. + + * NEWS: move info to ... + * NEWS-2.0: ... this new file. + * Makefile.am (EXTRA_DIST): add it. + +2021-05-18 Karl Berry + + python: new python-prefix test. + + * t/python-prefix.sh: new test. + * t/list-of-tests.mk (handwritten_tests): add it. + * NEWS: describe new Python prefix behavior. + +2021-05-18 Joshua Root + + python: use Python's sys.prefix and sys.exec_prefix + + for PYTHON_PREFIX and PYTHON_EXEC_PREFIX; new configure options + --with-python_prefix and --with-python_exec_prefix to set explicitly. + + This change fixes https://bugs.gnu.org/35322. + + * m4/python.m4 (AM_PATH_PYTHON): use Python's sys.prefix and + sys.exec_prefix for PYTHON_PREFIX and PYTHON_EXEC_PREFIX, + instead of $prefix and $exec_prefix. But use a variable + reference to ${prefix} if it is contained within sys.prefix; + similarly for exec_prefix. Also support new configure options + to set explicitly. + (PYTHON_PREFIX, PYTHON_EXEC_PREFIX): AC_SUBST these. + (am_cv_python_pythondir): use our new $am_cv_python_prefix, + substituting ${PYTHON_PREFIX}. + (am_cv_python_pyexecdir): likewise. + * doc/automake.texi (Python): PYTHON_PREFIX, PYTHON_EXEC_PREFIX, + document new approach. + * t/instmany-python.sh: set PYTHON_PREFIX as needed. + * t/python-vars.sh (PYTHON_EXEC_PREFIX, PYTHON_PREFIX): also set from + Python's sys.{exec_,}prefix; use ${PYTHON_{EXEC,}PREFIX} instead + of ${exec_,}prefix. + +2021-05-12 Karl Berry + + doc: HACKING updates. + + * HACKING: some additional tidbits. + +2021-02-27 Dirk Mueller + + automake: sort hash keys needed for reproducible output. + + This change fixes https://bugs.gnu.org/46744. + + * bin/automake.in: sort keys, in: handle_LIBOBJS, handle_clean, + handle_factored_dependencies, scan_autoconf_traces, + lang_vala_finish. + * NEWS: mention this. + +2021-02-22 Karl Berry + + doc: a_LDFLAGS always overrides AM_LDFLAGS. + + This change addresses https://bugs.gnu.org/34925. + + * doc/automake.texi (Program and Library Variables): document + that using a_LDFLAGS at all, even in the false branch of a + conditional, means that AM_LDFLAGS is ignored. + +2021-02-21 Mike Frysinger + + doc: [AM_]RUNTESTFLAGS not [AM_]RUNTESTDEFAULTFLAGS. + + * doc/automake.texi (Other Variables): Change [AM_]RUNTESTDEFAULTFLAGS + to [AM_]RUNTESTFLAGS. + +2021-02-11 Karl Berry + + doc: user flags last does not always allow overriding. + + This change addresses https://bugs.gnu.org/35526. + + * doc/automake.texi (Flag Variables Ordering): recognize that + user flags last does not always allow overriding. + +2021-01-06 Karl Berry + + doc: discuss AC_* ordering a little. + + * doc/automake.texi (Optional): mention that AC_CONFIG_AUX_DIR + must be called before AM_INIT_AUTOMAKE, and recommend that other + AC_CONFIG_* macros be called after. This seems to be the most + common practice. Autoconf does not currently impose ordering: + https://savannah.gnu.org/support/?110416 + +2020-12-14 Zack Weinberg + + Fix some build and test failures with Autoconf 2.70. + + Autoconf 2.70 (released last week) makes a few changes that broke Automake’s + expectations, mostly in the test suite. This patch addresses two of the + problems: + + - autoconf now issues a warning if fed a configure script that doesn’t invoke + both AC_INIT and AC_OUTPUT; this, plus a problem with system-provided + tools (still under investigation) broke the *build* on macOS; it also + causes a couple of spurious testsuite failures. + + - AC_PACKAGE_NAME and AC_PACKAGE_VERSION are now defined unconditionally. + AM_INIT_AUTOMAKE needs to use m4_ifset instead of m4_ifdef to diagnose + the obsolete use of AC_INIT with fewer than two arguments. (This change + is compatible with autoconf 2.69; m4_ifset is much older, and it means + ‘defined with a non-empty value’.) + + * configure.ac: Use both AC_INIT and AC_OUTPUT in test configure scripts. + * t/deprecated-acinit.sh, t/init.sh: Likewise. + * m4/init.m4 (AM_INIT_AUTOMAKE): Use m4_ifset, not m4_ifdef, to detect + AC_PACKAGE_NAME and/or AC_PACKAGE_VERSION not having a value. + +2020-12-13 Karl Berry + + python: don't assume $(...) in py-compile. + + This change (very) partially fixes https://bugs.gnu.org/45205. + + * lib/py-compile: use `...` instead of $(...). + Solaris 10 /bin/sh is still in use. + +2020-12-09 Karl Berry + + tests: more .NOTPARALLEL tests. + + * t/java-compile-run-nested.sh: .NOTPARALLEL in subdirs too. + +2020-12-08 Karl Berry + + tests: more .NOTPARALLEL tests. + + * contrib/t/multilib.sh: yet more .NOTPARALLEL for AM_TESTSUITE_MAKE, + found by Jim on heavier machines. + * t/autodist-stamp-vti.sh: likewise. + * t/java-compile-run-nested.sh: likewise. + * t/transform2.sh: likewise. + +2020-12-07 Karl Berry + + tests: more .NOTPARALLEL tests. + + * contrib/t/multilib.sh: use .NOTPARALLEL to avoid unreproducible + (and undebuggable, by me) test failures when running + make -j$njobs AM_TESTSUITE_MAKE="make -j$njobs" + for some arbitrary but rather large value of $njobs. + The failures don't occur with just make -j; have to run the makes + inside the tests in parallel also. + * t/java-compile-install.sh: likewise. + * t/java-compile-run-flat.sh: likewise. + * t/java-uninstall.sh: likewise. + * t/vala-headers.sh: likewise. + +2020-12-05 Karl Berry + + doc: comment Vala -newer test. + + This change updates https://bugs.gnu.org/44772. + + * bin/automake.in (lang_vala_finish_target): comment that + we're checking "C file not older than Vala file", and the + log message misleadingly says "reversed". + +2020-12-05 Reuben Thomas + + tags: support setting CTAGS, ETAGS, CSCOPE vars via ./configure. + + This change fixes https://bugs.gnu.org/45013. + + * m4/init.m4: add default settings and AC_SUBST calls for the variables + `CTAGS', `ETAGS' and `CSCOPE'. + * lib/am/tags.am: remove default settings of the above variables. + * doc/automake.texi (Tags): mention and index. + * NEWS: mention. + +2020-12-03 Karl Berry + + warnings: be less forceful about a missing subdir-objects option. + + This change somewhat ameliorates https://bugs.gnu.org/20699. + + * bin/automake.in (handle_single_transform): change + forward-incompatibility message for subdir-objects to be + less draconian and less certain that the change will ever be made. + * t/subobj.sh: message text has changed. + * doc/automake.texi (Program and Library Variables): mention + the unfortunate fact that one directory can clean in a sibling, + subdir-objects notwithstanding. + +2020-11-27 Karl Berry + + tests: .NOTPARALLEL test-driver-create-log-dir. + + * t/test-driver-create-log-dir.sh (.NOTPARALLEL): add target, + since the two tests under sub/ seem to have a race condition. + No evident way to debug or reliably reproduce. Reported by Jim. + +2020-11-27 Reuben Thomas + + vala: avoid wrong regeneration of C files. + + This change might fix https://bugs.gnu.org/44772. + + * bin/automake.in (lang_val_finish_target): reverse -newer test + to handle files being created at the same time causing + spurious rebuilds. + +2020-11-24 Karl Berry + + doc: typo. + + This change fixes https://bugs.gnu.org/44845. + + * doc/automake.texi (Vala Support): zardoz.c not zardoc.c. + +2020-11-23 Karl Berry + + tests: create log file before running the test script. + + This change partially fixes https://bugs.gnu.org/35762. + + * lib/test-driver: create $log_file before running the + test script. Also quote $log_file. Combined suggestions + from howaboutsynergy and Eric Blake. + +2020-11-22 Karl Berry + + doc: mention overriding SUBDIRS= with TESTS= and recursive make. + + This change palliates https://bugs.gnu.org/42883, + though it's not a real fix. + + * doc/automake.texi (Parallel Test Harness): with recursive + make, when limiting the tests run, also presumably needed to + override SUBDIRS. + +2020-11-18 Jim Meyering + + maint: Post-release administrivia + + * configure.ac (AC_INIT): Bump version number to 1.16b. + * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). + +2020-11-18 Jim Meyering + + version 1.16.3 + + * configure.ac (AC_INIT): Bump version number to 1.16.3. + * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). + * NEWS: Record release version. + +2020-11-16 Jim Meyering + + tests: correct preceding change. + + * t/auxdir-pr19311.sh: Fix error in case stmt and match more + upcoming versions. + +2020-11-16 Jim Meyering + + tests: auxdir-pr19311.sh no longer fails with latest autoconf + + * t/list-of-tests.mk (XFAIL_TESTS): Remove from this list. + * t/auxdir-pr19311.sh: Instead, run this test only when autoconf + is 2.69d or newer. Otherwise, skip it. + +2020-11-16 Jim Meyering + + maint: placate maintainer-check's rm -f check + + * t/vala-recursive-setup.sh: Add an unnecessary -f option + to an rm invocation to avoid "make maintainer-check" failure. + +2020-11-15 Jim Meyering + + maint: Update files from upstream with 'make fetch' + + * lib/config.guess: Update. + * lib/config.sub: Likewise. + * lib/texinfo.tex: Likewise. + +2020-11-15 Jim Meyering + + tests: avoid missing .dvi failure with parallel tests + + * t/txinfo-no-clutter.sh: Tests of texinfo-related rules + had overlap that made them fail often when some rules were + run in parallel, so inhibit parallelism in that one directory. + See discussion starting at + https://lists.gnu.org/r/automake-patches/2020-11/msg00011.html + +2020-11-15 Jim Meyering + + tests: protect against parallel false failure + + * t/parallel-tests-console-output.sh: Do not depend on the order + of items in test summary. With a parallel test run, they may + appear in a different order, e.g., when running tests like this: + make check AM_TESTSUITE_MAKE='make -j14' + Sort the expected output and the actual output before comparing. + +2020-11-15 Jim Meyering + + doc: fix quoting in suggested parallel test invocation + + * t/README: Fix reversed single/double quotes. + +2020-11-14 Jim Meyering + + tests: accommodate an $ac_aux_dir of "." or "./" + + * t/auxdir-pr15981.sh: This test would fail when run with + autoconf-2.69d because $ac_aux_dir would be "./" rather than + the expected ".". Accept both. + +2020-11-14 Jim Meyering + + tests: avoid failures due to missing ar-lib + + * t/ar4.sh: Create dummy ar-lib, as done in other tests, + to avoid failure like this: + configure: error: cannot find required auxiliary files: ar-lib + * t/ar5.sh: Likewise. + +2020-11-13 Karl Berry + + install-sh: trailing whitespace. + + * lib/install-sh: remove trailing whitespace. Sigh. + (scriptversion): 2020-11-14.01 + +2020-11-13 Robert Menteer + + dejagnu: quote `pwd` when writing "set objdir" line to site.exp. + + This change fixes https://bugs.gnu.org/44600. + + * lib/am/dejagnu.am (site.exp): quote set objdir line. + * NEWS: mention this. + +2020-11-12 Karl Berry + + install-sh: new option -S SUFFIX for simple file backups. + + * lib/install-sh: implement and document -S. + Patch sent by Julien Elie: + https://lists.gnu.org/archive/html/automake-patches/2018-03/msg00004.html + (scriptversion): 2020-11-13.01 + * t/install-sh-option-S.sh: new test. + * t/list-of-tests.mk (handwritten_tests): add it. + * NEWS: mention it. + +2020-11-10 Karl Berry + + install-sh: --help tweaks. + + * lib/install-sh (usage): avoid too-long line, mention + bug reporting address (bug-automake) and automake home page. + +2020-11-10 Karl Berry + + install-sh: new option -p to preserve mtime. + + * lib/install-sh: new option -p to call cp -p. + Idea from patch sent by Julien Elie: + https://lists.gnu.org/archive/html/automake-patches/2018-03/msg00002.html + (scriptversion): 2020-11-11.02 + * NEWS: mention this. + + 2020-11-10 Karl Berry + +2020-11-10 Karl Berry + + vala: forgot to update lists-of-tests.mk. + + * t/list-of-tests.mk (handwritten_tests): include + t/vala-libs-distcheck.sh and t/vala-libs-vpath.sh. + Should have been committed with 2020-10-29 vala change, + but somehow missed. + + 2020-11-10 Karl Berry + +2020-11-10 Karl Berry + + install-sh: do not chown existing directories. + + * lib/install-sh: do not chown existing directories. + Original patch sent by Julien Elie: + https://lists.gnu.org/archive/html/automake-patches/2018-03/msg00003.html + (scriptversion): 2020-11-11.01 + * NEWS: mention this. + +2020-11-10 Karl Berry + + install-sh: do not redundantly specify -f to rm. + + * lib/install-sh: do not redundantly specify -f to rm. + Mention implication for RMPROG in the --help message. + Original patch sent by Julien Elie: + https://lists.gnu.org/archive/html/automake-patches/2018-03/msg00005.html + * NEWS: mention this. + +2020-11-07 Reuben Thomas + + vala: improve support, especially builddir vs. srcdir. + + This change fixes https://bugs.gnu.org/13002. + + * NEWS: mention these changes. + * bin/automake.in: generated C files go in builddir, not srcdir. + Distribute the header files generated from VAPI files. + * t/vala-libs-distcheck.sh: new test for `make distcheck' of a + Vala library. + * t/vala-libs-vpath.sh: new test for a VPATH build of a Vala library. + * t/vala-libs.sh: add local VAPIs used as external --package to test. + + * t/vala-recursive-setup.sh: we need to make + maintainer-clean at one point to remove stamp files to avoid + confusing a VPATH build performed after a non-VPATH build. + * t/vala-non-recursive-setup.sh: likewise. + + * t/vala-parallel.sh: some test paths need changing to take into + account that generated C files now go in builddir. + * t/vala-per-target-flags.sh: likewise. + * t/vala-recursive-setup.sh: likewise. + * t/vala-vpath.sh: likewise. + +2020-11-07 Karl Berry + + tests: recompute dependencies when lists-of-tests.mk changes. + + This change fixes https://bugs.gnu.org/44458 + and updates https://bugs.gnu.org/11347. + + * t/local.mk ($(srcdir)/%D/testsuite-part.am): restore + dependency on '%D/list-of-tests.mk' (i.e., t/list-of-tests.mk), + partially reverting the change of 26 Apr 2012 for bug#11347. + Otherwise, new tests that have dependencies will not cause an + update of testsuite-part.am, leading to strange failures + (bug#44458). The original problem being fixed in #11347 was + unnecessary rebuilding when modifying tests; that should not be + affected here, but when new tests are added, it seems reasonable, + as well as necessary, to ensure dependencies are updated. + +2020-10-27 Miro Hron\v{c}ok + + python: determine Python (3.10) version number correctly. + + This change fixes https://bugs.gnu.org/44239 + (and https://bugzilla.redhat.com/show_bug.cgi?id=1889732). + + * m4/python.m4: use print('%u.%u' % sys.version_info[:2]) for + the version number instead of merely sys.version[:3], so the + numbers are treated as numbers. + * t/python-vars.sh (PYTHON_VERSION): Likewise. + * doc/automake.texi: Document it. + * NEWS: mention it. (Minor tweaks from Karl Berry.) + +2020-10-23 Jim Meyering + + doc: correct "moved in", to "moved to" + + * NEWS: Correct wording. + * contrib/README: Likewise. + * doc/automake.texi: Likewise. + +2020-10-23 Reuben Thomas + + contrib/README: fix and clarify the English + +2020-10-23 Reuben Thomas + + Improve Vala compiler detection: use API version, not compiler version + + * m4/vala.m4: check `valac --api-version', not `valac --version'. + * doc/automake.texi: update documentation. + +2020-10-07 Zack Weinberg + + Use complete configure.ac’s in testsuite. + + Autoconf 2.70 will issue warnings if it encounters a configure.ac that doesn’t + call both AC_INIT and AC_OUTPUT. + + Automake already issues warnings if it encounters a configure.ac that uses an + AM_ macro but doesn’t call AM_INIT_AUTOMAKE or AC_CONFIG_FILES([Makefile]). + + In two places, the testsuite was tripping these warnings, leading to spurious + failures with Autoconf 2.70 betas. + + * t/aminit-moreargs-deprecation.sh: Add AC_OUTPUT to test configure.ac. + * t/mkdirp-deprecation.sh: Use a complete test configure.ac, not a stub + containing only a use of AM_PROG_MKDIR_P. + +2020-10-06 Karl Berry + + automake: install-exec did not depend on $(BUILT_SOURCES). + + This change fixes https://bugs.gnu.org/43683. + + * lib/am/install.am (install-exec): %maybe_BUILT_SOURCES% dependency, + twice. Basic patch from madmurphy (tiny change), message#8. + (.MAKE) [maybe_BUILT_SOURCES]: depend on install-exec. + * NEWS: mention it. + * doc/automake.texi (Sources): mention this (also that make dist + depends on $(BUILT_SOURCES)). + * t/built-sources-install-exec.sh: new test. + * t/list-of-tests.mk (handwritten_TESTS): add it. + * t/built-sources-install.sh: typo. + * t/built-sources-check.sh: typo. + +2020-09-21 Zack Weinberg + + Update documentation of warnings options and strictness levels. + + The warning categories ‘cross’ and ‘portability-recursive’ were not mentioned + in the manual. + + Also clarify the relationship between warnings categories and strictness + levels, and streamline the description of strictness levels by merging the + “Gnits” section into the “Strictness” section. + + * doc/automake.texi (Gnits, Strictness): Combine these sections. + Minor revisions to explanation of strictness levels. + (automake Invocation): Add documentation of all the warnings + categories that have been added since the last time this section + was updated. Minor clarifications. + +2020-09-21 Zack Weinberg + + Use WARNINGS=none to suppress warnings from autom4te runs. + + aclocal uses autom4te in trace mode to scan configure.ac for macros whose + definition is not yet available. It has a kludge to prevent this from + producing spurious warnings, but a cleaner, fully backward compatible, way to + get the same effect is to set WARNINGS=none in the environment and not pass + down any -W options. (This is better than passing -Wnone on the command line + because it automatically inherits to any subprocesses started by autom4te.) + + Perl’s ‘local’ feature can be used to make the enviironment variable setting + temporary, reverting to the previous value when we exit the function. + + automake also runs autom4te (technically autoconf) in trace mode; warnings + from this invocation will not be *spurious*, but in the common case where + the person running automake is going to run autoconf next, they will be + duplicated. Therefore, make the same change to automake. + + * bin/aclocal.in (trace_used_macros) + * bin/automake.in (scan_autoconf_traces): + Use “local $ENV{WARNINGS}='none'” to suppress warnings from autom4te. + +2020-09-18 Zack Weinberg + + New utility function Automake::ChannelDefs::merge_WARNINGS. + + This function merges a list of warnings categories into the environment + variable WARNINGS, returning a new value to set it to. The intended use + is in code of the form + + { + local $ENV{WARNINGS} = merge_WARNINGS ("this", "that"); + + # run a command here with WARNINGS=this,that,etc + } + + This is not actually used in automake, but will be in autoconf. + + * lib/Automake/ChannelDefs.pm (merge_WARNINGS): New function. + +2020-09-12 Zack Weinberg + + t/python-virtualenv.sh: Skip when versions don’t match + + On some operating systems ‘python’ is Python 2.x but ‘virtualenv -ppython’ + will create a virtualenv that uses Python 3.x. This is a bug, but it’s + not *automake’s* bug, and should not cause t/python-virtualenv.sh to fail. + Skip the test, instead of failing it, when the inner=outer version check + fails. + + (This also has nothing to do with the main goal of this patchset, it just + annoyed me while I was testing.) + + * t/python-virtualenv.sh: Skip test, rather than failing it, when + $py_version_pre != $py_version_post. + +2020-09-12 Zack Weinberg + + Consistently use ‘our’ instead of ‘use vars’. + + At file scope of a file containing at most one ‘package’ declaration, + ‘use vars’ is exactly equivalent to ‘our’, and the latter is preferred + starting with Perl 5.6.0, which happens to be the oldest version we + support. + + (This change has nothing to do with the previous two, but I want to make the + same change in Autoconf and that means doing it here for all the files synced + from Automake.) + + (I don’t know why, but this change exposed a latent bug in FileUtils.pm where + the last pod block in the file didn’t have a ‘=cut’ delimiter, so the code + after it was considered documentation, causing ‘require FileUtils’ to fail.) + + * lib/Automake/ChannelDefs.pm + * lib/Automake/Channels.pm + * lib/Automake/Condition.pm + * lib/Automake/Configure_ac.pm + * lib/Automake/DisjConditions.pm + * lib/Automake/FileUtils.pm + * lib/Automake/General.pm + * lib/Automake/Getopt.pm + * lib/Automake/Options.pm + * lib/Automake/Rule.pm + * lib/Automake/RuleDef.pm + * lib/Automake/VarDef.pm + * lib/Automake/Variable.pm + * lib/Automake/Wrap.pm + * lib/Automake/XFile.pm: + Replace all uses of ‘use vars’ with ‘our’. + + * lib/Automake/FileUtils.pm: + Add missing ‘=cut’ to a pod block near the end of the file. + +2020-09-12 Zack Weinberg + + Consistently process -W(no-)error after all other warning options. + + automake and aclocal were processing ‘-W(no-)error’ whenever it + appeared on the command line, which means that + ‘-Werror,something-strange’ would issue a hard error, but + ‘-Wsomething-strange,error’ would only issue a warning. + + It is not desirable for warnings about unknown warning categories ever to be + treated as a hard error; that leads to problems for driver scripts like + autoreconf, which would like to pass whatever -W options it got on its own + command line down to all the tools and not worry about which tools understand + which warning categories. Also, this sort of order dependence is confusing + for humans. + + Change parse_warnings to take just one option, the _complete_ list of warning + categories seen on the command line, and to process -Werror / -Wno-error after + processing all other warnings options. Thus, unknown warnings categories will + always just be a plain warning. This does mean aclocal has to stop using + parse_warnings as a Getopt::Long callback, but that’s not a big deal. + + Similarly, change parse_WARNINGS to record whether ‘error’ appeared in the + environment variable, but not activate warnings-are-errors mode itself. + parse_warnings picks up the record and honors it, unless it’s overridden by + the command line. + + * lib/Automake/ChannelDefs.pm ($werror): New package global (not exported). + (parse_WARNINGS): Do not call switch_warning for ‘error’ / ‘no-error’; + just toggle the value of $werror. + (parse_warnings): Do not call switch_warning immediately for + ‘error’ / ‘no-error’; toggle $werror instead. Call switch_warning ‘error’ + at the very end if $werror is true. Remove unused $OPTION argument. + * bin/automake.in: parse_warnings now takes only one argument. + * bin/aclocal.in: Call parse_warnings after parse_options instead of + using it as a parse_options callback. + +2020-09-11 Zack Weinberg + + Sync ChannelDefs.pm from autoconf. + + ChannelDefs.pm *ought* to be kept in sync between automake and autoconf, + because it defines the set of valid -W options, and autoreconf assumes + that it can pass arbitrary -W options to all of the tools it invokes. + However, it isn’t covered by either project’s ‘make fetch’ and it hasn’t + actually *been* in sync for more than 17 years. + + This patch manually brings over all of the changes made on the autoconf side. + Most importantly, there is a new warnings channel ‘cross’, for warnings + related to cross-compilation. Also, the ‘usage’ function now *returns* + the text to be put into a usage message, instead of printing it itself. + (This is necessary on autoconf’s side.) + + * lib/Automake/ChannelDefs.pm: Sync from autoconf. + (cross): New warnings channel. + (portability-recursive): Document. + (usage): Now returns the text to be printed, instead of printing it. + (parse_warnings): Second argument may now be a list. + +2020-09-05 Zack Weinberg + + automake: be robust against directories containing (). + + This change fixes https://bugs.gnu.org/14196. + + * m4/missing.m4 (AM_MISSING_HAS_RUN): always quote the + invocation (not just if $am_aux_dir contains space or tab), in + case $am_aux_dir contains () or other metachars not rejected by + AM_SANITY_CHECK; quoting with '...' suggested by Jim Meyering. + * t/man6.sh (HELP2MAN): adjust grep since missing value + is quoted now. + * t/am-missing-prog.sh: likewise. + +2020-09-04 Issam E. Maghni + + maint: Update files from upstream with 'make fetch' + + * lib/config.guess: Update. + * lib/config.sub: Likewise. + * lib/gendocs_template: Likewise. + * lib/gitlog-to-changelog: Likewise. + * lib/texinfo.tex: Likewise. + * lib/update-copyright: Likewise. + +2020-08-31 Zack Weinberg + + perl: use warnings instead of -w; consistent ordering of use, etc. + + Per thread at: + https://lists.gnu.org/archive/html/automake-patches/2020-08/msg00009.html + + * bin/aclocal.in: use warnings instead of #!...-w; + consistent ordering of basic "use" directives, + then BEGIN block, + then standard modules in ASCII order, + then Automake:: modules (not sort), + finally use vars. + Also sort @ISA lists and use qw(...) in ASCII order. + * bin/automake.in: likewise. + * lib/Automake/ChannelDefs.pm: likewise. + * lib/Automake/Channels.pm: likewise. + * lib/Automake/Condition.pm: likewise. + * lib/Automake/Config.in: likewise. + * lib/Automake/Configure_ac.pm: likewise. + * lib/Automake/DisjConditions.pm: likewise. + * lib/Automake/FileUtils.pm: likewise. + * lib/Automake/General.pm: likewise. + * lib/Automake/Getopt.pm: likewise. + * lib/Automake/Item.pm: likewise. + * lib/Automake/ItemDef.pm: likewise. + * lib/Automake/Language.pm: likewise. + * lib/Automake/Location.pm: likewise. + * lib/Automake/Options.pm: likewise. + * lib/Automake/Rule.pm: likewise. + * lib/Automake/RuleDef.pm: likewise. + * lib/Automake/VarDef.pm: likewise. + * lib/Automake/Variable.pm: likewise. + * lib/Automake/Version.pm: likewise. + * lib/Automake/Wrap.pm: likewise. + * lib/Automake/XFile.pm: remove unnecessary imports of + Carp, DynaLoader, and File::Basename. + +2020-08-28 Robert Wanamaker + + docs: automake-history.texi @dircategory Software development. + + Per thread at: + https://lists.gnu.org/archive/html/automake-patches/2020-08/msg00006.html + + * doc/automake-history.texi (@dircategory): Define. + +2020-08-28 Karl Berry + + automake: if TEST_EXTENSIONS is set to empty, don't look inside it. + + This change fixes https://bugs.gnu.org/42635. + + * bin/automake.in (handle_tests): do not use $test_suffixes[0] + if it does not exist. + * t/test-extensions-empty.sh: new test. + * t/list-of-tests.mk (handwritten_TESTS): add it. + +2020-08-13 Felix Yan + + docs: typo in tap-driver.sh. + + Per thread at: + https://lists.gnu.org/archive/html/automake-patches/2020-08/msg00000.html + + * lib/tap-driver.sh (setup_result_obj): "assing" typo, etc. + +2020-08-01 Paul Eggert + + port XFile locking to OpenIndiana + + I observed this problem on an NFS filesystem on an OpenIndiana + host (5.11 illumos-dde7ba523f i386). fcntl (fd, F_SETLK, ...) + failed with errno == EINVAL, which POSIX allows for files that + do not support locking. + * lib/Automake/XFile.pm (lock): Treat EINVAL like ENOLCK. + +2020-07-26 Paul Eggert + + * Update scriptversions for install-sh, mkinstalldirs. + +2020-07-26 Paul Eggert + + Install directories mode 755 instead of using umask + + Problem reported by Antoine Amarilli in: + https://lists.gnu.org/archive/html/automake/2019-01/msg00000.html + and followed up by Akim Demaille in: + https://lists.gnu.org/archive/html/bug-bison/2020-07/msg00040.html + * bin/automake.in: Add a comment about this. + * lib/install-sh: Ignore umask; just create directories mode 755 + unless overridden via -m (for non-intermediate directories only). + Also, fix 'umask=$mkdir_umask' typo. + * lib/mkinstalldirs: Likewise. + +2020-06-29 Paul Eggert + + automake: remove stray up_to_date_p + + * lib/Automake/FileUtils.pm (up_to_date_p): + Don’t export up_to_date_p, which was removed in + 2020-05-11T00:40:14Z!karl@freefriends.org. + +2020-06-06 Karl Berry + + tests: support -fno-common in vala-mix2 test. + + This change fixes https://bugs.gnu.org/41726. + + * t/vala-mix2.sh: extern in .h, initialization in .c. + GCC 10 defaults to -fno-common. + +2020-06-06 Karl Berry + + automake: support AM_TESTSUITE_SUMMARY_HEADER override. + + This change handles https://bugs.gnu.org/11745. + + * lib/am/check.am (AM_TESTSUITE_SUMMARY_HEADER): new variable. + Default value is " for $(PACKAGE_STRING)", including quotes, + to keep the default output the same. + ($(TEST_SUITE_LOG)): use it, unquoted. + * doc/automake.texi (Scripts-based Testsuites): document it. + * NEWS: mention it. + * t/testsuite-summary-header.sh: new test. + * t/list-of-tests.mk (handwritten_tests): add it. + * t/ax/testsuite-summary-checks.sh: fix typo. + +2020-05-28 Akim Demaille + + docs: promote Makefile snippets that work properly with make -n. + + This change handles https://bugs.gnu.org/10852. + + * doc/automake.texi (Multiple Outputs): Split commands than + reinvoke $(MAKE) to avoid file removals during dry runs. + +2020-05-25 Karl Berry + + docs: forgot TAR in NEWS; fix " -- " in manual. + + * NEWS: it seems the TAR envvar was never mentioned in NEWS; + add it, back for 1.11.3 when it was apparently implemented. + * doc/automake.texi: consistently use "---" instead of " --". + +2020-05-25 Karl Berry + + docs: TAR envvar overrides "tar" for make dist. + + This change finishes https://bugs.gnu.org/9822. + + * doc/automake.texi (Basics of Distribution): mention that + environment variable TAR overrides "tar". + +2020-05-17 Karl Berry + + automake: new variable AM_DISTCHECK_DVI_TARGET to override "dvi". + + This change fixes https://bugs.gnu.org/8289. + + * lib/am/distdir.am (AM_DISTCHECK_DVI_TARGET): define as dvi. + (distcheck): use it, isntead of hardcoding dvi. + * lib/Automake/Variable.pm (%_silent_variable_override): add + AM_DISTCHECK_DVI_TARGET. + * t/distcheck-override-dvi.sh: new test. + * t/list-of-tests.mk (handwritten_TESTS): add it. + * doc/automake.texi (Checking the Distribution): document this. + (Third-Party Makefiles): explicitly mention that + EMPTY_AUTOMAKE_TARGETS is not a built-in or special name. + Various other index entries and wording tweaks. + * NEWS (Distribution): mention this. + +2020-05-10 Karl Berry + + automake: remove unused Automake::FileUtils::up_to_date_p function. + + Per thread at: + https://lists.gnu.org/archive/html/automake-patches/2020-04/msg00000.html> + especially: + https://lists.gnu.org/archive/html/automake-patches/2020-05/msg00003.html + + * lib/Automake/FileUtils.pm (up_to_date_p): remove. + Nothing in Automake itself uses this. It is used in Autoconf's + autom4te utility, but Autoconf has its own copy, and the duplication + was impeding auto4mte development, as discussed in the thread above. + (While here, insert missing =over/=back to placate pod2text.) + * NEWS (Miscellanous changes): note this. + +2020-05-07 Karl Berry + + docs: make dist implies make dvi. + + This change handles https://bugs.gnu.org/7994. + + * doc/automake.texi (Preparing Distributions): make distcheck + runs make dvi. + (Auxiliary Programs) : mention + that make dist runs make dvi, and therefore a TeX system is + required when Texinfo sources are present. Add @cmindex entries + for all auxiliary programs while we're here. + +2020-05-07 Karl Berry + + tests: TeX system required for two more tests. + + * t/instdir-no-empty.sh (required): makeinfo tex texi2dvi dvips. + * t/txinfo-bsd-make-recurs.sh (required): likewise. + +2020-04-23 Vincent Lefevre + + bug#40699: "dist Hook" documentation in manual is incorrect or unclear about write permissions + + On 2020-04-20 14:59:00 -0600, Karl Berry wrote: + > i.e. it does not change the permissions in order to make the removal + > work recursively + > + > Right, I see it now. Had been testing the wrong thing. + > + > So, can you propose a specific change for the manual? -k + + I think that it is sufficient to fix the example (the explanation + is just below). BTW, the second example is also incorrect. + + commit a639e5b51cadbaff88ca4059b4db4571c811070c + Author: Vincent Lefevre + Date: 2020-04-23 17:33:54 +0200 + + doc: fix dist-hook examples + +2020-04-18 Karl Berry + + cosmetics: spurious word in README, copyright year. + + * README: delete spurious "that"; update copyright year end to 2020. + Original suggestion from Vincent Lefevre, + https://lists.gnu.org/archive/html/automake-patches/2020-04/msg00007.html + +2020-04-08 Samuel Tardieu + + docs: test-driver options do not accept =, update --help. + + This change fixes https://bugs.gnu.org/22445. + + * lib/test-driver (print_usage): space after --test-name, + --log-file, --trs-file, not =. Also mention Automake as source. + +2020-04-06 Samy Mahmoudi + + cosmetics: typo in comment. + + This change fixes https://bugs.gnu.org/32100. + + * bin/aclocal.in (install_file): remove duplicate "the" in + "Using the real the destination file ...". + +2020-04-05 Colomban Wendling + + vala: more precise argument matching. + + This change fixes https://bugs.gnu.org/18734. + + * bin/automake.in (lang_vala_finish_target): anchor option regexp + so that, e.g., an argument "vapi" does not match the option --vapi. + * NEWS: mention this (and preceding checklinkx change, sorry). + +2020-04-03 Karl Berry + + doc: update urls in manual and include checklinkx script. + + * doc/automake.texi: update many urls; http -> https, + search.cpan.org -> metacpan.org/pod/distribution, node names, etc. + Remove sourceware.org/cgi-bin/gnatsweb.pl and + miller.emu.id.au/pmiller/books/rmch/ as these are 404 + and no good replacement is evident. + s/perl/Perl/ a couple times in text for good measure. + * contrib/checklinkx: new script, a small modification of + W3C checklink + (W3C license, which is free software), starting from version 4.81 + installed from CPAN: + https://metacpan.org/pod/distribution/W3C-LinkChecker/bin/checklink.pod + * doc/local.mk (checklinkx): new target to invoke it, with variables. + * Makefile.am (EXTRA_DIST): distribute it. + * NEWS: mention all this. + +2020-03-24 Karl Berry + + tests: require etags for tags-lisp-space test. + + * t/tags-lisp-space.sh (required): set to etags. + +2020-03-24 Karl Berry + + Merge branch 'master' of git.savannah.gnu.org:/srv/git/automake + +2020-03-24 Karl Berry + + doc: forgot Python 3 NEWS entries. + + * NEWS: item for Python 3 support in 1.16.2. + +2020-03-23 Jim Meyering + + maint: Post-release administrivia + + * NEWS: Add header line for next release. + * configure.ac (AC_INIT): Bump version number to 1.16b. + * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). + +2020-03-16 Jim Meyering + + version 1.16.2 + + * configure.ac (AC_INIT): Bump version number to 1.16.2. + * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). + * NEWS: Record release version. + +2020-03-16 Karl Berry + + maint: sync fdl.texi. + + * doc/fdl.texi: sync with gnulib/doc/fdl.texi, for https://fsf.org + and some Texinfo fixes. + +2020-03-12 Karl Berry + + maint: do not descend into unreadable test directories. + + * maintainer/syntax-checks.mk (sc_tests_makefile_variable_order): + find t ! -perm o+r -prune, since some test directories + are intentionally unreadable. + +2020-03-11 Jim Meyering + + doc: gender tweak + + * HACKING: s/his/their/ + +2020-03-11 Jim Meyering + + maint: run "make fetch" to update files from elsewhere + + * lib/config.guess: Auto-update. + * lib/config.sub: Auto-update. + * lib/gendocs.sh: Auto-update. + * lib/gendocs_template: Auto-update. + * lib/gitlog-to-changelog: Auto-update. + * lib/gnupload: Auto-update. + * lib/texinfo.tex: Auto-update. + * lib/update-copyright: Auto-update. + +2020-03-11 Karl Berry + + maint: typo in comment. + + * t/CheckListOfTests.am (maintainer-check-list-of-tests): an -> and. + +2020-02-25 Karl Berry + + python: support both Python 2 and 3 in py-compile + + * lib/py-compile: check python major version and use imp + or importlib accordingly, plus related changes. Original + patch for Python 3 only from Gabriel Ganne at: + https://lists.gnu.org/archive/html/automake-patches/2019-07/msg00002.html + +2020-02-15 Paul Osmialowski + + configure: add flang compilers to _AM_COMPILER_CAN_FAIL + + * configure.ac (_AM_COMPILER_CAN_FAIL): add armflang and flang + (in two places). Original patch at: + https://lists.gnu.org/archive/html/automake-patches/2019-02/msg00001.html + +2020-02-14 Libor Bukata + + cosmetics: improve error message when dependency tracking fails + + This change fixes https://bugs.gnu.org/35848. + + * m4/depout.m4: Add suggestion to try GNU make to the error message. + Original patch at + https://lists.gnu.org/archive/html/automake-patches/2019-05/msg00000.html + +2020-02-13 Vincent Lefevre + + maint: update lib/COPYING from canonical source. + + * lib/COPYING: update from https://www.gnu.org/licenses/gpl-3.0.txt + (only change is to use https urls). + +2020-02-10 Mathieu Lirzin + + build: fix 'installcheck' target + + * t/local.mk (installcheck-testsuite): Do not use 'pre-inst-env' script. + (AM_TESTS_ENVIRONMENT): Ensure that installed perl modules are found. + +2020-01-29 Lukas Fleischer + + python: properly uninstall __pycache__ in subdirectories + + This change finishes fixing automake bug#32088: + https://debbugs.gnu.org/32088 + + * lib/am/python.am (uninstall-%DIR%PYTHON): Uninstall + byte-compiled files in a '__pycache__' subdirectory + from sub/__pycache__/, not __pycache__/sub/. + (am__pep3147_tweak): prefix __pycache__ here, for both .pyc and .pyo. + https://lists.gnu.org/archive/html/automake-patches/2018-05/msg00000.html + * t/instmany-python.sh (limit): increase to 4500, following + Andreas Huettel, https://debbugs.gnu.org/32088#11. + +2020-01-29 Lukas Fleischer + + tests: in python tests, do not require .pyo files (for python3) + + This change partially fixes automake bug#32088: + https://debbugs.gnu.org/32088 + + * t/py-compile-basedir.sh: Remove all .pyo checks. + Also, in this test only, allow for either 4 or 6 files resulting + from compilation, as new-enough Python3 results in 6 + (per Andreas Huettel, https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32088#17) + * t/py-compile-basic.sh: Remove all .pyo checks. + * t/py-compile-destdir.sh: Likewise. + * t/py-compile-option-terminate.sh: Likewise. + * t/python-virtualenv.sh: Likewise. + * t/python10.sh: Likewise. + * t/python12.sh: Likewise. + * t/python3.sh: Likewise. + +2020-01-26 Karl Berry + + doc: clarify build tree location + + * doc/automake.texi (VPATH Builds): more words about the build + tree location. Suggestion from Jefferson Carpenter, 31 May 2018: + + +2020-01-19 Karl Berry + + lint: make syntax-check same as maintainer-check. + + * maintainer/syntax-checks.mk (syntax-check): new target, + same as maintainer-check. For consistency with many other + GNU packages. + (.PHONY): add here too. + +2020-01-19 Karl Berry + + tests: use find+rm, not perl, to remove temporary directories. + + This change fixes automake bug#39078: + https://debbugs.gnu.org/39078 + + * t/ax/test-lib.sh (rm_rf_): run chmod -R u+rwx and rm -rf, + instead of calling our t/ax/deltree.pl script. This reverses the + change of 2013-05-16. It made sense to write and use deltree + at that point, but unfortunately as of perl-5.28.0 + (File::Path.pm version 2.15), rmtree no longer removes a tree with + unreadable subdirectories, such as we (intentionally) have. So we + might as well go back to rm -rf. The unconditional recursive chmod + instead of the previously-used more complex find command will + hopefully prove portable. See the bug report for more details. + + Our deltree.pl is not used for anything else, but nevertheless + leaving it in our source tree for now, for ease of reversion + and comparison. + +2020-01-08 Karl Berry + + tests: use skip_ consistently. + + * t/lisp-loadpath.sh: use skip_ instead of exit 77; + also, notice and reset if the EMACS envvar is simply "t". + * t/uninstall-fail.sh: use skip_ instead of the undefined skip. + +2020-01-05 Karl Berry + + tests: Correctly simulate no emacs in t/nobase-nodist.sh + + * t/nobase-nodist.sh: export EMACS, not EMCAS, as "no". + +2020-01-04 Karl Berry + + automake: Support byte compilation in older Emacsen + + * lib/am/lisp.am (am__emacs_byte_compile_setup) [FIRST]: define + new make variable, to use byte-compile-dest-file-function if + available, else byte-compile-dest-file. + (.el.elc): use it. + * t/lisp-loadpath.sh: skip test if emacs version is <= 23, + since their -L ordering is backwards. + * NEWS: update. + +2020-01-01 Jim Meyering + + maint: make update-copyright + +2019-12-23 Jim Meyering + + maint: make maintainer-check tests pass + + * maintainer/syntax-checks.mk (sc_sanity_gnu_grep): Remove + NUL byte from grep output, to avoid shell diagnostic about + "NUL byte suppressed from expansion." + (automake_diff_no, aclocal_diff_no): Adjust number of expected + diff lines. + +2019-12-21 Karl Berry + + tests: Ensure UTC for Texinfo @UPDATED@ test + + * t/txinfo-vtexi4.sh: TZ=UTC0; export TZ (same as mdate-sh). + * NEWS: update. + +2019-12-17 Karl Berry + + automake: Ensure space after $(LISP) in tags dependencies. + + This change fixes automake bug#38139. + + * bin/automake.in (handle_tags): Concatenate with space in " @config". + * t/tags-lisp-space.sh: New test. + * t/list-of-tests.mk (handwritten_TESTS): Add it. + +2019-11-17 Giuseppe Scrivano + + dist: add dist-zstd option + + Add support for using the zstd compression algorithm. + Use a default compression setting of -19, and ".zst" as the suffix. + + * bin/automake.in (handle_dist): Add zstd to the list of known dist- + suffixes. + (preprocess_file): Map ZSTD to dist-zstd. + * doc/automake.texi: Document the new option. + * lib/Automake/Options.pm (_is_valid_easy_option): Add dist-zstd. + * lib/am/distdir.am (dist-zstd): New rule. + (?ZSTD?DIST_TARGETS): Add definition. + (distcheck): Add a case for *.tar.zst*. + * t/dist-formats.tap: Add tests. + * NEWS: Mention the change. + +2019-11-11 Paul Eggert + + config: add msys support + + Requested by Arnold Robbins in: + https://lists.gnu.org/r/bug-gnulib/2019-11/msg00008.html + * lib/ar-lib, lib/compile (func_file_conv): + Treat msys like cygwin. + +2019-10-14 Paul Eggert + + maint: make update-copyright + +2019-10-14 Paul Eggert + + maint: make fetch + +2019-09-02 Gavin Smith + + automake: do not require @setfilename in Texinfo files + + Texinfo no longer requires a @setfilename directive in each + .texi file, so automake now also relaxes its restriction. + * bin/automake.in (scan_texinfo_file): Derive name of info file from + name of input file if no @setfilename line occurs in the file. + * t/txinfo-no-setfilename.sh: New test. + * t/list-of-tests.mk: Add it. + * NEWS: Mention it. + + Fixes automake bugs #36921 and #34201. + +2019-08-26 Paul Eggert + + install-sh: support -s with read-only source + + Problem reported by Karl Berry in: + https://lists.gnu.org/r/bug-gnulib/2019-08/msg00067.html + * lib/install-sh: If -s is given, create the temporary file + with $cp_umask so that ‘strip’ can write to it. + +2019-07-03 Bruno Haible + + ar-lib: Fix for MSVC 14. + + * lib/ar-lib (extract): Convert CRLFs in 'lib -NOLOGO -LIST' output to LFs. + +2018-10-23 Paul Hardy + + doc: Fix various typos and phrasing + + This change fixes automake bug#32150. + + * doc/automake.texi: Various typos and phrasing changes. + +2018-07-08 Mathieu Lirzin + + python: Don't use '\n' in sed substitution + + This change fixes automake bug#31222. + + On macOS, 'sed' interprets '\n' in the substitution text as the letter 'n' + instead of as a newline. + + * lib/am/python.am [?FIRST?] (am__pep3147_tweak): Use a space instead of '\n'. + * NEWS: Update. + +2018-03-24 Mathieu Lirzin + + test-driver.scm: Add "--coverage" option + + * contrib/test-driver.scm: When 'coverage' option is enabled, run tests + in the debug vm and trace coverage data. + (%options): Add 'coverage'. + (show-help): Display option. + +2018-03-24 Mathieu Lirzin + + test-driver.scm: Don't guess script name from "--test-name" + + 'primitive-load' is used instead of 'load-from-path' since the script is + given as a relative file name. For unknown reason, using 'load' fails + with GNU Mcron test suite when running 'make distcheck'. + + * contrib/test-driver.scm: Get the actual script name directly from the + command line. Handle the case where that argument is missing. + +2018-03-24 Mathieu Lirzin + + test-driver.scm: Inline 'main' procedure + + Having a main procedure involves passing the '-e main' command-line + argument to 'guile' which makes the test driver a bit less easy to use. + + * contrib/test-driver.scm (main): Delete. Move body to the top-level. + +2018-03-11 Mathieu Lirzin + + maint: Use 'before-save-hook' in "contrib/test-driver.scm" + + This a follow-up to commit 6bab5b26a1241b0e0edd058d2a921989f9a1747c. + + Use 'before-save-hook' instead of 'write-file-functions' to match what + is done in other scripts. + + * contrib/test-driver.scm: Update hook usage and use 'UTC0' timezone + instead of 'UTC'. + +2018-03-11 Mathieu Lirzin + + bin: Rely only on the shebang line + + Previously ‘automake’ and ‘aclocal’ were handling the case of being + interpreted as a Shell script by using a hack leveraging the fact that + Shell and Perl has a compatible syntax intersection allowing those + scripts to launch ‘perl’ from the shell. + + * bin/aclocal.in: Remove cryptic launching hack. + * bin/automake.in: Likewise. + +2018-03-11 Mathieu Lirzin + + maint: Post-release administrivia + + * NEWS: Add header line for next release. + * configure.ac (AC_INIT): Bump version number to 1.16a. + * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). + 2018-03-11 Mathieu Lirzin version 1.16.1 @@ -75,7 +1849,7 @@ 'python3.8', and 'python3.9'. * NEWS: Update. -2018-03-07 Paul Eggert +2018-03-06 Paul Eggert maint: write-file-hooks -> before-save-hook @@ -176,7 +1950,7 @@ * t/maken3.sh (check_targets): "--force" is not a documented option, so don't use it. -2018-02-04 Mathieu Lirzin +2018-02-03 Mathieu Lirzin python: Generate python interpreter list @@ -197,7 +1971,7 @@ * t/txinfo-many-output-formats.sh: Explain why AM_MAKEINFOFLAGS is set with an invalid option. -2018-01-19 Mathieu Lirzin +2018-01-18 Mathieu Lirzin tests: Distribute DEJATOOL files manually @@ -207,14 +1981,14 @@ * t/check12.sh (Makefile.am): Distribute files from DEJATOOL. -2018-01-19 Mathieu Lirzin +2018-01-18 Mathieu Lirzin tests: Let 'ltorder.sh' run successfully with Guix dynamic loader * t/ltorder.sh: Set GUIX_LD_WRAPPER_ALLOW_IMPURITIES environment variable to unlock the dynamic loader provided by GNU Guix. -2018-01-19 Mathieu Lirzin +2018-01-18 Mathieu Lirzin tests: Fix various 'flex' compilation issues @@ -233,7 +2007,7 @@ * t/aclocal.sh: Check that 'aclocal' support the --version and --help command-line options. -2018-01-18 Mathieu Lirzin +2018-01-17 Mathieu Lirzin contrib: Add Guile custom test driver using SRFI-64 test harness @@ -242,13 +2016,13 @@ * contrib/test-driver.scm: New test driver script. * NEWS: Update. -2018-01-18 Mathieu Lirzin +2018-01-17 Mathieu Lirzin maint: Document how to use Guix for Automake development * HACKING : New part. -2018-01-05 Khem Raj (tiny change) +2018-01-04 Khem Raj (tiny change) automake: Add default libtool_tag to cppasm @@ -281,7 +2055,7 @@ * maintainer/maint.mk (files_without_copyright): Add ".dir-locals.el". -2017-12-17 Jim Meyering +2017-12-16 Jim Meyering port elisp-compilation support to emacs-23.1 and newer @@ -300,7 +2074,7 @@ * t/list-of-tests.mk (handwritten_TESTS): Add it. * NEWS (Bugs fixed): Mention this problem. -2017-11-29 Jim Meyering +2017-11-28 Jim Meyering "make dist" did not depend on $(BUILT_SOURCES) @@ -370,11 +2144,11 @@ * HACKING: Fix instructions merge instructions. -2017-09-22 Paul Eggert +2017-09-21 Paul Eggert * lib/mdate.sh (TZ): Use portable setting. -2017-09-20 Mathieu Lirzin +2017-09-19 Mathieu Lirzin Merge branch 'minor' @@ -423,11 +2197,11 @@ help. The GNU project regularly serves up code to users, so we should take some care here. -2017-09-17 Paul Eggert +2017-09-16 Paul Eggert make fetch -2017-09-17 Paul Eggert +2017-09-16 Paul Eggert Fix a couple more http: URLs @@ -554,7 +2328,7 @@ * maintainer/syntax-checks.mk (sc_perl_protos): New target. (syntax_check_rules): Add it. -2017-08-31 Mathieu Lirzin +2017-08-30 Mathieu Lirzin build: Generate versioned scripts at make time @@ -566,7 +2340,7 @@ (%D%/aclocal-$(APIVERSION)): New targets. (CLEANFILES): Add them. -2017-08-31 Mathieu Lirzin +2017-08-30 Mathieu Lirzin aclocal: Support ACLOCAL_AUTOMAKE_DIR environment variable @@ -651,7 +2425,7 @@ * bin/automake.in (handle_LIBOBJS_or_ALLOCA): Remove complex regexp substitution when handling LTLIBOBJS. -2017-08-22 Michael Haubenwallner +2017-08-21 Michael Haubenwallner automake: Ensure that LIBOBJ_DIR builddir is created @@ -668,7 +2442,7 @@ * doc/help2man: Sync with version 1.47.3 to support reproducible builds by using $SOURCE_DATE_EPOCH. -2017-07-16 Mathieu Lirzin +2017-07-15 Mathieu Lirzin doc: Fix typo "nothing" => "noting" @@ -677,7 +2451,7 @@ * doc/automake.texi (Checking the Distribution): Fix typo. * THANKS: Update. -2017-07-16 Mathieu Lirzin +2017-07-15 Mathieu Lirzin doc: Fix typos @@ -687,7 +2461,7 @@ (Parallel Test Harness): Fix typos. * THANKS: Update. -2017-07-16 Mathieu Lirzin +2017-07-15 Mathieu Lirzin check: Make 'check-TESTS' target depend on test dependencies @@ -783,7 +2557,7 @@ * maintainer/maint.mk (git-tag-release): Use a Git tag message similar to what the 'do-release-commit-and-tag' script from Gnulib do. -2017-06-18 Mathieu Lirzin +2017-06-17 Mathieu Lirzin maint: Update files from upstream with 'make fetch' @@ -791,7 +2565,7 @@ * lib/config.sub: Likewise. * lib/texinfo.tex: Likewise. -2017-06-18 Mathieu Lirzin +2017-06-17 Mathieu Lirzin maint: Update NEWS @@ -912,7 +2686,7 @@ UPDATE_COPYRIGHT_MAX_LINE_LENGTH=79 \ update-copyright $(git ls-files) -2016-09-09 Jim Meyering +2016-09-08 Jim Meyering automake: do not emit rule with two dependents @@ -929,7 +2703,7 @@ it is deduped. See: http://bugs/gnu/org/22702 -2016-06-02 Jim Meyering +2016-06-01 Jim Meyering compile: remove .Tpo file upon failure @@ -949,21 +2723,21 @@ * t/list-of-tests.mk (handwritten_TESTS): Add it. This addresses bug#23661. -2016-04-21 Paul Eggert +2016-04-20 Paul Eggert python: add python3.5, python3.4 * m4/python.m4 (AM_PATH_PYTHON): Add python3.5, python3.4. -2016-04-01 Paul Eggert +2016-03-31 Paul Eggert Merge branch 'minor' -2016-04-01 Paul Eggert +2016-03-31 Paul Eggert Merge branch 'micro' into minor -2016-04-01 Paul Eggert +2016-03-31 Paul Eggert automake: port to Perl 5.22 and later @@ -973,7 +2747,7 @@ http://search.cpan.org/dist/perl-5.22.0/pod/perldelta.pod#A_literal_%22{%22_should_now_be_escaped_in_a_pattern * bin/automake.in (substitute_ac_subst_variables): Escape left brace. -2016-03-29 Paul Eggert +2016-03-28 Paul Eggert automake: port better to future gzip @@ -1293,14 +3067,14 @@ install-sh: assume 'dirname' is available and working correctly post-release: micro version bump (1.14a) -2014-12-31 Stefano Lattarini +2014-12-30 Stefano Lattarini release: stable minor release 1.15 * configure.ac (AC_INIT): Bump version number to 1.15. * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). -2014-12-31 Stefano Lattarini +2014-12-30 Stefano Lattarini NEWS: minor improvements and fixed some typos and grammaros @@ -1799,7 +3573,7 @@ They were swapped. Reported in http://debbugs.gnu.org/19108. -2014-12-18 Stefano Lattarini +2014-12-17 Stefano Lattarini docs: improve description of ${PACKAGE}, ${VERSION}, and similar variables @@ -1980,7 +3754,7 @@ use curly quotes, which is easier to read though it does assume UTF-8 support. -2013-12-31 Stefano Lattarini +2013-12-30 Stefano Lattarini NEWS: a typofix, and better word wrapping @@ -2057,7 +3831,7 @@ See also automake bugs #9088, #8662 and #8540. -2013-12-26 Stefano Lattarini +2013-12-25 Stefano Lattarini Merge branch 'install-sh-improvements' into minor @@ -2065,7 +3839,7 @@ install-sh: a slightly better diagnostic, and tests enhancements install-sh: be stricter in catching invalid usages -2013-12-26 Stefano Lattarini +2013-12-25 Stefano Lattarini install-sh: a slightly better diagnostic, and tests enhancements @@ -2076,7 +3850,7 @@ * t/install-sh-unittests.sh: Enhance to also check diagnostic printed in cases of expected failure. -2013-12-26 Stefano Lattarini +2013-12-25 Stefano Lattarini install-sh: be stricter in catching invalid usages @@ -2318,7 +4092,7 @@ distcheck: don't allow overriding of --prefix and --srcdir by the user tests: expose bug#14991 (relates to 'distcheck') -2013-11-02 Stefano Lattarini +2013-11-01 Stefano Lattarini Merge branch 'modernize-install-sh' into minor @@ -2328,7 +4102,7 @@ install-sh: assume ${var:-value} works as expected install-sh: assume 'dirname' is available and working correctly -2013-11-02 Stefano Lattarini +2013-11-01 Stefano Lattarini Merge branch 'micro' into minor @@ -2339,7 +4113,7 @@ distcheck: don't allow overriding of --prefix and --srcdir by the user tests: expose bug#14991 (relates to 'distcheck') -2013-11-02 Stefano Lattarini +2013-11-01 Stefano Lattarini cosmetics: fix typo in a user-facing message in tests @@ -2357,7 +4131,7 @@ automake: account for perl hash order randomization tests: avoid use of intervals to capitalize letters -2013-10-31 Stefano Lattarini +2013-10-30 Stefano Lattarini automake: account for perl hash order randomization @@ -2378,7 +4152,7 @@ sorts its output. * t/preproc-errmsg.sh: Adjust. -2013-10-31 Stefano Lattarini +2013-10-30 Stefano Lattarini tests: avoid use of intervals to capitalize letters @@ -2387,13 +4161,13 @@ * t/test-extensions.sh: Adjust. -2013-10-31 Stefano Lattarini +2013-10-30 Stefano Lattarini cosmetics: untabify the install-sh script * lib/install-sh: Here, plus a couple of related formatting tweaks. -2013-10-31 Stefano Lattarini +2013-10-30 Stefano Lattarini install-sh: assume that "set -f" and "set +f" work... @@ -2452,7 +4226,7 @@ * t/distcheck-no-prefix-or-srcdir-override.sh: New, expose the bug. * t/list-of-tests.mk (handwritten_TESTS, XFAIL_TESTS): Add it. -2013-10-30 Stefano Lattarini +2013-10-29 Stefano Lattarini Merge branch 'minor' @@ -2471,7 +4245,7 @@ tests: avoid a spurious failure on MacOS X 10.6.8 tests: don't risk hanging on the 'cl' requirement -2013-10-30 Stefano Lattarini +2013-10-29 Stefano Lattarini Merge branch 'micro' into minor @@ -2490,7 +4264,7 @@ tests: avoid a spurious failure on MacOS X 10.6.8 tests: don't risk hanging on the 'cl' requirement -2013-10-30 Stefano Lattarini +2013-10-29 Stefano Lattarini tests: fix spurious failure when zip is present but unzip is not @@ -2502,7 +4276,7 @@ at it, reorganize the existing code a bit. * THANKS, NEWS: Update. -2013-10-30 Stefano Lattarini +2013-10-29 Stefano Lattarini tests: fix spurious failure due to localization issues @@ -2512,11 +4286,11 @@ we can expect error messages in English when grepping its output. * THANKS, NEWS: Update. -2013-10-30 Stefano Lattarini +2013-10-29 Stefano Lattarini NEWS: update with the changes since v1.14 -2013-10-29 Peter Breitenlohner (tiny change) +2013-10-28 Peter Breitenlohner (tiny change) docs: correct typos in the fix-timestamp.sh script @@ -3038,7 +4812,7 @@ updated (apparently, it was mistakenly not updated in the previous real change to the script). -2013-06-13 Stefano Lattarini +2013-06-12 Stefano Lattarini Merge branch 'maint' @@ -4207,7 +5981,7 @@ * t/tap-more.sh: Likewise. * t/parallel-tests-concurrency.sh: Likewise. -2013-05-24 Stefano Lattarini +2013-05-23 Stefano Lattarini tests: new convenience target 'check-parallel' @@ -4374,7 +6148,7 @@ * t/make-keepgoing.tap: Here. * t/parallel-tests-exit-statuses.sh: And here. -2013-05-22 Stefano Lattarini +2013-05-21 Stefano Lattarini Merge branch 'maint' @@ -4385,7 +6159,7 @@ test-lib: minor style changes test-lib: fix botched function name in an error message -2013-05-22 Stefano Lattarini +2013-05-21 Stefano Lattarini Merge branch 'micro' into maint @@ -4396,7 +6170,7 @@ test-lib: minor style changes test-lib: fix botched function name in an error message -2013-05-22 Stefano Lattarini +2013-05-21 Stefano Lattarini tests: run_make: options to do command redirection @@ -4453,7 +6227,7 @@ * t/uninstall-fail.sh: Likewise. * t/yacc-dist-nobuild.sh: Likewise. -2013-05-22 Stefano Lattarini +2013-05-21 Stefano Lattarini tests: only activate 'unset' alias if required @@ -4466,7 +6240,7 @@ alias if "unset VAR" returns a non-zero exit status when VAR is already unset. -2013-05-22 Stefano Lattarini +2013-05-21 Stefano Lattarini tests: better idiom to override make macro defs on the cmdline @@ -4611,7 +6385,7 @@ * t/parallel-tests-recheck-pr11791.sh: Here. -2013-05-19 Stefano Lattarini +2013-05-18 Stefano Lattarini tests: fix a spurious failure with FreeBSD make @@ -4620,7 +6394,7 @@ * t/ltlibsrc.sh: Adjust. -2013-05-19 Stefano Lattarini +2013-05-18 Stefano Lattarini tests: fix a spurious failure with FreeBSD make @@ -4750,7 +6524,7 @@ * t/yflags.sh: Likewise. * t/yflags2.sh: Likewise. -2013-05-17 Stefano Lattarini +2013-05-16 Stefano Lattarini tests: fix some botched/outdated comments @@ -4884,7 +6658,7 @@ * t/README: Likewise, and updated the surrounding text to get rid of obsolete statements and advices. -2013-05-16 Stefano Lattarini +2013-05-15 Stefano Lattarini PLANS: subdir-objects: various updates @@ -5272,7 +7046,7 @@ commit 'v1.13.1d-129-gf7ef16f', but we noticed that too late. Oh well. -2013-05-11 Stefano Lattarini +2013-05-10 Stefano Lattarini options: consistently use return statuses to report errors (more) @@ -5283,7 +7057,7 @@ * lib/Automake/Options.pm (_process_option_list): Adjust, where dealing with the removed options 'dist-shar' and 'dist-tarZ'. -2013-05-11 Stefano Lattarini +2013-05-10 Stefano Lattarini Merge branch 'maint' @@ -5299,7 +7073,7 @@ THANKS: update Eric Blake's e-mail address NEWS: typofix -2013-05-11 Stefano Lattarini +2013-05-10 Stefano Lattarini options: try to report as much errors as possible @@ -5309,7 +7083,7 @@ * lib/Automake/Options.pm (_process_option_list): Do so by avoiding early returns in here. -2013-05-11 Stefano Lattarini +2013-05-10 Stefano Lattarini Merge branch 'branch-1.13.2' into maint @@ -5687,13 +7461,13 @@ * doc/automake.texi: Adjust. -2013-05-05 Stefano Lattarini +2013-05-04 Stefano Lattarini fixlet: remove leftover comment fragment * configure.ac: Here. -2013-05-05 Stefano Lattarini +2013-05-04 Stefano Lattarini master branch: we are going to become Automake 2.0 @@ -5701,7 +7475,7 @@ 1.13a to 1.99a. * m4/amversion.m4: Regenerate. -2013-05-05 Stefano Lattarini +2013-05-04 Stefano Lattarini Merge branch 'maint' @@ -5713,7 +7487,7 @@ tests: typofixes in comments in t/preproc-c-compile.sh tests: remove bashism from a test -2013-05-05 Stefano Lattarini +2013-05-04 Stefano Lattarini maint branch: we are going to become Automake 1.14 @@ -5721,7 +7495,7 @@ 1.13.2a to 1.13a. * m4/amversion.m4: Regenerate. -2013-05-05 Stefano Lattarini +2013-05-04 Stefano Lattarini Merge branch 'branch-1.13.2' into maint @@ -5730,7 +7504,7 @@ release: beta release 1.13.1d (will become 1.13.2) NEWS: document more robust handling/recognition of make options -2013-05-05 Stefano Lattarini +2013-05-04 Stefano Lattarini maint: version bump after beta release 1.13.1d @@ -5957,7 +7731,7 @@ * t/header-vars.am (am__make_running_with_option): Adjust to cater to the new GNU make behaviour. -2013-05-02 Stefano Lattarini +2013-05-01 Stefano Lattarini tests: expose weaknesses in make flags analysis @@ -5967,7 +7741,7 @@ * t/make-dryrun.tap: Enhance and extend. * t/make-keepgoing.tap: Likewise. -2013-05-02 Stefano Lattarini +2013-05-01 Stefano Lattarini tests: improve debugging output in checks on make flags analysis @@ -6882,7 +8656,7 @@ * lib/Automake/Options.pm: Likewise. * m4/internal/ac-config-macro-dirs.m4: Likewise. -2013-02-17 Stefano Lattarini +2013-02-16 Stefano Lattarini cosmetics: fix some "docstring-like" comments in automake @@ -8226,7 +10000,7 @@ Conflicts: Makefile.am -2013-01-04 Karl Berry +2013-01-03 Karl Berry docs: mention dist-hook help for EXTRA_DIST @@ -8668,7 +10442,7 @@ * configure.ac (AC_INIT): Bump version number to 1.13.1. * m4/amversion.m4: Likewise (auto-updated by "make bootstrap"). -2013-01-01 Stefano Lattarini +2012-12-31 Stefano Lattarini Merge branch 'maint' @@ -8679,7 +10453,7 @@ coverage: test CONFIGURE_DEPENDENCIES coverage: test CONFIG_STATUS_DEPENDENCIES -2013-01-01 Stefano Lattarini +2012-12-31 Stefano Lattarini tests: don't always look for a C++ compiler named 'RCC' @@ -8699,7 +10473,7 @@ * configure.ac: Adjust. -2013-01-01 Stefano Lattarini +2012-12-31 Stefano Lattarini tests: fix bug in pkg-config-macros.sh, could cause spurious SKIPs @@ -8712,7 +10486,7 @@ not to be found even when the program was present. * THANKS: Update. -2013-01-01 Stefano Lattarini +2012-12-31 Stefano Lattarini docs: autom4te cache can break CONFIGURE_DEPENDENCIES @@ -8723,7 +10497,7 @@ * doc/automake.texi (Rebuilding): ... here. -2013-01-01 Stefano Lattarini +2012-12-31 Stefano Lattarini coverage: test CONFIGURE_DEPENDENCIES @@ -8731,7 +10505,7 @@ * t/list-of-tests.mk: Add it. * doc/automake.texi: Reference it in comments. -2013-01-01 Stefano Lattarini +2012-12-31 Stefano Lattarini coverage: test CONFIG_STATUS_DEPENDENCIES @@ -9095,11 +10869,11 @@ (edit_configure_in): ... this function ... (edit_configure_ac): ... like this. -2012-12-29 Stefano Lattarini +2012-12-28 Stefano Lattarini NEWS: better distinction between obsolete and obsolescent features -2012-12-29 Stefano Lattarini +2012-12-28 Stefano Lattarini cleanup: get rid of 'Automake::Configure_ac' module @@ -9118,7 +10892,7 @@ 'require_configure_ac' function. * aclocal.in: Likewise. -2012-12-29 Stefano Lattarini +2012-12-28 Stefano Lattarini maint: remove last vestiges of 'configure.in' support from the testsuite @@ -9127,13 +10901,13 @@ * t/autodist-configure-no-subdir.sh: Remove last references to 'configure.in'. -2012-12-29 Stefano Lattarini +2012-12-28 Stefano Lattarini tests: remove a botched comment from a test case * t/backcompat6.sh: Here. -2012-12-29 Stefano Lattarini +2012-12-28 Stefano Lattarini maint: reflect removal of 'configure.in' support in comments and messages @@ -10577,7 +12351,7 @@ * t/aclocal-underquoted-defun.sh: ... like this. * t/list-of-tests.mk: Update. -2012-11-18 Stefano Lattarini +2012-11-17 Stefano Lattarini tests: improve coverage on Texinfo + silent rules @@ -10873,7 +12647,7 @@ * NEWS (Bugs fixed in 1.12.5): Here. -2012-11-11 Yaakov Selkowitz (tiny change) +2012-11-10 Yaakov Selkowitz (tiny change) python: improve support for modern python (CPython 3.2 and PyPy) @@ -12408,7 +14182,7 @@ * automake.in (preprocess_file): Here. -2012-08-11 Stefano Lattarini +2012-08-10 Stefano Lattarini cleanup: remove stale references to 'lzma' option @@ -13212,7 +14986,7 @@ * runtest.in: Here. This required code refactoring not completely trivial. -2012-07-26 Stefano Lattarini +2012-07-25 Stefano Lattarini cosmetics: remove leftover comment fragment from runtest.in @@ -14755,7 +16529,7 @@ not 'configure', as the witness file, because the latter does not exist in the current directory during a VPATH build. -2012-06-29 Stefano Lattarini +2012-06-28 Stefano Lattarini tests: prefer "test ! -e FILE" to check that a file doesn't exist @@ -15245,14 +17019,14 @@ the existing code heavily, in particular introducing (give_advice): ... this new function in the process. -2012-06-23 Stefano Lattarini +2012-06-22 Stefano Lattarini Merge branch 'missing-not-touch-just-warn' * missing-not-touch-just-warn: missing: do not touch timestamps; only warn for out-of-date files -2012-06-23 Stefano Lattarini +2012-06-22 Stefano Lattarini Merge branch 'maint' @@ -15268,7 +17042,7 @@ cosmetics: fix description of an expected error message in a test tests: assume automake quotes 'like this', not `like this' -2012-06-23 Stefano Lattarini +2012-06-22 Stefano Lattarini tests: avoid one last `...` command substitution in 'test-init.sh' @@ -15276,7 +17050,7 @@ also shave off a couple of forks, and the need for a sanity check only required in fringe situations. -2012-06-23 Stefano Lattarini +2012-06-22 Stefano Lattarini maintcheck: guard against `...` for command substitution in test cases @@ -16306,7 +18080,7 @@ * lib/am/tags.am: Use it in several recipes and dependencies list to reduce code duplication. -2012-06-08 Stefano Lattarini +2012-06-07 Stefano Lattarini tags (cscope): also process $(TAGS_FILES) @@ -16314,7 +18088,7 @@ the '$(TAGS_FILES) variable, for consistency by what is done by the 'ID', 'TAGS' and 'CTAGS' rules. -2012-06-08 Stefano Lattarini +2012-06-07 Stefano Lattarini tags (ID, cscope): also process config header (if any) @@ -17197,7 +18971,7 @@ had erroneously been applied to 'master' only rather than to 'maint'. -2012-05-05 Stefano Lattarini +2012-05-04 Stefano Lattarini maintcheck: reduce code duplication, increase coverage @@ -18288,7 +20062,7 @@ * t/self-check-is_newest.tap: Apparently, on some systems (or file systems), "touch -r" can truncate timestamps :-( Work around that. -2012-04-26 Stefano Lattarini +2012-04-25 Stefano Lattarini build: require autoconf 2.69 @@ -18608,7 +20382,7 @@ * t/vala-headers.sh, t/vala-vpath.sh: Enhance. * NEWS: Update. -2012-04-17 Stefano Lattarini +2012-04-16 Stefano Lattarini vala tests: check headers generation @@ -18616,7 +20390,7 @@ header generation (e.g., '-H', '--vapi', ...) in '$(..._VALAFLAGS)'. * t/list-of-tests.mk: Add it. -2012-04-17 Stefano Lattarini +2012-04-16 Stefano Lattarini vala tests: remove redundant libtool requirements and usages @@ -18643,7 +20417,7 @@ reasons). Ensure the stamp file is created in the source directory. -2012-04-16 Jim Meyering +2012-04-15 Jim Meyering build: use latest help2man, but without locale support @@ -18843,7 +20617,7 @@ * NEWS (Changes to Automake-generated testsuite harnesses): It's 'perl', not 'per'. Reported by Akim Demaille in a private mail. -2012-04-12 Marc-Antoine Perennou (tiny change) +2012-04-11 Marc-Antoine Perennou (tiny change) vala: fix vapi files handling @@ -18857,7 +20631,7 @@ as an extension for vala input files. * tests/list-of-tests.mk (XFAIL_TESTS): Remove 'vala-vapi.test'. -2012-04-12 Stefano Lattarini (tiny change) +2012-04-11 Stefano Lattarini (tiny change) Marc-Antoine Perennou vala: test vapi files handling (still failing) @@ -19028,7 +20802,7 @@ tests: remove recipes that run tests with 'prove' tests: move most helper scripts and files into the 'ax' subdirectory -2012-04-09 Stefano Lattarini +2012-04-08 Stefano Lattarini Peter Rosin tests: avoid spurious failures with non-flex 'lex' programs and C++ @@ -19393,7 +21167,7 @@ From a suggestion by Joseph S. Myers in automake bug#11034. -2012-03-29 Stefano Lattarini +2012-03-28 Stefano Lattarini perl refactor: use modern semantics of 'open' @@ -20164,7 +21938,7 @@ commit), even though this change has nothing to do with the changes on the msvc branch. -2012-03-07 Stefano Lattarini +2012-03-06 Stefano Lattarini tests: remove useless sleep from tests on remake rules @@ -20181,11 +21955,11 @@ * tests/remake10b.test: Likewise. * tests/remake10c.test: Likewise. -2012-03-07 Stefano Lattarini +2012-03-06 Stefano Lattarini Merge branch 'msvc' into master (dummy merge) -2012-03-07 Stefano Lattarini +2012-03-06 Stefano Lattarini Merge branch 'maint' into msvc @@ -20784,7 +22558,7 @@ compilers determined at configure time (i.e., $GNU_CC for the GNU C compiler, and so on). -2012-02-24 Stefano Lattarini +2012-02-23 Stefano Lattarini docs, news: document planned removal of obsolete macros and features @@ -20794,7 +22568,7 @@ two- or three-arguments invocation forms of AM_INIT_AUTOMAKE. * doc/automake.texi: Likewise. -2012-02-24 Stefano Lattarini +2012-02-23 Stefano Lattarini docs: remove reference to lzma support, it has been removed @@ -20806,14 +22580,14 @@ * doc/automake.texi: Remove references to the 'dist-lzma' option and to the lzma compression support. -2012-02-24 Stefano Lattarini +2012-02-23 Stefano Lattarini cosmetics: fixlet in comment in automake * automake.in ($configure_dist_common): In the associated comment, refer to scanning of 'configure.ac', not 'configure.in'. -2012-02-24 Stefano Lattarini +2012-02-23 Stefano Lattarini maint: assume 'test -x' is portable @@ -20823,7 +22597,7 @@ should today be portable to any non-museum system. Since we are at it, improve diagnostic in case of failure. -2012-02-24 Stefano Lattarini +2012-02-23 Stefano Lattarini deptrack: avoid few forks in configure (minor optimization) @@ -21270,7 +23044,7 @@ cosmetics: remove extra trailing whitespace in configure.ac -2012-02-18 Peter Rosin +2012-02-17 Peter Rosin Merge branch 'yacc-quote-fix' @@ -21881,7 +23655,7 @@ * configure.ac (AM_SUBST_NOTMAKE): Don't call anymore on 'YACC' nor on 'LEX'. -2012-02-14 Peter Rosin +2012-02-13 Peter Rosin depcomp tests: do not specify LDFLAGS for static libraries @@ -21892,7 +23666,7 @@ * tests/depcomp.sh (src/Makefile.am): Don't add any LDFLAGS when libbaz is built as a static library. -2012-02-14 Peter Rosin +2012-02-13 Peter Rosin depcomp tests: avoid redundant runs for non-libtool test @@ -21903,7 +23677,7 @@ * tests/depcomp.sh: Only run the tests three-fold when libtool is in use. -2012-02-14 Stefano Lattarini +2012-02-13 Stefano Lattarini tests: avoid yet other spurious failures on NetBSD @@ -22748,7 +24522,7 @@ Or maybe this situation is the consequence of a minor blunder in the conversion from CVS to Git; either way, this is not a big deal. -2012-01-31 Stefano Lattarini +2012-01-30 Stefano Lattarini Merge branch 'maint' @@ -22922,7 +24696,7 @@ * tests/transform2.test: Skip the affected part of the test if the described Cygwin behaviour is detected. -2012-01-28 Stefano Lattarini +2012-01-27 Stefano Lattarini tests: avoid spurious failure of deleted-am.test with FreeBSD make @@ -24767,7 +26541,7 @@ avoid spuriously triggering a match from the syntax check `sc_tests_overriding_macros_on_cmdline'. -2011-12-31 Stefano Lattarini +2011-12-30 Stefano Lattarini Merge branch 'dist-lzip' into maint diff -Nru automake-1.16-1.16.1/configure automake-1.16-1.16.5/configure --- automake-1.16-1.16.1/configure 2018-03-11 21:21:08.000000000 +0000 +++ automake-1.16-1.16.5/configure 2021-10-04 03:07:25.000000000 +0000 @@ -1,11 +1,12 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNU Automake 1.16.1. +# Generated by GNU Autoconf 2.71 for GNU Automake 1.16.5. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -16,14 +17,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -33,46 +36,46 @@ fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -81,13 +84,6 @@ fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -96,8 +92,12 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -109,30 +109,10 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -154,20 +134,22 @@ exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else +else \$as_nop case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -187,42 +169,53 @@ as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : -else +else \$as_nop exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : + if (eval "$as_required") 2>/dev/null +then : as_have_required=yes -else +else $as_nop as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : -else +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : break 2 fi fi @@ -230,14 +223,21 @@ esac as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi +fi - if test "x$CONFIG_SHELL" != x; then : + if test "x$CONFIG_SHELL" != x +then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -255,18 +255,19 @@ exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and $0: bug-automake@gnu.org about your system, including any $0: error possibly output before this message. Then install $0: a modern shell, or manually run the script under such a @@ -294,6 +295,7 @@ } as_unset=as_fn_unset + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -311,6 +313,14 @@ as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -325,7 +335,7 @@ as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -334,7 +344,7 @@ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -373,12 +383,13 @@ # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -390,18 +401,27 @@ # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -413,9 +433,9 @@ as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -442,7 +462,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -486,7 +506,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -500,6 +520,10 @@ exit } + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -513,6 +537,13 @@ ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -580,10 +611,10 @@ # Identity of this package. PACKAGE_NAME='GNU Automake' PACKAGE_TARNAME='automake' -PACKAGE_VERSION='1.16.1' -PACKAGE_STRING='GNU Automake 1.16.1' +PACKAGE_VERSION='1.16.5' +PACKAGE_STRING='GNU Automake 1.16.5' PACKAGE_BUGREPORT='bug-automake@gnu.org' -PACKAGE_URL='http://www.gnu.org/software/automake/' +PACKAGE_URL='https://www.gnu.org/software/automake/' ac_unique_file="bin/automake.in" ac_subst_vars='am__EXEEXT_FALSE @@ -641,6 +672,9 @@ pkgvdatadir APIVERSION RELEASE_YEAR +CSCOPE +ETAGS +CTAGS am__untar am__tar AMTAR @@ -700,6 +734,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -788,6 +823,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -817,8 +853,6 @@ *) ac_optarg=yes ;; esac - # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -859,9 +893,9 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -885,9 +919,9 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1040,6 +1074,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1089,9 +1132,9 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1105,9 +1148,9 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1151,9 +1194,9 @@ *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1169,7 +1212,7 @@ case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1177,7 +1220,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1233,7 +1276,7 @@ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1290,7 +1333,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 GNU Automake 1.16.1 to adapt to many kinds of systems. +\`configure' configures GNU Automake 1.16.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1330,6 +1373,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1360,7 +1404,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU Automake 1.16.1:";; + short | recursive ) echo "Configuration of GNU Automake 1.16.5:";; esac cat <<\_ACEOF @@ -1404,8 +1448,8 @@ it to find libraries and programs with nonstandard names/locations. Report bugs to . -GNU Automake home page: . -General help using GNU software: . +GNU Automake home page: . +General help using GNU software: . _ACEOF ac_status=$? fi @@ -1421,9 +1465,9 @@ case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1451,7 +1495,8 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -1459,7 +1504,7 @@ echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1468,10 +1513,10 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU Automake configure 1.16.1 -generated by GNU Autoconf 2.69 +GNU Automake configure 1.16.5 +generated by GNU Autoconf 2.71 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1488,14 +1533,14 @@ ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1503,14 +1548,15 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1526,14 +1572,14 @@ ac_fn_cxx_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1541,14 +1587,15 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1564,14 +1611,14 @@ ac_fn_fc_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1579,14 +1626,15 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_fc_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1602,14 +1650,14 @@ ac_fn_f77_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1617,14 +1665,15 @@ cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_f77_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1633,14 +1682,34 @@ as_fn_set_status $ac_retval } # ac_fn_f77_try_compile +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done + +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +esac + cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU Automake $as_me 1.16.1, which was -generated by GNU Autoconf 2.69. Invocation command line was +It was created by GNU Automake $as_me 1.16.5, which was +generated by GNU Autoconf 2.71. Invocation command line was - $ $0 $@ + $ $0$ac_configure_args_raw _ACEOF exec 5>>config.log @@ -1673,8 +1742,12 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS @@ -1709,7 +1782,7 @@ | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -1744,11 +1817,13 @@ # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - $as_echo "## ---------------- ## + printf "%s\n" "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -1759,8 +1834,8 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -1784,7 +1859,7 @@ ) echo - $as_echo "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -1792,14 +1867,14 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + printf "%s\n" "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -1807,15 +1882,15 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - $as_echo "## ----------- ## + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -1823,8 +1898,8 @@ echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -1838,63 +1913,48 @@ # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -$as_echo "/* confdefs.h */" > confdefs.h +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" + +for ac_site_file in $ac_site_files do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + || { { 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 $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -1904,19 +1964,641 @@ # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif + +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) '\''x'\'' +int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), + int, int);' + +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' + +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +// Does the compiler advertise C99 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif + +#include +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + #error "your preprocessor is broken" +#endif +#if BIG_OK +#else + #error "your preprocessor is broken" +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case '\''s'\'': // string + str = va_arg (args_copy, const char *); + break; + case '\''d'\'': // int + number = va_arg (args_copy, int); + break; + case '\''f'\'': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +' + +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' + // Check bool. + _Bool success = false; + success |= (argc != 0); + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' + +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +// Does the compiler advertise C11 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif + +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' + +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" + +# Test code for whether the C++ compiler supports C++98 (global declarations) +ac_cxx_conftest_cxx98_globals=' +// Does the compiler advertise C++98 conformance? +#if !defined __cplusplus || __cplusplus < 199711L +# error "Compiler does not advertise C++98 conformance" +#endif + +// These inclusions are to reject old compilers that +// lack the unsuffixed header files. +#include +#include + +// and are *not* freestanding headers in C++98. +extern void assert (int); +namespace std { + extern int strcmp (const char *, const char *); +} + +// Namespaces, exceptions, and templates were all added after "C++ 2.0". +using std::exception; +using std::strcmp; + +namespace { + +void test_exception_syntax() +{ + try { + throw "test"; + } catch (const char *s) { + // Extra parentheses suppress a warning when building autoconf itself, + // due to lint rules shared with more typical C programs. + assert (!(strcmp) (s, "test")); + } +} + +template struct test_template +{ + T const val; + explicit test_template(T t) : val(t) {} + template T add(U u) { return static_cast(u) + val; } +}; + +} // anonymous namespace +' + +# Test code for whether the C++ compiler supports C++98 (body of main) +ac_cxx_conftest_cxx98_main=' + assert (argc); + assert (! argv[0]); +{ + test_exception_syntax (); + test_template tt (2.0); + assert (tt.add (4) == 6.0); + assert (true && !false); +} +' + +# Test code for whether the C++ compiler supports C++11 (global declarations) +ac_cxx_conftest_cxx11_globals=' +// Does the compiler advertise C++ 2011 conformance? +#if !defined __cplusplus || __cplusplus < 201103L +# error "Compiler does not advertise C++11 conformance" +#endif + +namespace cxx11test +{ + constexpr int get_val() { return 20; } + + struct testinit + { + int i; + double d; + }; + + class delegate + { + public: + delegate(int n) : n(n) {} + delegate(): delegate(2354) {} + + virtual int getval() { return this->n; }; + protected: + int n; + }; + + class overridden : public delegate + { + public: + overridden(int n): delegate(n) {} + virtual int getval() override final { return this->n * 2; } + }; + + class nocopy + { + public: + nocopy(int i): i(i) {} + nocopy() = default; + nocopy(const nocopy&) = delete; + nocopy & operator=(const nocopy&) = delete; + private: + int i; + }; + + // for testing lambda expressions + template Ret eval(Fn f, Ret v) + { + return f(v); + } + + // for testing variadic templates and trailing return types + template auto sum(V first) -> V + { + return first; + } + template auto sum(V first, Args... rest) -> V + { + return first + sum(rest...); + } +} +' + +# Test code for whether the C++ compiler supports C++11 (body of main) +ac_cxx_conftest_cxx11_main=' +{ + // Test auto and decltype + auto a1 = 6538; + auto a2 = 48573953.4; + auto a3 = "String literal"; + + int total = 0; + for (auto i = a3; *i; ++i) { total += *i; } + + decltype(a2) a4 = 34895.034; +} +{ + // Test constexpr + short sa[cxx11test::get_val()] = { 0 }; +} +{ + // Test initializer lists + cxx11test::testinit il = { 4323, 435234.23544 }; +} +{ + // Test range-based for + int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3, + 14, 19, 17, 8, 6, 20, 16, 2, 11, 1}; + for (auto &x : array) { x += 23; } +} +{ + // Test lambda expressions + using cxx11test::eval; + assert (eval ([](int x) { return x*2; }, 21) == 42); + double d = 2.0; + assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0); + assert (d == 5.0); + assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0); + assert (d == 5.0); +} +{ + // Test use of variadic templates + using cxx11test::sum; + auto a = sum(1); + auto b = sum(1, 2); + auto c = sum(1.0, 2.0, 3.0); +} +{ + // Test constructor delegation + cxx11test::delegate d1; + cxx11test::delegate d2(); + cxx11test::delegate d3(45); +} +{ + // Test override and final + cxx11test::overridden o1(55464); +} +{ + // Test nullptr + char *c = nullptr; +} +{ + // Test template brackets + test_template<::test_template> v(test_template(12)); +} +{ + // Unicode literals + char const *utf8 = u8"UTF-8 string \u2500"; + char16_t const *utf16 = u"UTF-8 string \u2500"; + char32_t const *utf32 = U"UTF-32 string \u2500"; +} +' + +# Test code for whether the C compiler supports C++11 (complete). +ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals} +${ac_cxx_conftest_cxx11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_cxx_conftest_cxx98_main} + ${ac_cxx_conftest_cxx11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C++98 (complete). +ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals} +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_cxx_conftest_cxx98_main} + return ok; +} +" + + +# Auxiliary files required by this configure script. +ac_aux_files="compile missing install-sh config.guess config.sub" + +# Locations in which to look for auxiliary files. +ac_aux_dir_candidates="${srcdir}/lib" + +# Search for a directory containing all of the required auxiliary files, +# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. +# If we don't find one directory that contains all the files we need, +# we report the set of missing files from the *first* directory in +# $ac_aux_dir_candidates and give up. +ac_missing_aux_files="" +ac_first_candidate=: +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" + break + fi + ac_first_candidate=false + + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +fi + + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +if test -f "${ac_aux_dir}config.guess"; then + ac_config_guess="$SHELL ${ac_aux_dir}config.guess" +fi +if test -f "${ac_aux_dir}config.sub"; then + ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_configure="$SHELL ${ac_aux_dir}configure" +fi + # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -1927,12 +2609,12 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -1941,24 +2623,24 @@ ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1968,11 +2650,12 @@ fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -1987,38 +2670,11 @@ -ac_aux_dir= -for ac_dir in lib "$srcdir"/lib; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in lib \"$srcdir\"/lib" "$LINENO" 5 -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - # Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : +if test ${enable_silent_rules+y} +then : enableval=$enable_silent_rules; fi @@ -2028,12 +2684,13 @@ *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) +{ 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 $as_nop + if printf "%s\n" 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -2045,8 +2702,8 @@ am_cv_make_support_nested_variables=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } +{ 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)' @@ -2057,26 +2714,30 @@ AM_BACKSLASH='\' -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else + + + + # Make sure we can run config.sub. +$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +printf %s "checking build system type... " >&6; } +if test ${ac_cv_build+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 +ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -2095,21 +2756,22 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +printf %s "checking host system type... " >&6; } +if test ${ac_cv_host+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -2147,7 +2809,8 @@ am__api_version='1.16' -# Find a good install program. We prefer a C program (faster), + + # 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 @@ -2161,20 +2824,25 @@ # 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. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } +{ 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 ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${ac_cv_path_install+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ + 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/* ) ;; @@ -2184,13 +2852,13 @@ # 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 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 + 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 + 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 @@ -2198,12 +2866,12 @@ 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" && + 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" + ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" break 3 fi fi @@ -2219,7 +2887,7 @@ rm -rf conftest.one conftest.two conftest.dir fi - if test "${ac_cv_path_install+set}" = set; then + 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 @@ -2229,8 +2897,8 @@ INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +{ 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. @@ -2240,8 +2908,8 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } +{ 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=' @@ -2295,8 +2963,8 @@ as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +{ 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= @@ -2315,26 +2983,23 @@ # Double any \ or $. # By default was `s,x,x', remove it if useless. ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` +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 - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + + 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= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} + { 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 @@ -2354,11 +3019,12 @@ 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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 $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -2366,11 +3032,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2381,11 +3051,11 @@ fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2394,11 +3064,12 @@ 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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 $as_nop if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -2406,11 +3077,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2421,11 +3096,11 @@ fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { 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 @@ -2433,8 +3108,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ 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 @@ -2446,25 +3121,31 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + + { 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 ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${ac_cv_path_mkdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ + 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 + ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext break 3;; esac done @@ -2475,7 +3156,7 @@ fi test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then + if test ${ac_cv_path_mkdir+y}; then MKDIR_P="$ac_cv_path_mkdir -p" else # As a last resort, use the slow shell script. Don't cache a @@ -2485,18 +3166,19 @@ MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } +{ 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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 $as_nop if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -2504,11 +3186,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2519,24 +3205,25 @@ fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +printf "%s\n" "$AWK" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -n "$AWK" && break done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +{ 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=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else +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 $as_nop cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @@ -2552,12 +3239,12 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2592,7 +3279,7 @@ # Define the identity of the package. PACKAGE='automake' - VERSION='1.16.1' + VERSION='1.16.5' # Some tools Automake needs. @@ -2633,6 +3320,20 @@ +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi + +if test -z "$ETAGS"; then + ETAGS=etags +fi + +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi + + # 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 @@ -2679,7 +3380,7 @@ # Keep this on a line of its own, since it must be found and processed # by the 'update-copyright' rule in our Makefile. -RELEASE_YEAR=2018 +RELEASE_YEAR=2021 # The API version is the base version. We must guarantee @@ -2705,25 +3406,26 @@ ACLOCAL="\"`pwd`/pre-inst-env\" aclocal-$APIVERSION" AUTOMAKE="\"`pwd`/pre-inst-env\" automake-$APIVERSION" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +printf %s "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +printf "%s\n" "no, using $LN_S" >&6; } fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PERL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PERL+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PERL in [\\/]* | ?:[\\/]*) ac_cv_path_PERL="$PERL" # Let the user override the test with a path. @@ -2733,11 +3435,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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_path_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PERL="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2749,11 +3455,11 @@ fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 -$as_echo "$PERL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 +printf "%s\n" "$PERL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2776,11 +3482,12 @@ # The test suite will skip some tests if tex is absent. # Extract the first word of "tex", so it can be a program name with args. set dummy tex; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_TEX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_TEX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$TEX"; then ac_cv_prog_TEX="$TEX" # Let the user override the test. else @@ -2788,11 +3495,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_TEX="tex" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2803,11 +3514,11 @@ fi TEX=$ac_cv_prog_TEX if test -n "$TEX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEX" >&5 -$as_echo "$TEX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TEX" >&5 +printf "%s\n" "$TEX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2835,11 +3546,12 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_YACC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_YACC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. else @@ -2847,11 +3559,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_YACC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2862,11 +3578,11 @@ fi YACC=$ac_cv_prog_YACC if test -n "$YACC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 -$as_echo "$YACC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5 +printf "%s\n" "$YACC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2878,11 +3594,12 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LEX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_LEX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$LEX"; then ac_cv_prog_LEX="$LEX" # Let the user override the test. else @@ -2890,11 +3607,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_LEX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2905,11 +3626,11 @@ fi LEX=$ac_cv_prog_LEX if test -n "$LEX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 -$as_echo "$LEX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5 +printf "%s\n" "$LEX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2926,11 +3647,12 @@ required_autoconf_version=2.65 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether autoconf is installed" >&5 -$as_echo_n "checking whether autoconf is installed... " >&6; } -if ${am_cv_autoconf_installed+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether autoconf is installed" >&5 +printf %s "checking whether autoconf is installed... " >&6; } +if test ${am_cv_autoconf_installed+y} +then : + printf %s "(cached) " >&6 +else $as_nop if { echo "$as_me:$LINENO: $am_AUTOCONF --version" >&5 ($am_AUTOCONF --version) >&5 2>&5 ac_status=$? @@ -2942,20 +3664,23 @@ am_cv_autoconf_installed=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_autoconf_installed" >&5 -$as_echo "$am_cv_autoconf_installed" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_autoconf_installed" >&5 +printf "%s\n" "$am_cv_autoconf_installed" >&6; } if test "$am_cv_autoconf_installed" = no; then as_fn_error $? "Autoconf $required_autoconf_version or better is required. Please make sure it is installed and in your PATH." "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether autoconf works" >&5 -$as_echo_n "checking whether autoconf works... " >&6; } -if ${am_cv_autoconf_works+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether autoconf works" >&5 +printf %s "checking whether autoconf works... " >&6; } +if test ${am_cv_autoconf_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop mkdir conftest -echo 'AC''_INIT' > conftest/conftest.ac +printf '%s\n' > conftest/conftest.ac \ + 'AC''_INIT(smoke-test, 1)' \ + 'AC''_OUTPUT' if { echo "$as_me:$LINENO: cd conftest && $am_AUTOCONF -o /dev/null conftest.ac" >&5 (cd conftest && $am_AUTOCONF -o /dev/null conftest.ac) >&5 2>&5 ac_status=$? @@ -2968,20 +3693,24 @@ fi rm -rf conftest fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_autoconf_works" >&5 -$as_echo "$am_cv_autoconf_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_autoconf_works" >&5 +printf "%s\n" "$am_cv_autoconf_works" >&6; } if test "$am_cv_autoconf_works" = no; then as_fn_error $? "The installed version of autoconf does not work. Please check config.log for error messages before this one." "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether autoconf is recent enough" >&5 -$as_echo_n "checking whether autoconf is recent enough... " >&6; } -if ${am_cv_autoconf_version+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether autoconf is recent enough" >&5 +printf %s "checking whether autoconf is recent enough... " >&6; } +if test ${am_cv_autoconf_version+y} +then : + printf %s "(cached) " >&6 +else $as_nop mkdir conftest -echo 'AC'"_PREREQ([$required_autoconf_version])" > conftest/conftest.ac +printf '%s\n' > conftest/conftest.ac \ + 'AC'"_PREREQ([$required_autoconf_version])" \ + 'AC''_INIT(smoke-test, 1)' \ + 'AC''_OUTPUT' if { echo "$as_me:$LINENO: cd conftest && $am_AUTOCONF -o /dev/null conftest.ac" >&5 (cd conftest && $am_AUTOCONF -o /dev/null conftest.ac) >&5 2>&5 ac_status=$? @@ -2994,18 +3723,19 @@ fi rm -rf conftest fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_autoconf_version" >&5 -$as_echo "$am_cv_autoconf_version" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_autoconf_version" >&5 +printf "%s\n" "$am_cv_autoconf_version" >&6; } if test "$am_cv_autoconf_version" = no; then as_fn_error $? "Autoconf $required_autoconf_version or better is required." "$LINENO" 5 fi # Test for ln. We need use it to install the versioned binaries. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln works" >&5 -$as_echo_n "checking whether ln works... " >&6; } -if ${am_cv_prog_ln+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln works" >&5 +printf %s "checking whether ln works... " >&6; } +if test ${am_cv_prog_ln+y} +then : + printf %s "(cached) " >&6 +else $as_nop rm -f conftest conftest.file : >conftest.file @@ -3021,8 +3751,8 @@ result=no test "x$am_cv_prog_ln" = xln && result=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 -$as_echo "$result" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +printf "%s\n" "$result" >&6; } # The amount we should wait after modifying files depends on the platform. # On Windows '95, '98 and ME, files modifications have 2-seconds @@ -3039,11 +3769,12 @@ ## Test for things needed by the test suite. ## ## ------------------------------------------- ## -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$GREP"; then ac_path_GREP_found=false # Loop through the user's path and test for each of PROGNAME-LIST @@ -3051,10 +3782,15 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in grep ggrep + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP @@ -3063,13 +3799,13 @@ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" + printf "%s\n" 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3097,16 +3833,17 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +printf "%s\n" "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +printf %s "checking for egrep... " >&6; } +if test ${ac_cv_path_EGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else @@ -3117,10 +3854,15 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in egrep + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP @@ -3129,13 +3871,13 @@ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" + printf "%s\n" 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3164,16 +3906,17 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +printf %s "checking for fgrep... " >&6; } +if test ${ac_cv_path_FGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 then ac_cv_path_FGREP="$GREP -F" else @@ -3184,10 +3927,15 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in fgrep + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP @@ -3196,13 +3944,13 @@ ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" + printf "%s\n" 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3231,8 +3979,8 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +printf "%s\n" "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -3274,19 +4022,21 @@ # These messages only goes to the config.log file. -{ $as_echo "$as_me:${as_lineno-$LINENO}: will now look for a sturdy POSIX shell, for our testsuite" >&5 -$as_echo "$as_me: will now look for a sturdy POSIX shell, for our testsuite" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: will now look for a sturdy POSIX shell, for our testsuite" >&5 +printf "%s\n" "$as_me: will now look for a sturdy POSIX shell, for our testsuite" >&6;} am_bourne_compatible="# Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else +else \$as_nop case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -3296,9 +4046,10 @@ fi " -if ${ac_cv_AM_TEST_RUNNER_SHELL+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${ac_cv_AM_TEST_RUNNER_SHELL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "$AM_TEST_RUNNER_SHELL"; then # Let the user override it. ac_cv_AM_TEST_RUNNER_SHELL=$AM_TEST_RUNNER_SHELL @@ -3310,11 +4061,12 @@ for am_sh in sh sh5 dash ash bash zsh ksh pdksh; do # Extract the first word of "$am_sh", so it can be a program name with args. set dummy $am_sh; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_am_candidate_sh+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_am_candidate_sh+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $am_candidate_sh in [\\/]* | ?:[\\/]*) ac_cv_path_am_candidate_sh="$am_candidate_sh" # Let the user override the test with a path. @@ -3324,11 +4076,15 @@ for as_dir in $am_PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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_path_am_candidate_sh="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_am_candidate_sh="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3340,11 +4096,11 @@ fi am_candidate_sh=$ac_cv_path_am_candidate_sh if test -n "$am_candidate_sh"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_candidate_sh" >&5 -$as_echo "$am_candidate_sh" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_candidate_sh" >&5 +printf "%s\n" "$am_candidate_sh" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3364,8 +4120,8 @@ while :; do - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_sh supports \$(cmd)" >&5 -$as_echo_n "checking whether $am_sh supports \$(cmd)... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_sh supports \$(cmd)" >&5 +printf %s "checking whether $am_sh supports \$(cmd)... " >&6; } if { $am_sh -c "$am_bourne_compatible test \"\$(echo x)\" = x test \$? -eq 0 || exit 1 @@ -3374,18 +4130,18 @@ # syntax errors. exit 77" >&5 2>&1; test $? -eq 77; } then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } am_score=1; break fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_sh supports \$((expr))" >&5 -$as_echo_n "checking whether $am_sh supports \$((expr))... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_sh supports \$((expr))" >&5 +printf %s "checking whether $am_sh supports \$((expr))... " >&6; } if { $am_sh -c "$am_bourne_compatible test \$((1 + 2 * 3)) = 7 test \$? -eq 0 || exit 1 @@ -3394,18 +4150,18 @@ # syntax errors. exit 77" >&5 2>&1; test $? -eq 77; } then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } am_score=1; break fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_sh supports \${#var}" >&5 -$as_echo_n "checking whether $am_sh supports \${#var}... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_sh supports \${#var}" >&5 +printf %s "checking whether $am_sh supports \${#var}... " >&6; } if { $am_sh -c "$am_bourne_compatible zero='' one='x' twelve=' foobar baz!' \\ && test \${#zero} -eq 0 \\ @@ -3417,18 +4173,18 @@ # syntax errors. exit 77" >&5 2>&1; test $? -eq 77; } then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } am_score=1; break fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_sh supports \${var#glob} and \${var%glob}" >&5 -$as_echo_n "checking whether $am_sh supports \${var#glob} and \${var%glob}... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_sh supports \${var#glob} and \${var%glob}" >&5 +printf %s "checking whether $am_sh supports \${var#glob} and \${var%glob}... " >&6; } if { $am_sh -c "$am_bourne_compatible v=a/b/c \\ && test \${v#*/} = b/c \\ @@ -3441,18 +4197,18 @@ # syntax errors. exit 77" >&5 2>&1; test $? -eq 77; } then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } am_score=1; break fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_sh preserves exit traps with \"set -e\"" >&5 -$as_echo_n "checking whether $am_sh preserves exit traps with \"set -e\"... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_sh preserves exit traps with \"set -e\"" >&5 +printf %s "checking whether $am_sh preserves exit traps with \"set -e\"... " >&6; } if { $am_sh -c "$am_bourne_compatible set -e; trap 'exit \$?' 0; (exit 77); exit 77 test \$? -eq 0 || exit 1 @@ -3461,18 +4217,18 @@ # syntax errors. exit 77" >&5 2>&1; test $? -eq 77; } then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } am_score=1; break fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_sh can define exit traps in a shell function" >&5 -$as_echo_n "checking whether $am_sh can define exit traps in a shell function... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_sh can define exit traps in a shell function" >&5 +printf %s "checking whether $am_sh can define exit traps in a shell function... " >&6; } if { $am_sh -c "$am_bourne_compatible fail=0 && foo() { trap 'fail=1' 0; } && foo && test \$fail = 0 test \$? -eq 0 || exit 1 @@ -3481,18 +4237,18 @@ # syntax errors. exit 77" >&5 2>&1; test $? -eq 77; } then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } am_score=1; break fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_sh corrupts stderr with \"set -x\"" >&5 -$as_echo_n "checking whether $am_sh corrupts stderr with \"set -x\"... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_sh corrupts stderr with \"set -x\"" >&5 +printf %s "checking whether $am_sh corrupts stderr with \"set -x\"... " >&6; } if { $am_sh -c "$am_bourne_compatible (set -x; P=1 true 2>&3) 3>&1 2>/dev/null | grep P=1 test \$? -eq 0 || exit 1 @@ -3501,20 +4257,20 @@ # syntax errors. exit 77" >&5 2>&1; test $? -eq 77; } then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } am_score=9 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi echo 'return 34' > conftest-return.sh echo 'ok=no' >> conftest-return.sh - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_sh can return early from \"dot-sourced\" files" >&5 -$as_echo_n "checking whether $am_sh can return early from \"dot-sourced\" files... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_sh can return early from \"dot-sourced\" files" >&5 +printf %s "checking whether $am_sh can return early from \"dot-sourced\" files... " >&6; } if { $am_sh -c "$am_bourne_compatible ok=yes; . ./conftest-return.sh; test \$? -eq 34 && test \$ok = yes test \$? -eq 0 || exit 1 @@ -3523,20 +4279,20 @@ # syntax errors. exit 77" >&5 2>&1; test $? -eq 77; } then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } rm -f conftest-return.sh else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } rm -f conftest-return.sh; am_score=1; break fi echo 'alias false=echo' > conftest-alias.sh echo 'false && test "$(false 97)" = 97' >> conftest-alias.sh - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_sh supports alias named like shell builtins" >&5 -$as_echo_n "checking whether $am_sh supports alias named like shell builtins... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_sh supports alias named like shell builtins" >&5 +printf %s "checking whether $am_sh supports alias named like shell builtins... " >&6; } if { $am_sh -c "$am_bourne_compatible . ./conftest-alias.sh test \$? -eq 0 || exit 1 @@ -3545,18 +4301,18 @@ # syntax errors. exit 77" >&5 2>&1; test $? -eq 77; } then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } rm -f conftest-alias.sh else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } rm -f conftest-alias.sh; am_score=1; break fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_sh supports \"test -e\"" >&5 -$as_echo_n "checking whether $am_sh supports \"test -e\"... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_sh supports \"test -e\"" >&5 +printf %s "checking whether $am_sh supports \"test -e\"... " >&6; } if { $am_sh -c "$am_bourne_compatible test -e config.log && test -e . && test ! -e nonesuch test \$? -eq 0 || exit 1 @@ -3565,12 +4321,12 @@ # syntax errors. exit 77" >&5 2>&1; test $? -eq 77; } then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } am_score=1; break fi @@ -3579,12 +4335,12 @@ if test $am_score -eq 9; then # The shell is barely acceptable for our needs. We might # still find one that is even better, so continue looking. - { $as_echo "$as_me:${as_lineno-$LINENO}: shell $am_sh is acceptable, but we might do better" >&5 -$as_echo "$as_me: shell $am_sh is acceptable, but we might do better" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: shell $am_sh is acceptable, but we might do better" >&5 +printf "%s\n" "$as_me: shell $am_sh is acceptable, but we might do better" >&6;} ac_cv_AM_TEST_RUNNER_SHELL=$am_sh elif test $am_score -eq 10; then - { $as_echo "$as_me:${as_lineno-$LINENO}: shell $am_sh is good enough, stop looking" >&5 -$as_echo "$as_me: shell $am_sh is good enough, stop looking" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: shell $am_sh is good enough, stop looking" >&5 +printf "%s\n" "$as_me: shell $am_sh is good enough, stop looking" >&6;} ac_cv_AM_TEST_RUNNER_SHELL=$am_sh break fi @@ -3595,13 +4351,13 @@ if test $AM_TEST_RUNNER_SHELL = no; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { 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 $? "no POSIX shell found that is good enough to be used in our testsuite See \`config.log' for more details" "$LINENO" 5; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: will use $AM_TEST_RUNNER_SHELL as the testsuite shell" >&5 -$as_echo "$as_me: will use $AM_TEST_RUNNER_SHELL as the testsuite shell" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: will use $AM_TEST_RUNNER_SHELL as the testsuite shell" >&5 +printf "%s\n" "$as_me: will use $AM_TEST_RUNNER_SHELL as the testsuite shell" >&6;} fi @@ -3624,13 +4380,22 @@ # deliberate; for more discussion and rationale, see: # -{ $as_echo "$as_me:${as_lineno-$LINENO}: will now look for generic compilers" >&5 -$as_echo "$as_me: will now look for generic compilers" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: will now look for generic compilers" >&5 +printf "%s\n" "$as_me: will now look for generic compilers" >&6;} # C compiler. + + + + + + + + + am__failed=no while :; do ac_ext=c @@ -3643,11 +4408,12 @@ 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -3655,11 +4421,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3670,11 +4440,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3687,11 +4457,12 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -3699,11 +4470,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3714,11 +4489,11 @@ fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3730,8 +4505,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ 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 CC=$ac_ct_CC @@ -3740,24 +4515,24 @@ test -z "$CC" && { - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no acceptable C compiler found in \$PATH" >&5 -$as_echo "$as_me: WARNING: no acceptable C compiler found in \$PATH" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no acceptable C compiler found in \$PATH" >&5 +printf "%s\n" "$as_me: WARNING: no acceptable C compiler found in \$PATH" >&2;} am__failed=yes break } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3767,7 +4542,7 @@ cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -3775,7 +4550,7 @@ /* end confdefs.h. */ int -main () +main (void) { ; @@ -3787,9 +4562,9 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -3810,11 +4585,12 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -3831,7 +4607,7 @@ # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3847,46 +4623,48 @@ done test "$ac_cv_exeext" = no && ac_cv_exeext= -else +else $as_nop ac_file='' fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C compiler cannot create executables" >&5 -$as_echo "$as_me: WARNING: C compiler cannot create executables" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: C compiler cannot create executables" >&5 +printf "%s\n" "$as_me: WARNING: C compiler cannot create executables" >&2;} am__failed=yes break } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3900,17 +4678,17 @@ * ) break;; esac done -else +else $as_nop { - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of executables: cannot compile and link" >&5 -$as_echo "$as_me: WARNING: cannot compute suffix of executables: cannot compile and link" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of executables: cannot compile and link" >&5 +printf "%s\n" "$as_me: WARNING: cannot compute suffix of executables: cannot compile and link" >&2;} am__failed=yes break } fi rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -3919,7 +4697,7 @@ /* end confdefs.h. */ #include int -main () +main (void) { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -3931,8 +4709,8 @@ ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -3940,10 +4718,10 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -3951,10 +4729,10 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else @@ -3962,9 +4740,9 @@ cross_compiling=yes else { - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot run C compiled programs. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 -$as_echo "$as_me: WARNING: cannot run C compiled programs. +printf "%s\n" "$as_me: WARNING: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} am__failed=yes break @@ -3972,21 +4750,22 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -4000,11 +4779,12 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -4013,33 +4793,34 @@ break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of object files: cannot compile" >&5 -$as_echo "$as_me: WARNING: cannot compute suffix of object files: cannot compile" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of object files: cannot compile" >&5 +printf "%s\n" "$as_me: WARNING: cannot compute suffix of object files: cannot compile" >&2;} am__failed=yes break } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -4049,29 +4830,33 @@ return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -4080,57 +4865,60 @@ /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else +else $as_nop CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -4145,94 +4933,144 @@ CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi fi ac_ext=c @@ -4241,21 +5079,23 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=c + + 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 -$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } -if ${am_cv_prog_cc_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +printf %s "checking whether $CC understands -c and -o together... " >&6; } +if test ${am_cv_prog_cc_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -4283,8 +5123,8 @@ rm -f core conftest* unset am_i fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 -$as_echo "$am_cv_prog_cc_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +printf "%s\n" "$am_cv_prog_cc_c_o" >&6; } if test "$am_cv_prog_cc_c_o" != yes; then # Losing compiler, so override with the script. # FIXME: It is wrong to rewrite CC. @@ -4302,9 +5142,10 @@ break done - if test $am__failed = yes; then : - CC=false; { $as_echo "$as_me:${as_lineno-$LINENO}: tests requiring the C compiler will be skipped" >&5 -$as_echo "$as_me: tests requiring the C compiler will be skipped" >&6;} + if test $am__failed = yes +then : + CC=false; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: tests requiring the C compiler will be skipped" >&5 +printf "%s\n" "$as_me: tests requiring the C compiler will be skipped" >&6;} fi # We have to clear these cache variables, so that future checks on # compilers for different languages won't be confused. @@ -4319,9 +5160,10 @@ -if test x"$GCC" = x"yes"; then : +if test x"$GCC" = x"yes" +then : am_CC_is_GNU=yes -else +else $as_nop am_CC_is_GNU=no fi @@ -4345,6 +5187,12 @@ + + + + + + am__failed=no while :; do ac_ext=cpp @@ -4361,11 +5209,12 @@ 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. else @@ -4373,11 +5222,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4388,11 +5241,11 @@ fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 +printf "%s\n" "$CXX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4405,11 +5258,12 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. else @@ -4417,11 +5271,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4432,11 +5290,11 @@ fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 +printf "%s\n" "$ac_ct_CXX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4448,8 +5306,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ 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 CXX=$ac_ct_CXX @@ -4459,7 +5317,7 @@ fi fi # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -4469,7 +5327,7 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -4479,7 +5337,7 @@ cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -4487,7 +5345,7 @@ /* end confdefs.h. */ int -main () +main (void) { ; @@ -4499,9 +5357,9 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5 -$as_echo_n "checking whether the C++ compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5 +printf %s "checking whether the C++ compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -4522,11 +5380,12 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -4543,7 +5402,7 @@ # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -4559,46 +5418,48 @@ done test "$ac_cv_exeext" = no && ac_cv_exeext= -else +else $as_nop ac_file='' fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C++ compiler cannot create executables" >&5 -$as_echo "$as_me: WARNING: C++ compiler cannot create executables" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: C++ compiler cannot create executables" >&5 +printf "%s\n" "$as_me: WARNING: C++ compiler cannot create executables" >&2;} am__failed=yes break } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5 -$as_echo_n "checking for C++ compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler default output file name" >&5 +printf %s "checking for C++ compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -4612,17 +5473,17 @@ * ) break;; esac done -else +else $as_nop { - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of executables: cannot compile and link" >&5 -$as_echo "$as_me: WARNING: cannot compute suffix of executables: cannot compile and link" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of executables: cannot compile and link" >&5 +printf "%s\n" "$as_me: WARNING: cannot compute suffix of executables: cannot compile and link" >&2;} am__failed=yes break } fi rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -4631,7 +5492,7 @@ /* end confdefs.h. */ #include int -main () +main (void) { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -4643,8 +5504,8 @@ ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -4652,10 +5513,10 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -4663,10 +5524,10 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else @@ -4674,9 +5535,9 @@ cross_compiling=yes else { - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot run C++ compiled programs. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot run C++ compiled programs. If you meant to cross compile, use \`--host'." >&5 -$as_echo "$as_me: WARNING: cannot run C++ compiled programs. +printf "%s\n" "$as_me: WARNING: cannot run C++ compiled programs. If you meant to cross compile, use \`--host'." >&2;} am__failed=yes break @@ -4684,21 +5545,22 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -4712,11 +5574,12 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -4725,33 +5588,34 @@ break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of object files: cannot compile" >&5 -$as_echo "$as_me: WARNING: cannot compute suffix of object files: cannot compile" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of object files: cannot compile" >&5 +printf "%s\n" "$as_me: WARNING: cannot compute suffix of object files: cannot compile" >&2;} am__failed=yes break } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if ${ac_cv_cxx_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5 +printf %s "checking whether the compiler supports GNU C++... " >&6; } +if test ${ac_cv_cxx_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -4761,29 +5625,33 @@ return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + if test $ac_compiler_gnu = yes; then GXX=yes else GXX= fi -ac_test_CXXFLAGS=${CXXFLAGS+set} +ac_test_CXXFLAGS=${CXXFLAGS+y} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if ${ac_cv_prog_cxx_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 +printf %s "checking whether $CXX accepts -g... " >&6; } +if test ${ac_cv_prog_cxx_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes ac_cv_prog_cxx_g=no @@ -4792,57 +5660,60 @@ /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_cv_prog_cxx_g=yes -else +else $as_nop CXXFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : -else +else $as_nop ac_cxx_werror_flag=$ac_save_cxx_werror_flag CXXFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_compile "$LINENO" +then : ac_cv_prog_cxx_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 +printf "%s\n" "$ac_cv_prog_cxx_g" >&6; } +if test $ac_test_CXXFLAGS; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then if test "$GXX" = yes; then @@ -4857,6 +5728,100 @@ CXXFLAGS= fi fi +ac_prog_cxx_stdcxx=no +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5 +printf %s "checking for $CXX option to enable C++11 features... " >&6; } +if test ${ac_cv_prog_cxx_11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cxx_11=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx11_program +_ACEOF +for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx11" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +fi + +if test "x$ac_cv_prog_cxx_cxx11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx11" +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11 + ac_prog_cxx_stdcxx=cxx11 +fi +fi +if test x$ac_prog_cxx_stdcxx = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5 +printf %s "checking for $CXX option to enable C++98 features... " >&6; } +if test ${ac_cv_prog_cxx_98+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cxx_98=no +ac_save_CXX=$CXX +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_cxx_conftest_cxx98_program +_ACEOF +for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA +do + CXX="$ac_save_CXX $ac_arg" + if ac_fn_cxx_try_compile "$LINENO" +then : + ac_cv_prog_cxx_cxx98=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cxx_cxx98" != "xno" && break +done +rm -f conftest.$ac_ext +CXX=$ac_save_CXX +fi + +if test "x$ac_cv_prog_cxx_cxx98" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cxx_cxx98" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5 +printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; } + CXX="$CXX $ac_cv_prog_cxx_cxx98" +fi + ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98 + ac_prog_cxx_stdcxx=cxx98 +fi +fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4865,9 +5830,10 @@ break done - if test $am__failed = yes; then : - CXX=false; { $as_echo "$as_me:${as_lineno-$LINENO}: tests requiring the C++ compiler will be skipped" >&5 -$as_echo "$as_me: tests requiring the C++ compiler will be skipped" >&6;} + if test $am__failed = yes +then : + CXX=false; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: tests requiring the C++ compiler will be skipped" >&5 +printf "%s\n" "$as_me: tests requiring the C++ compiler will be skipped" >&6;} fi # We have to clear these cache variables, so that future checks on # compilers for different languages won't be confused. @@ -4882,9 +5848,10 @@ -if test x"$GXX" = x"yes"; then : +if test x"$GXX" = x"yes" +then : am_CXX_is_GNU=yes -else +else $as_nop am_CXX_is_GNU=no fi @@ -4903,15 +5870,16 @@ ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_fc_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 pgf90 pghpf epcf90 g95 gfortran + for ac_prog in xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 armflang flang pgf90 pghpf epcf90 g95 gfortran 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_FC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_FC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$FC"; then ac_cv_prog_FC="$FC" # Let the user override the test. else @@ -4919,11 +5887,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_FC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4934,11 +5906,11 @@ fi FC=$ac_cv_prog_FC if test -n "$FC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FC" >&5 -$as_echo "$FC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FC" >&5 +printf "%s\n" "$FC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4947,15 +5919,16 @@ fi if test -z "$FC"; then ac_ct_FC=$FC - for ac_prog in xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 pgf90 pghpf epcf90 g95 gfortran + for ac_prog in xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor xlf90 f90 armflang flang pgf90 pghpf epcf90 g95 gfortran do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_FC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_FC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_FC"; then ac_cv_prog_ac_ct_FC="$ac_ct_FC" # Let the user override the test. else @@ -4963,11 +5936,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_FC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4978,11 +5955,11 @@ fi ac_ct_FC=$ac_cv_prog_ac_ct_FC if test -n "$ac_ct_FC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FC" >&5 -$as_echo "$ac_ct_FC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FC" >&5 +printf "%s\n" "$ac_ct_FC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4994,8 +5971,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ 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 FC=$ac_ct_FC @@ -5004,7 +5981,7 @@ # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -5014,7 +5991,7 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -5024,7 +6001,7 @@ cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done rm -f a.out @@ -5039,9 +6016,9 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Fortran compiler works" >&5 -$as_echo_n "checking whether the Fortran compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the Fortran compiler works" >&5 +printf %s "checking whether the Fortran compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -5062,11 +6039,12 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -5083,7 +6061,7 @@ # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -5099,46 +6077,48 @@ done test "$ac_cv_exeext" = no && ac_cv_exeext= -else +else $as_nop ac_file='' fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Fortran compiler cannot create executables" >&5 -$as_echo "$as_me: WARNING: Fortran compiler cannot create executables" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Fortran compiler cannot create executables" >&5 +printf "%s\n" "$as_me: WARNING: Fortran compiler cannot create executables" >&2;} am__failed=yes break } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran compiler default output file name" >&5 -$as_echo_n "checking for Fortran compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran compiler default output file name" >&5 +printf %s "checking for Fortran compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -5152,17 +6132,17 @@ * ) break;; esac done -else +else $as_nop { - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of executables: cannot compile and link" >&5 -$as_echo "$as_me: WARNING: cannot compute suffix of executables: cannot compile and link" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of executables: cannot compile and link" >&5 +printf "%s\n" "$as_me: WARNING: cannot compute suffix of executables: cannot compile and link" >&2;} am__failed=yes break } fi rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -5177,8 +6157,8 @@ ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -5186,10 +6166,10 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -5197,10 +6177,10 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else @@ -5208,9 +6188,9 @@ cross_compiling=yes else { - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot run Fortran compiled programs. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot run Fortran compiled programs. If you meant to cross compile, use \`--host'." >&5 -$as_echo "$as_me: WARNING: cannot run Fortran compiled programs. +printf "%s\n" "$as_me: WARNING: cannot run Fortran compiled programs. If you meant to cross compile, use \`--host'." >&2;} am__failed=yes break @@ -5218,16 +6198,17 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat > conftest.$ac_ext <<_ACEOF program main @@ -5240,11 +6221,12 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -5253,32 +6235,33 @@ break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of object files: cannot compile" >&5 -$as_echo "$as_me: WARNING: cannot compute suffix of object files: cannot compile" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of object files: cannot compile" >&5 +printf "%s\n" "$as_me: WARNING: cannot compute suffix of object files: cannot compile" >&2;} am__failed=yes break } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT # If we don't use `.F' as extension, the preprocessor is not run on the # input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran compiler" >&5 -$as_echo_n "checking whether we are using the GNU Fortran compiler... " >&6; } -if ${ac_cv_fc_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU Fortran" >&5 +printf %s "checking whether the compiler supports GNU Fortran... " >&6; } +if test ${ac_cv_fc_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat > conftest.$ac_ext <<_ACEOF program main #ifndef __GNUC__ @@ -5287,43 +6270,48 @@ end _ACEOF -if ac_fn_fc_try_compile "$LINENO"; then : +if ac_fn_fc_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_fc_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_compiler_gnu" >&5 -$as_echo "$ac_cv_fc_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_fc_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_fc_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_fc_compiler_gnu + ac_ext=$ac_save_ext -ac_test_FCFLAGS=${FCFLAGS+set} +ac_test_FCFLAGS=${FCFLAGS+y} ac_save_FCFLAGS=$FCFLAGS FCFLAGS= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $FC accepts -g" >&5 -$as_echo_n "checking whether $FC accepts -g... " >&6; } -if ${ac_cv_prog_fc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $FC accepts -g" >&5 +printf %s "checking whether $FC accepts -g... " >&6; } +if test ${ac_cv_prog_fc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop FCFLAGS=-g cat > conftest.$ac_ext <<_ACEOF program main end _ACEOF -if ac_fn_fc_try_compile "$LINENO"; then : +if ac_fn_fc_try_compile "$LINENO" +then : ac_cv_prog_fc_g=yes -else +else $as_nop ac_cv_prog_fc_g=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_g" >&5 -$as_echo "$ac_cv_prog_fc_g" >&6; } -if test "$ac_test_FCFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_fc_g" >&5 +printf "%s\n" "$ac_cv_prog_fc_g" >&6; } +if test $ac_test_FCFLAGS; then FCFLAGS=$ac_save_FCFLAGS elif test $ac_cv_prog_fc_g = yes; then if test "x$ac_cv_fc_compiler_gnu" = xyes; then @@ -5352,9 +6340,10 @@ break done - if test $am__failed = yes; then : - FC=false; { $as_echo "$as_me:${as_lineno-$LINENO}: tests requiring the Fortran compiler will be skipped" >&5 -$as_echo "$as_me: tests requiring the Fortran compiler will be skipped" >&6;} + if test $am__failed = yes +then : + FC=false; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: tests requiring the Fortran compiler will be skipped" >&5 +printf "%s\n" "$as_me: tests requiring the Fortran compiler will be skipped" >&6;} fi # We have to clear these cache variables, so that future checks on # compilers for different languages won't be confused. @@ -5369,9 +6358,10 @@ -if test x"$GFC" = x"yes"; then : +if test x"$GFC" = x"yes" +then : am_FC_is_GNU=yes -else +else $as_nop am_FC_is_GNU=no fi @@ -5385,15 +6375,16 @@ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_f77_compiler_gnu if test -n "$ac_tool_prefix"; then - for ac_prog in xlf f77 frt pgf77 cf77 fort77 fl32 af77 g77 gfortran + for ac_prog in xlf f77 frt pgf77 cf77 fort77 fl32 af77 g77 armflang flang gfortran 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_F77+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_F77+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$F77"; then ac_cv_prog_F77="$F77" # Let the user override the test. else @@ -5401,11 +6392,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5416,11 +6411,11 @@ fi F77=$ac_cv_prog_F77 if test -n "$F77"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $F77" >&5 -$as_echo "$F77" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $F77" >&5 +printf "%s\n" "$F77" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5429,15 +6424,16 @@ fi if test -z "$F77"; then ac_ct_F77=$F77 - for ac_prog in xlf f77 frt pgf77 cf77 fort77 fl32 af77 g77 gfortran + for ac_prog in xlf f77 frt pgf77 cf77 fort77 fl32 af77 g77 armflang flang gfortran do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_F77+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_F77+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_F77"; then ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. else @@ -5445,11 +6441,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_F77="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5460,11 +6460,11 @@ fi ac_ct_F77=$ac_cv_prog_ac_ct_F77 if test -n "$ac_ct_F77"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5 -$as_echo "$ac_ct_F77" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_F77" >&5 +printf "%s\n" "$ac_ct_F77" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5476,8 +6476,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ 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 F77=$ac_ct_F77 @@ -5486,7 +6486,7 @@ # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler version" >&5 set X $ac_compile ac_compiler=$2 for ac_option in --version -v -V -qversion; do @@ -5496,7 +6496,7 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -5506,7 +6506,7 @@ cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done rm -f a.out @@ -5521,9 +6521,9 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the Fortran 77 compiler works" >&5 -$as_echo_n "checking whether the Fortran 77 compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the Fortran 77 compiler works" >&5 +printf %s "checking whether the Fortran 77 compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -5544,11 +6544,12 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -5565,7 +6566,7 @@ # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -5581,46 +6582,48 @@ done test "$ac_cv_exeext" = no && ac_cv_exeext= -else +else $as_nop ac_file='' fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Fortran 77 compiler cannot create executables" >&5 -$as_echo "$as_me: WARNING: Fortran 77 compiler cannot create executables" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Fortran 77 compiler cannot create executables" >&5 +printf "%s\n" "$as_me: WARNING: Fortran 77 compiler cannot create executables" >&2;} am__failed=yes break } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler default output file name" >&5 -$as_echo_n "checking for Fortran 77 compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Fortran 77 compiler default output file name" >&5 +printf %s "checking for Fortran 77 compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -5634,17 +6637,17 @@ * ) break;; esac done -else +else $as_nop { - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of executables: cannot compile and link" >&5 -$as_echo "$as_me: WARNING: cannot compute suffix of executables: cannot compile and link" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of executables: cannot compile and link" >&5 +printf "%s\n" "$as_me: WARNING: cannot compute suffix of executables: cannot compile and link" >&2;} am__failed=yes break } fi rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -5659,8 +6662,8 @@ ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -5668,10 +6671,10 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -5679,10 +6682,10 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else @@ -5690,9 +6693,9 @@ cross_compiling=yes else { - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot run Fortran 77 compiled programs. + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot run Fortran 77 compiled programs. If you meant to cross compile, use \`--host'." >&5 -$as_echo "$as_me: WARNING: cannot run Fortran 77 compiled programs. +printf "%s\n" "$as_me: WARNING: cannot run Fortran 77 compiled programs. If you meant to cross compile, use \`--host'." >&2;} am__failed=yes break @@ -5700,16 +6703,17 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat > conftest.$ac_ext <<_ACEOF program main @@ -5722,11 +6726,12 @@ *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -5735,32 +6740,33 @@ break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of object files: cannot compile" >&5 -$as_echo "$as_me: WARNING: cannot compute suffix of object files: cannot compile" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot compute suffix of object files: cannot compile" >&5 +printf "%s\n" "$as_me: WARNING: cannot compute suffix of object files: cannot compile" >&2;} am__failed=yes break } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT # If we don't use `.F' as extension, the preprocessor is not run on the # input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Fortran 77 compiler" >&5 -$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } -if ${ac_cv_f77_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU Fortran 77" >&5 +printf %s "checking whether the compiler supports GNU Fortran 77... " >&6; } +if test ${ac_cv_f77_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat > conftest.$ac_ext <<_ACEOF program main #ifndef __GNUC__ @@ -5769,43 +6775,48 @@ end _ACEOF -if ac_fn_f77_try_compile "$LINENO"; then : +if ac_fn_f77_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5 -$as_echo "$ac_cv_f77_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_f77_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_f77_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_f77_compiler_gnu + ac_ext=$ac_save_ext -ac_test_FFLAGS=${FFLAGS+set} +ac_test_FFLAGS=${FFLAGS+y} ac_save_FFLAGS=$FFLAGS FFLAGS= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5 -$as_echo_n "checking whether $F77 accepts -g... " >&6; } -if ${ac_cv_prog_f77_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $F77 accepts -g" >&5 +printf %s "checking whether $F77 accepts -g... " >&6; } +if test ${ac_cv_prog_f77_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop FFLAGS=-g cat > conftest.$ac_ext <<_ACEOF program main end _ACEOF -if ac_fn_f77_try_compile "$LINENO"; then : +if ac_fn_f77_try_compile "$LINENO" +then : ac_cv_prog_f77_g=yes -else +else $as_nop ac_cv_prog_f77_g=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5 -$as_echo "$ac_cv_prog_f77_g" >&6; } -if test "$ac_test_FFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_f77_g" >&5 +printf "%s\n" "$ac_cv_prog_f77_g" >&6; } +if test $ac_test_FFLAGS; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then if test "x$ac_cv_f77_compiler_gnu" = xyes; then @@ -5834,9 +6845,10 @@ break done - if test $am__failed = yes; then : - F77=false; { $as_echo "$as_me:${as_lineno-$LINENO}: tests requiring the Fortran 77 compiler will be skipped" >&5 -$as_echo "$as_me: tests requiring the Fortran 77 compiler will be skipped" >&6;} + if test $am__failed = yes +then : + F77=false; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: tests requiring the Fortran 77 compiler will be skipped" >&5 +printf "%s\n" "$as_me: tests requiring the Fortran 77 compiler will be skipped" >&6;} fi # We have to clear these cache variables, so that future checks on # compilers for different languages won't be confused. @@ -5851,9 +6863,10 @@ -if test x"$G77" = x"yes"; then : +if test x"$G77" = x"yes" +then : am_F77_is_GNU=yes -else +else $as_nop am_F77_is_GNU=no fi @@ -5867,15 +6880,15 @@ # they won't be compatible. So we allow the user to define variants of # these variables for the GNU compilers separately. -{ $as_echo "$as_me:${as_lineno-$LINENO}: will now look for GNU compilers" >&5 -$as_echo "$as_me: will now look for GNU compilers" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: will now look for GNU compilers" >&5 +printf "%s\n" "$as_me: will now look for GNU compilers" >&6;} # GNU C compiler. if test $am_CC_is_GNU = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $CC is already a GNU C compiler" >&5 -$as_echo "$as_me: $CC is already a GNU C compiler" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $CC is already a GNU C compiler" >&5 +printf "%s\n" "$as_me: $CC is already a GNU C compiler" >&6;} GNU_CC=$CC GNU_CFLAGS=${GNU_CFLAGS-$CFLAGS} else if test -n "$ac_tool_prefix"; then @@ -5883,11 +6896,12 @@ 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_GNU_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_GNU_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$GNU_CC"; then ac_cv_prog_GNU_CC="$GNU_CC" # Let the user override the test. else @@ -5895,11 +6909,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_GNU_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5910,11 +6928,11 @@ fi GNU_CC=$ac_cv_prog_GNU_CC if test -n "$GNU_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNU_CC" >&5 -$as_echo "$GNU_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNU_CC" >&5 +printf "%s\n" "$GNU_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5927,11 +6945,12 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_GNU_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_GNU_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_GNU_CC"; then ac_cv_prog_ac_ct_GNU_CC="$ac_ct_GNU_CC" # Let the user override the test. else @@ -5939,11 +6958,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_GNU_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5954,11 +6977,11 @@ fi ac_ct_GNU_CC=$ac_cv_prog_ac_ct_GNU_CC if test -n "$ac_ct_GNU_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GNU_CC" >&5 -$as_echo "$ac_ct_GNU_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GNU_CC" >&5 +printf "%s\n" "$ac_ct_GNU_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5970,8 +6993,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ 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 GNU_CC=$ac_ct_GNU_CC @@ -5984,13 +7007,14 @@ ($GNU_CC --version && $GNU_CC -v) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then : + (exit $ac_status); } +then : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: botched installation for GNU C compiler" >&5 -$as_echo "$as_me: WARNING: botched installation for GNU C compiler" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: tests requiring the GNU C compiler will be skipped" >&5 -$as_echo "$as_me: tests requiring the GNU C compiler will be skipped" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: botched installation for GNU C compiler" >&5 +printf "%s\n" "$as_me: WARNING: botched installation for GNU C compiler" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: tests requiring the GNU C compiler will be skipped" >&5 +printf "%s\n" "$as_me: tests requiring the GNU C compiler will be skipped" >&6;} fi fi @@ -5998,8 +7022,8 @@ if test $am_CXX_is_GNU = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $CXX is already a GNU C++ compiler" >&5 -$as_echo "$as_me: $CXX is already a GNU C++ compiler" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $CXX is already a GNU C++ compiler" >&5 +printf "%s\n" "$as_me: $CXX is already a GNU C++ compiler" >&6;} GNU_CXX=$CXX GNU_CXXFLAGS=${GNU_CXXFLAGS-$CXXFLAGS} else @@ -6008,11 +7032,12 @@ 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_GNU_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_GNU_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$GNU_CXX"; then ac_cv_prog_GNU_CXX="$GNU_CXX" # Let the user override the test. else @@ -6020,11 +7045,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_GNU_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6035,11 +7064,11 @@ fi GNU_CXX=$ac_cv_prog_GNU_CXX if test -n "$GNU_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNU_CXX" >&5 -$as_echo "$GNU_CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNU_CXX" >&5 +printf "%s\n" "$GNU_CXX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6052,11 +7081,12 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_GNU_CXX+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_GNU_CXX+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_GNU_CXX"; then ac_cv_prog_ac_ct_GNU_CXX="$ac_ct_GNU_CXX" # Let the user override the test. else @@ -6064,11 +7094,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_GNU_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6079,11 +7113,11 @@ fi ac_ct_GNU_CXX=$ac_cv_prog_ac_ct_GNU_CXX if test -n "$ac_ct_GNU_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GNU_CXX" >&5 -$as_echo "$ac_ct_GNU_CXX" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GNU_CXX" >&5 +printf "%s\n" "$ac_ct_GNU_CXX" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6095,8 +7129,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ 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 GNU_CXX=$ac_ct_GNU_CXX @@ -6109,13 +7143,14 @@ ($GNU_CXX --version && $GNU_CXX -v) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then : + (exit $ac_status); } +then : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: botched installation for GNU C++ compiler" >&5 -$as_echo "$as_me: WARNING: botched installation for GNU C++ compiler" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: tests requiring the GNU C++ compiler will be skipped" >&5 -$as_echo "$as_me: tests requiring the GNU C++ compiler will be skipped" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: botched installation for GNU C++ compiler" >&5 +printf "%s\n" "$as_me: WARNING: botched installation for GNU C++ compiler" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: tests requiring the GNU C++ compiler will be skipped" >&5 +printf "%s\n" "$as_me: tests requiring the GNU C++ compiler will be skipped" >&6;} fi fi @@ -6123,8 +7158,8 @@ if test $am_FC_is_GNU = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $FC is already a GNU Fortran compiler" >&5 -$as_echo "$as_me: $FC is already a GNU Fortran compiler" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $FC is already a GNU Fortran compiler" >&5 +printf "%s\n" "$as_me: $FC is already a GNU Fortran compiler" >&6;} GNU_FC=$FC GNU_FCFLAGS=${GNU_FCFLAGS-$FCFLAGS} else @@ -6133,11 +7168,12 @@ 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_GNU_FC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_GNU_FC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$GNU_FC"; then ac_cv_prog_GNU_FC="$GNU_FC" # Let the user override the test. else @@ -6145,11 +7181,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_GNU_FC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6160,11 +7200,11 @@ fi GNU_FC=$ac_cv_prog_GNU_FC if test -n "$GNU_FC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNU_FC" >&5 -$as_echo "$GNU_FC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNU_FC" >&5 +printf "%s\n" "$GNU_FC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6177,11 +7217,12 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_GNU_FC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_GNU_FC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_GNU_FC"; then ac_cv_prog_ac_ct_GNU_FC="$ac_ct_GNU_FC" # Let the user override the test. else @@ -6189,11 +7230,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_GNU_FC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6204,11 +7249,11 @@ fi ac_ct_GNU_FC=$ac_cv_prog_ac_ct_GNU_FC if test -n "$ac_ct_GNU_FC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GNU_FC" >&5 -$as_echo "$ac_ct_GNU_FC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GNU_FC" >&5 +printf "%s\n" "$ac_ct_GNU_FC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6220,8 +7265,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ 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 GNU_FC=$ac_ct_GNU_FC @@ -6234,13 +7279,14 @@ ($GNU_FC --version && $GNU_FC -v) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then : + (exit $ac_status); } +then : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: botched installation for GNU Fortran compiler" >&5 -$as_echo "$as_me: WARNING: botched installation for GNU Fortran compiler" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: tests requiring the GNU Fortran compiler will be skipped" >&5 -$as_echo "$as_me: tests requiring the GNU Fortran compiler will be skipped" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: botched installation for GNU Fortran compiler" >&5 +printf "%s\n" "$as_me: WARNING: botched installation for GNU Fortran compiler" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: tests requiring the GNU Fortran compiler will be skipped" >&5 +printf "%s\n" "$as_me: tests requiring the GNU Fortran compiler will be skipped" >&6;} fi fi @@ -6248,8 +7294,8 @@ if test $am_F77_is_GNU = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $F77 is already a GNU Fortran 77 compiler" >&5 -$as_echo "$as_me: $F77 is already a GNU Fortran 77 compiler" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $F77 is already a GNU Fortran 77 compiler" >&5 +printf "%s\n" "$as_me: $F77 is already a GNU Fortran 77 compiler" >&6;} GNU_F77=$F77 GNU_FFLAGS=${GNU_FFLAGS-$FFLAGS} else @@ -6258,11 +7304,12 @@ 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_GNU_F77+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_GNU_F77+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$GNU_F77"; then ac_cv_prog_GNU_F77="$GNU_F77" # Let the user override the test. else @@ -6270,11 +7317,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_GNU_F77="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6285,11 +7336,11 @@ fi GNU_F77=$ac_cv_prog_GNU_F77 if test -n "$GNU_F77"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNU_F77" >&5 -$as_echo "$GNU_F77" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNU_F77" >&5 +printf "%s\n" "$GNU_F77" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6302,11 +7353,12 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_GNU_F77+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_GNU_F77+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_GNU_F77"; then ac_cv_prog_ac_ct_GNU_F77="$ac_ct_GNU_F77" # Let the user override the test. else @@ -6314,11 +7366,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_GNU_F77="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6329,11 +7385,11 @@ fi ac_ct_GNU_F77=$ac_cv_prog_ac_ct_GNU_F77 if test -n "$ac_ct_GNU_F77"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GNU_F77" >&5 -$as_echo "$ac_ct_GNU_F77" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GNU_F77" >&5 +printf "%s\n" "$ac_ct_GNU_F77" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6345,8 +7401,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ 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 GNU_F77=$ac_ct_GNU_F77 @@ -6359,13 +7415,14 @@ ($GNU_F77 --version && $GNU_F77 -v) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then : + (exit $ac_status); } +then : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: botched installation for GNU Fortran 77 compiler" >&5 -$as_echo "$as_me: WARNING: botched installation for GNU Fortran 77 compiler" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: tests requiring the GNU Fortran 77 compiler will be skipped" >&5 -$as_echo "$as_me: tests requiring the GNU Fortran 77 compiler will be skipped" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: botched installation for GNU Fortran 77 compiler" >&5 +printf "%s\n" "$as_me: WARNING: botched installation for GNU Fortran 77 compiler" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: tests requiring the GNU Fortran 77 compiler will be skipped" >&5 +printf "%s\n" "$as_me: tests requiring the GNU Fortran 77 compiler will be skipped" >&6;} fi fi @@ -6377,11 +7434,12 @@ 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 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_GNU_GCJ+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_GNU_GCJ+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$GNU_GCJ"; then ac_cv_prog_GNU_GCJ="$GNU_GCJ" # Let the user override the test. else @@ -6389,11 +7447,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_GNU_GCJ="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6404,11 +7466,11 @@ fi GNU_GCJ=$ac_cv_prog_GNU_GCJ if test -n "$GNU_GCJ"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNU_GCJ" >&5 -$as_echo "$GNU_GCJ" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GNU_GCJ" >&5 +printf "%s\n" "$GNU_GCJ" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6421,11 +7483,12 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_GNU_GCJ+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ 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_GNU_GCJ+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_GNU_GCJ"; then ac_cv_prog_ac_ct_GNU_GCJ="$ac_ct_GNU_GCJ" # Let the user override the test. else @@ -6433,11 +7496,15 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + 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 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_GNU_GCJ="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6448,11 +7515,11 @@ fi ac_ct_GNU_GCJ=$ac_cv_prog_ac_ct_GNU_GCJ if test -n "$ac_ct_GNU_GCJ"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GNU_GCJ" >&5 -$as_echo "$ac_ct_GNU_GCJ" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_GNU_GCJ" >&5 +printf "%s\n" "$ac_ct_GNU_GCJ" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6464,8 +7531,8 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ 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 GNU_GCJ=$ac_ct_GNU_GCJ @@ -6477,13 +7544,14 @@ ($GNU_GCJ --version && $GNU_GCJ -v) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then : + (exit $ac_status); } +then : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: botched installation for GNU Java compiler" >&5 -$as_echo "$as_me: WARNING: botched installation for GNU Java compiler" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: tests requiring the GNU Java compiler will be skipped" >&5 -$as_echo "$as_me: tests requiring the GNU Java compiler will be skipped" >&6;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: botched installation for GNU Java compiler" >&5 +printf "%s\n" "$as_me: WARNING: botched installation for GNU Java compiler" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: tests requiring the GNU Java compiler will be skipped" >&5 +printf "%s\n" "$as_me: tests requiring the GNU Java compiler will be skipped" >&6;} fi fi @@ -6533,8 +7601,8 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -6564,15 +7632,15 @@ /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -6586,8 +7654,8 @@ fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -6640,7 +7708,7 @@ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -6651,14 +7719,14 @@ LTLIBOBJS=$ac_ltlibobjs -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 -$as_echo_n "checking that generated files are newer than configure... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +printf %s "checking that generated files are newer than configure... " >&6; } if test -n "$am_sleep_pid"; then # Hide warnings about reused PIDs. wait $am_sleep_pid 2>/dev/null fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 -$as_echo "done" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 +printf "%s\n" "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -6672,8 +7740,8 @@ ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -6696,14 +7764,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -6713,46 +7783,46 @@ fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -6761,13 +7831,6 @@ fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -6776,8 +7839,12 @@ for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -6789,30 +7856,10 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -6825,13 +7872,14 @@ as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -6858,18 +7906,20 @@ { eval $1=; unset $1;} } as_unset=as_fn_unset + # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -6881,12 +7931,13 @@ # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -6917,7 +7968,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -6939,6 +7990,10 @@ as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -6952,6 +8007,12 @@ ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -6993,7 +8054,7 @@ as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -7002,7 +8063,7 @@ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -7064,8 +8125,8 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU Automake $as_me 1.16.1, which was -generated by GNU Autoconf 2.69. Invocation command line was +This file was extended by GNU Automake $as_me 1.16.5, which was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -7116,18 +8177,20 @@ $config_links Report bugs to . -GNU Automake home page: . -General help using GNU software: ." +GNU Automake home page: . +General help using GNU software: ." _ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -GNU Automake config.status 1.16.1 -configured by $0, generated by GNU Autoconf 2.69, +GNU Automake config.status 1.16.5 +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -7167,21 +8230,21 @@ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --he | --h | --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -7209,7 +8272,7 @@ if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -7223,7 +8286,7 @@ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF @@ -7250,8 +8313,8 @@ # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files + test ${CONFIG_LINKS+y} || CONFIG_LINKS=$config_links fi # Have a temporary directory for convenience. Make it in the build tree @@ -7479,7 +8542,7 @@ esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -7487,17 +8550,17 @@ # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -7514,7 +8577,7 @@ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -7538,9 +8601,9 @@ case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -7602,8 +8665,8 @@ case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -7647,9 +8710,9 @@ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -7673,8 +8736,8 @@ ac_source=$srcdir/$ac_source fi - { $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5 -$as_echo "$as_me: linking $ac_source to $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5 +printf "%s\n" "$as_me: linking $ac_source to $ac_file" >&6;} if test ! -r "$ac_source"; then as_fn_error $? "$ac_source: file not found" "$LINENO" 5 @@ -7732,8 +8795,8 @@ $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi @@ -7746,7 +8809,7 @@ am_stable_version_rx='[1-9]\.[0-9]+(\.[0-9]+)?' am_beta_version_rx="$am_stable_version_rx[bdfhjlnprtvxz]" -am_release_type=`$as_echo "$PACKAGE_VERSION" | LC_ALL=C awk " +am_release_type=`printf "%s\n" "$PACKAGE_VERSION" | LC_ALL=C awk " /^$am_stable_version_rx$/ { print \"stable\"; exit(0); } /^$am_beta_version_rx$/ { print \"beta version\"; exit(0); } { print \"development snapshot\"; }"` @@ -7762,3 +8825,4 @@ EOF as_fn_exit 0 + diff -Nru automake-1.16-1.16.1/configure.ac automake-1.16-1.16.5/configure.ac --- automake-1.16-1.16.1/configure.ac 2018-03-11 21:20:15.000000000 +0000 +++ automake-1.16-1.16.5/configure.ac 2021-10-04 03:06:47.000000000 +0000 @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. -# Copyright (C) 1995-2018 Free Software Foundation, Inc. +# Copyright (C) 1995-2021 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 @@ -16,7 +16,7 @@ # along with this program. If not, see . AC_PREREQ([2.69]) -AC_INIT([GNU Automake], [1.16.1], [bug-automake@gnu.org]) +AC_INIT([GNU Automake], [1.16.5], [bug-automake@gnu.org]) AC_CONFIG_SRCDIR([bin/automake.in]) AC_CONFIG_AUX_DIR([lib]) @@ -44,7 +44,7 @@ # Keep this on a line of its own, since it must be found and processed # by the 'update-copyright' rule in our Makefile. -RELEASE_YEAR=2018 +RELEASE_YEAR=2021 AC_SUBST([RELEASE_YEAR]) # The API version is the base version. We must guarantee @@ -123,7 +123,9 @@ AC_CACHE_CHECK([whether autoconf works], [am_cv_autoconf_works], [mkdir conftest -echo 'AC''_INIT' > conftest/conftest.ac +printf '%s\n' > conftest/conftest.ac \ + 'AC''_INIT([smoke-test], [1])' \ + 'AC''_OUTPUT' if AM_RUN_LOG([cd conftest && $am_AUTOCONF -o /dev/null conftest.ac]); then am_cv_autoconf_works=yes @@ -139,7 +141,10 @@ AC_CACHE_CHECK([whether autoconf is recent enough], [am_cv_autoconf_version], [mkdir conftest dnl Creative quoting required to avoid spurious expansion of AC_PREREQ macro -echo 'AC'"_PREREQ([[$required_autoconf_version]])" > conftest/conftest.ac +printf '%s\n' > conftest/conftest.ac \ + 'AC'"_PREREQ([[$required_autoconf_version]])" \ + 'AC''_INIT([smoke-test], [1])' \ + 'AC''_OUTPUT' if AM_RUN_LOG([cd conftest && $am_AUTOCONF -o /dev/null conftest.ac]); then am_cv_autoconf_version=yes @@ -463,13 +468,13 @@ _AM_COMPILER_CAN_FAIL([AC_PROG_FC(dnl [xlf95 f95 fort ifort ifc efc pgfortran pgf95 lf95 ftn nagfor] dnl - [xlf90 f90 pgf90 pghpf epcf90 g95 gfortran])], + [xlf90 f90 armflang flang pgf90 pghpf epcf90 g95 gfortran])], [FC=false; _AM_SKIP_COMP_TESTS([Fortran])]) AS_IF([test x"$GFC" = x"yes"], [am_FC_is_GNU=yes], [am_FC_is_GNU=no]) _AM_COMPILER_CAN_FAIL([AC_PROG_F77(dnl - [xlf f77 frt pgf77 cf77 fort77 fl32 af77 g77 gfortran])], + [xlf f77 frt pgf77 cf77 fort77 fl32 af77 g77 armflang flang gfortran])], [F77=false; _AM_SKIP_COMP_TESTS([Fortran 77])]) AS_IF([test x"$G77" = x"yes"], [am_F77_is_GNU=yes], [am_F77_is_GNU=no]) diff -Nru automake-1.16-1.16.1/contrib/check-html.am automake-1.16-1.16.5/contrib/check-html.am --- automake-1.16-1.16.1/contrib/check-html.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/contrib/check-html.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2001-2018 Free Software Foundation, Inc. +## Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/contrib/checklinkx automake-1.16-1.16.5/contrib/checklinkx --- automake-1.16-1.16.1/contrib/checklinkx 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/contrib/checklinkx 2021-10-04 02:51:12.000000000 +0000 @@ -0,0 +1,3380 @@ +#!/usr/local/bin/perl -wT +# +# W3C Link Checker +# by Hugo Haas +# (c) 1999-2011 World Wide Web Consortium +# based on Renaud Bruyeron's checklink.pl +# +# This program is licensed under the W3C(r) Software License: +# http://www.w3.org/Consortium/Legal/copyright-software +# +# The documentation is at: +# http://validator.w3.org/docs/checklink.html +# +# See the Mercurial interface at: +# http://dvcs.w3.org/hg/link-checker/ +# +# An online version is available at: +# http://validator.w3.org/checklink +# +# Comments and suggestions should be sent to the www-validator mailing list: +# www-validator@w3.org (with 'checklink' in the subject) +# http://lists.w3.org/Archives/Public/www-validator/ (archives) +# +# Small modifications in March 2020 by Karl Berry +# (contributed under the same license, or public domain if you prefer). +# I started from https://metacpan.org/release/W3C-LinkChecker, version 4.81. +# - (&simple_request) ignore "Argument isn't numeric" warnings. +# - (%Opts, &check_uri) new option --exclude-url-file; see --help message. +# - (&parse_arguments) allow multiple -X options. +# - (&check_uri) missing argument to hprintf. +# - (&hprintf) avoid useless warnings when undef is returned. +# The ideas are (1) to avoid rechecking every url during development, +# and (2) to make the exclude list easier to maintain, +# and (3) to eliminate useless warnings from the code, +# +# For GNU Automake, this program is used by the checklinkx target +# in doc/local.mk to check the (html output of) automake manual. + +use strict; +use 5.008; + +# Get rid of potentially unsafe and unneeded environment variables. +delete(@ENV{qw(IFS CDPATH ENV BASH_ENV)}); +$ENV{PATH} = undef; + +# ...but we want PERL5?LIB honored even in taint mode, see perlsec, perl5lib, +# http://www.mail-archive.com/cpan-testers-discuss%40perl.org/msg01064.html +use Config qw(%Config); +use lib map { /(.*)/ } + defined($ENV{PERL5LIB}) ? split(/$Config{path_sep}/, $ENV{PERL5LIB}) : + defined($ENV{PERLLIB}) ? split(/$Config{path_sep}/, $ENV{PERLLIB}) : + (); + +# ----------------------------------------------------------------------------- + +package W3C::UserAgent; + +use LWP::RobotUA 1.19 qw(); +use LWP::UserAgent qw(); +use Net::HTTP::Methods 5.833 qw(); # >= 5.833 for 4kB cookies (#6678) + +# if 0, ignore robots exclusion (useful for testing) +use constant USE_ROBOT_UA => 1; + +if (USE_ROBOT_UA) { + @W3C::UserAgent::ISA = qw(LWP::RobotUA); +} +else { + @W3C::UserAgent::ISA = qw(LWP::UserAgent); +} + +sub new +{ + my $proto = shift; + my $class = ref($proto) || $proto; + my ($name, $from, $rules) = @_; + + # For security/privacy reasons, if $from was not given, do not send it. + # Cheat by defining something for the constructor, and resetting it later. + my $from_ok = $from; + $from ||= 'www-validator@w3.org'; + + my $self; + if (USE_ROBOT_UA) { + $self = $class->SUPER::new($name, $from, $rules); + } + else { + my %cnf; + @cnf{qw(agent from)} = ($name, $from); + $self = LWP::UserAgent->new(%cnf); + $self = bless $self, $class; + } + + $self->from(undef) unless $from_ok; + + $self->env_proxy(); + + $self->allow_private_ips(1); + + $self->protocols_forbidden([qw(mailto javascript)]); + + return $self; +} + +sub allow_private_ips +{ + my $self = shift; + if (@_) { + $self->{Checklink_allow_private_ips} = shift; + if (!$self->{Checklink_allow_private_ips}) { + + # Pull in dependencies + require Net::IP; + require Socket; + require Net::hostent; + } + } + return $self->{Checklink_allow_private_ips}; +} + +sub redirect_progress_callback +{ + my $self = shift; + $self->{Checklink_redirect_callback} = shift if @_; + return $self->{Checklink_redirect_callback}; +} + +sub simple_request +{ + my $self = shift; + + my $response = $self->ip_disallowed($_[0]->uri()); + + # RFC 2616, section 15.1.3 + $_[0]->remove_header("Referer") + if ($_[0]->referer() && + (!$_[0]->uri()->secure() && URI->new($_[0]->referer())->secure())); + + $response ||= do { + local $SIG{__WARN__} = + sub { # Suppress RobotRules warnings, rt.cpan.org #18902 + # Suppress "Argument isn't numeric" warnings, see below. + warn($_[0]) + if ($_[0] + && $_[0] !~ /^RobotRules/ + && $_[0] !~ /^Argument .* isn't numeric.*Response\.pm/ + ); + }; + + # @@@ Why not just $self->SUPER::simple_request? [--unknown] + # --- Indeed. Further, why use simple_request in the first place? + # It is not part of the UserAgent UI. I believe this can result + # in warnings like: + # Argument "0, 0, 0, 0" isn't numeric in numeric gt (>) at + # /usr/local/lib/perl5/site_perl/5.30.2/HTTP/Response.pm line 261. + # when checking, e.g., + # https://metacpan.org/pod/distribution/Test-Harness/bin/prove + # For testing, here is a three-line html file to check that url: + # X + #

prove

+ # + # I have been unable to reproduce the warning with a test program + # checking that url using $ua->request(), or other UserAgent + # functions, even after carefully reproducing all the headers + # that checklink sends in the request. --karl@freefriends.org. + + $self->W3C::UserAgent::SUPER::simple_request(@_); + }; + + if (!defined($self->{FirstResponse})) { + $self->{FirstResponse} = $response->code(); + $self->{FirstMessage} = $response->message() || '(no message)'; + } + + return $response; +} + +sub redirect_ok +{ + my ($self, $request, $response) = @_; + + if (my $callback = $self->redirect_progress_callback()) { + + # @@@ TODO: when an LWP internal robots.txt request gets redirected, + # this will a bit confusingly fire for it too. Would need a robust + # way to determine whether the request is such a LWP "internal + # robots.txt" one. + &$callback($request->method(), $request->uri()); + } + + return 0 unless $self->SUPER::redirect_ok($request, $response); + + if (my $res = $self->ip_disallowed($request->uri())) { + $response->previous($response->clone()); + $response->request($request); + $response->code($res->code()); + $response->message($res->message()); + return 0; + } + + return 1; +} + +# +# Checks whether we're allowed to retrieve the document based on its IP +# address. Takes an URI object and returns a HTTP::Response containing the +# appropriate status and error message if the IP was disallowed, 0 +# otherwise. URIs without hostname or IP address are always allowed, +# including schemes where those make no sense (eg. data:, often javascript:). +# +sub ip_disallowed +{ + my ($self, $uri) = @_; + return 0 if $self->allow_private_ips(); # Short-circuit + + my $hostname = undef; + eval { $hostname = $uri->host() }; # Not all URIs implement host()... + return 0 unless $hostname; + + my $addr = my $iptype = my $resp = undef; + if (my $host = Net::hostent::gethostbyname($hostname)) { + $addr = Socket::inet_ntoa($host->addr()) if $host->addr(); + if ($addr && (my $ip = Net::IP->new($addr))) { + $iptype = $ip->iptype(); + } + } + if ($iptype && $iptype ne 'PUBLIC') { + $resp = HTTP::Response->new(403, + 'Checking non-public IP address disallowed by link checker configuration' + ); + $resp->header('Client-Warning', 'Internal response'); + } + return $resp; +} + +# ----------------------------------------------------------------------------- + +package W3C::LinkChecker; + +use vars qw($AGENT $PACKAGE $PROGRAM $VERSION $REVISION + $DocType $Head $Accept $ContentTypes %Cfg $CssUrl); + +use CSS::DOM 0.09 qw(); # >= 0.09 for many bugfixes +use CSS::DOM::Constants qw(:rule); +use CSS::DOM::Style qw(); +use CSS::DOM::Util qw(); +use Encode qw(); +use HTML::Entities qw(); +use HTML::Parser 3.40 qw(); # >= 3.40 for utf8_mode() +use HTTP::Headers::Util qw(); +use HTTP::Message 5.827 qw(); # >= 5.827 for content_charset() +use HTTP::Request 5.814 qw(); # >= 5.814 for accept_decodable() +use HTTP::Response 1.50 qw(); # >= 1.50 for decoded_content() +use Time::HiRes qw(); +use URI 1.53 qw(); # >= 1.53 for secure() +use URI::Escape qw(); +use URI::Heuristic qw(); + +# @@@ Needs also W3C::UserAgent but can't use() it here. + +use constant RC_ROBOTS_TXT => -1; +use constant RC_DNS_ERROR => -2; +use constant RC_IP_DISALLOWED => -3; +use constant RC_PROTOCOL_DISALLOWED => -4; + +use constant LINE_UNKNOWN => -1; + +use constant MP2 => + (exists($ENV{MOD_PERL_API_VERSION}) && $ENV{MOD_PERL_API_VERSION} >= 2); + +# Tag=>attribute mapping of things we treat as links. +# Note: meta/@http-equiv gets special treatment, see start() for details. +use constant LINK_ATTRS => { + a => ['href'], + + # base/@href intentionally not checked + # http://www.w3.org/mid/200802091439.27764.ville.skytta%40iki.fi + area => ['href'], + audio => ['src'], + blockquote => ['cite'], + body => ['background'], + command => ['icon'], + + # button/@formaction not checked (side effects) + del => ['cite'], + + # @pluginspage, @pluginurl, @href: pre-HTML5 proprietary + embed => ['href', 'pluginspage', 'pluginurl', 'src'], + + # form/@action not checked (side effects) + frame => ['longdesc', 'src'], + html => ['manifest'], + iframe => ['longdesc', 'src'], + img => ['longdesc', 'src'], + + # input/@action, input/@formaction not checked (side effects) + input => ['src'], + ins => ['cite'], + link => ['href'], + object => ['data'], + q => ['cite'], + script => ['src'], + source => ['src'], + track => ['src'], + video => ['src', 'poster'], +}; + +# Tag=>[separator, attributes] mapping of things we treat as lists of links. +use constant LINK_LIST_ATTRS => { + a => [qr/\s+/, ['ping']], + applet => [qr/[\s,]+/, ['archive']], + area => [qr/\s+/, ['ping']], + head => [qr/\s+/, ['profile']], + object => [qr/\s+/, ['archive']], +}; + +# TBD/TODO: +# - applet/@code? +# - bgsound/@src? +# - object/@classid? +# - isindex/@action? +# - layer/@background,@src? +# - ilayer/@background? +# - table,tr,td,th/@background? +# - xmp/@href? + +@W3C::LinkChecker::ISA = qw(HTML::Parser); + +BEGIN { + + # Version info + $PACKAGE = 'W3C Link Checker'; + $PROGRAM = 'W3C-checklink'; + $VERSION = '4.81'; + $REVISION = sprintf('version %s (c) 1999-2011 W3C', $VERSION); + $AGENT = sprintf( + '%s/%s %s', + $PROGRAM, $VERSION, + ( W3C::UserAgent::USE_ROBOT_UA ? LWP::RobotUA->_agent() : + LWP::UserAgent->_agent() + ) + ); + + # Pull in mod_perl modules if applicable. + eval { + local $SIG{__DIE__} = undef; + require Apache2::RequestUtil; + } if MP2(); + + my @content_types = qw( + text/html + application/xhtml+xml;q=0.9 + application/vnd.wap.xhtml+xml;q=0.6 + ); + $Accept = join(', ', @content_types, '*/*;q=0.5'); + push(@content_types, 'text/css', 'text/html-sandboxed'); + my $re = join('|', map { s/;.*//; quotemeta } @content_types); + $ContentTypes = qr{\b(?:$re)\b}io; + + # Regexp for matching URL values in CSS. + $CssUrl = qr/(?:\s|^)url\(\s*(['"]?)(.*?)\1\s*\)(?=\s|$)/; + + # + # Read configuration. If the W3C_CHECKLINK_CFG environment variable has + # been set or the default contains a non-empty file, read it. Otherwise, + # skip silently. + # + my $defaultconfig = '/etc/w3c/checklink.conf'; + if ($ENV{W3C_CHECKLINK_CFG} || -s $defaultconfig) { + + require Config::General; + Config::General->require_version(2.06); # Need 2.06 for -SplitPolicy + + my $conffile = $ENV{W3C_CHECKLINK_CFG} || $defaultconfig; + eval { + my %config_opts = ( + -ConfigFile => $conffile, + -SplitPolicy => 'equalsign', + -AllowMultiOptions => 'no', + ); + %Cfg = Config::General->new(%config_opts)->getall(); + }; + if ($@) { + die <<"EOF"; +Failed to read configuration from '$conffile': +$@ +EOF + } + } + $Cfg{Markup_Validator_URI} ||= 'http://validator.w3.org/check?uri=%s'; + $Cfg{CSS_Validator_URI} ||= + 'http://jigsaw.w3.org/css-validator/validator?uri=%s'; + $Cfg{Doc_URI} ||= 'http://validator.w3.org/docs/checklink.html'; + + # Untaint config params that are used as the format argument to (s)printf(), + # Perl 5.10 does not want to see that in taint mode. + ($Cfg{Markup_Validator_URI}) = ($Cfg{Markup_Validator_URI} =~ /^(.*)$/); + ($Cfg{CSS_Validator_URI}) = ($Cfg{CSS_Validator_URI} =~ /^(.*)$/); + + $DocType = + ''; + my $css_url = URI->new_abs('linkchecker.css', $Cfg{Doc_URI}); + my $js_url = URI->new_abs('linkchecker.js', $Cfg{Doc_URI}); + $Head = + sprintf(<<'EOF', HTML::Entities::encode($AGENT), $css_url, $js_url); + + + + +EOF + + # Trusted environment variables that need laundering in taint mode. + for (qw(NNTPSERVER NEWSHOST)) { + ($ENV{$_}) = ($ENV{$_} =~ /^(.*)$/) if $ENV{$_}; + } + + # Use passive FTP by default, see Net::FTP(3). + $ENV{FTP_PASSIVE} = 1 unless exists($ENV{FTP_PASSIVE}); +} + +# Autoflush +$| = 1; + +# Different options specified by the user +my $cmdline = !($ENV{GATEWAY_INTERFACE} && $ENV{GATEWAY_INTERFACE} =~ /^CGI/); +my %Opts = ( + Command_Line => $cmdline, + Quiet => 0, + Summary_Only => 0, + Verbose => 0, + Progress => 0, + HTML => 0, + Timeout => 30, + Redirects => 1, + Dir_Redirects => 1, + Accept_Language => $cmdline ? undef : $ENV{HTTP_ACCEPT_LANGUAGE}, + Cookies => undef, + No_Referer => 0, + Hide_Same_Realm => 0, + Depth => 0, # < 0 means unlimited recursion. + Sleep_Time => 1, + Connection_Cache_Size => 2, + Max_Documents => 150, # For the online version. + User => undef, + Password => undef, + Base_Locations => [], + Exclude => undef, + Exclude_Docs => undef, + Exclude_Url_File => undef, + Suppress_Redirect => [], + Suppress_Redirect_Prefix => [], + Suppress_Redirect_Regexp => [], + Suppress_Temp_Redirects => 1, + Suppress_Broken => [], + Suppress_Fragment => [], + Masquerade => 0, + Masquerade_From => '', + Masquerade_To => '', + Trusted => $Cfg{Trusted}, + Allow_Private_IPs => defined($Cfg{Allow_Private_IPs}) ? + $Cfg{Allow_Private_IPs} : + $cmdline, +); +undef $cmdline; + +# Global variables +# What URI's did we process? (used for recursive mode) +my %processed; + +# Result of the HTTP query +my %results; + +# List of redirects +my %redirects; + +# Count of the number of documents checked +my $doc_count = 0; + +# Time stamp +my $timestamp = &get_timestamp(); + +# Per-document header; undefined if already printed. See print_doc_header(). +my $doc_header; + +&parse_arguments() if $Opts{Command_Line}; + +my $ua = W3C::UserAgent->new($AGENT); # @@@ TODO: admin address + +$ua->conn_cache({total_capacity => $Opts{Connection_Cache_Size}}); +if ($ua->can('delay')) { + $ua->delay($Opts{Sleep_Time} / 60); +} +$ua->timeout($Opts{Timeout}); + +# Set up cookie stash if requested +if (defined($Opts{Cookies})) { + require HTTP::Cookies; + my $cookie_file = $Opts{Cookies}; + if ($cookie_file eq 'tmp') { + $cookie_file = undef; + } + elsif ($cookie_file =~ /^(.*)$/) { + $cookie_file = $1; # untaint + } + $ua->cookie_jar(HTTP::Cookies->new(file => $cookie_file, autosave => 1)); +} +eval { $ua->allow_private_ips($Opts{Allow_Private_IPs}); }; +if ($@) { + die <<"EOF"; +Allow_Private_IPs is false; this feature requires the Net::IP, Socket, and +Net::hostent modules: +$@ +EOF +} + +# Add configured forbidden protocols +if ($Cfg{Forbidden_Protocols}) { + my $forbidden = $ua->protocols_forbidden(); + push(@$forbidden, split(/[,\s]+/, lc($Cfg{Forbidden_Protocols}))); + $ua->protocols_forbidden($forbidden); +} + +if ($Opts{Command_Line}) { + + require Text::Wrap; + Text::Wrap->import('wrap'); + + require URI::file; + + &usage(1) unless scalar(@ARGV); + + $Opts{_Self_URI} = 'http://validator.w3.org/checklink'; # For HTML output + + &ask_password() if ($Opts{User} && !$Opts{Password}); + + if (!$Opts{Summary_Only}) { + printf("%s %s\n", $PACKAGE, $REVISION) unless $Opts{HTML}; + } + else { + $Opts{Verbose} = 0; + $Opts{Progress} = 0; + } + + # Populate data for print_form() + my %params = ( + summary => $Opts{Summary_Only}, + hide_redirects => !$Opts{Redirects}, + hide_type => $Opts{Dir_Redirects} ? 'dir' : 'all', + no_accept_language => !( + defined($Opts{Accept_Language}) && $Opts{Accept_Language} eq 'auto' + ), + no_referer => $Opts{No_Referer}, + recursive => ($Opts{Depth} != 0), + depth => $Opts{Depth}, + ); + + my $check_num = 1; + my @bases = @{$Opts{Base_Locations}}; + for my $uri (@ARGV) { + + # Reset base locations so that previous URI's given on the command line + # won't affect the recursion scope for this URI (see check_uri()) + @{$Opts{Base_Locations}} = @bases; + + # Transform the parameter into a URI + $uri = &urize($uri); + $params{uri} = $uri; + &check_uri(\%params, $uri, $check_num, $Opts{Depth}, undef, undef, 1); + $check_num++; + } + undef $check_num; + + if ($Opts{HTML}) { + &html_footer(); + } + elsif ($doc_count > 0 && !$Opts{Summary_Only}) { + printf("\n%s\n", &global_stats()); + } + +} +else { + + require CGI; + require CGI::Carp; + CGI::Carp->import(qw(fatalsToBrowser)); + require CGI::Cookie; + + # file: URIs are not allowed in CGI mode + my $forbidden = $ua->protocols_forbidden(); + push(@$forbidden, 'file'); + $ua->protocols_forbidden($forbidden); + + my $query = CGI->new(); + + for my $param ($query->param()) { + my @values = map { Encode::decode_utf8($_) } $query->param($param); + $query->param($param, @values); + } + + # Set a few parameters in CGI mode + $Opts{Verbose} = 0; + $Opts{Progress} = 0; + $Opts{HTML} = 1; + $Opts{_Self_URI} = $query->url(-relative => 1); + + # Backwards compatibility + my $uri = undef; + if ($uri = $query->param('url')) { + $query->param('uri', $uri) unless $query->param('uri'); + $query->delete('url'); + } + $uri = $query->param('uri'); + + if (!$uri) { + &html_header('', undef); # Set cookie only from results page. + my %cookies = CGI::Cookie->fetch(); + &print_form(scalar($query->Vars()), $cookies{$PROGRAM}, 1); + &html_footer(); + exit; + } + + # Backwards compatibility + if ($query->param('hide_dir_redirects')) { + $query->param('hide_redirects', 'on'); + $query->param('hide_type', 'dir'); + $query->delete('hide_dir_redirects'); + } + + $Opts{Summary_Only} = 1 if $query->param('summary'); + + if ($query->param('hide_redirects')) { + $Opts{Dir_Redirects} = 0; + if (my $type = $query->param('hide_type')) { + $Opts{Redirects} = 0 if ($type ne 'dir'); + } + else { + $Opts{Redirects} = 0; + } + } + + $Opts{Accept_Language} = undef if $query->param('no_accept_language'); + $Opts{No_Referer} = $query->param('no_referer'); + + $Opts{Depth} = -1 if ($query->param('recursive') && $Opts{Depth} == 0); + if (my $depth = $query->param('depth')) { + + # @@@ Ignore invalid depth silently for now. + $Opts{Depth} = $1 if ($depth =~ /(-?\d+)/); + } + + # Save, clear or leave cookie as is. + my $cookie = undef; + if (my $action = $query->param('cookie')) { + if ($action eq 'clear') { + + # Clear the cookie. + $cookie = CGI::Cookie->new(-name => $PROGRAM); + $cookie->value({clear => 1}); + $cookie->expires('-1M'); + } + elsif ($action eq 'set') { + + # Set the options. + $cookie = CGI::Cookie->new(-name => $PROGRAM); + my %options = $query->Vars(); + delete($options{$_}) + for qw(url uri check cookie); # Non-persistent. + $cookie->value(\%options); + } + } + if (!$cookie) { + my %cookies = CGI::Cookie->fetch(); + $cookie = $cookies{$PROGRAM}; + } + + # Always refresh cookie expiration time. + $cookie->expires('+1M') if ($cookie && !$cookie->expires()); + + # All Apache configurations don't set HTTP_AUTHORIZATION for CGI scripts. + # If we're under mod_perl, there is a way around it... + eval { + local $SIG{__DIE__} = undef; + my $auth = + Apache2::RequestUtil->request()->headers_in()->{Authorization}; + $ENV{HTTP_AUTHORIZATION} = $auth if $auth; + } if (MP2() && !$ENV{HTTP_AUTHORIZATION}); + + $uri =~ s/^\s+//g; + if ($uri =~ /:/) { + $uri = URI->new($uri); + } + else { + if ($uri =~ m|^//|) { + $uri = URI->new("http:$uri"); + } + else { + local $ENV{URL_GUESS_PATTERN} = ''; + my $guess = URI::Heuristic::uf_uri($uri); + if ($guess->scheme() && $ua->is_protocol_supported($guess)) { + $uri = $guess; + } + else { + $uri = URI->new("http://$uri"); + } + } + } + $uri = $uri->canonical(); + $query->param("uri", $uri); + + &check_uri(scalar($query->Vars()), $uri, 1, $Opts{Depth}, $cookie); + undef $query; # Not needed any more. + &html_footer(); +} + +############################################################################### + +################################ +# Command line and usage stuff # +################################ + +sub parse_arguments () +{ + require Encode::Locale; + Encode::Locale::decode_argv(); + + require Getopt::Long; + Getopt::Long->require_version(2.17); + Getopt::Long->import('GetOptions'); + Getopt::Long::Configure('bundling', 'no_ignore_case'); + my $masq = ''; + my @locs = (); + + GetOptions( + 'help|h|?' => sub { usage(0) }, + 'q|quiet' => sub { + $Opts{Quiet} = 1; + $Opts{Summary_Only} = 1; + }, + 's|summary' => \$Opts{Summary_Only}, + 'b|broken' => sub { + $Opts{Redirects} = 0; + $Opts{Dir_Redirects} = 0; + }, + 'e|dir-redirects' => sub { $Opts{Dir_Redirects} = 0; }, + 'v|verbose' => \$Opts{Verbose}, + 'i|indicator' => \$Opts{Progress}, + 'H|html' => \$Opts{HTML}, + 'r|recursive' => sub { + $Opts{Depth} = -1 + if $Opts{Depth} == 0; + }, + 'l|location=s' => \@locs, + 'X|exclude=s@' => \@{$Opts{Exclude}}, + 'exclude-docs=s@' => \@{$Opts{Exclude_Docs}}, + 'exclude-url-file=s' => \$Opts{Exclude_Url_File}, + 'suppress-redirect=s@' => \@{$Opts{Suppress_Redirect}}, + 'suppress-redirect-prefix=s@' => \@{$Opts{Suppress_Redirect_Prefix}}, + 'suppress-temp-redirects' => \$Opts{Suppress_Temp_Redirects}, + 'suppress-broken=s@' => \@{$Opts{Suppress_Broken}}, + 'suppress-fragment=s@' => \@{$Opts{Suppress_Fragment}}, + 'u|user=s' => \$Opts{User}, + 'p|password=s' => \$Opts{Password}, + 't|timeout=i' => \$Opts{Timeout}, + 'C|connection-cache=i' => \$Opts{Connection_Cache_Size}, + 'S|sleep=i' => \$Opts{Sleep_Time}, + 'L|languages=s' => \$Opts{Accept_Language}, + 'c|cookies=s' => \$Opts{Cookies}, + 'R|no-referer' => \$Opts{No_Referer}, + 'D|depth=i' => sub { + $Opts{Depth} = $_[1] + unless $_[1] == 0; + }, + 'd|domain=s' => \$Opts{Trusted}, + 'masquerade=s' => \$masq, + 'hide-same-realm' => \$Opts{Hide_Same_Realm}, + 'V|version' => \&version, + ) || + usage(1); + + if ($masq) { + $Opts{Masquerade} = 1; + my @masq = split(/\s+/, $masq); + if (scalar(@masq) != 2 || + !defined($masq[0]) || + $masq[0] !~ /\S/ || + !defined($masq[1]) || + $masq[1] !~ /\S/) + { + usage(1, + "Error: --masquerade takes two whitespace separated URIs."); + } + else { + require URI::file; + $Opts{Masquerade_From} = $masq[0]; + my $u = URI->new($masq[1]); + $Opts{Masquerade_To} = + $u->scheme() ? $u : URI::file->new_abs($masq[1]); + } + } + + if ($Opts{Accept_Language} && $Opts{Accept_Language} eq 'auto') { + $Opts{Accept_Language} = &guess_language(); + } + + if (($Opts{Sleep_Time} || 0) < 1) { + warn( + "*** Warning: minimum allowed sleep time is 1 second, resetting.\n" + ); + $Opts{Sleep_Time} = 1; + } + + push(@{$Opts{Base_Locations}}, map { URI->new($_)->canonical() } @locs); + + $Opts{Depth} = -1 if ($Opts{Depth} == 0 && @locs); + + for my $i (0 .. $#{$Opts{Exclude_Docs}}) { + eval { $Opts{Exclude_Docs}->[$i] = qr/$Opts{Exclude_Docs}->[$i]/; }; + &usage(1, "Error in exclude-docs regexp: $@") if $@; + } + if (defined($Opts{Trusted})) { + eval { $Opts{Trusted} = qr/$Opts{Trusted}/io; }; + &usage(1, "Error in trusted domains regexp: $@") if $@; + } + + # Sanity-check error-suppression arguments + for my $i (0 .. $#{$Opts{Suppress_Redirect}}) { + ${$Opts{Suppress_Redirect}}[$i] =~ s/ /->/; + my $sr_arg = ${$Opts{Suppress_Redirect}}[$i]; + if ($sr_arg !~ /.->./) { + &usage(1, + "Bad suppress-redirect argument, should contain \"->\": $sr_arg" + ); + } + } + for my $i (0 .. $#{$Opts{Suppress_Redirect_Prefix}}) { + my $srp_arg = ${$Opts{Suppress_Redirect_Prefix}}[$i]; + $srp_arg =~ s/ /->/; + if ($srp_arg !~ /^(.*)->(.*)$/) { + &usage(1, + "Bad suppress-redirect-prefix argument, should contain \"->\": $srp_arg" + ); + } + + # Turn prefixes into a regexp. + ${$Opts{Suppress_Redirect_Prefix}}[$i] = qr/^\Q$1\E(.*)->\Q$2\E\1$/ism; + } + for my $i (0 .. $#{$Opts{Suppress_Broken}}) { + ${$Opts{Suppress_Broken}}[$i] =~ s/ /:/; + my $sb_arg = ${$Opts{Suppress_Broken}}[$i]; + if ($sb_arg !~ /^(-1|[0-9]+):./) { + &usage(1, + "Bad suppress-broken argument, should be prefixed by a numeric response code: $sb_arg" + ); + } + } + for my $sf_arg (@{$Opts{Suppress_Fragment}}) { + if ($sf_arg !~ /.#./) { + &usage(1, + "Bad suppress-fragment argument, should contain \"#\": $sf_arg" + ); + } + } + + if ($#{$Opts{Exclude}} > 0) { + # convert $Opts{Exclude} array into regexp by parenthesizing + # each and inserting alternations between. + my $exclude_rx = join("|", map { "($_)" } @{$Opts{Exclude}}); + # + # For the sake of the rest of the program, pretend the option + # was that string all along. + $Opts{Exclude} = $exclude_rx; + } + + if ($Opts{Exclude_Url_File}) { + # The idea is that if the specified file exists, we read it and + # treat it as a list of excludes. If the file doesn't exist, we + # write it with all the urls that were successful. That way, we + # can avoid re-checking them on every run, and it can be removed + # externally (from cron) to get re-updated. + # + # We distinguish the cases here, and either add to + # $Opts{Exclude} if reading, or setting Exclude_File_Write in + # %Opts if writing (even though it is not really an option, + # but it's the most convenient place). + if (-s $Opts{Exclude_Url_File}) { + open (my $xf, "$Opts{Exclude_Url_File}") + || &usage(1, "Could not open $Opts{Exclude_Url_File}" + . " for reading: $!"); + my @xf = (); + while (<$xf>) { + chomp; + # the file is urls, not regexps, so quotemeta. + push (@xf, "(" . quotemeta($_) . ")"); + } + my $xf_rx = join ("|", @xf); + if ($Opts{Exclude}) { + $Opts{Exclude} .= "|$xf_rx"; + } else { + $Opts{Exclude} = $xf_rx; + } + } else { + open ($Opts{Exclude_File_Write}, ">$Opts{Exclude_Url_File}") + || &usage(1, + "Could not open $Opts{Exclude_Url_File} for writing: $!"); + # we write on a successful retrieve, and don't bother closing. + } + } + + # Precompile/error-check final list of regular expressions + if (defined($Opts{Exclude})) { + eval { $Opts{Exclude} = qr/$Opts{Exclude}/o; }; + &usage(1, "Error in exclude regexp $Opts{Exclude}: $@") if $@; + } + + return; +} + +sub version () +{ + print "$PACKAGE $REVISION\n"; + exit 0; +} + +sub usage () +{ + my ($exitval, $msg) = @_; + $exitval = 0 unless defined($exitval); + $msg ||= ''; + $msg =~ s/[\r\n]*$/\n\n/ if $msg; + + die($msg) unless $Opts{Command_Line}; + + my $trust = defined($Cfg{Trusted}) ? $Cfg{Trusted} : 'same host only'; + + select(STDERR) if $exitval; + print "$msg$PACKAGE $REVISION + +Usage: checklink +Options: + -s, --summary Result summary only. + -b, --broken Show only the broken links, not the redirects. + -e, --directory Hide directory redirects, for example + http://www.w3.org/TR -> http://www.w3.org/TR/ + -r, --recursive Check the documents linked from the first one. + -D, --depth N Check the documents linked from the first one to + depth N (implies --recursive). + -l, --location URI Scope of the documents checked in recursive mode + (implies --recursive). Can be specified multiple + times. If not specified, the default eg. for + http://www.w3.org/TR/html4/Overview.html + would be http://www.w3.org/TR/html4/ + -X, --exclude REGEXP Do not check links whose full, canonical URIs + match REGEXP; also limits recursion the same way + as --exclude-docs with the same regexp would. + This option may be specified multiple times. + --exclude-docs REGEXP In recursive mode, do not check links in documents + whose full, canonical URIs match REGEXP. This + option may be specified multiple times. + --exclude-url-file FILE If FILE exists, treat each line as a string + specifying another exclude; quotemeta is called + to make them regexps. If FILE does not exist, + open it for writing and write each checked url + which gets a 200 response to it. + --suppress-redirect URI->URI Do not report a redirect from the first to the + second URI. This option may be specified multiple + times. + --suppress-redirect-prefix URI->URI Do not report a redirect from a child of + the first URI to the same child of the second URI. + This option may be specified multiple times. + --suppress-temp-redirects Suppress warnings about temporary redirects. + --suppress-broken CODE:URI Do not report a broken link with the given CODE. + CODE is HTTP response, or -1 for robots exclusion. + This option may be specified multiple times. + --suppress-fragment URI Do not report the given broken fragment URI. + A fragment URI contains \"#\". This option may be + specified multiple times. + -L, --languages LANGS Accept-Language header to send. The special value + 'auto' causes autodetection from the environment. + -c, --cookies FILE Use cookies, load/save them in FILE. The special + value 'tmp' causes non-persistent use of cookies. + -R, --no-referer Do not send the Referer HTTP header. + -q, --quiet No output if no errors are found (implies -s). + -v, --verbose Verbose mode. + -i, --indicator Show percentage of lines processed while parsing. + -u, --user USERNAME Specify a username for authentication. + -p, --password PASSWORD Specify a password. + --hide-same-realm Hide 401's that are in the same realm as the + document checked. + -S, --sleep SECS Sleep SECS seconds between requests to each server + (default and minimum: 1 second). + -t, --timeout SECS Timeout for requests in seconds (default: 30). + -d, --domain DOMAIN Regular expression describing the domain to which + authentication information will be sent + (default: $trust). + --masquerade \"BASE1 BASE2\" Masquerade base URI BASE1 as BASE2. See the + manual page for more information. + -H, --html HTML output. + -?, -h, --help Show this message and exit. + -V, --version Output version information and exit. + +See \"perldoc LWP\" for information about proxy server support, +\"perldoc Net::FTP\" for information about various environment variables +affecting FTP connections and \"perldoc Net::NNTP\" for setting a default +NNTP server for news: URIs. + +The W3C_CHECKLINK_CFG environment variable can be used to set the +configuration file to use. See details in the full manual page, it can +be displayed with: perldoc checklink + +More documentation at: $Cfg{Doc_URI} +Please send bug reports and comments to the www-validator mailing list: + www-validator\@w3.org (with 'checklink' in the subject) + Archives are at: http://lists.w3.org/Archives/Public/www-validator/ +"; + exit $exitval; +} + +sub ask_password () +{ + eval { + local $SIG{__DIE__} = undef; + require Term::ReadKey; + Term::ReadKey->require_version(2.00); + Term::ReadKey->import(qw(ReadMode)); + }; + if ($@) { + warn('Warning: Term::ReadKey 2.00 or newer not available, ' . + "password input disabled.\n"); + return; + } + printf(STDERR 'Enter the password for user %s: ', $Opts{User}); + ReadMode('noecho', *STDIN); + chomp($Opts{Password} = ); + ReadMode('restore', *STDIN); + print(STDERR "ok.\n"); + return; +} + +############################################################################### + +########################################################################### +# Guess an Accept-Language header based on the $LANG environment variable # +########################################################################### + +sub guess_language () +{ + my $lang = $ENV{LANG} or return; + + $lang =~ s/[\.@].*$//; # en_US.UTF-8, fi_FI@euro... + + return 'en' if ($lang eq 'C' || $lang eq 'POSIX'); + + my $res = undef; + eval { + require Locale::Language; + if (my $tmp = Locale::Language::language2code($lang)) { + $lang = $tmp; + } + if (my ($l, $c) = (lc($lang) =~ /^([a-z]+)(?:[-_]([a-z]+))?/)) { + if (Locale::Language::code2language($l)) { + $res = $l; + if ($c) { + require Locale::Country; + $res .= "-$c" if Locale::Country::code2country($c); + } + } + } + }; + return $res; +} + +############################ +# Transform foo into a URI # +############################ + +sub urize ($) +{ + my $arg = shift; + my $uarg = URI::Escape::uri_unescape($arg); + my $uri; + if (-d $uarg) { + + # look for an "index" file in dir, return it if found + require File::Spec; + for my $index (map { File::Spec->catfile($uarg, $_) } + qw(index.html index.xhtml index.htm index.xhtm)) + { + if (-e $index) { + $uri = URI::file->new_abs($index); + last; + } + } + + # return dir itself if an index file was not found + $uri ||= URI::file->new_abs($uarg); + } + elsif ($uarg =~ /^[.\/\\]/ || -e $uarg) { + $uri = URI::file->new_abs($uarg); + } + else { + my $newuri = URI->new($arg); + if ($newuri->scheme()) { + $uri = $newuri; + } + else { + local $ENV{URL_GUESS_PATTERN} = ''; + $uri = URI::Heuristic::uf_uri($arg); + $uri = URI::file->new_abs($uri) unless $uri->scheme(); + } + } + return $uri->canonical(); +} + +######################################## +# Check for broken links in a resource # +######################################## + +sub check_uri (\%\$$$$;\$$) +{ + my ($params, $uri, $check_num, $depth, $cookie, $referer, $is_start) = @_; + $is_start ||= ($check_num == 1); + + my $start = $Opts{Summary_Only} ? 0 : &get_timestamp(); + + # Get and parse the document + my $response = &get_document( + 'GET', $uri, $doc_count, \%redirects, $referer, + $cookie, $params, $check_num, $is_start + ); + + # Can we check the resource? If not, we exit here... + return if defined($response->{Stop}); + + if ($Opts{HTML}) { + &html_header($uri, $cookie) if ($check_num == 1); + &print_form($params, $cookie, $check_num) if $is_start; + } + + if ($is_start) { # Starting point of a new check, eg. from the command line + # Use the first URI as the recursion base unless specified otherwise. + push(@{$Opts{Base_Locations}}, $response->{absolute_uri}->canonical()) + unless @{$Opts{Base_Locations}}; + } + else { + + # Before fetching the document, we don't know if we'll be within the + # recursion scope or not (think redirects). + if (!&in_recursion_scope($response->{absolute_uri})) { + hprintf("Not in recursion scope: %s\n", $response->{absolute_uri}) + if ($Opts{Verbose}); + $response->content(""); + return; + } + } + + # Define the document header, and perhaps print it. + # (It might still be defined if the previous document had no errors; + # just redefine it in that case.) + + if ($check_num != 1) { + if ($Opts{HTML}) { + $doc_header = "\n
\n"; + } + else { + $doc_header = "\n" . ('-' x 40) . "\n"; + } + } + + if ($Opts{HTML}) { + $doc_header .= + ("

\nProcessing\t" . &show_url($response->{absolute_uri}) . + "\n

\n\n"); + } + else { + $doc_header .= "\nProcessing\t$response->{absolute_uri}\n\n"; + } + + if (!$Opts{Quiet}) { + print_doc_header(); + } + + # We are checking a new document + $doc_count++; + + my $result_anchor = 'results' . $doc_count; + + if ($check_num == 1 && !$Opts{HTML} && !$Opts{Summary_Only}) { + my $s = $Opts{Sleep_Time} == 1 ? '' : 's'; + my $acclang = $Opts{Accept_Language} || '(not sent)'; + my $send_referer = $Opts{No_Referer} ? 'not sent' : 'sending'; + my $cookies = 'not used'; + if (defined($Opts{Cookies})) { + $cookies = 'used, '; + if ($Opts{Cookies} eq 'tmp') { + $cookies .= 'non-persistent'; + } + else { + $cookies .= "file $Opts{Cookies}"; + } + } + printf( + <<'EOF', $Accept, $acclang, $send_referer, $cookies, $Opts{Sleep_Time}, $s); + +Settings used: +- Accept: %s +- Accept-Language: %s +- Referer: %s +- Cookies: %s +- Sleeping %d second%s between requests to each server +EOF + printf("- Excluding links matching %s\n", $Opts{Exclude}) + if defined($Opts{Exclude}); + printf("- Excluding links in documents whose URIs match %s\n", + join(', ', @{$Opts{Exclude_Docs}})) + if @{$Opts{Exclude_Docs}}; + } + + if ($Opts{HTML}) { + if (!$Opts{Summary_Only}) { + my $accept = &encode($Accept); + my $acclang = &encode($Opts{Accept_Language} || '(not sent)'); + my $send_referer = $Opts{No_Referer} ? 'not sent' : 'sending'; + my $s = $Opts{Sleep_Time} == 1 ? '' : 's'; + printf( + <<'EOF', $accept, $acclang, $send_referer, $Opts{Sleep_Time}, $s); +
+Settings used: + +
+EOF + printf("

Go to the results.

\n", + $result_anchor); + my $esc_uri = URI::Escape::uri_escape($response->{absolute_uri}, + "^A-Za-z0-9."); + print "

For reliable link checking results, check "; + + if (!$response->{IsCss}) { + printf("HTML validity and ", + &encode(sprintf($Cfg{Markup_Validator_URI}, $esc_uri))); + } + printf( + "CSS validity first.

+

Back to the link checker.

\n", + &encode(sprintf($Cfg{CSS_Validator_URI}, $esc_uri)), + &encode($Opts{_Self_URI}) + ); + + printf(<<'EOF', $result_anchor); +
+

Status:

+
+
+EOF
+        }
+    }
+
+    if ($Opts{Summary_Only} && !$Opts{Quiet}) {
+        print '
' if $Opts{HTML};
+        print 'This may take some time';
+        print "... (why?)
"
+            if $Opts{HTML};
+        print " if the document has many links to check.\n" unless $Opts{HTML};
+    }
+
+    # Record that we have processed this resource
+    $processed{$response->{absolute_uri}} = 1;
+
+    # Parse the document
+    my $p =
+        &parse_document($uri, $response->base(), $response, 1, ($depth != 0));
+    my $base = URI->new($p->{base});
+
+    # Check anchors
+    ###############
+
+    print "Checking anchors...\n" unless $Opts{Summary_Only};
+
+    my %errors;
+    while (my ($anchor, $lines) = each(%{$p->{Anchors}})) {
+        if (!length($anchor)) {
+
+            # Empty IDREF's are not allowed
+            $errors{$anchor} = 1;
+        }
+        else {
+            my $times = 0;
+            $times += $_ for values(%$lines);
+
+            # They should appear only once
+            $errors{$anchor} = 1 if ($times > 1);
+        }
+    }
+    print " done.\n" unless $Opts{Summary_Only};
+
+    # Check links
+    #############
+
+    &hprintf("Recording all the links found: %d\n",
+        scalar(keys %{$p->{Links}}))
+        if ($Opts{Verbose});
+    my %links;
+    my %hostlinks;
+
+    # Record all the links found
+    while (my ($link, $lines) = each(%{$p->{Links}})) {
+        my $link_uri = URI->new($link);
+        my $abs_link_uri = URI->new_abs($link_uri, $base);
+
+        if ($Opts{Masquerade}) {
+            if ($abs_link_uri =~ m|^\Q$Opts{Masquerade_From}\E|) {
+                print_doc_header();
+                printf("processing %s in base %s\n",
+                    $abs_link_uri, $Opts{Masquerade_To});
+                my $nlink = $abs_link_uri;
+                $nlink =~ s|^\Q$Opts{Masquerade_From}\E|$Opts{Masquerade_To}|;
+                $abs_link_uri = URI->new($nlink);
+            }
+        }
+
+        my $canon_uri = URI->new($abs_link_uri->canonical());
+        my $fragment  = $canon_uri->fragment(undef);
+        if (!defined($Opts{Exclude}) || $canon_uri !~ $Opts{Exclude}) {
+            if (!exists($links{$canon_uri})) {
+                my $hostport;
+                $hostport = $canon_uri->host_port()
+                    if $canon_uri->can('host_port');
+                $hostport = '' unless defined $hostport;
+                push(@{$hostlinks{$hostport}}, $canon_uri);
+            }
+            for my $line_num (keys(%$lines)) {
+                if (!defined($fragment) || !length($fragment)) {
+
+                    # Document without fragment
+                    $links{$canon_uri}{location}{$line_num} = 1;
+                }
+                else {
+
+                    # Resource with a fragment
+                    $links{$canon_uri}{fragments}{$fragment}{$line_num} = 1;
+                }
+            }
+        } else {
+          hprintf("excluded via options: %s\n", $canon_uri)
+              if ($Opts{Verbose});
+        }
+    }
+
+    my @order = &distribute_links(\%hostlinks);
+    undef %hostlinks;
+
+    # Build the list of broken URI's
+
+    my $nlinks = scalar(@order);
+
+    &hprintf("Checking %d links to build list of broken URI's\n", $nlinks)
+        if ($Opts{Verbose});
+
+    my %broken;
+    my $link_num = 0;
+    for my $u (@order) {
+        my $ulinks = $links{$u};
+
+        if ($Opts{Summary_Only}) {
+
+            # Hack: avoid browser/server timeouts in summary only CGI mode, bug 896
+            print ' ' if ($Opts{HTML} && !$Opts{Command_Line});
+        }
+        else {
+            &hprintf("\nChecking link %s\n", $u);
+            my $progress = ($link_num / $nlinks) * 100;
+            printf(
+                '',
+                $result_anchor, &encode($u), $progress)
+                if (!$Opts{Command_Line} &&
+                $Opts{HTML} &&
+                !$Opts{Summary_Only});
+        }
+        $link_num++;
+
+        # Check that a link is valid
+        &check_validity($uri, $u, ($depth != 0 && &in_recursion_scope($u)),
+            \%links, \%redirects);
+        &hprintf("\tReturn code: %s\n", $results{$u}{location}{code})
+            if ($Opts{Verbose});
+        if ($Opts{Exclude_File_Write} && $results{$u}{location}{code} == 200) {
+            my $fh = $Opts{Exclude_File_Write};
+            print $fh ("$u\n");
+        }
+        if ($results{$u}{location}{success}) {
+
+            # Even though it was not broken, we might want to display it
+            # on the results page (e.g. because it required authentication)
+            $broken{$u}{location} = 1
+                if ($results{$u}{location}{display} >= 400);
+
+            # List the broken fragments
+            while (my ($fragment, $lines) = each(%{$ulinks->{fragments}})) {
+
+                my $fragment_ok = $results{$u}{fragments}{$fragment};
+
+                if ($Opts{Verbose}) {
+                    my @line_nums = sort { $a <=> $b } keys(%$lines);
+                    &hprintf(
+                        "\t\t%s %s - Line%s: %s\n",
+                        $fragment,
+                        $fragment_ok             ? 'OK' : 'Not found',
+                        (scalar(@line_nums) > 1) ? 's'  : '',
+                        join(', ', @line_nums)
+                    );
+                }
+
+                # A broken fragment?
+                $broken{$u}{fragments}{$fragment} += 2 unless $fragment_ok;
+            }
+        }
+        elsif (!($Opts{Quiet} && &informational($results{$u}{location}{code})))
+        {
+
+            # Couldn't find the document
+            $broken{$u}{location} = 1;
+
+            # All the fragments associated are hence broken
+            for my $fragment (keys %{$ulinks->{fragments}}) {
+                $broken{$u}{fragments}{$fragment}++;
+            }
+        }
+    }
+    &hprintf(
+        "\nProcessed in %s seconds.\n",
+        &time_diff($start, &get_timestamp())
+    ) unless $Opts{Summary_Only};
+    printf(
+        '',
+        $result_anchor, &time_diff($start, &get_timestamp()))
+        if ($Opts{HTML} && !$Opts{Summary_Only});
+
+    # Display results
+    if ($Opts{HTML} && !$Opts{Summary_Only}) {
+        print("
\n
\n"); + printf("

Results

\n", $result_anchor); + } + print "\n" unless $Opts{Quiet}; + + &links_summary(\%links, \%results, \%broken, \%redirects); + &anchors_summary($p->{Anchors}, \%errors); + + # Do we want to process other documents? + if ($depth != 0) { + + for my $u (map { URI->new($_) } keys %links) { + + next unless $results{$u}{location}{success}; # Broken link? + + next unless &in_recursion_scope($u); + + # Do we understand its content type? + next unless ($results{$u}{location}{type} =~ $ContentTypes); + + # Have we already processed this URI? + next if &already_processed($u, $uri); + + # Do the job + print "\n" unless $Opts{Quiet}; + if ($Opts{HTML}) { + if (!$Opts{Command_Line}) { + if ($doc_count == $Opts{Max_Documents}) { + print( + "
\n

Maximum number of documents ($Opts{Max_Documents}) reached!

\n" + ); + } + if ($doc_count >= $Opts{Max_Documents}) { + $doc_count++; + print("

Not checking $u

\n"); + $processed{$u} = 1; + next; + } + } + } + + # This is an inherently recursive algorithm, so Perl's warning is not + # helpful. You may wish to comment this out when debugging, though. + no warnings 'recursion'; + + if ($depth < 0) { + &check_uri($params, $u, 0, -1, $cookie, $uri); + } + else { + &check_uri($params, $u, 0, $depth - 1, $cookie, $uri); + } + } + } + return; +} + +############################################################### +# Distribute links based on host:port to avoid RobotUA delays # +############################################################### + +sub distribute_links(\%) +{ + my $hostlinks = shift; + + # Hosts ordered by weight (number of links), descending + my @order = + sort { scalar(@{$hostlinks->{$b}}) <=> scalar(@{$hostlinks->{$a}}) } + keys %$hostlinks; + + # All link list flattened into one, in host weight order + my @all; + push(@all, @{$hostlinks->{$_}}) for @order; + + return @all if (scalar(@order) < 2); + + # Indexes and chunk size for "zipping" the end result list + my $num = scalar(@{$hostlinks->{$order[0]}}); + my @indexes = map { $_ * $num } (0 .. $num - 1); + + # Distribute them + my @result; + while (my @chunk = splice(@all, 0, $num)) { + @result[@indexes] = @chunk; + @indexes = map { $_ + 1 } @indexes; + } + + # Weed out undefs + @result = grep(defined, @result); + + return @result; +} + +########################################## +# Decode Content-Encodings in a response # +########################################## + +sub decode_content ($) +{ + my $response = shift; + my $error = undef; + + my $docref = $response->decoded_content(ref => 1); + if (defined($docref)) { + utf8::encode($$docref); + $response->content_ref($docref); + + # Remove Content-Encoding so it won't be decoded again later. + $response->remove_header('Content-Encoding'); + } + else { + my $ce = $response->header('Content-Encoding'); + $ce = defined($ce) ? "'$ce'" : 'undefined'; + my $ct = $response->header('Content-Type'); + $ct = defined($ct) ? "'$ct'" : 'undefined'; + my $request_uri = $response->request->url; + + my $cs = $response->content_charset(); + $cs = defined($cs) ? "'$cs'" : 'unknown'; + $error = + "Error decoding document at <$request_uri>, Content-Type $ct, " . + "Content-Encoding $ce, content charset $cs: '$@'"; + } + return $error; +} + +####################################### +# Get and parse a resource to process # +####################################### + +sub get_document ($\$$;\%\$$$$$) +{ + my ($method, $uri, $in_recursion, $redirects, $referer, + $cookie, $params, $check_num, $is_start + ) = @_; + + # $method contains the HTTP method the use (GET or HEAD) + # $uri object contains the identifier of the resource + # $in_recursion is > 0 if we are in recursion mode (i.e. it is at least + # the second resource checked) + # $redirects is a pointer to the hash containing the map of the redirects + # $referer is the URI object of the referring document + # $cookie, $params, $check_num, and $is_start are for printing HTTP headers + # and the form if $in_recursion == 0 and not authenticating + + # Get the resource + my $response; + if (defined($results{$uri}{response}) && + !($method eq 'GET' && $results{$uri}{method} eq 'HEAD')) + { + $response = $results{$uri}{response}; + } + else { + $response = &get_uri($method, $uri, $referer); + &record_results($uri, $method, $response, $referer); + &record_redirects($redirects, $response); + } + if (!$response->is_success()) { + if (!$in_recursion) { + + # Is it too late to request authentication? + if ($response->code() == 401) { + &authentication($response, $cookie, $params, $check_num, + $is_start); + } + else { + if ($Opts{HTML}) { + &html_header($uri, $cookie) if ($check_num == 1); + &print_form($params, $cookie, $check_num) if $is_start; + print "

", &status_icon($response->code()); + } + &hprintf("\nError: %d %s\n", + $response->code(), $response->message() || '(no message)'); + print "

\n" if $Opts{HTML}; + } + } + $response->{Stop} = 1; + $response->content(""); + return ($response); + } + + # What is the URI of the resource that we are processing by the way? + my $base_uri = $response->base(); + my $request_uri = URI->new($response->request->url); + $response->{absolute_uri} = $request_uri->abs($base_uri); + + # Can we parse the document? + my $failed_reason; + my $ct = $response->header('Content-Type'); + if (!$ct || $ct !~ $ContentTypes) { + $failed_reason = "Content-Type for <$request_uri> is " . + (defined($ct) ? "'$ct'" : 'undefined'); + } + else { + $failed_reason = decode_content($response); + } + if ($failed_reason) { + + # No, there is a problem... + if (!$in_recursion) { + if ($Opts{HTML}) { + &html_header($uri, $cookie) if ($check_num == 1); + &print_form($params, $cookie, $check_num) if $is_start; + print "

", &status_icon(406); + + } + &hprintf("Can't check links: %s.\n", $failed_reason); + print "

\n" if $Opts{HTML}; + } + $response->{Stop} = 1; + $response->content(""); + } + + # Ok, return the information + return ($response); +} + +######################################################### +# Check whether a URI is within the scope of recursion. # +######################################################### + +sub in_recursion_scope (\$) +{ + my ($uri) = @_; + return 0 unless $uri; + + my $candidate = $uri->canonical(); + + return 0 if (defined($Opts{Exclude}) && $candidate =~ $Opts{Exclude}); + + for my $excluded_doc (@{$Opts{Exclude_Docs}}) { + return 0 if ($candidate =~ $excluded_doc); + } + + for my $base (@{$Opts{Base_Locations}}) { + my $rel = $candidate->rel($base); + next if ($candidate eq $rel); # Relative path not possible? + next if ($rel =~ m|^(\.\.)?/|); # Relative path upwards? + return 1; + } + + return 0; # We always have at least one base location, but none matched. +} + +################################# +# Check for content type match. # +################################# + +sub is_content_type ($$) +{ + my ($candidate, $type) = @_; + return 0 unless ($candidate && $type); + my @v = HTTP::Headers::Util::split_header_words($candidate); + return scalar(@v) ? $type eq lc($v[0]->[0]) : 0; +} + +################################################## +# Check whether a URI has already been processed # +################################################## + +sub already_processed (\$\$) +{ + my ($uri, $referer) = @_; + + # Don't be verbose for that part... + my $summary_value = $Opts{Summary_Only}; + $Opts{Summary_Only} = 1; + + # Do a GET: if it fails, we stop, if not, the results are cached + my $response = &get_document('GET', $uri, 1, undef, $referer); + + # ... but just for that part + $Opts{Summary_Only} = $summary_value; + + # Can we process the resource? + return -1 if defined($response->{Stop}); + + # Have we already processed it? + return 1 if defined($processed{$response->{absolute_uri}->as_string()}); + + # It's not processed yet and it is processable: return 0 + return 0; +} + +############################ +# Get the content of a URI # +############################ + +sub get_uri ($\$;\$$\%$$$$) +{ + + # Here we have a lot of extra parameters in order not to lose information + # if the function is called several times (401's) + my ($method, $uri, $referer, $start, $redirects, + $code, $realm, $message, $auth + ) = @_; + + # $method contains the method used + # $uri object contains the target of the request + # $referer is the URI object of the referring document + # $start is a timestamp (not defined the first time the function is called) + # $redirects is a map of redirects + # $code is the first HTTP return code + # $realm is the realm of the request + # $message is the HTTP message received + # $auth equals 1 if we want to send out authentication information + + # For timing purposes + $start = &get_timestamp() unless defined($start); + + # Prepare the query + + # Do we want printouts of progress? + my $verbose_progress = + !($Opts{Summary_Only} || (!$doc_count && $Opts{HTML})); + + &hprintf("%s %s ", $method, $uri) if $verbose_progress; + + my $request = HTTP::Request->new($method, $uri); + + $request->header('Accept-Language' => $Opts{Accept_Language}) + if $Opts{Accept_Language}; + $request->header('Accept', $Accept); + $request->accept_decodable(); + + # Are we providing authentication info? + if ($auth && $request->url()->host() =~ $Opts{Trusted}) { + if (defined($ENV{HTTP_AUTHORIZATION})) { + $request->header(Authorization => $ENV{HTTP_AUTHORIZATION}); + } + elsif (defined($Opts{User}) && defined($Opts{Password})) { + $request->authorization_basic($Opts{User}, $Opts{Password}); + } + } + + # Tell the user agent if we want progress reports for redirects or not. + $ua->redirect_progress_callback(sub { &hprintf("\n-> %s %s ", @_); }) + if $verbose_progress; + + # Set referer + $request->referer($referer) if (!$Opts{No_Referer} && $referer); + + # Telling caches in the middle we want a fresh copy (Bug 4998) + $request->header(Cache_Control => "max-age=0"); + + # Do the query + my $response = $ua->request($request); + + # Get the results + # Record the very first response + if (!defined($code)) { + ($code, $message) = delete(@$ua{qw(FirstResponse FirstMessage)}); + } + + # Authentication requested? + if ($response->code() == 401 && + !defined($auth) && + (defined($ENV{HTTP_AUTHORIZATION}) || + (defined($Opts{User}) && defined($Opts{Password}))) + ) + { + + # Set host as trusted domain unless we already have one. + if (!$Opts{Trusted}) { + my $re = sprintf('^%s$', quotemeta($response->base()->host())); + $Opts{Trusted} = qr/$re/io; + } + + # Deal with authentication and avoid loops + if (!defined($realm) && + $response->www_authenticate() =~ /Basic realm=\"([^\"]+)\"/) + { + $realm = $1; + } + + print "\n" if $verbose_progress; + return &get_uri($method, $response->request()->url(), + $referer, $start, $redirects, $code, $realm, $message, 1); + } + + # @@@ subtract robot delay from the "fetched in" time? + &hprintf(" fetched in %s seconds\n", &time_diff($start, &get_timestamp())) + if $verbose_progress; + + $response->{IsCss} = + is_content_type($response->content_type(), "text/css"); + $response->{Realm} = $realm if defined($realm); + + return $response; +} + +######################################### +# Record the results of an HTTP request # +######################################### + +sub record_results (\$$$$) +{ + my ($uri, $method, $response, $referer) = @_; + $results{$uri}{referer} = $referer; + $results{$uri}{response} = $response; + $results{$uri}{method} = $method; + $results{$uri}{location}{code} = $response->code(); + $results{$uri}{location}{code} = RC_ROBOTS_TXT() + if ($results{$uri}{location}{code} == 403 && + $response->message() =~ /Forbidden by robots\.txt/); + $results{$uri}{location}{code} = RC_IP_DISALLOWED() + if ($results{$uri}{location}{code} == 403 && + $response->message() =~ /non-public IP/); + $results{$uri}{location}{code} = RC_DNS_ERROR() + if ($results{$uri}{location}{code} == 500 && + $response->message() =~ /Bad hostname '[^\']*'/); + $results{$uri}{location}{code} = RC_PROTOCOL_DISALLOWED() + if ($results{$uri}{location}{code} == 500 && + $response->message() =~ /Access to '[^\']*' URIs has been disabled/); + $results{$uri}{location}{type} = $response->header('Content-type'); + $results{$uri}{location}{display} = $results{$uri}{location}{code}; + + # Rewind, check for the original code and message. + for (my $tmp = $response->previous(); $tmp; $tmp = $tmp->previous()) { + $results{$uri}{location}{orig} = $tmp->code(); + $results{$uri}{location}{orig_message} = $tmp->message() || + '(no message)'; + } + $results{$uri}{location}{success} = $response->is_success(); + + # If a suppressed broken link, fill the data structure like a typical success. + # print STDERR "success? " . $results{$uri}{location}{success} . ": $uri\n"; + if (!$results{$uri}{location}{success}) { + my $code = $results{$uri}{location}{code}; + my $match = grep { $_ eq "$code:$uri" } @{$Opts{Suppress_Broken}}; + if ($match) { + $results{$uri}{location}{success} = 1; + $results{$uri}{location}{code} = 100; + $results{$uri}{location}{display} = 100; + } + } + + # Stores the authentication information + if (defined($response->{Realm})) { + $results{$uri}{location}{realm} = $response->{Realm}; + $results{$uri}{location}{display} = 401 unless $Opts{Hide_Same_Realm}; + } + + # What type of broken link is it? (stored in {record} - the {display} + # information is just for visual use only) + if ($results{$uri}{location}{display} == 401 && + $results{$uri}{location}{code} == 404) + { + $results{$uri}{location}{record} = 404; + } + else { + $results{$uri}{location}{record} = $results{$uri}{location}{display}; + } + + # Did it fail? + $results{$uri}{location}{message} = $response->message() || '(no message)'; + if (!$results{$uri}{location}{success}) { + &hprintf( + "Error: %d %s\n", + $results{$uri}{location}{code}, + $results{$uri}{location}{message} + ) if ($Opts{Verbose}); + } + return; +} + +#################### +# Parse a document # +#################### + +sub parse_document (\$\$$$$) +{ + my ($uri, $base_uri, $response, $links, $rec_needs_links) = @_; + + print("parse_document($uri, $base_uri, ..., $links, $rec_needs_links)\n") + if $Opts{Verbose}; + + my $p; + + if (defined($results{$uri}{parsing})) { + + # We have already done the job. Woohoo! + $p->{base} = $results{$uri}{parsing}{base}; + $p->{Anchors} = $results{$uri}{parsing}{Anchors}; + $p->{Links} = $results{$uri}{parsing}{Links}; + return $p; + } + + $p = W3C::LinkChecker->new(); + $p->{base} = $base_uri; + + my $stype = $response->header("Content-Style-Type"); + $p->{style_is_css} = !$stype || is_content_type($stype, "text/css"); + + my $start; + if (!$Opts{Summary_Only}) { + $start = &get_timestamp(); + print("Parsing...\n"); + } + + # Content-Encoding etc already decoded in get_document(). + my $docref = $response->content_ref(); + + # Count lines beforehand if needed (for progress indicator, or CSS while + # we don't get any line context out of the parser). In case of HTML, the + # actual final number of lines processed shown is populated by our + # end_document handler. + $p->{Total} = ($$docref =~ tr/\n//) + if ($response->{IsCss} || $Opts{Progress}); + + # We only look for anchors if we are not interested in the links + # obviously, or if we are running a recursive checking because we + # might need this information later + $p->{only_anchors} = !($links || $rec_needs_links); + + if ($response->{IsCss}) { + + # Parse as CSS + + $p->parse_css($$docref, LINE_UNKNOWN()); + } + else { + + # Parse as HTML + + # Transform into for parsing + # Processing instructions are not parsed by process, but in this case + # it should be. It's expensive, it's horrible, but it's the easiest way + # for right now. + $$docref =~ s/\<\?(xml:stylesheet.*?)\?\>/\<$1\>/ + unless $p->{only_anchors}; + + $p->xml_mode(1) if ($response->content_type() =~ /\+xml$/); + + $p->parse($$docref)->eof(); + } + + $response->content(""); + + if (!$Opts{Summary_Only}) { + my $stop = &get_timestamp(); + print "\r" if $Opts{Progress}; + &hprintf(" done (%d lines in %s seconds).\n", + $p->{Total}, &time_diff($start, $stop)); + } + + # Save the results before exiting + $results{$uri}{parsing}{base} = $p->{base}; + $results{$uri}{parsing}{Anchors} = $p->{Anchors}; + $results{$uri}{parsing}{Links} = $p->{Links}; + + return $p; +} + +#################################### +# Constructor for W3C::LinkChecker # +#################################### + +sub new +{ + my $p = HTML::Parser::new(@_, api_version => 3); + $p->utf8_mode(1); + + # Set up handlers + + $p->handler(start => 'start', 'self, tagname, attr, line'); + $p->handler(end => 'end', 'self, tagname, line'); + $p->handler(text => 'text', 'self, dtext, line'); + $p->handler( + declaration => sub { + my $self = shift; + $self->declaration(substr($_[0], 2, -1)); + }, + 'self, text, line' + ); + $p->handler(end_document => 'end_document', 'self, line'); + if ($Opts{Progress}) { + $p->handler(default => 'parse_progress', 'self, line'); + $p->{last_percentage} = 0; + } + + # Check ? + $p->{check_name} = 1; + + # Check <[..] id="..">? + $p->{check_id} = 1; + + # Don't interpret comment loosely + $p->strict_comment(1); + + return $p; +} + +################################################# +# Record or return the doctype of the document # +################################################# + +sub doctype +{ + my ($self, $dc) = @_; + return $self->{doctype} unless $dc; + $_ = $self->{doctype} = $dc; + + # What to look for depending on the doctype + + # Check for ? + $self->{check_name} = 0 + if m%^-//(W3C|WAPFORUM)//DTD XHTML (Basic|Mobile) %; + + # Check for <* id="...">? + $self->{check_id} = 0 + if (m%^-//IETF//DTD HTML [23]\.0//% || m%^-//W3C//DTD HTML 3\.2//%); + + # Enable XML mode (XHTML, XHTML Mobile, XHTML-Print, XHTML+RDFa, ...) + $self->xml_mode(1) if (m%^-//(W3C|WAPFORUM)//DTD XHTML[ \-\+]%); + + return; +} + +################################### +# Print parse progress indication # +################################### + +sub parse_progress +{ + my ($self, $line) = @_; + return unless defined($line) && $line > 0 && $self->{Total} > 0; + + my $percentage = int($line / $self->{Total} * 100); + if ($percentage != $self->{last_percentage}) { + printf("\r%4d%%", $percentage); + $self->{last_percentage} = $percentage; + } + + return; +} + +############################# +# Extraction of the anchors # +############################# + +sub get_anchor +{ + my ($self, $tag, $attr) = @_; + + my $anchor = $self->{check_id} ? $attr->{id} : undef; + if ($self->{check_name} && ($tag eq 'a')) { + + # @@@@ In XHTML, is mandatory + # Force an error if it's not the case (or if id's and name's values + # are different) + # If id is defined, name if defined must have the same value + $anchor ||= $attr->{name}; + } + + return $anchor; +} + +############################# +# W3C::LinkChecker handlers # +############################# + +sub add_link +{ + my ($self, $uri, $base, $line) = @_; + if (defined($uri)) { + + # Remove repeated slashes after the . or .. in relative links, to avoid + # duplicated checking or infinite recursion. + $uri =~ s|^(\.\.?/)/+|$1|o; + $uri = Encode::decode_utf8($uri); + $uri = URI->new_abs($uri, $base) if defined($base); + $self->{Links}{$uri}{defined($line) ? $line : LINE_UNKNOWN()}++; + } + return; +} + +sub start +{ + my ($self, $tag, $attr, $line) = @_; + $line = LINE_UNKNOWN() unless defined($line); + + # Anchors + my $anchor = $self->get_anchor($tag, $attr); + $self->{Anchors}{$anchor}{$line}++ if defined($anchor); + + # Links + if (!$self->{only_anchors}) { + + my $tag_local_base = undef; + + # Special case: base/@href + # @@@TODO: The reason for handling ourselves is that LWP's + # head parsing magic fails at least for responses that have + # Content-Encodings: https://rt.cpan.org/Ticket/Display.html?id=54361 + if ($tag eq 'base') { + + # Ignore with missing/empty href. + $self->{base} = $attr->{href} + if (defined($attr->{href}) && length($attr->{href})); + } + + # Special case: meta[@http-equiv=Refresh]/@content + elsif ($tag eq 'meta') { + if ($attr->{'http-equiv'} && + lc($attr->{'http-equiv'}) eq 'refresh') + { + my $content = $attr->{content}; + if ($content && $content =~ /.*?;\s*(?:url=)?(.+)/i) { + $self->add_link($1, undef, $line); + } + } + } + + # Special case: tags that have "local base" + elsif ($tag eq 'applet' || $tag eq 'object') { + if (my $codebase = $attr->{codebase}) { + + # Applet codebases are directories, append trailing slash + # if it's not there so that new_abs does the right thing. + $codebase .= "/" if ($tag eq 'applet' && $codebase !~ m|/$|); + + # TODO: HTML 4 spec says applet/@codebase may only point to + # subdirs of the directory containing the current document. + # Should we do something about that? + $tag_local_base = URI->new_abs($codebase, $self->{base}); + } + } + + # Link attributes: + if (my $link_attrs = LINK_ATTRS()->{$tag}) { + for my $la (@$link_attrs) { + $self->add_link($attr->{$la}, $tag_local_base, $line); + } + } + + # List of links attributes: + if (my $link_attrs = LINK_LIST_ATTRS()->{$tag}) { + my ($sep, $attrs) = @$link_attrs; + for my $la (@$attrs) { + if (defined(my $value = $attr->{$la})) { + for my $link (split($sep, $value)) { + $self->add_link($link, $tag_local_base, $line); + } + } + } + } + + # Inline CSS: + delete $self->{csstext}; + if ($tag eq 'style') { + $self->{csstext} = '' + if ((!$attr->{type} && $self->{style_is_css}) || + is_content_type($attr->{type}, "text/css")); + } + elsif ($self->{style_is_css} && (my $style = $attr->{style})) { + $style = CSS::DOM::Style::parse($style); + $self->parse_style($style, $line); + } + } + + $self->parse_progress($line) if $Opts{Progress}; + return; +} + +sub end +{ + my ($self, $tagname, $line) = @_; + + $self->parse_css($self->{csstext}, $line) if ($tagname eq 'style'); + delete $self->{csstext}; + + $self->parse_progress($line) if $Opts{Progress}; + return; +} + +sub parse_css +{ + my ($self, $css, $line) = @_; + return unless $css; + + my $sheet = CSS::DOM::parse($css); + for my $rule (@{$sheet->cssRules()}) { + if ($rule->type() == IMPORT_RULE()) { + $self->add_link($rule->href(), $self->{base}, $line); + } + elsif ($rule->type == STYLE_RULE()) { + $self->parse_style($rule->style(), $line); + } + } + return; +} + +sub parse_style +{ + my ($self, $style, $line) = @_; + return unless $style; + + for (my $i = 0, my $len = $style->length(); $i < $len; $i++) { + my $prop = $style->item($i); + my $val = $style->getPropertyValue($prop); + + while ($val =~ /$CssUrl/go) { + my $url = CSS::DOM::Util::unescape($2); + $self->add_link($url, $self->{base}, $line); + } + } + + return; +} + +sub declaration +{ + my ($self, $text, $line) = @_; + + # Extract the doctype + my @declaration = split(/\s+/, $text, 4); + if ($#declaration >= 3 && + $declaration[0] eq 'DOCTYPE' && + lc($declaration[1]) eq 'html') + { + + # Parse the doctype declaration + if ($text =~ + m/^DOCTYPE\s+html\s+(?:PUBLIC\s+"([^"]+)"|SYSTEM)(\s+"([^"]+)")?\s*$/i + ) + { + + # Store the doctype + $self->doctype($1) if $1; + + # If there is a link to the DTD, record it + $self->add_link($3, undef, $line) + if (!$self->{only_anchors} && $3); + } + } + + $self->text($text) unless $self->{only_anchors}; + + return; +} + +sub text +{ + my ($self, $text, $line) = @_; + $self->{csstext} .= $text if defined($self->{csstext}); + $self->parse_progress($line) if $Opts{Progress}; + return; +} + +sub end_document +{ + my ($self, $line) = @_; + $self->{Total} = $line; + delete $self->{csstext}; + return; +} + +################################ +# Check the validity of a link # +################################ + +sub check_validity (\$\$$\%\%) +{ + my ($referer, $uri, $want_links, $links, $redirects) = @_; + + # $referer is the URI object of the document checked + # $uri is the URI object of the target that we are verifying + # $want_links is true if we're interested in links in the target doc + # $links is a hash of the links in the documents checked + # $redirects is a map of the redirects encountered + + # Get the document with the appropriate method: GET if there are + # fragments to check or links are wanted, HEAD is enough otherwise. + my $fragments = $links->{$uri}{fragments} || {}; + my $method = ($want_links || %$fragments) ? 'GET' : 'HEAD'; + + my $response; + my $being_processed = 0; + if (!defined($results{$uri}) || + ($method eq 'GET' && $results{$uri}{method} eq 'HEAD')) + { + $being_processed = 1; + $response = &get_uri($method, $uri, $referer); + + # Get the information back from get_uri() + &record_results($uri, $method, $response, $referer); + + # Record the redirects + &record_redirects($redirects, $response); + } + elsif (!($Opts{Summary_Only} || (!$doc_count && $Opts{HTML}))) { + my $ref = $results{$uri}{referer}; + &hprintf("Already checked%s\n", $ref ? ", referrer $ref" : "."); + } + + # We got the response of the HTTP request. Stop here if it was a HEAD. + return if ($method eq 'HEAD'); + + # There are fragments. Parse the document. + my $p; + if ($being_processed) { + + # Can we really parse the document? + if (!defined($results{$uri}{location}{type}) || + $results{$uri}{location}{type} !~ $ContentTypes) + { + &hprintf("Can't check content: Content-Type for '%s' is '%s'.\n", + $uri, $results{$uri}{location}{type}) + if ($Opts{Verbose}); + $response->content(""); + return; + } + + # Do it then + if (my $error = decode_content($response)) { + &hprintf("%s\n.", $error); + } + + # @@@TODO: this isn't the best thing to do if a decode error occurred + $p = + &parse_document($uri, $response->base(), $response, 0, + $want_links); + } + else { + + # We already had the information + $p->{Anchors} = $results{$uri}{parsing}{Anchors}; + } + + # Check that the fragments exist + for my $fragment (keys %$fragments) { + if (defined($p->{Anchors}{$fragment}) || + &escape_match($fragment, $p->{Anchors}) || + grep { $_ eq "$uri#$fragment" } @{$Opts{Suppress_Fragment}}) + { + $results{$uri}{fragments}{$fragment} = 1; + } + else { + $results{$uri}{fragments}{$fragment} = 0; + } + } + return; +} + +sub escape_match ($\%) +{ + my ($a, $hash) = (URI::Escape::uri_unescape($_[0]), $_[1]); + for my $b (keys %$hash) { + return 1 if ($a eq URI::Escape::uri_unescape($b)); + } + return 0; +} + +########################## +# Ask for authentication # +########################## + +sub authentication ($;$$$$) +{ + my ($response, $cookie, $params, $check_num, $is_start) = @_; + + my $realm = ''; + if ($response->www_authenticate() =~ /Basic realm=\"([^\"]+)\"/) { + $realm = $1; + } + + if ($Opts{Command_Line}) { + printf STDERR <<'EOF', $response->request()->url(), $realm; + +Authentication is required for %s. +The realm is "%s". +Use the -u and -p options to specify a username and password and the -d option +to specify trusted domains. +EOF + } + else { + + printf( + "Status: 401 Authorization Required\nWWW-Authenticate: %s\n%sConnection: close\nContent-Language: en\nContent-Type: text/html; charset=utf-8\n\n", + $response->www_authenticate(), + $cookie ? "Set-Cookie: $cookie\n" : "", + ); + + printf( + "%s + + +W3C Link Checker: 401 Authorization Required +%s +", $DocType, $Head + ); + &banner(': 401 Authorization Required'); + &print_form($params, $cookie, $check_num) if $is_start; + printf( + '

+ %s + You need "%s" access to %s to perform link checking.
+', + &status_icon(401), + &encode($realm), (&encode($response->request()->url())) x 2 + ); + + my $host = $response->request()->url()->host(); + if ($Opts{Trusted} && $host !~ $Opts{Trusted}) { + printf <<'EOF', &encode($Opts{Trusted}), &encode($host); + This service has been configured to send authentication only to hostnames + matching the regular expression %s, but the hostname + %s does not match it. +EOF + } + + print "

\n"; + } + return; +} + +################## +# Get statistics # +################## + +sub get_timestamp () +{ + return pack('LL', Time::HiRes::gettimeofday()); +} + +sub time_diff ($$) +{ + my @start = unpack('LL', $_[0]); + my @stop = unpack('LL', $_[1]); + for ($start[1], $stop[1]) { + $_ /= 1_000_000; + } + return (sprintf("%.2f", ($stop[0] + $stop[1]) - ($start[0] + $start[1]))); +} + +######################## +# Handle the redirects # +######################## + +# Record the redirects in a hash +sub record_redirects (\%$) +{ + my ($redirects, $response) = @_; + for (my $prev = $response->previous(); $prev; $prev = $prev->previous()) { + + # Check for redirect match. + my $from = $prev->request()->url(); + my $to = $response->request()->url(); # same on every loop iteration + my $from_to = $from . '->' . $to; + my $match = grep { $_ eq $from_to } @{$Opts{Suppress_Redirect}}; + + # print STDERR "Result $match of redirect checking $from_to\n"; + if ($match) { next; } + + $match = grep { $from_to =~ /$_/ } @{$Opts{Suppress_Redirect_Prefix}}; + + # print STDERR "Result $match of regexp checking $from_to\n"; + if ($match) { next; } + + my $c = $prev->code(); + if ($Opts{Suppress_Temp_Redirects} && ($c == 307 || $c == 302)) { + next; + } + + $redirects->{$prev->request()->url()} = $response->request()->url(); + } + return; +} + +# Determine if a request is redirected +sub is_redirected ($%) +{ + my ($uri, %redirects) = @_; + return (defined($redirects{$uri})); +} + +# Get a list of redirects for a URI +sub get_redirects ($%) +{ + my ($uri, %redirects) = @_; + my @history = ($uri); + my %seen = ($uri => 1); # for tracking redirect loops + my $loop = 0; + while ($redirects{$uri}) { + $uri = $redirects{$uri}; + push(@history, $uri); + if ($seen{$uri}) { + $loop = 1; + last; + } + else { + $seen{$uri}++; + } + } + return ($loop, @history); +} + +#################################################### +# Tool for sorting the unique elements of an array # +#################################################### + +sub sort_unique (@) +{ + my %saw; + @saw{@_} = (); + return (sort { $a <=> $b } keys %saw); +} + +##################### +# Print the results # +##################### + +sub line_number ($) +{ + my $line = shift; + return $line if ($line >= 0); + return "(N/A)"; +} + +sub http_rc ($) +{ + my $rc = shift; + return $rc if ($rc >= 0); + return "(N/A)"; +} + +# returns true if the given code is informational +sub informational ($) +{ + my $rc = shift; + return $rc == RC_ROBOTS_TXT() || + $rc == RC_IP_DISALLOWED() || + $rc == RC_PROTOCOL_DISALLOWED(); +} + +sub anchors_summary (\%\%) +{ + my ($anchors, $errors) = @_; + + # Number of anchors found. + my $n = scalar(keys(%$anchors)); + if (!$Opts{Quiet}) { + if ($Opts{HTML}) { + print("

Anchors

\n

"); + } + else { + print("Anchors\n\n"); + } + &hprintf("Found %d anchor%s.\n", $n, ($n == 1) ? '' : 's'); + print("

\n") if $Opts{HTML}; + } + + # List of the duplicates, if any. + my @errors = keys %{$errors}; + if (!scalar(@errors)) { + print("

Valid anchors!

\n") + if (!$Opts{Quiet} && $Opts{HTML} && $n); + return; + } + undef $n; + + print_doc_header(); + print('

') if $Opts{HTML}; + print('List of duplicate and empty anchors'); + print <<'EOF' if $Opts{HTML}; +

+ + + + + + + + +EOF + print("\n"); + + for my $anchor (@errors) { + my $format; + my @unique = &sort_unique( + map { line_number($_) } + keys %{$anchors->{$anchor}} + ); + if ($Opts{HTML}) { + $format = "\n"; + } + else { + my $s = (scalar(@unique) > 1) ? 's' : ''; + $format = "\t%s\tLine$s: %s\n"; + } + printf($format, + &encode(length($anchor) ? $anchor : 'Empty anchor'), + join(', ', @unique)); + } + + print("\n
AnchorLines
%s%s
\n") if $Opts{HTML}; + + return; +} + +sub show_link_report (\%\%\%\%\@;$\%) +{ + my ($links, $results, $broken, $redirects, $urls, $codes, $todo) = @_; + + print("\n
") if $Opts{HTML}; + print("\n") if (!$Opts{Quiet}); + + # Process each URL + my ($c, $previous_c); + for my $u (@$urls) { + my @fragments = keys %{$broken->{$u}{fragments}}; + + # Did we get a redirect? + my $redirected = &is_redirected($u, %$redirects); + + # List of lines + my @total_lines; + push(@total_lines, keys(%{$links->{$u}{location}})); + for my $f (@fragments) { + push(@total_lines, keys(%{$links->{$u}{fragments}{$f}})) + unless ($f eq $u && defined($links->{$u}{$u}{LINE_UNKNOWN()})); + } + + my ($redirect_loop, @redirects_urls) = get_redirects($u, %$redirects); + my $currloc = $results->{$u}{location}; + + # Error type + $c = &code_shown($u, $results); + + # What to do + my $whattodo; + my $redirect_too; + if ($todo) { + if ($u =~ m/^javascript:/) { + if ($Opts{HTML}) { + $whattodo = + 'You must change this link: people using a browser without JavaScript support +will not be able to follow this link. See the +Web Content +Accessibility Guidelines on the use of scripting on the Web and the +techniques +on how to solve this.'; + } + else { + $whattodo = + 'Change this link: people using a browser without JavaScript support will not be able to follow this link.'; + } + } + elsif ($c == RC_ROBOTS_TXT()) { + $whattodo = + 'The link was not checked due to robots exclusion ' . + 'rules. Check the link manually.'; + } + elsif ($redirect_loop) { + $whattodo = + 'Retrieving the URI results in a redirect loop, that should be ' + . 'fixed. Examine the redirect sequence to see where the loop ' + . 'occurs.'; + } + else { + $whattodo = $todo->{$c}; + } + } + elsif (defined($redirects{$u})) { + + # Redirects + if (($u . '/') eq $redirects{$u}) { + $whattodo = + 'The link is missing a trailing slash, and caused a redirect. Adding the trailing slash would speed up browsing.'; + } + elsif ($c == 307 || $c == 302) { + $whattodo = + 'This is a temporary redirect. Update the link if you believe it makes sense, or leave it as is.'; + } + elsif ($c == 301) { + $whattodo = + 'This is a permanent redirect. The link should be updated.'; + } + } + + my @unique = &sort_unique(map { line_number($_) } @total_lines); + my $lines_list = join(', ', @unique); + my $s = (scalar(@unique) > 1) ? 's' : ''; + undef @unique; + + my @http_codes = ($currloc->{code}); + unshift(@http_codes, $currloc->{orig}) if $currloc->{orig}; + @http_codes = map { http_rc($_) } @http_codes; + + if ($Opts{HTML}) { + + # Style stuff + my $idref = ''; + if ($codes && (!defined($previous_c) || ($c != $previous_c))) { + $idref = ' id="d' . $doc_count . 'code_' . $c . '"'; + $previous_c = $c; + } + + # Main info + for (@redirects_urls) { + $_ = &show_url($_); + } + + # HTTP message + my $http_message; + if ($currloc->{message}) { + $http_message = &encode($currloc->{message}); + if ($c == 404 || $c == 500) { + $http_message = + '' . $http_message . ''; + } + } + my $redirmsg = + $redirect_loop ? ' redirect loop detected' : ''; + printf(" +%s Line%s: %s %s +
Status: %s %s %s
+

%s %s

\n", + + # Anchor for return codes + $idref, + + # Color + &status_icon($c), + $s, + + # List of lines + $lines_list, + + # List of redirects + $redirected ? + join(' redirected to ', @redirects_urls) . $redirmsg : + &show_url($u), + + # Realm + defined($currloc->{realm}) ? + sprintf('Realm: %s
', &encode($currloc->{realm})) : + '', + + # HTTP original message + # defined($currloc->{orig_message}) + # ? &encode($currloc->{orig_message}). + # ' -> ' + # : '', + + # Response code chain + join( + ' -> ', + map { &encode($_) } @http_codes), + + # HTTP final message + $http_message, + + # What to do + $whattodo, + + # Redirect too? + $redirect_too ? + sprintf(' %s', + &bgcolor(301), $redirect_too) : + '', + ); + if ($#fragments >= 0) { + printf("
Broken fragments:
    \n"); + } + } + else { + my $redirmsg = $redirect_loop ? ' redirect loop detected' : ''; + printf( + "\n%s\t%s\n Code: %s %s\n%s\n", + + # List of redirects + $redirected ? join("\n-> ", @redirects_urls) . $redirmsg : $u, + + # List of lines + $lines_list ? sprintf("\n%6s: %s", "Line$s", $lines_list) : '', + + # Response code chain + join(' -> ', @http_codes), + + # HTTP message + $currloc->{message} || '', + + # What to do + wrap(' To do: ', ' ', $whattodo) + ); + if ($#fragments >= 0) { + if ($currloc->{code} == 200) { + print("The following fragments need to be fixed:\n"); + } + else { + print("Fragments:\n"); + } + } + } + + # Fragments + for my $f (@fragments) { + my @unique_lines = + &sort_unique(keys %{$links->{$u}{fragments}{$f}}); + my $plural = (scalar(@unique_lines) > 1) ? 's' : ''; + my $unique_lines = join(', ', @unique_lines); + if ($Opts{HTML}) { + printf("
  • %s#%s (line%s %s)
    • \n", + &encode($u), &encode($f), $plural, $unique_lines); + } + else { + printf("\t%-30s\tLine%s: %s\n", $f, $plural, $unique_lines); + } + } + + print("
\n") if ($Opts{HTML} && scalar(@fragments)); + } + + # End of the table + print("
\n") if $Opts{HTML}; + + return; +} + +sub code_shown ($$) +{ + my ($u, $results) = @_; + + if ($results->{$u}{location}{record} == 200) { + return $results->{$u}{location}{orig} || + $results->{$u}{location}{record}; + } + else { + return $results->{$u}{location}{record}; + } +} + +sub links_summary (\%\%\%\%) +{ + + # Advices to fix the problems + + my %todo = ( + 200 => + 'Some of the links to this resource point to broken URI fragments (such as index.html#fragment).', + 300 => + 'This often happens when a typo in the link gets corrected automatically by the server. For the sake of performance, the link should be fixed.', + 301 => + 'This is a permanent redirect. The link should be updated to point to the more recent URI.', + 302 => + 'This is a temporary redirect. Update the link if you believe it makes sense, or leave it as is.', + 303 => + 'This rare status code points to a "See Other" resource. There is generally nothing to be done.', + 307 => + 'This is a temporary redirect. Update the link if you believe it makes sense, or leave it as is.', + 400 => + 'This is usually the sign of a malformed URL that cannot be parsed by the server. Check the syntax of the link.', + 401 => + "The link is not public and the actual resource is only available behind authentication. If not already done, you could specify it.", + 403 => + 'The link is forbidden! This needs fixing. Usual suspects: a missing index.html or Overview.html, or a missing ACL.', + 404 => + 'The link is broken. Double-check that you have not made any typo, or mistake in copy-pasting. If the link points to a resource that no longer exists, you may want to remove or fix the link.', + 405 => + 'The server does not allow HTTP HEAD requests, which prevents the Link Checker to check the link automatically. Check the link manually.', + 406 => + "The server isn't capable of responding according to the Accept* headers sent. This is likely to be a server-side issue with negotiation.", + 407 => 'The link is a proxy, but requires Authentication.', + 408 => 'The request timed out.', + 410 => 'The resource is gone. You should remove this link.', + 415 => 'The media type is not supported.', + 500 => 'This is a server side problem. Check the URI.', + 501 => + 'Could not check this link: method not implemented or scheme not supported.', + 503 => + 'The server cannot service the request, for some unknown reason.', + + # Non-HTTP codes: + RC_ROBOTS_TXT() => sprintf( + 'The link was not checked due to %srobots exclusion rules%s. Check the link manually, and see also the link checker %sdocumentation on robots exclusion%s.', + $Opts{HTML} ? ( + '', '', + "", '' + ) : ('') x 4 + ), + RC_DNS_ERROR() => + 'The hostname could not be resolved. Check the link for typos.', + RC_IP_DISALLOWED() => + sprintf( + 'The link resolved to a %snon-public IP address%s, and this link checker instance has been configured to not access such addresses. This may be a real error or just a quirk of the name resolver configuration on the server where the link checker runs. Check the link manually, in particular its hostname/IP address.', + $Opts{HTML} ? + ('', '') : + ('') x 2), + RC_PROTOCOL_DISALLOWED() => + 'Accessing links with this URI scheme has been disabled in link checker.', + ); + my %priority = ( + 410 => 1, + 404 => 2, + 403 => 5, + 200 => 10, + 300 => 15, + 401 => 20 + ); + + my ($links, $results, $broken, $redirects) = @_; + + # List of the broken links + my @urls = keys %{$broken}; + my @dir_redirect_urls = (); + if ($Opts{Redirects}) { + + # Add the redirected URI's to the report + for my $l (keys %$redirects) { + next + unless (defined($results->{$l}) && + defined($links->{$l}) && + !defined($broken->{$l})); + + # Check whether we have a "directory redirect" + # e.g. http://www.w3.org/TR -> http://www.w3.org/TR/ + my ($redirect_loop, @redirects) = get_redirects($l, %$redirects); + if ($#redirects == 1) { + push(@dir_redirect_urls, $l); + next; + } + push(@urls, $l); + } + } + + # Broken links and redirects + if ($#urls < 0) { + if (!$Opts{Quiet}) { + print_doc_header(); + if ($Opts{HTML}) { + print "

Links

\n

Valid links!

\n"; + } + else { + print "\nValid links.\n"; + } + } + } + else { + print_doc_header(); + print('

') if $Opts{HTML}; + print("\nList of broken links and other issues"); + + #print(' and redirects') if $Opts{Redirects}; + + # Sort the URI's by HTTP Code + my %code_summary; + my @idx; + for my $u (@urls) { + if (defined($results->{$u}{location}{record})) { + my $c = &code_shown($u, $results); + $code_summary{$c}++; + push(@idx, $c); + } + } + my @sorted = @urls[ + sort { + defined($priority{$idx[$a]}) ? + defined($priority{$idx[$b]}) ? + $priority{$idx[$a]} <=> $priority{$idx[$b]} : + -1 : + defined($priority{$idx[$b]}) ? 1 : + $idx[$a] <=> $idx[$b] + } 0 .. $#idx + ]; + @urls = @sorted; + undef(@sorted); + undef(@idx); + + if ($Opts{HTML}) { + + # Print a summary + print <<'EOF'; +

+

There are issues with the URLs listed below. The table summarizes the +issues and suggested actions by HTTP response status code.

+ + + + + + + + + +EOF + for my $code (sort(keys(%code_summary))) { + printf('', &bgcolor($code)); + printf('', + $doc_count, $code, http_rc($code)); + printf('', $code_summary{$code}); + printf('', $todo{$code}); + print "\n"; + } + print "\n
CodeOccurrencesWhat to do
%s%s%s
\n"; + } + else { + print(':'); + } + &show_link_report($links, $results, $broken, $redirects, \@urls, 1, + \%todo); + } + + # Show directory redirects + if ($Opts{Dir_Redirects} && ($#dir_redirect_urls > -1)) { + print_doc_header(); + print('

') if $Opts{HTML}; + print("\nList of redirects"); + print( + "

\n

The links below are not broken, but the document does not use the exact URL, and the links were redirected. It may be a good idea to link to the final location, for the sake of speed.

" + ) if $Opts{HTML}; + &show_link_report($links, $results, $broken, $redirects, + \@dir_redirect_urls); + } + + return; +} + +############################################################################### + +################ +# Global stats # +################ + +sub global_stats () +{ + my $stop = &get_timestamp(); + my $n_docs = + ($doc_count <= $Opts{Max_Documents}) ? $doc_count : + $Opts{Max_Documents}; + return sprintf( + 'Checked %d document%s in %s seconds.', + $n_docs, + ($n_docs == 1) ? '' : 's', + &time_diff($timestamp, $stop) + ); +} + +################## +# HTML interface # +################## + +sub html_header ($$) +{ + my ($uri, $cookie) = @_; + + my $title = defined($uri) ? $uri : ''; + $title = ': ' . $title if ($title =~ /\S/); + + my $headers = ''; + if (!$Opts{Command_Line}) { + $headers .= "Cache-Control: no-cache\nPragma: no-cache\n" if $uri; + $headers .= "Content-Type: text/html; charset=utf-8\n"; + $headers .= "Set-Cookie: $cookie\n" if $cookie; + + # mod_perl 1.99_05 doesn't seem to like it if the "\n\n" isn't in the same + # print() statement as the last header + $headers .= "Content-Language: en\n\n"; + } + + my $onload = $uri ? '' : + ' onload="if(document.getElementById){document.getElementById(\'uri_1\').focus()}"'; + + print $headers, $DocType, " + + +W3C Link Checker", &encode($title), " +", $Head, " +'; + &banner($title); + return; +} + +sub banner ($) +{ + my $tagline = "Check links and anchors in Web pages or full Web sites"; + + printf( + <<'EOF', URI->new_abs("../images/no_w3c.png", $Cfg{Doc_URI}), $tagline); + +
+EOF + return; +} + +sub status_icon($) +{ + my ($code) = @_; + my $icon_type; + my $r = HTTP::Response->new($code); + if ($r->is_success()) { + $icon_type = 'error' + ; # if is success but reported, it's because of broken frags => error + } + elsif (&informational($code)) { + $icon_type = 'info'; + } + elsif ($code == 300) { + $icon_type = 'info'; + } + elsif ($code == 401) { + $icon_type = 'error'; + } + elsif ($r->is_redirect()) { + $icon_type = 'warning'; + } + elsif ($r->is_error()) { + $icon_type = 'error'; + } + else { + $icon_type = 'error'; + } + return sprintf('%s', + URI->new_abs("../images/info_icons/$icon_type.png", $Cfg{Doc_URI}), + $icon_type); +} + +sub bgcolor ($) +{ + my ($code) = @_; + my $class; + my $r = HTTP::Response->new($code); + if ($r->is_success()) { + return ''; + } + elsif ($code == RC_ROBOTS_TXT() || $code == RC_IP_DISALLOWED()) { + $class = 'dubious'; + } + elsif ($code == 300) { + $class = 'multiple'; + } + elsif ($code == 401) { + $class = 'unauthorized'; + } + elsif ($r->is_redirect()) { + $class = 'redirect'; + } + elsif ($r->is_error()) { + $class = 'broken'; + } + else { + $class = 'broken'; + } + return (' class="' . $class . '"'); +} + +sub show_url ($) +{ + my ($url) = @_; + return sprintf('%s', (&encode($url)) x 2); +} + +sub html_footer () +{ + printf("

%s

\n", &global_stats()) + if ($doc_count > 0 && !$Opts{Quiet}); + if (!$doc_count) { + print <<'EOF'; +
+

+ This Link Checker looks for issues in links, anchors and referenced objects + in a Web page, CSS style sheet, or recursively on a whole Web site. For + best results, it is recommended to first ensure that the documents checked + use Valid (X)HTML Markup and + CSS. The Link Checker is + part of the W3C's validators and + Quality Web tools. +

+
+EOF + } + printf(<<'EOF', $Cfg{Doc_URI}, $Cfg{Doc_URI}, $PACKAGE, $REVISION); +
+ +
+
+%s
%s +
+
+ + +EOF + return; +} + +sub print_form (\%$$) +{ + my ($params, $cookie, $check_num) = @_; + + # Split params on \0, see CGI's docs on Vars() + while (my ($key, $value) = each(%$params)) { + if ($value) { + my @vals = split(/\0/, $value, 2); + $params->{$key} = $vals[0]; + } + } + + # Override undefined values from the cookie, if we got one. + my $valid_cookie = 0; + if ($cookie) { + my %cookie_values = $cookie->value(); + if (!$cookie_values{clear}) + { # XXX no easy way to check if cookie expired? + $valid_cookie = 1; + while (my ($key, $value) = each(%cookie_values)) { + $params->{$key} = $value unless defined($params->{$key}); + } + } + } + + my $chk = ' checked="checked"'; + $params->{hide_type} = 'all' unless $params->{hide_type}; + + my $requested_uri = &encode($params->{uri} || ''); + my $sum = $params->{summary} ? $chk : ''; + my $red = $params->{hide_redirects} ? $chk : ''; + my $all = ($params->{hide_type} ne 'dir') ? $chk : ''; + my $dir = $all ? '' : $chk; + my $acc = $params->{no_accept_language} ? $chk : ''; + my $ref = $params->{no_referer} ? $chk : ''; + my $rec = $params->{recursive} ? $chk : ''; + my $dep = &encode($params->{depth} || ''); + + my $cookie_options = ''; + if ($valid_cookie) { + $cookie_options = " + + + "; + } + else { + $cookie_options = " + "; + } + + print "
+

+

+
+ More Options +
+

+ +
+ + + +
+ +
+ +
+ , + +

", $cookie_options, " +

+
+
+

+
+
+ +"; + return; +} + +sub encode (@) +{ + return $Opts{HTML} ? HTML::Entities::encode(@_) : @_; +} + +sub hprintf (@) +{ + print_doc_header(); + if (!$Opts{HTML}) { + # can have undef values here; avoid useless warning. E.g., + # Error: -1 Forbidden by robots.txt + # Use of uninitialized value $_[2] in printf at /usr/local/bin/checklink line 3245. + # and + # Error: 404 File `/u/karl/gnu/src/akarl/doc/dejagnu.html' does not exist + # Use of uninitialized value $_[2] in printf at /usr/local/bin/checklink line 3245. + my @args = (); + for my $a (@_) { + push (@args, defined $a ? $a : ""), + } + printf(@args); + } + else { + print HTML::Entities::encode(sprintf($_[0], @_[1 .. @_ - 1])); + } + return; +} + +# Print the document header, if it hasn't been printed already. +# This is invoked before most other output operations, in order +# to enable quiet processing that doesn't clutter the output with +# "Processing..." messages when nothing else will be reported. +sub print_doc_header () +{ + if (defined($doc_header)) { + print $doc_header; + undef($doc_header); + } +} + +# Local Variables: +# mode: perl +# indent-tabs-mode: nil +# cperl-indent-level: 4 +# cperl-continued-statement-offset: 4 +# cperl-brace-offset: -4 +# perl-indent-level: 4 +# End: +# ex: ts=4 sw=4 et diff -Nru automake-1.16-1.16.1/contrib/multilib/config-ml.in automake-1.16-1.16.5/contrib/multilib/config-ml.in --- automake-1.16-1.16.1/contrib/multilib/config-ml.in 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/contrib/multilib/config-ml.in 2021-07-12 02:41:13.000000000 +0000 @@ -1,7 +1,7 @@ # Configure fragment invoked in the post-target section for subdirs # wanting multilib support. # -# Copyright (C) 1995-2018 Free Software Foundation, Inc. +# Copyright (C) 1995-2021 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru automake-1.16-1.16.1/contrib/multilib/multilib.am automake-1.16-1.16.5/contrib/multilib/multilib.am --- automake-1.16-1.16.1/contrib/multilib/multilib.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/contrib/multilib/multilib.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 Free Software Foundation, Inc. ## This Makefile.in 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. diff -Nru automake-1.16-1.16.1/contrib/multilib/multi.m4 automake-1.16-1.16.5/contrib/multilib/multi.m4 --- automake-1.16-1.16.1/contrib/multilib/multi.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/contrib/multilib/multi.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/contrib/multilib/symlink-tree automake-1.16-1.16.5/contrib/multilib/symlink-tree --- automake-1.16-1.16.1/contrib/multilib/symlink-tree 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/contrib/multilib/symlink-tree 2021-07-12 02:41:13.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # Create a symlink tree. # -# Copyright (C) 1995-2018 Free Software Foundation, Inc. +# Copyright (C) 1995-2021 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru automake-1.16-1.16.1/contrib/README automake-1.16-1.16.5/contrib/README --- automake-1.16-1.16.1/contrib/README 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/contrib/README 2020-10-24 04:13:42.000000000 +0000 @@ -1,26 +1,23 @@ This is the 'contrib' directory of the GNU Automake distribution. -Here you'll find additions to the Automake base distribution, in form of -makefile fragments, m4 macros, scripts, documentation, et cetera. Such -addition that might be useful for a significant percentage of its general -audience, but (for one reason or another) are not deemed appropriate for -inclusion into the Automake core. +Here you'll find additions to the Automake base distribution, in the form of +makefile fragments, m4 macros, scripts, documentation, et cetera: additions +that might be handy to many users, but (for one reason or another) are not +deemed appropriate for inclusion into the Automake core. -There are several reasons for which a feature can be kept in contrib: +There are several reasons that a feature might be kept in contrib: 1. The long-term usefulness of the feature is debatable and uncertain; - on-field and real-word testing are necessary to prove or disprove - its usefulness, before the feature can be committed into the Automake - core (as doing so too early would later force us to continue the - support for backward-compatibility, even if the features proves - flawed or fails to attract widespread use). + real-world testing is necessary to prove or disprove its usefulness, + before the feature can be committed into the Automake core (as doing so + too early would later force us to continue support for + backward-compatibility, even if the feature proved flawed or fails to + attract widespread use). - 2. The APIs or overall design of the feature are still unstable, and - need on-field testing to iron warts and usability bugs, or uncover - potential flaws. + 2. The APIs or overall design of the feature are still unstable, and need + testing to iron out warts and usability bugs, or uncover potential flaws. - 3. The feature was an historical one, mostly obsoleted but still used - "here and there" in the wild; so we want to to deprecate it and - remove it from the Automake core, but cannot remove it altogether, - for the sake of those still-existing usage. So it gets moved in - contrib. + 3. The feature was an historical one, mostly obsolete but still used in the + wild. We want to deprecate it and remove it from the Automake core, but + cannot remove it altogether, for the sake of the existing usage, so it + gets moved to contrib. diff -Nru automake-1.16-1.16.1/contrib/t/help-multilib.sh automake-1.16-1.16.5/contrib/t/help-multilib.sh --- automake-1.16-1.16.1/contrib/t/help-multilib.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/contrib/t/help-multilib.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/contrib/t/local.mk automake-1.16-1.16.5/contrib/t/local.mk --- automake-1.16-1.16.1/contrib/t/local.mk 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/contrib/t/local.mk 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- makefile-automake -*- -## Copyright (C) 1995-2018 Free Software Foundation, Inc. +## Copyright (C) 1995-2021 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 diff -Nru automake-1.16-1.16.1/contrib/t/multilib.sh automake-1.16-1.16.5/contrib/t/multilib.sh --- automake-1.16-1.16.1/contrib/t/multilib.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/contrib/t/multilib.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 @@ -61,6 +61,11 @@ test -f debug/libbar/libbar.a test -f libfoo/libfoo.a test -f libbar/libbar.a +# Tell GNU make not to parallelize, since the tests can result in, for example: +# make[5]: *** No rule to make target 'mostlyclean'. Stop. +# make[5]: Leaving directory '/u/karl/gnu/src/akarl/contrib/t/multilib.dir/build/debug/libbar/sub' +# No evident way to debug or reliably reproduce. +.NOTPARALLEL: EOF # libfoo tests multilib supports when there are no subdirectories @@ -89,6 +94,10 @@ noinst_LIBRARIES = libfoo.a libfoo_a_SOURCES = foo.c include $(top_srcdir)/multilib.am + +# The test can fail under a parallel make, so disable. +# No evident way to debug or reliably reproduce. +.NOTPARALLEL: END : > libfoo/foo.c @@ -116,6 +125,10 @@ noinst_LIBRARIES = libbar.a libbar_a_SOURCES = bar.c include $(top_srcdir)/multilib.am + +# The test can fail under a parallel make, so disable. +# No evident way to debug or reliably reproduce. +.NOTPARALLEL: END mkdir libbar/sub diff -Nru automake-1.16-1.16.1/contrib/t/parallel-tests-html-recursive.sh automake-1.16-1.16.5/contrib/t/parallel-tests-html-recursive.sh --- automake-1.16-1.16.1/contrib/t/parallel-tests-html-recursive.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/contrib/t/parallel-tests-html-recursive.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/contrib/t/parallel-tests-html.sh automake-1.16-1.16.5/contrib/t/parallel-tests-html.sh --- automake-1.16-1.16.1/contrib/t/parallel-tests-html.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/contrib/t/parallel-tests-html.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/contrib/tap-driver.pl automake-1.16-1.16.5/contrib/tap-driver.pl --- automake-1.16-1.16.1/contrib/tap-driver.pl 2018-03-08 20:15:51.000000000 +0000 +++ automake-1.16-1.16.5/contrib/tap-driver.pl 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /usr/bin/env perl -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/debian/automake.info automake-1.16-1.16.5/debian/automake.info --- automake-1.16-1.16.1/debian/automake.info 2018-11-05 04:03:34.000000000 +0000 +++ automake-1.16-1.16.5/debian/automake.info 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -doc/automake-1.16.info* diff -Nru automake-1.16-1.16.1/debian/automake.install automake-1.16-1.16.5/debian/automake.install --- automake-1.16-1.16.1/debian/automake.install 2018-11-05 04:03:34.000000000 +0000 +++ automake-1.16-1.16.5/debian/automake.install 2021-10-23 04:35:41.000000000 +0000 @@ -1,3 +1,5 @@ debian/tmp/usr/bin/*-1.16 usr/bin/ debian/tmp/usr/share/*-1.16 usr/share/ +debian/tmp/usr/share/info/automake-1.16.info* usr/share/info +debian/tmp/usr/share/info/automake-history.info usr/share/info debian/tmp/usr/share/man/man1/*-1.16.1 usr/share/man/man1 diff -Nru automake-1.16-1.16.1/debian/automake.lintian-overrides automake-1.16-1.16.5/debian/automake.lintian-overrides --- automake-1.16-1.16.1/debian/automake.lintian-overrides 2018-11-05 04:03:34.000000000 +0000 +++ automake-1.16-1.16.5/debian/automake.lintian-overrides 2021-10-23 04:35:41.000000000 +0000 @@ -1,2 +1,3 @@ automake: extra-license-file usr/share/automake-1.16/COPYING +automake: package-contains-documentation-outside-usr-share-doc usr/share/automake-1.16/texinfo.tex automake: package-contains-empty-directory usr/share/aclocal/ diff -Nru automake-1.16-1.16.1/debian/changelog automake-1.16-1.16.5/debian/changelog --- automake-1.16-1.16.1/debian/changelog 2020-02-05 14:31:46.000000000 +0000 +++ automake-1.16-1.16.5/debian/changelog 2023-10-22 19:57:30.000000000 +0000 @@ -1,34 +1,110 @@ -automake-1.16 (1:1.16.1-4ubuntu6) focal; urgency=medium +automake-1.16 (1:1.16.5-1.3~20.04.sav0) focal; urgency=medium - * Restore the skipping of self-check-report test on armhf, it still fails + * Backport to Focal + * debian/control: Set debhelper-compat (= 12) BD - -- Sebastien Bacher Wed, 05 Feb 2020 15:31:03 +0100 + -- Rob Savoury Sun, 22 Oct 2023 12:57:30 -0700 -automake-1.16 (1:1.16.1-4ubuntu5) focal; urgency=medium +automake-1.16 (1:1.16.5-1.3) unstable; urgency=medium - * debian/tests/control: - - Build-Depends on python2 instead of python + * Non-maintainer upload. + * Fix a regression in the patch in 1:1.16.5-1.2, support older Python + versions. (Closes: #1007912) + + -- Stefano Rivera Fri, 18 Mar 2022 09:09:08 -0400 + +automake-1.16 (1:1.16.5-1.2) unstable; urgency=medium + + * Non maintainer upload + * Patch: Fix search paths for new Python 3.10, use posix_prefix scheme. + (Closes: #1006784, LP: #1960608) + + -- Stefano Rivera Tue, 15 Mar 2022 20:13:57 -0400 + +automake-1.16 (1:1.16.5-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add support for Python 3.10 and 3.11. + + -- Matthias Klose Thu, 11 Nov 2021 12:46:00 +0100 + +automake-1.16 (1:1.16.5-1) unstable; urgency=medium + + [ Eric Dorland ] + * New upstream release + + [ Debian Janitor ] + * Remove constraints unnecessary since buster + + -- Eric Dorland Sat, 23 Oct 2021 00:35:41 -0400 + +automake-1.16 (1:1.16.4-2) unstable; urgency=medium + + * Patch to fix t/python-prefix.sh with python3. Thanks Simon McVittie. + (Closes: 992416) + + -- Eric Dorland Thu, 09 Sep 2021 20:21:31 -0400 - -- Sebastien Bacher Wed, 29 Jan 2020 23:53:12 +0100 +automake-1.16 (1:1.16.4-1) unstable; urgency=medium -automake-1.16 (1:1.16.1-4ubuntu4) focal; urgency=medium + * New upstream release + * Switch to debhelper v13 + + -- Eric Dorland Sun, 15 Aug 2021 13:25:19 -0400 + +automake-1.16 (1:1.16.3-2) unstable; urgency=medium + + * Use python3 when running autopkgtest (Closes: 966434) + + -- Eric Dorland Mon, 04 Jan 2021 00:32:20 -0500 + +automake-1.16 (1:1.16.3-1) unstable; urgency=medium + + * New upstream release + * Refresh and drop upstreamed patch + * Standards-Version to 4.5.1.0 + + -- Eric Dorland Tue, 01 Dec 2020 01:35:51 -0500 - * Enable self-check-report test on armhf as it now passes. (LP: #1812688) +automake-1.16 (1:1.16.2-4) unstable; urgency=medium - -- Brian Murray Fri, 06 Dec 2019 10:46:22 -0800 + * Add patch for 'support -fno-common in vala-mix2 test' (Closes: 970142) + * Fix ordering of patches + * Add upstream Repository and Repository-Browse + * Add lintian override for tex file outside of /usr/share/doc -automake-1.16 (1:1.16.1-4ubuntu3) disco; urgency=medium + -- Eric Dorland Sun, 13 Sep 2020 01:12:34 -0400 - * Only mark the self-check-report test as failing on armhf, - an XPASS fails the testsuite on the other architectures ... +automake-1.16 (1:1.16.2-3) unstable; urgency=medium - -- Matthias Klose Thu, 24 Jan 2019 10:36:04 +0100 + * Add debian/not-installed + * Move info file installation to automake.install + * Add automake-history.info to the package -automake-1.16 (1:1.16.1-4ubuntu2) disco; urgency=medium + -- Eric Dorland Sun, 05 Jul 2020 00:51:26 -0400 - * Mark the self-check-report test as failing. +automake-1.16 (1:1.16.2-2) unstable; urgency=medium - -- Matthias Klose Wed, 23 Jan 2019 16:45:46 +0100 + [ Debian Janitor ] + * Trim trailing whitespace. + * Set upstream metadata fields: Bug-Submit (from ./configure). + + [ Eric Dorland ] + * Add dch section to gbp.conf + * Use https for watch file URL + + -- Eric Dorland Sat, 04 Jul 2020 18:23:19 -0400 + +automake-1.16 (1:1.16.2-1) unstable; urgency=medium + + * New upstream release (Closes: 889647, 918582) + * Update upstream signing key + * Switch to debhelper-compat 12 + * Standards-Version to 4.5.0.1 + * Switch python dependencies to Python 3 (Closes: 942928) + * Remove long obsolete Conflicts + + -- Eric Dorland Sun, 12 Apr 2020 14:14:58 -0400 automake-1.16 (1:1.16.1-4) unstable; urgency=medium @@ -406,7 +482,7 @@ automake1.10 (1:1.10.1-2) unstable; urgency=low * The "Must Obey lintian" release. - + * debian/lintian.overrides: Fix the package name in the override. * debian/automake.doc-base: Fix spurious space in paragraph separator. @@ -418,7 +494,7 @@ * New upstream release. The documentation now contains no invariant sections or cover texts, so moving the documentation back into the package. (Closes: #462148) - + * debian/rules: Add back the documentation building rules. * debian/automake.info, debian/automake.doc-base: Add back these document files. @@ -459,9 +535,9 @@ * debian/control: - Standards-Version to 3.7.2.1. - - Use Build-Depends instead of Build-Depends-Indep for things + - Use Build-Depends instead of Build-Depends-Indep for things that need to be there for the clean target. - * automake.in: Fix for extension detection of .info files. + * automake.in: Fix for extension detection of .info files. -- Eric Dorland Sat, 15 Jul 2006 00:28:25 -0400 @@ -499,7 +575,7 @@ automake1.9 (1.9.5-1) unstable; urgency=low * New upstream release. - * debian/copyright: Add full copyright citation. + * debian/copyright: Add full copyright citation. -- Eric Dorland Wed, 16 Feb 2005 01:06:55 -0500 @@ -514,7 +590,7 @@ * New upstream release. Urgency medium since there's no reason for this not to move to testing. - * doc/autmake.texi: Resolve CVS conflict about document name on upgrade. + * doc/autmake.texi: Resolve CVS conflict about document name on upgrade. -- Eric Dorland Wed, 3 Nov 2004 00:04:38 -0500 @@ -527,7 +603,7 @@ automake1.9 (1.9.1-1) unstable; urgency=low - * New upstream release. + * New upstream release. -- Eric Dorland Thu, 12 Aug 2004 22:17:17 -0400 diff -Nru automake-1.16-1.16.1/debian/compat automake-1.16-1.16.5/debian/compat --- automake-1.16-1.16.1/debian/compat 2018-11-05 04:03:34.000000000 +0000 +++ automake-1.16-1.16.5/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -11 diff -Nru automake-1.16-1.16.1/debian/control automake-1.16-1.16.5/debian/control --- automake-1.16-1.16.1/debian/control 2020-02-05 14:31:57.000000000 +0000 +++ automake-1.16-1.16.5/debian/control 2023-10-22 19:57:30.000000000 +0000 @@ -1,18 +1,17 @@ Source: automake-1.16 Section: devel Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Eric Dorland -Standards-Version: 4.2.1.3 -Build-Depends: debhelper (>= 11) -Build-Depends-Indep: autoconf (>= 2.65), +Maintainer: Eric Dorland +Standards-Version: 4.5.1.0 +Build-Depends: debhelper-compat (= 12) +Build-Depends-Indep: autoconf, gettext, help2man, install-info, libtool, libtool-bin, pkg-config, - texinfo (>= 4.9), + texinfo, Rules-Requires-Root: no Homepage: https://www.gnu.org/software/automake/ Vcs-Git: https://salsa.debian.org/eric/automake-1.16.git @@ -22,12 +21,8 @@ Architecture: all Multi-Arch: foreign Provides: automake-1.16, automaken -Depends: autoconf (>= 2.65), autotools-dev (>= 20020320.1), ${misc:Depends} +Depends: autoconf, autotools-dev, ${misc:Depends} Suggests: autoconf-doc, gnu-standards -Conflicts: automake (<< 1:1.4-p5-1), - automake1.10-doc, - automake1.5 (<< 1.5-2), - automake1.6 (<< 1.6.1-4) Description: Tool for generating GNU Standards-compliant Makefiles Automake is a tool for automatically generating `Makefile.in's from files called `Makefile.am'. diff -Nru automake-1.16-1.16.1/debian/gbp.conf automake-1.16-1.16.5/debian/gbp.conf --- automake-1.16-1.16.1/debian/gbp.conf 2018-11-05 04:03:34.000000000 +0000 +++ automake-1.16-1.16.5/debian/gbp.conf 2021-10-23 04:35:41.000000000 +0000 @@ -1,3 +1,6 @@ [DEFAULT] pristine-tar = True upstream-vcs-tag = v%(version)s + +[dch] +commit-msg = debian/changelog: %(version)s diff -Nru automake-1.16-1.16.1/debian/not-installed automake-1.16-1.16.5/debian/not-installed --- automake-1.16-1.16.1/debian/not-installed 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/debian/not-installed 2021-10-23 04:35:41.000000000 +0000 @@ -0,0 +1,6 @@ +usr/bin/aclocal +usr/bin/automake +usr/share/aclocal/README +usr/share/doc/automake/amhello-1.0.tar.gz +usr/share/man/man1/aclocal.1 +usr/share/man/man1/automake.1 diff -Nru automake-1.16-1.16.1/debian/patches/0001-texi-rename.patch automake-1.16-1.16.5/debian/patches/0001-texi-rename.patch --- automake-1.16-1.16.1/debian/patches/0001-texi-rename.patch 2018-11-05 04:03:34.000000000 +0000 +++ automake-1.16-1.16.5/debian/patches/0001-texi-rename.patch 2021-10-23 04:35:41.000000000 +0000 @@ -7,7 +7,7 @@ 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/automake.texi b/doc/automake.texi -index da0aa29..b6457aa 100644 +index 9f4acf6..c4d08e9 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -1,7 +1,7 @@ diff -Nru automake-1.16-1.16.1/debian/patches/0002-Drop-SHELL.patch automake-1.16-1.16.5/debian/patches/0002-Drop-SHELL.patch --- automake-1.16-1.16.1/debian/patches/0002-Drop-SHELL.patch 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/debian/patches/0002-Drop-SHELL.patch 2021-10-23 04:35:41.000000000 +0000 @@ -0,0 +1,23 @@ +From: Eric Dorland +Date: Mon, 3 Jul 2017 17:15:34 -0400 +Subject: Drop @SHELL@ + +Using @SHELL@ is a reproducibility problem and shouldn't be necessary on +Debian systems. +--- + bin/automake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: automake-1.16/bin/automake.in +=================================================================== +--- automake-1.16.orig/bin/automake.in 2020-12-01 01:24:01.564403114 -0500 ++++ automake-1.16/bin/automake.in 2020-12-01 01:24:01.560403159 -0500 +@@ -38,7 +38,7 @@ + # it turns up other systems need the same thing. After all, + # if SHELL is used, ./configure's SHELL is always better than + # the user's SHELL (which may be something like tcsh). +- $ENV{'SHELL'} = '@SHELL@' if exists $ENV{'DJDIR'}; ++ $ENV{'SHELL'} = '/bin/sh' if exists $ENV{'DJDIR'}; + } + + use Carp; diff -Nru automake-1.16-1.16.1/debian/patches/0003-t-python-prefix.sh-Respect-PYTHON-environment-variable.patch automake-1.16-1.16.5/debian/patches/0003-t-python-prefix.sh-Respect-PYTHON-environment-variable.patch --- automake-1.16-1.16.1/debian/patches/0003-t-python-prefix.sh-Respect-PYTHON-environment-variable.patch 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/debian/patches/0003-t-python-prefix.sh-Respect-PYTHON-environment-variable.patch 2021-10-23 04:35:41.000000000 +0000 @@ -0,0 +1,30 @@ +From: Simon McVittie +Date: Mon, 6 Sep 2021 11:11:32 +0100 +Subject: t/python-prefix.sh: Respect PYTHON environment variable + +Otherwise, this test will fail on operating systems that have python3 +but not python (implicitly Python 2) in the PATH. + +The test initialization in t/ax/*.sh sets PYTHON whenever we have +required=python, so we can assume it is set, and do not need to fall +back to calling python if it is unset. + +Bug-Debian: https://bugs.debian.org/992416 +Signed-off-by: Simon McVittie +--- + t/python-prefix.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/t/python-prefix.sh b/t/python-prefix.sh +index 3179d42..5c70d96 100755 +--- a/t/python-prefix.sh ++++ b/t/python-prefix.sh +@@ -45,7 +45,7 @@ echo-python-exec-prefix: + @echo $(PYTHON_EXEC_PREFIX) + END + +-py_version=$(python -c 'import sys; print("%u.%u" % sys.version_info[:2])') ++py_version=$($PYTHON -c 'import sys; print("%u.%u" % sys.version_info[:2])') + py_inst_site=inst/lib/python$py_version/site-packages + py_instexec_site=instexec/lib/python$py_version/site-packages + diff -Nru automake-1.16-1.16.1/debian/patches/0006-Drop-SHELL.patch automake-1.16-1.16.5/debian/patches/0006-Drop-SHELL.patch --- automake-1.16-1.16.1/debian/patches/0006-Drop-SHELL.patch 2018-11-05 04:03:34.000000000 +0000 +++ automake-1.16-1.16.5/debian/patches/0006-Drop-SHELL.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -From: Eric Dorland -Date: Mon, 3 Jul 2017 17:15:34 -0400 -Subject: Drop @SHELL@ - -Using @SHELL@ is a reproducibility problem and shouldn't be necessary on -Debian systems. ---- - bin/automake.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: automake-1.16/bin/automake.in -=================================================================== ---- automake-1.16.orig/bin/automake.in 2018-03-10 16:51:25.061272857 -0500 -+++ automake-1.16/bin/automake.in 2018-03-10 16:51:25.029273230 -0500 -@@ -41,7 +41,7 @@ - # it turns up other systems need the same thing. After all, - # if SHELL is used, ./configure's SHELL is always better than - # the user's SHELL (which may be something like tcsh). -- $ENV{'SHELL'} = '@SHELL@' if exists $ENV{'DJDIR'}; -+ $ENV{'SHELL'} = '/bin/sh' if exists $ENV{'DJDIR'}; - } - - use Automake::Config; diff -Nru automake-1.16-1.16.1/debian/patches/0008-SOURCE_DATE_EPOCH-support-for-mdate-sh.patch automake-1.16-1.16.5/debian/patches/0008-SOURCE_DATE_EPOCH-support-for-mdate-sh.patch --- automake-1.16-1.16.1/debian/patches/0008-SOURCE_DATE_EPOCH-support-for-mdate-sh.patch 2018-11-05 04:03:34.000000000 +0000 +++ automake-1.16-1.16.5/debian/patches/0008-SOURCE_DATE_EPOCH-support-for-mdate-sh.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,31 +0,0 @@ -From: Eric Dorland -Date: Sat, 16 Sep 2017 18:47:43 -0400 -Subject: $SOURCE_DATE_EPOCH support for mdate-sh - -Uses $SOURCE_DATE_EPOCH if it is set, to get reproducible behavior no -matter what file mtime says. ---- - lib/mdate-sh | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -Index: automake-1.16/lib/mdate-sh -=================================================================== ---- automake-1.16.orig/lib/mdate-sh 2018-07-18 20:02:46.619692936 -0400 -+++ automake-1.16/lib/mdate-sh 2018-07-18 20:02:46.591693280 -0400 -@@ -88,6 +88,16 @@ - - save_arg1=$1 - -+# Try SOURCE_DATE_EPOCH -+if test -n "${SOURCE_DATE_EPOCH}"; then -+ if date -d "@${SOURCE_DATE_EPOCH}" '+%-d %B %Y'; then -+ exit 0 -+ else -+ error 'Invalid $SOURCE_DATE_EPOCH' -+ fi -+fi -+ -+ - # Find out how to get the extended ls output of a file or directory. - if ls -L /dev/null 1>/dev/null 2>&1; then - ls_command='ls -L -l -d' diff -Nru automake-1.16-1.16.1/debian/patches/mark-self-check-report-xfail.diff automake-1.16-1.16.5/debian/patches/mark-self-check-report-xfail.diff --- automake-1.16-1.16.1/debian/patches/mark-self-check-report-xfail.diff 2019-01-23 15:53:47.000000000 +0000 +++ automake-1.16-1.16.5/debian/patches/mark-self-check-report-xfail.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ ---- a/t/list-of-tests.mk -+++ b/t/list-of-tests.mk -@@ -43,6 +43,7 @@ t/remake-timing-bug-pr8365.sh \ - t/lex-subobj-nodep.sh \ - t/remake-am-pr10111.sh \ - t/remake-m4-pr10111.sh \ -+t/self-check-report.sh \ - $(perl_fake_XFAIL_TESTS) - - perl_TESTS = \ diff -Nru automake-1.16-1.16.1/debian/patches/python3.10.patch automake-1.16-1.16.5/debian/patches/python3.10.patch --- automake-1.16-1.16.1/debian/patches/python3.10.patch 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/debian/patches/python3.10.patch 2021-11-11 11:46:00.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Add support for Python 3.10 +Author: Graham Inggs +Last-Update: 2021-11-08 + +--- a/m4/python.m4 ++++ b/m4/python.m4 +@@ -38,6 +38,7 @@ + dnl supported. (2.0 was released on October 16, 2000). + m4_define_default([_AM_PYTHON_INTERPRETER_LIST], + [python python2 python3 dnl ++ python3.11 python3.10 dnl + python3.9 python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 dnl + python3.2 python3.1 python3.0 dnl + python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 dnl diff -Nru automake-1.16-1.16.1/debian/patches/python3.10-sysconfig.patch automake-1.16-1.16.5/debian/patches/python3.10-sysconfig.patch --- automake-1.16-1.16.1/debian/patches/python3.10-sysconfig.patch 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/debian/patches/python3.10-sysconfig.patch 2022-03-18 13:09:08.000000000 +0000 @@ -0,0 +1,60 @@ +Subject: [PATCH] python: use the posix_prefix sysconfig scheme on Debian + +Fixes Debian's bug: https://bugs.debian.org/1006784 + +Debian adds a custom sysconfig scheme to system python installs, +"posix_local". This is the default scheme, and it redirects local users' +Python module installs to /usr/local even though Python is installed +with a /usr prefix. Both are on Debian's python's sys.path module search +path. + +Automake and its users understand prefixes, and are likely to select +/usr/local, explicitly. Select the "posix_prefix" scheme, with the +user-supplied prefix. + +Previously this custom sysconfig scheme was specified in +distutils.sysconfig, but not sysconfig itself. As distutils is being +deprecated, the custom scheme is now specified in sysconfig, since +Debian's Python 3.10 (3.10.2-4). + +Author: Gianfranco Costamagna +Bug-Debian: https://bugs.debian.org/1006784 +Forwarded: http://debbugs.gnu.org/54412 +Last-Update: 2022-03-15 + +diff --git a/m4/python.m4 b/m4/python.m4 +index 6653e4d89..c7db51814 100644 +--- a/m4/python.m4 ++++ b/m4/python.m4 +@@ -255,7 +255,14 @@ except ImportError: + am_cv_python_pythondir=`$PYTHON -c " + $am_python_setup_sysconfig + if can_use_sysconfig: +- sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) ++ if hasattr(sysconfig, 'get_default_scheme'): ++ scheme = sysconfig.get_default_scheme() ++ else: ++ scheme = sysconfig._get_default_scheme() ++ if scheme == 'posix_local': ++ # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/ ++ scheme = 'posix_prefix' ++ sitedir = sysconfig.get_path('purelib', scheme, vars={'base':'$am_py_prefix'}) + else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') +@@ -297,7 +304,14 @@ sys.stdout.write(sitedir)"` + am_cv_python_pyexecdir=`$PYTHON -c " + $am_python_setup_sysconfig + if can_use_sysconfig: +- sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'}) ++ if hasattr(sysconfig, 'get_default_scheme'): ++ scheme = sysconfig.get_default_scheme() ++ else: ++ scheme = sysconfig._get_default_scheme() ++ if scheme == 'posix_local': ++ # Debian's default scheme installs to /usr/local/ but we want to find headers in /usr/ ++ scheme = 'posix_prefix' ++ sitedir = sysconfig.get_path('platlib', scheme, vars={'platbase':'$am_py_exec_prefix'}) + else: + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix') diff -Nru automake-1.16-1.16.1/debian/patches/series automake-1.16-1.16.5/debian/patches/series --- automake-1.16-1.16.1/debian/patches/series 2019-01-24 09:32:50.000000000 +0000 +++ automake-1.16-1.16.5/debian/patches/series 2022-03-15 23:03:50.000000000 +0000 @@ -1,4 +1,5 @@ 0001-texi-rename.patch -0006-Drop-SHELL.patch -#0008-SOURCE_DATE_EPOCH-support-for-mdate-sh.patch -#mark-self-check-report-xfail.diff +0002-Drop-SHELL.patch +0003-t-python-prefix.sh-Respect-PYTHON-environment-variable.patch +python3.10.patch +python3.10-sysconfig.patch diff -Nru automake-1.16-1.16.1/debian/rules automake-1.16-1.16.5/debian/rules --- automake-1.16-1.16.1/debian/rules 2018-11-05 04:03:34.000000000 +0000 +++ automake-1.16-1.16.5/debian/rules 2021-10-23 04:35:41.000000000 +0000 @@ -40,7 +40,7 @@ rm -f \ $(CURDIR)/debian/tmp/usr/share/automake-$(version)/config.guess ifneq ($(DEB_BUILD_PROFILE),stage1) -# Rebuild the info files +# Rebuild the info files cd $(infodir) && makeinfo automake.texi endif diff -Nru automake-1.16-1.16.1/debian/tests/build automake-1.16-1.16.5/debian/tests/build --- automake-1.16-1.16.1/debian/tests/build 2019-01-24 09:35:27.000000000 +0000 +++ automake-1.16-1.16.5/debian/tests/build 2021-10-23 04:35:41.000000000 +0000 @@ -2,10 +2,4 @@ trap "cp ./test-suite.log $AUTOPKGTEST_ARTIFACTS" EXIT -case "$(dpkg --print-architecture)" in - armhf) - # fails on armhf, see LP: #1812688 - patch -p1 < debian/patches/mark-self-check-report-xfail.diff -esac - -make check +PYTHON=python3 make check diff -Nru automake-1.16-1.16.1/debian/tests/control automake-1.16-1.16.5/debian/tests/control --- automake-1.16-1.16.1/debian/tests/control 2020-02-05 14:33:22.000000000 +0000 +++ automake-1.16-1.16.5/debian/tests/control 2021-10-23 04:35:41.000000000 +0000 @@ -15,10 +15,9 @@ libglib2.0-dev, lzip, ncompress, - patch, - python2, - python-docutils, - python-virtualenv, + python3, + python3-docutils, + python3-virtualenv, sharutils, texlive, unzip, diff -Nru automake-1.16-1.16.1/debian/upstream/metadata automake-1.16-1.16.5/debian/upstream/metadata --- automake-1.16-1.16.1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/debian/upstream/metadata 2021-10-23 04:35:41.000000000 +0000 @@ -0,0 +1,3 @@ +Bug-Submit: bug-automake@gnu.org +Repository: https://git.savannah.gnu.org/git/automake.git +Repository-Browse: https://git.savannah.gnu.org/cgit/automake.git diff -Nru automake-1.16-1.16.1/debian/upstream/signing-key.asc automake-1.16-1.16.5/debian/upstream/signing-key.asc --- automake-1.16-1.16.1/debian/upstream/signing-key.asc 2018-11-05 04:03:34.000000000 +0000 +++ automake-1.16-1.16.5/debian/upstream/signing-key.asc 2021-10-23 04:35:41.000000000 +0000 @@ -1,111 +1,65 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -mQINBFP1zTYBEACwXwhVfpq7aGOcuz2m8m4v+nK5WgXiMb/eWq1wwNgxKuU9uJH+ -6nkKmr6qF0Pv8jI+fLmXWI6DN1m8i8YAsvhk+jC7ZcfH0pmOnBAbenmNQEkb2iiP -qMhSVSWtR98MNdI65bcVrbHy8rSf4AlEz3MifbluGD0cRq0cv6z9xmT277r3+iQt -smYgx0AD5maU8O+jShTlYNuWjtdeRRBhNoLOzw/z8frqK870siqtqaSyl69ktBF9 -e2s5GNYHQ5SI1U1qb50CMgGKXR5YqQ/aP7mN3LSLzLHMO4+ItGBdv+tLCSVLVP/H -txTlvUaJl3gvmcvSyRSntsi+OBVC7FxoOVdRlPQQK3GyWi4i7wVmdGQZYREg6sVz -cqt/qNcorWYKIbWPQzrFy71IDx9+PMR+EUAtPdbRYSe+EnuVlzqhhZSs03Zq3kvC -Jrs98Lk0P8w3YtZK57EN8BrPu1fRQEzkPpRs1287zws6FPR92t6EIGDK3mNRL/ah -v5wlsqRYx3ecSOuiUqAKn9vaqmDaRkRsOWHpfWfOt217+OGWrpEe0LnvH9NjT34q -PBo2mDFgEekgrwFNJaDhVLnxLjEblJPW+/aaM9GxoTpSHKHODYq59M3CgDcEwDC6 -YhpCaUBU2Mt/hgi1fRlu8MHQj8oeV0HE83H4PokhjmdKCrDp5Sy8jc8zUQARAQAB -tB1NYXRoaWV1IExpcnppbiA8bXRobEBnbnUub3JnPokCQQQTAQIAKwIbIwUJCWYB -gAYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAlZErpsCGQEACgkQCt7hAJRgTTd8 -CA/+PQ/rlLw2PdNROgPyQri/P3FZR18QUIGCnIOgFgJjqQcHT99rCpTHdhir/0WV -9onNVWfVaRN6BXut+I7jBPFzI7FBAmBRhzDTItFrGw3Cl3tzDONdnzh4+ptotS0t -giEuZAn78ff42GA6H5EfYIQK19Qead6avgzCteGhH2fmlzXneSMLfVXUp8w6Rrhc -Ngz5F7JL92d3F06abH+9/2LgJ2J82GDbE8QAhlul/ZCiLgukqm7nlDJI9G2sLeIT -qb6JR+nNGdqgAW7ezTR6ERUdqZ3nsKiVZjhwgv8aZgCQq00ogsuMoTnLky0INlTO -BsfM4UYxJjxtdQjjew1hSzpU+U2GSAle8sCcBwqArtn27umkNhCASoJw6rR49qWU -gSv/l0XE1C1MIXCVOw8CssvTqGcmeD4A68BMmWBTXrcp38FcTfqiwByWf/oRNx9s -W7Ye2kdjCapIgG36i4ga9ZopmC0Qte34/zZcwac8D7ar4QPAosH00/65fA1mqRh0 -vBa5pQNMwryORb71Q/yAXck6GOh3pwoi52OkrGbfgXfiNr6Xjt5bOkMH3/I5F7uq -Yv0en/pI2DbGdQl+x+o4sZwhsP3kyTvrHyOUcGVQrdCrj09vuxVi2U7edXviGgTm -hRNdN19/WcYnDQxayLTrEQw/Dg8Ds/wWZxhumFs24JA8hImJAhwEEAEKAAYFAlnW -troACgkQ0BeMdn0GnuZcmA//cqg1R8GVu5Al/0rZiy9nsyzzAqw2ZPQGOzrffPpw -uKYFFwIHbjBRRB6ljslPF5ECB41cR9LDJWQH0W/5VnT3Rich7Pc/XSXXvi7tIiNk -Bor6ODhh6XKUBssoe7X0ZJ3BVoTVOiGkI2bAd+4BYR208PnsL3XuU0f0msTz+QPd -vqIcHMnWKScpMx+j1sPYHxr6ufHbdnTVTgXShf2rS4u9q8yyQVS8HAeVSHozkByk -yqOPgWgdsm7WK/hYqHi13J4ReXCKQfShVJO1Ql1ox7Ikctz/Z6IBKuUv5Wr2bfq1 -H0JOWvd7F9YoFnEdM1rC7vOz0aoN5o2D6B7tSCZkgZ4+L+XcHjdw+caljW1xrWUD -g627Jv/B0UdLaLnGCPCYQijX0ZFK47K+8cDPldVMKDsTc9pcZBDGFS9EgRIQXghq -ZJr7xKwPGeFCx/sDJYzUbLJwQ+G5NWUEohbUoreHIJQ0u3H4H1fKe8EaHxaXg92Q -dymzX8GdyFOSXh2yfZVbTd5cbE3Aw0w2kXXi4GLu2LL30qCvY4zoqE9wqJnmIXKm -JErs5FMu8Xxbo86alAcYdgTvPGvNcaKubNWrqYOodeseRHvmPuRJwzGwctvcu2sk -AbV59tzA0yIochpT/l9VXX5ePqPdmNulqswxZoeL1lZ6yuQrgYD/WKPg41wcHJxR -Y7W0JU1hdGhpZXUgTGlyemluIDxtdGhsQG9wZW5tYWlsYm94Lm9yZz6JAj8EEwEI -ACkFAlWXjl4CGyMFCQlmAYAHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRAK -3uEAlGBNNwwfD/448Miv7rEjyFRW8X3S5yBJCfzXXlWvXiY2Fdw8qbLupjr8Eel6 -ynYPBaL9Ae9PXXZdpw/W1q+O3LoG/RLjw1b0EjQq9A/E7ZSWHi4Z8Gp0uJ4BZ2bV -QQNS//kU7sle1uwjGDcn39+cv8d/oq8ODB2UOAenRbO8218PunD29XzVuHVj5nsV -jquddG/DlPuqhbBiOReJi5FX3r4EBCakHD0sx+/cr1hLC6icCjioM/dxtptXwPx3 -aXy+7xnyUTmrfbVfaiDNb8a4BqgCcsGnkdFV6e3gYmU2wzNrDPymxDiFBqrfgL+K -JgQu6Xfb6aAYSPeh+FU2OU9mV7SQUacFEq6dSm9tb9FrpI64mWHD5On6Md0CA+iv -ZjHuFwUoU5vgq1NTEaDICGBWl9zDYAyx6K4LlqLOy9JYkV8avclsjyHurMaF9SNL -y9alLQK/mmz4hPew6UjDJfi9br2J069yepIkl2YdpnJE+7xM+POOdpjhB1LXR4xl -4EhqObPZOYPigGE2siN9HnSZSwYtdelXZvjyy0y5StNpD+aEmW1qXCY1RO+7RxVG -TXO0ztjz85rajWPfImd6I7VSUoWo+9aNU6W+P/T9xWfDwhyN03fVxkPl6/HETkNU -4hwGSMx9D8P1R17oUCeNiUAacdjZuOU37wY+RpPFi1Sah5Dbx/An/zrEzIkCHAQQ -AQoABgUCWda2ugAKCRDQF4x2fQae5t2DD/9Z6h4Gra6bqycBZ+LfsbcPisS/5ai5 -BM09DBW1oM3fqTDGH/0L0GdJq+JK4tPOg8MXs5pDuCSDKEk79YW5obl2BuHx9wf6 -Wf+JYZaMudjAMc8dxONMFU3VL4UuQaDifV4JFGCBX9YYa23CoWcc+YHUM+y4kEgZ -qcNgb3Vj0sjF4q4NS7Bg42Ss7lItXkFoD+uAMaifz4LjIDYJx7VcxJUjh7qxj9od -ear8OUzdTWaErt3zBJV3bsqZ4qOxBciZoNWCwVsf90SFcdtMX3rRe0+MR15NamzC -oO8PyZxrEgVb9+CfRChjxSMhbQ2RaFyDs+HphQmLupdlF5GXHB3y4POfK0o9MsX8 -CQAH04Q+wSfcwfIBgHzvASXT4DdKCGsKBb0c2eX2jissmfHEYQPqza/DbrQH+cC7 -WIfDWsJSNnIGNrsB2PE9G14a38a2++dQ6KQ7QtZkS4V1P7NzrX4zKVFMDjb56inV -Rswks0Wq/Dom91kLetMvyyO8DP5glTv9sPWp6l4mEzbihtXMLLT0I+nuon+xP1si -sXTTV5+oMeiCPVOdD+FgoKToNrnJJ690ynsX/DPzRCNFzcII8Jn58QH53HoqxGvw -41zg0bMLCbe28uI3v+7oOVAEIIkpfsHFDU6ANoJCcykbf5E4WuU+wFe9fKbK4eO/ -Q5hpaov/fFD1F7QvTWF0aGlldSBMaXJ6aW4gPG1hdGhpZXUubGlyemluQG9wZW5t -YWlsYm94Lm9yZz6JAj4EEwECACgFAlP1zTYCGyMFCQlmAYAGCwkIBwMCBhUIAgkK -CwQWAgMBAh4BAheAAAoJEAre4QCUYE03JqMQAIN+Ll0333o1ygk6SC0Z90oWsPwJ -wR1qks8Lk9yFE31/nO0U4BtrVTVzpQ6BysM5g8ajauqxeKriuabu4lPXbtIl/08C -uWAlkvbiTVVfg90KT5EH/ZYyVWrVb7t6XoRr5TKc6ziPCq4FBS086X960zXE36tP -QdOgVrWJH/hynoYFHbK+5Q+ABCzrFRamRyWpt+Knww/bMkYuPWoKTEuDuh2+IzC/ -TKL8A55r8zhuu4EP6fOQ4c/1vBSqskhNFMs+FPdwuRseQFhlC0kiZsQeDsOxPMye -nBk9g6qwIRKwoagbcEbU9fmhklxOzTF2//bmBErJt7u9TOOKPPhVMrzCRFtRg3hl -KuSLdfO3c7G8zEzv0ZFPCLVtlgPUa/nOXAoScyCOsI+GhwBqPLEb7MAAGt+i9WF6 -fQ9bjy+5FzL1cJRTEZb0lXrw2b1Qn2JlTjNmfS0/6egc7yy4gOINfe+UAHNXmuRH -2Ke8g208QdSiW12VtqhWBEcCWnARWeD6MqdyWhMmqpDe02pg8n2Iwr69aL0E8iOh -KN1gjOMxWL0ojBB6GNTOs1lw0Dui6z1u/VpTB2Iv+6LnGbVVTpZ8+B1++sY07zTl -sib7abaTKiPArrAExUyL6xj31ovU3T2W7ikJ23AqE5IGpNJ129hqwQCIg1yW1cK8 -a8ZKETqmOtCZjj8wiQIcBBABCgAGBQJZ1ra6AAoJENAXjHZ9Bp7mAqcQALffRVHt -leX1H3DeQ82knLxaRW+M1jn6yGTGheV39Jp33s2ewbJ7FS+1USoP9qpUQ+eIAgYY -KiGzD3YmfXtIUYkNiSZGpJm2vK9nsW0GXH2D8N+MzsAXc1vrSAby0QICNM9biUL3 -rDpELkKPb7YekC2SUgLyGQQlwcizjgYfBSKxQXDSNxuCWY+BflncWTpOpDQgsgGR -3luXZMBBq1xkZ93sVhaspKJd05LAGSwrwATHwQgPn/iY8OCtsjtH0mJSQV75jusD -NXHNmVHbujRvSsVuxYCQjPiv3u3j0JDTROY3zkP4J5psOv3F1Cbo1G9hhKY7lHQh -5aUhb4RjG+s7ujRY5vI24TAyXgKTOS85kpVuVYlamH2tbpYSpEqa/Bn0xIyAXylH -sfbL7wGCh04RVFZZGJjKnT0N0h5B9fL+f+IAUQdq2Vn6l/5n9a4V9GxaKl3Z1EdT -roMOei6V8qafboQl9NsU7B6s4R3Fc9tY9jo3iGVpCUVSef3d2gc1ci+D+SOuaLLc -kPmKjIjfX5W1FGfx1SupQ7F2wK1OH2QEysRRyxJQoIOkFOEDbNO95K9MZeOhEv+5 -Rr0L5u0+CFveHcdURtLXSK4g7z/eQF64QXvcRWz1hB+Bvg2laqAPK3k4bxQJS1ZF -+5TUh4HWhbqy4yYTIgcS7BJtyITBoGdxcR1luQINBFP1zTYBEACvPNpAa7ZmCaWQ -sINW8lKL26U0I+N/ja/1L13J+hKWJLnX9uqk696tewi/8Z/x7dp1M6rAkc1qRnAN -9qM2JUZ/n6cWRuGxl7PCu+7vM40PrR6mnFpmeDallf43RTIiPi1v9EkyP1vpJaGg -0h2j2FHLtusULKvsRVx6TwcesOLICmBOI9F/nra1uKy1iZ1RNk8g13dKYwXkswAM -vl4YfeW0c9rcup/Ual6Tpf+NeSVGndNJrpyoCzVCuS9bJDrOzX9uGQruy6B1F5g7 -Iw8I3kQq33UqPrv8FK1HymKwOM+g8U4616ZZdqhGvhGDRozasHMMqnS8G11LbEUT -N/oYDTNw+kYgcvW5VX1fxJUTAFpqnPn+LKn1AAXj9qiHz8+C3CuSwM/5vgvr04wW -hHfuac9hE0M1WBzUOkEUxGOOkR9KQ0WzONJbQ8LCpb3SBF2UvEUi1zzSFpxNQgUN -MWZ7jNIXv256M+hZRc6kNzQZVRzMZMG2oi1ZEb3rBYAEpxAWr3YTzatytjHZ7Dr0 -aXcJII0VklN+BLE931sIXLFkMqdqh4UTn03RdPxEkmalnVGuAutNzsI+roZCdfw6 -SlyaAdqdRF0OV5F5noDXcFUe61P7hVpLRKf0pUtSijRQ0qot4UB0PtFKSnXiaTE0 -vcrJ2+hi4AiCuXEFMFdYKZGwwIcuNwARAQABiQIlBBgBAgAPBQJT9c02AhsMBQkJ -ZgGAAAoJEAre4QCUYE03rbMP/1WEfHuoUOVUPmTdDswh+1LKsWfSbbH9Q3UZYjrW -ViiTeX+9upkiF2xaVXHzHr9vizRdfQ+cCpemVluBRZmz8BMmhLCpah/jkkfYUZlT -ON7hW6Klh/UVQ3RtD+muSlnON3yLdZbPcX2PEOAVyP38CHKs8Z7ze6M41lry8s3r -gRwo4d+T0EKorVe7NnmgPclLPNSJP5PLwjT2j+2pAcC4PW1hcsIvHAOO9ihJHGXi -tAZK7KqIOiHFl0/SRtyipXE5T8AL2H1W4j9HcTNfQGjNEUb6KmKUAcqxKMmRBIvw -60zNkEXWtL2CaJf/llalCReYi8n70N/39pVuuxu7N6euE601qIWZR89oLfgBWjIy -ccUvQzVfdK5P4EvpX1nw6lgRUJZxlUwe5SJOtriv92pc+zaBhfCfr79eCw9Y0GCQ -T0POhoBX/M+PDTIM8C2ficg2VsCFUMawGjzdNP6efQMa313tYup5pZbv0PxWdkwJ -sef2FhVhg/LOOpO1qIqzVhkf9anoQs3ra2G+LrwWtCPng5qMvf4LwWqR9rGmjcgq -JpY3ZY9HRiKENmg1vklhiilLPlk0RGxvt7FT5b3S0ZRmq+b1GNTtDaDRy/3NN1lQ -TKWximd7ygaX3hA9drwCR4rzrzIMTiWLHORC/vomS0yqTaINpc5/0Zw6ok29MFaE -GE1+ -=eFVN +mQINBEwWvdkBEACyOXTiLBZ5MFNM6jmm83ui3MqW0/eD8TcAI4gt0gwOvd/jXerI +ros8dRVook7FBoNiFSiJSMVOiNPUMfv5h5wZm0bje33qTJPL7IanSKXtk/I7Za1G +EJfEnfgZI/d4EIV8wrl0WI1lPEteTgRJbo76zfLIUOHpynVC2Wm5gALJ4oeJIS0A +hYSzbFmHD9dFI7m3sO/HmbhxTiMISy0FbmoqE/cpo8ZX6eahND2UrS2oGNC0Ok8/ +nN8XLPPsikx35FKx6bDTfoAK/svx6PK1sSPfAdoZFZ5Jy6Ti4zubebUD+5I8+bOn +6R9I7P0HerCTqMBLnf9LJHTPhTk8fHEwlAeH+WfpEmN9/4YORb84WY97tFbVK4f/ +icEjnYBc0Ozl4qMGI1g/1R5Q9Z8qxLGsW9tNWyIfAf+2BhLA08RfA0wxmEf2Gnfp +J379s5c0U8xLZegOGRF1tOAEIC+5wRKFN/qU9zpLbUZIGrB+ysVeTlDuCDnTnyUe +WBQeRnfItl4taEN0/axNGB/NuHvxShyzxez/flbyqKwsxc35/a2OCbwmADeUh+ct +sYUGZya/GuXfejWbCuaqZLLkP6Ed9k4+LY+ww6jA7uNPRXpCYoXFo2WN9OaIqfb/ +RDk6zW708qbxvcWKe6j9f8R0lPMYdtUzZhyxZxeZ0/2BdDyXAj1Wvnw1UwARAQAB +tB5KaW0gTWV5ZXJpbmcgPG1leWVyaW5nQGZiLmNvbT6JAjcEEwECACEFAlDwG/0C +Gy8FCwkIBwMFFQoJCAsFFgMCAQACHgECF4AACgkQf9n8ywAL7u75Ag/+IzQ1hoL/ +qwCsVjhFdi2WloZ3+HREC1aeyAKiOduQijWg3dd4YZQeMGFHMgIqaHHOxWAijJP/ +Qi5Y/k5cotE/gUSPX2lEldF+bA1ZpzgZbOiqfjpTFmsy8nXAeDRLusc8Tn/+vQVa +l9ZzcfG21CUEZaDLk+8OFpj8poqczPMsNpmsuy7CjK8TRIoHMVJk+h/P1AYaQpQw +qRg8+/Fzn1AnnNcVnRTE13lcfrG9EmCfF1A+Auy9BsPe2j0LlZHhXGOrK2JGUGO6 +er+yQLy1STsRFw0b/jVp3hbsT8qcLxYx+Ekhli4OeF1pXZRlvbKHQcguuRgBdFtF +nnpcWkHyAVUP4Mpwf3eZRcQnbdDIf42VdAVoh8DKHc3Fxr+NABlj+851SuKoNn4/ +liAOxBku4Za6flHM7EMPLgpkzoB934s1HNNTrfPS6f+9G+C1p7kWuGl/lBq0pWho +t1v8ojQci2UHnxQu+RY4PTpBH2TwqwolpxZERG/pFADsw/peoTgTNdeY059amgvZ +mKk29krXgV4OW083GTM2UTtnrycNvLF4d93EcIZX3Rot0uxYg6g0Btu1ifRJFmzi +XflYoBnIc//971j2Ty7oM1xq+lUiG1oCYKwfbc4ewFjMrLfqtlO/OV2T2spm9cVy +w3e78u3DDEUaTxa4oKt2W2B/XTJb4fx0VCi0H0ppbSBNZXllcmluZyA8amltQG1l +eWVyaW5nLm5ldD6JAjoEEwEIACQCGy8FCwkIBwMFFQoJCAsFFgIDAQACHgECF4AF +AkwXdFQCGQEACgkQf9n8ywAL7u6hfQ/+J5VFGee4r5JF3M+ImCzLmidwRk7Ah2Gu +a1Xv8MvH05kSxUGXp83a3F3Zgo60sRzQ569EBjhCu2Hewz3p3nfWgYqnkKuCIOhg +7oq7dirEaFatdTHgN7tuACI2m60ncdgQa9S13tmmEy407iZqYQJNtLFDe/r6Fcf6 +cDFnjiIsVdk1WPyw3gLs/gjgh+MmyQRtotULAHFPSuq1v2SdE3umaillGH9gSfoa +U8PUdnKRgyaOHA7mC0EHdgHk8Fte+5ZtpbAnWJL7IlZw5ul6br4q3Ry/5UL9GbbR +/ma9AMAYEt42NMhLLnaOHbiVC7iyNqSoVsoLY8VFWprHxd3xe+WtzdEMSLqd6lvm +CF9B+IAsLvvQaas2v+FtOKuDDRcWMFm/ulyPxa5ewSabgB/xhr1n2KROBJuyGXuI +BCzj2XTt2mCjfs6aMV7COoLiDoVDrc3SjM7SIUvndgemQ7dCGmWEAJsRHHU1KW7X +H3ycYi2waiFPL16hTaUGi0sjIR50OOMbzA/JBwUj1rocK5OM1RbdZk4vu1GQwZuD +BGsVvL6eciXPFEWrJNbdqaCYiSKVGByPVUUgLC6qPcVYezCOcdJTrBae9Y+me8B4 +K8hNAU3t/fGlOFxt8Ka5daoPLHbyw9EWo9QNWEHlTOhqhB3w04YJBwrxeI07uRm0 +UhqufTRftUG0H0ppbSBNZXllcmluZyA8bWV5ZXJpbmdAZ251Lm9yZz6JAjcEEwEI +ACEFAkwXc5MCGy8FCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQf9n8ywAL7u7d +Xg//TD0dsvwMl5gGSJspUHz08vwcM9zp2fldabi1GMC0q73nYnoUH9wHLVcPJ77C +Rqh+9lyvd230hnHPPbMksg/L6YetnVAo0NUz8pxx1hZBw8fJDvl4NxTgs8FbwtxL +/ZnAs/RHzEEiECbWWnxaEWYuZAGD4S8u6fnzNfPCYbf/dCEdO4O+FIumPoJCJF9o +rHd3rvtB+P41YKaY1+K8lM02BoY3fXRwbCvX1Rn965/BtIJiUDJLxEXUk2Gq6pZ9 +zPcHKQjHcGs+2zS/Z6wmhuTEhFmpCw0jIt9rzMs5i5JOB0eqLtKD9C6tURA1KK1e +XUvE4X8F7kaXkfPXhLzdLZskTt0kbNr+YU5AZtEDWplaw71t376JKOyn7yLqYLJL +R0KMmn1DpU4kFSMK+zufLGo0gmp0054hwBqM0q8V69AhfJQB/AV9MnpJ4h23N1kI +RxfYMThZr29PBFR0xkq6hOW7sfbZmQDL8j6NaMKWVJx7cFDzMkXXGozuBltjFGa+ +q0Vf9QpDGiMPXIUz9elRZQ/pPP6ha6pycpElp9LJ9DumBAtG2bimhhlEXNP0L7H5 +TQefDCgmfVY2DuyxbPP5knAmvEW4pEXd+UZ+epsRve5mu8yAHp+vznGM+SuBp1sG +UL5VmkFtNnpXhW6hco2s3egz7hZOlsH+L8BbAmw5E+tGfP60IkppbSBNZXllcmlu +ZyA8bWV5ZXJpbmdAcmVkaGF0LmNvbT6JAh8EMAEIAAkFAlCBOrICHSAACgkQf9n8 +ywAL7u7aJQ/+IJqpTT55uVMvnvVGsSnSGEm0Fbirbra3yncsV/9DF5iNpYj3deCf +A4YdKLrcn+F7sep+62rMtk+Pwik1rbU98bbcd/rH0Zg92ePlS2gingyi166XkQs8 +Vgx1WsUH9gGA/vRmtSdso4Gbod1ucmePliMxIxDF3a7zRte9T8GuYFW/cD/yozHi +JrL2k7nVor6+YbIvePToEP/p0XLGeYUn2iZ1XCEp9na2Odw7/g9Z/78aJAXsCvWN +MVXYbKv67lx+4p2u5kwg34gOpnoBfFVMDy+xQYYRM8XrOrcRMnUlBNdFDYue7EB+ +E65PfKfzPaTLPBI2eeeyrBg72H9PG9IY5TDFdvm2KCO7GMnd4Kjg9h9d+r1kfZAX +zXHpzkHMpxarvNoAovaxAr8Xh0lP5PwlMA0GkZXpSTXImYrobwLeR2sowGbwXazq +ozsroO7LGwaI8cRcGmXtCMQR+iS/c2gp80tzKazP+7ao+C/AZr67gzrnJY5uO000 +Vd5lRaTG1T11feTbAhnxFSmQUE5TnUIOfss2dCCO6CMqcrlac6QTYEolgWRBN/Fo +3zAVAPpbXsqY+OEPnHwwWJeCv9ZprW36PRIjktfw4igP38wTimZ0onI4j0SlKLIT +V1KlGZVpG2onBn/Ly5HGepqZd7VbRQTruLXpWEpn56YN+vtrthw1wcM= +=Q4hV -----END PGP PUBLIC KEY BLOCK----- diff -Nru automake-1.16-1.16.1/debian/watch automake-1.16-1.16.5/debian/watch --- automake-1.16-1.16.1/debian/watch 2018-11-05 04:03:34.000000000 +0000 +++ automake-1.16-1.16.5/debian/watch 2021-10-23 04:35:41.000000000 +0000 @@ -1,4 +1,4 @@ version=4 opts="pgpsigurlmangle=s/$/.sig/" \ - http://ftp.gnu.org/gnu/automake/automake-(.*)\.tar\.xz + https://ftp.gnu.org/gnu/automake/automake-(.*)\.tar\.xz diff -Nru automake-1.16-1.16.1/doc/amhello/configure.ac automake-1.16-1.16.5/doc/amhello/configure.ac --- automake-1.16-1.16.1/doc/amhello/configure.ac 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/doc/amhello/configure.ac 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 Free Software Foundation, Inc. # This configure.ac script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. diff -Nru automake-1.16-1.16.1/doc/amhello/Makefile.am automake-1.16-1.16.5/doc/amhello/Makefile.am --- automake-1.16-1.16.1/doc/amhello/Makefile.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/doc/amhello/Makefile.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 Free Software Foundation, Inc. # This Makefile.am is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. diff -Nru automake-1.16-1.16.1/doc/amhello/src/main.c automake-1.16-1.16.5/doc/amhello/src/main.c --- automake-1.16-1.16.1/doc/amhello/src/main.c 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/doc/amhello/src/main.c 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2018 Free Software Foundation, Inc. +/* Copyright (C) 2006-2021 Free Software Foundation, Inc. This program is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. */ diff -Nru automake-1.16-1.16.1/doc/amhello/src/Makefile.am automake-1.16-1.16.5/doc/amhello/src/Makefile.am --- automake-1.16-1.16.1/doc/amhello/src/Makefile.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/doc/amhello/src/Makefile.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 Free Software Foundation, Inc. # This Makefile.am is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. Binary files /tmp/tmputgdoq_m/kB89voLxg1/automake-1.16-1.16.1/doc/amhello-1.0.tar.gz and /tmp/tmputgdoq_m/wRWcbmafyX/automake-1.16-1.16.5/doc/amhello-1.0.tar.gz differ diff -Nru automake-1.16-1.16.1/doc/automake-history.info automake-1.16-1.16.5/doc/automake-history.info --- automake-1.16-1.16.1/doc/automake-history.info 2018-03-11 21:21:17.000000000 +0000 +++ automake-1.16-1.16.5/doc/automake-history.info 2021-07-12 02:58:18.000000000 +0000 @@ -1,10 +1,10 @@ -This is automake-history.info, produced by makeinfo version 6.5 from +This is automake-history.info, produced by makeinfo version 6.8 from automake-history.texi. This manual describes (part of) the history of GNU Automake, a program that creates GNU standards-compliant Makefiles from template files. - Copyright (C) 1995-2018 Free Software Foundation, Inc. + Copyright (C) 1995-2021 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, @@ -13,6 +13,11 @@ and with no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License." +INFO-DIR-SECTION Software development +START-INFO-DIR-ENTRY +* Automake-history: (automake-history). History of Automake development. +END-INFO-DIR-ENTRY +  File: automake-history.info, Node: Top, Next: Timeline, Up: (dir) @@ -22,7 +27,7 @@ This manual describes (part of) the history of GNU Automake, a program that creates GNU standards-compliant Makefiles from template files. - Copyright (C) 1995-2018 Free Software Foundation, Inc. + Copyright (C) 1995-2021 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, @@ -146,7 +151,7 @@ to the Gnits folks. Gnits was (and still is) totally informal, just a few GNU friends - who Franc,ois Pinard knew, who were all interested in making a + who François Pinard knew, who were all interested in making a common infrastructure for GNU projects, and shared a similar outlook on how to do it. So they were able to make some progress. It came along with Autoconf and extensions thereof, and then @@ -244,17 +249,17 @@ 'automake'; it has lasted pretty well. AutoMake is renamed to Automake (Tom seems to recall it was - Franc,ois Pinard's doing). + François Pinard's doing). 0.25 fixes a Perl 4 portability bug. 1995-12-18 Jim Meyering starts using Automake in GNU Textutils. -1995-12-31 Franc,ois Pinard starts using Automake in GNU tar. +1995-12-31 François Pinard starts using Automake in GNU tar. 1996-01-03 Automake 0.26 1996-01-03 Automake 0.27 - Of the many changes and suggestions sent by Franc,ois Pinard and + Of the many changes and suggestions sent by François Pinard and included in 0.26, perhaps the most important is the advice that to ease customization a user rule or variable definition should always override an Automake rule or definition. @@ -297,7 +302,7 @@ 'EXTRA_PROGRAMS' finally replaces 'AM_PROGRAMS'. - All the third-party Autoconf macros, written mostly by Franc,ois + All the third-party Autoconf macros, written mostly by François Pinard (and later Jim Meyering), are distributed in Automake's hand-written 'aclocal.m4' file. Package maintainers are expected to extract the necessary macros from this file. (In previous @@ -413,8 +418,8 @@ Libtool is fully supported using '*_LTLIBRARIES'. - The missing script is introduced by Franc,ois Pinard; it is meant - to be a better solution than 'AM_MAINTAINER_MODE' (*note + The missing script is introduced by François Pinard; it is meant to + be a better solution than 'AM_MAINTAINER_MODE' (*note maintainer-mode: (automake)maintainer-mode.). Conditionals support was implemented by Ian Lance Taylor. At the @@ -1185,8 +1190,8 @@ Version 1.3, 3 November 2008 - Copyright (C) 2000-2018 Free Software Foundation, Inc. - + Copyright (C) 2000-2021 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -1329,7 +1334,7 @@ have printed covers) of the Document, numbering more than 100, and the Document's license notice requires Cover Texts, you must enclose the copies in covers that carry, clearly and legibly, all - of these Cover Texts: Front-Cover Texts on the front cover, and + these Cover Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on the back cover. Both covers must also clearly and legibly identify you as the publisher of these copies. The front cover must present the full title with all words of the title @@ -1583,7 +1588,7 @@ the GNU Free Documentation License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. See - . + . Each version of the License is given a distinguishing version number. If the Document specifies that a particular numbered @@ -1644,7 +1649,7 @@ Free Documentation License''. If you have Invariant Sections, Front-Cover Texts and Back-Cover -Texts, replace the "with...Texts." line with this: +Texts, replace the "with...Texts." line with this: with the Invariant Sections being LIST THEIR TITLES, with the Front-Cover Texts being LIST, and with the Back-Cover Texts @@ -1662,17 +1667,22 @@  Tag Table: -Node: Top702 -Node: Timeline2236 -Node: Dependency Tracking Evolution33697 -Node: First Take on Dependencies34539 -Node: Dependencies As Side Effects37197 -Node: Dependencies for the User39256 -Node: Techniques for Dependencies44286 -Node: Recommendations for Tool Writers45984 -Node: Future Directions for Dependencies46703 -Node: Releases47173 -Node: Copying This Manual52560 -Node: GNU Free Documentation License52787 +Node: Top854 +Node: Timeline2388 +Node: Dependency Tracking Evolution33849 +Node: First Take on Dependencies34691 +Node: Dependencies As Side Effects37349 +Node: Dependencies for the User39408 +Node: Techniques for Dependencies44438 +Node: Recommendations for Tool Writers46136 +Node: Future Directions for Dependencies46855 +Node: Releases47325 +Node: Copying This Manual52712 +Node: GNU Free Documentation License52939  End Tag Table + + +Local Variables: +coding: utf-8 +End: diff -Nru automake-1.16-1.16.1/doc/automake-history.texi automake-1.16-1.16.5/doc/automake-history.texi --- automake-1.16-1.16.1/doc/automake-history.texi 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/doc/automake-history.texi 2021-07-12 02:41:13.000000000 +0000 @@ -10,7 +10,7 @@ This manual describes (part of) the history of GNU Automake, a program that creates GNU standards-compliant Makefiles from template files. -Copyright @copyright{} 1995-2018 Free Software Foundation, Inc. +Copyright @copyright{} 1995--2021 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -23,6 +23,11 @@ @end quotation @end copying +@dircategory Software development +@direntry +* Automake-history: (automake-history). History of Automake development. +@end direntry + @titlepage @title Brief History of Automake @author David MacKenzie diff -Nru automake-1.16-1.16.1/doc/automake.info automake-1.16-1.16.5/doc/automake.info --- automake-1.16-1.16.1/doc/automake.info 2018-03-11 21:21:16.000000000 +0000 +++ automake-1.16-1.16.5/doc/automake.info 2021-10-04 02:47:04.000000000 +0000 @@ -1,11 +1,11 @@ -This is automake.info, produced by makeinfo version 6.5 from +This is automake.info, produced by makeinfo version 6.8 from automake.texi. -This manual is for GNU Automake (version 1.16.1, 26 February 2018), a +This manual is for GNU Automake (version 1.16.5, 1 October 2021), a program that creates GNU standards-compliant Makefiles from template files. - Copyright © 1995-2018 Free Software Foundation, Inc. + Copyright © 1995–2021 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, @@ -28,215 +28,214 @@  Indirect: automake.info-1: 1083 -automake.info-2: 301698 +automake.info-2: 301994  Tag Table: (Indirect) Node: Top1083 -Node: Introduction14412 -Ref: Introduction-Footnote-115821 -Node: Autotools Introduction15980 -Node: GNU Build System17361 -Node: Use Cases20109 -Node: Basic Installation22237 -Node: Standard Targets25823 -Node: Standard Directory Variables27426 -Node: Standard Configuration Variables29283 -Node: config.site30642 -Node: VPATH Builds32068 -Node: Two-Part Install36016 -Node: Cross-Compilation38460 -Node: Renaming41435 -Node: DESTDIR42593 -Node: Preparing Distributions44775 -Node: Dependency Tracking47146 -Node: Nested Packages49254 -Node: Why Autotools50770 -Node: Hello World52412 -Ref: amhello Explained52834 -Node: Creating amhello53006 -Node: amhello's configure.ac Setup Explained58361 -Node: amhello's Makefile.am Setup Explained63281 -Node: Generalities66981 -Node: General Operation67675 -Node: Strictness71098 -Node: Uniform72716 -Node: Length Limitations77655 -Node: Canonicalization79965 -Node: User Variables81037 -Node: Auxiliary Programs82527 -Node: Examples86265 -Node: Complete87135 -Node: true89240 -Node: automake Invocation91731 -Ref: Invoking automake91886 -Node: configure99668 -Node: Requirements100597 -Node: Optional105835 -Node: aclocal Invocation115237 -Ref: Invoking aclocal115398 -Node: aclocal Options118453 -Node: Macro Search Path122178 -Ref: ACLOCAL_PATH126553 -Node: Extending aclocal128123 -Node: Local Macros131847 -Node: Serials135831 -Node: Future of aclocal141024 -Node: Macros143413 -Node: Public Macros143954 -Ref: Modernize AM_INIT_AUTOMAKE invocation145585 -Node: Obsolete Macros150066 -Node: Private Macros151408 -Node: Directories152858 -Node: Subdirectories154454 -Node: Conditional Subdirectories157845 -Node: SUBDIRS vs DIST_SUBDIRS159525 -Node: Subdirectories with AM_CONDITIONAL161163 -Node: Subdirectories with AC_SUBST162357 -Node: Unconfigured Subdirectories163184 -Node: Alternative166635 -Ref: Alternative-Footnote-1168827 -Node: Subpackages168952 -Node: Programs172299 -Node: A Program173841 -Node: Program Sources174564 -Node: Linking176469 -Node: Conditional Sources180114 -Node: Conditional Programs183040 -Node: A Library184930 -Node: A Shared Library187607 -Node: Libtool Concept188611 -Node: Libtool Libraries190715 -Node: Conditional Libtool Libraries192449 -Node: Conditional Libtool Sources194906 -Node: Libtool Convenience Libraries196293 -Node: Libtool Modules199720 -Node: Libtool Flags201036 -Node: LTLIBOBJS202940 -Node: Libtool Issues203575 -Node: Error required file ltmain.sh not found203916 -Node: Objects created both with libtool and without205137 -Node: Program and Library Variables207061 -Ref: Program and Library Variables-Footnote-1218437 -Node: Default _SOURCES218512 -Node: LIBOBJS220984 -Node: Program Variables226211 -Node: Yacc and Lex229775 -Ref: Yacc and Lex-Footnote-1235399 -Node: C++ Support235662 -Node: Objective C Support236542 -Node: Objective C++ Support237515 -Node: Unified Parallel C Support238537 -Node: Assembly Support239533 -Node: Fortran 77 Support240705 -Ref: Fortran 77 Support-Footnote-1242390 -Node: Preprocessing Fortran 77242593 -Node: Compiling Fortran 77 Files243197 -Node: Mixing Fortran 77 With C and C++243809 -Ref: Mixing Fortran 77 With C and C++-Footnote-1246132 -Node: How the Linker is Chosen246439 -Node: Fortran 9x Support247977 -Node: Compiling Fortran 9x Files249023 -Node: Java Support with gcj249659 -Node: Vala Support251140 -Node: Support for Other Languages253225 -Node: Dependencies253933 -Node: EXEEXT255820 -Node: Other Objects258063 -Node: Scripts258655 -Node: Headers261514 -Node: Data263317 -Node: Sources264002 -Node: Built Sources Example266947 -Node: Other GNU Tools274135 -Node: Emacs Lisp274664 -Node: gettext276762 -Node: Libtool277450 -Node: Java277709 -Node: Python280368 -Node: Documentation285449 -Node: Texinfo285753 -Node: Man Pages292952 -Node: Install296077 -Node: Basics of Installation296781 -Node: The Two Parts of Install298311 -Node: Extending Installation299851 -Node: Staged Installs301698 -Node: Install Rules for the User303111 -Node: Clean303669 -Node: Dist305841 -Node: Basics of Distribution306345 -Node: Fine-grained Distribution Control309576 -Node: The dist Hook310503 -Node: Checking the Distribution312994 -Node: The Types of Distributions319353 -Node: Tests321591 -Node: Generalities about Testing322787 -Node: Simple Tests325722 -Node: Scripts-based Testsuites326103 -Ref: Testsuite progress on console328487 -Ref: Simple tests and color-tests329590 -Node: Serial Test Harness333606 -Node: Parallel Test Harness335704 -Ref: Basics of test metadata336210 -Node: Custom Test Drivers344940 -Node: Overview of Custom Test Drivers Support345231 -Node: Declaring Custom Test Drivers348285 -Node: API for Custom Test Drivers349707 -Node: Command-line arguments for test drivers350484 -Node: Log files generation and test results recording353198 -Node: Testsuite progress output357409 -Node: Using the TAP test protocol358831 -Node: Introduction to TAP359193 -Node: Use TAP with the Automake test harness361010 -Node: Incompatibilities with other TAP parsers and drivers366426 -Node: Links and external resources on TAP367821 -Node: DejaGnu Tests369445 -Node: Install Tests371572 -Node: Rebuilding371882 -Node: Options375557 -Node: Options generalities375858 -Node: List of Automake options377640 -Ref: tar-formats384291 -Node: Miscellaneous387755 -Node: Tags388100 -Node: Suffixes391217 -Node: Include392849 -Node: Conditionals394584 -Node: Usage of Conditionals395443 -Node: Limits of Conditionals398799 -Node: Silencing Make399984 -Node: Make verbosity400335 -Ref: Make verbosity-Footnote-1401657 -Node: Tricks For Silencing Make401731 -Node: Automake Silent Rules404248 -Node: Gnits411232 -Node: Not Enough413712 -Node: Extending414159 -Node: Third-Party Makefiles419194 -Node: Distributing426130 -Node: API Versioning426779 -Node: Upgrading429488 -Node: FAQ431533 -Node: CVS432657 -Node: maintainer-mode441046 -Node: Wildcards445210 -Node: Limitations on File Names448649 -Node: Errors with distclean451279 -Node: Flag Variables Ordering456227 -Node: Renamed Objects464058 -Node: Per-Object Flags465649 -Node: Multiple Outputs468654 -Node: Hard-Coded Install Paths480609 -Node: Debugging Make Rules485765 -Ref: Debugging Make Rules-Footnote-1487922 -Node: Reporting Bugs488100 -Node: Copying This Manual490048 -Node: GNU Free Documentation License490278 -Node: Indices515581 -Node: Macro Index515870 -Node: Variable Index521509 -Node: General Index552531 +Node: Introduction14520 +Ref: Introduction-Footnote-115929 +Node: Autotools Introduction16088 +Node: GNU Build System17470 +Node: Use Cases20218 +Node: Basic Installation22346 +Node: Standard Targets25932 +Node: Standard Directory Variables27535 +Node: Standard Configuration Variables29392 +Node: config.site30751 +Node: VPATH Builds32177 +Node: Two-Part Install36235 +Node: Cross-Compilation38679 +Node: Renaming41645 +Node: DESTDIR42803 +Node: Preparing Distributions44985 +Node: Dependency Tracking47355 +Node: Nested Packages49463 +Node: Why Autotools50979 +Node: Hello World52621 +Ref: amhello Explained53043 +Node: Creating amhello53215 +Node: amhello's configure.ac Setup Explained58570 +Node: amhello's Makefile.am Setup Explained63491 +Node: Generalities67191 +Node: General Operation67885 +Node: Strictness71309 +Ref: Gnits71443 +Node: Uniform75343 +Node: Length Limitations80240 +Node: Canonicalization82551 +Node: User Variables83623 +Node: Auxiliary Programs85113 +Node: Examples89050 +Node: Complete89920 +Node: true92025 +Node: automake Invocation94516 +Ref: Invoking automake94671 +Node: configure103286 +Node: Requirements104215 +Node: Optional109453 +Node: aclocal Invocation119196 +Ref: Invoking aclocal119357 +Node: aclocal Options122395 +Node: Macro Search Path126105 +Ref: ACLOCAL_PATH130479 +Node: Extending aclocal132049 +Node: Local Macros135748 +Node: Serials139731 +Node: Future of aclocal144951 +Node: Macros147301 +Node: Public Macros147842 +Ref: Modernize AM_INIT_AUTOMAKE invocation149465 +Node: Obsolete Macros153947 +Node: Private Macros155289 +Node: Directories156739 +Node: Subdirectories158334 +Node: Conditional Subdirectories161726 +Node: SUBDIRS vs DIST_SUBDIRS163407 +Node: Subdirectories with AM_CONDITIONAL165045 +Node: Subdirectories with AC_SUBST166239 +Node: Unconfigured Subdirectories167066 +Node: Alternative170524 +Node: Subpackages172711 +Node: Programs176066 +Node: A Program177608 +Node: Program Sources178331 +Node: Linking180236 +Node: Conditional Sources183880 +Node: Conditional Programs186808 +Node: A Library188698 +Node: A Shared Library191375 +Node: Libtool Concept192379 +Node: Libtool Libraries194469 +Node: Conditional Libtool Libraries196203 +Node: Conditional Libtool Sources198660 +Node: Libtool Convenience Libraries200047 +Node: Libtool Modules203474 +Node: Libtool Flags204790 +Node: LTLIBOBJS206701 +Node: Libtool Issues207336 +Node: Error required file ltmain.sh not found207677 +Node: Objects created both with libtool and without208898 +Node: Program and Library Variables210814 +Node: Default _SOURCES222974 +Node: LIBOBJS225451 +Node: Program Variables230678 +Node: Yacc and Lex234223 +Node: Linking Multiple Yacc Parsers238439 +Node: C++ Support240252 +Node: Objective C Support241114 +Node: Objective C++ Support242070 +Node: Unified Parallel C Support243075 +Node: Assembly Support244053 +Node: Fortran 77 Support245225 +Ref: Fortran 77 Support-Footnote-1246892 +Node: Preprocessing Fortran 77247095 +Node: Compiling Fortran 77 Files247699 +Node: Mixing Fortran 77 With C and C++248311 +Ref: Mixing Fortran 77 With C and C++-Footnote-1250634 +Node: How the Linker is Chosen250942 +Node: Fortran 9x Support252481 +Node: Compiling Fortran 9x Files253509 +Node: Java Support with gcj254145 +Node: Vala Support255626 +Node: Support for Other Languages257899 +Node: Dependencies258607 +Node: EXEEXT260494 +Node: Other Objects262734 +Node: Scripts263316 +Node: Headers266175 +Node: Data267970 +Node: Sources268655 +Node: Built Sources Example271660 +Node: Other GNU Tools278832 +Node: Emacs Lisp279361 +Node: gettext281458 +Node: Libtool282146 +Node: Java282405 +Node: Python285064 +Node: Documentation290297 +Node: Texinfo290601 +Node: Man Pages297786 +Node: Install301994 +Node: Basics of Installation302689 +Node: The Two Parts of Install304219 +Node: Extending Installation305759 +Node: Staged Installs306523 +Node: Install Rules for the User307936 +Node: Clean308494 +Node: Dist310666 +Node: Basics of Distribution311170 +Node: Fine-grained Distribution Control315343 +Node: The dist Hook316270 +Node: Checking the Distribution318800 +Node: The Types of Distributions326107 +Node: Tests329260 +Node: Generalities about Testing330456 +Node: Simple Tests333396 +Node: Scripts-based Testsuites333777 +Ref: Testsuite progress on console336150 +Ref: Simple tests and color-tests338243 +Node: Testsuite Environment Overrides340365 +Node: Serial Test Harness342964 +Node: Parallel Test Harness345054 +Ref: Basics of test metadata345560 +Node: Custom Test Drivers354653 +Node: Overview of Custom Test Drivers Support354944 +Node: Declaring Custom Test Drivers357996 +Node: API for Custom Test Drivers359418 +Node: Command-line arguments for test drivers360190 +Node: Log files generation and test results recording362904 +Node: Testsuite progress output367119 +Node: Using the TAP test protocol368541 +Node: Introduction to TAP368903 +Node: Use TAP with the Automake test harness370687 +Node: Incompatibilities with other TAP parsers and drivers376110 +Node: Links and external resources on TAP377511 +Node: DejaGnu Tests379103 +Node: Install Tests381231 +Node: Rebuilding381541 +Node: Options385635 +Node: Options generalities385936 +Node: List of Automake options387717 +Ref: tar-formats395124 +Node: Miscellaneous398637 +Node: Tags398982 +Node: Suffixes402178 +Node: Include403810 +Node: Conditionals405545 +Node: Usage of Conditionals406403 +Node: Limits of Conditionals409761 +Node: Silencing Make410946 +Node: Make verbosity411302 +Ref: Make verbosity-Footnote-1412624 +Node: Tricks For Silencing Make412698 +Node: Automake Silent Rules415205 +Node: Not Enough422183 +Node: Extending422639 +Node: Third-Party Makefiles427673 +Node: Distributing434732 +Node: API Versioning435381 +Node: Upgrading438086 +Node: FAQ440131 +Node: CVS441255 +Node: maintainer-mode449691 +Node: Wildcards453866 +Node: Limitations on File Names457304 +Node: Errors with distclean459934 +Node: Flag Variables Ordering464876 +Node: Renamed Objects472885 +Node: Per-Object Flags474480 +Node: Multiple Outputs477490 +Node: Hard-Coded Install Paths489834 +Node: Debugging Make Rules494978 +Ref: Debugging Make Rules-Footnote-1497124 +Node: Reporting Bugs497302 +Node: Copying This Manual498940 +Node: GNU Free Documentation License499170 +Node: Indices524474 +Node: Macro Index524763 +Node: Variable Index530613 +Node: General Index563584  End Tag Table diff -Nru automake-1.16-1.16.1/doc/automake.info-1 automake-1.16-1.16.5/doc/automake.info-1 --- automake-1.16-1.16.1/doc/automake.info-1 2018-03-11 21:21:16.000000000 +0000 +++ automake-1.16-1.16.5/doc/automake.info-1 2021-10-04 02:47:04.000000000 +0000 @@ -1,11 +1,11 @@ -This is automake.info, produced by makeinfo version 6.5 from +This is automake.info, produced by makeinfo version 6.8 from automake.texi. -This manual is for GNU Automake (version 1.16.1, 26 February 2018), a +This manual is for GNU Automake (version 1.16.5, 1 October 2021), a program that creates GNU standards-compliant Makefiles from template files. - Copyright © 1995-2018 Free Software Foundation, Inc. + Copyright © 1995–2021 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, @@ -31,11 +31,11 @@ GNU Automake ************ -This manual is for GNU Automake (version 1.16.1, 26 February 2018), a +This manual is for GNU Automake (version 1.16.5, 1 October 2021), a program that creates GNU standards-compliant Makefiles from template files. - Copyright © 1995-2018 Free Software Foundation, Inc. + Copyright © 1995–2021 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, @@ -67,7 +67,6 @@ * Include:: Including extra files in an Automake template * Conditionals:: Conditionals * Silencing Make:: Obtain less verbose output from ‘make’ -* Gnits:: The effect of ‘--gnu’ and ‘--gnits’ * Not Enough:: When Automake is not Enough * Distributing:: Distributing the Makefile.in * API Versioning:: About compatibility between Automake versions @@ -141,6 +140,7 @@ Autoconf macros supplied with Automake * Public Macros:: Macros that you can use. +* Obsolete Macros:: Macros that will soon be removed. * Private Macros:: Macros that you should not use. Directories @@ -205,6 +205,10 @@ * Error required file ltmain.sh not found:: The need to run libtoolize * Objects created both with libtool and without:: Avoid a specific build race +Yacc and Lex support + +* Linking Multiple Yacc Parsers:: + Fortran 77 Support * Preprocessing Fortran 77:: Preprocessing Fortran 77 sources @@ -261,7 +265,7 @@ Support for test suites -* Generalities about Testing:: Generic concepts and terminology about testing +* Generalities about Testing:: Concepts and terminology about testing * Simple Tests:: Listing test scripts in ‘TESTS’ * Custom Test Drivers:: Writing and using custom test drivers * Using the TAP test protocol:: Integrating test scripts that use the TAP protocol @@ -274,12 +278,9 @@ * Serial Test Harness:: Older (and discouraged) serial test harness * Parallel Test Harness:: Generic concurrent test harness -Using the TAP test protocol +Scripts-based Testsuites -* Introduction to TAP:: -* Use TAP with the Automake test harness:: -* Incompatibilities with other TAP parsers and drivers:: -* Links and external resources on TAP:: +* Testsuite Environment Overrides:: Custom Test Drivers @@ -293,6 +294,13 @@ * Log files generation and test results recording:: * Testsuite progress output:: +Using the TAP test protocol + +* Introduction to TAP:: +* Use TAP with the Automake test harness:: +* Incompatibilities with other TAP parsers and drivers:: +* Links and external resources on TAP:: + Changing Automake’s Behavior * Options generalities:: Semantics of Automake option @@ -308,7 +316,7 @@ * Usage of Conditionals:: Declaring conditional content * Limits of Conditionals:: Enclosing complete statements -Silencing Make +Silencing ‘make’ * Make verbosity:: Make is verbose by default * Tricks For Silencing Make:: Standard and generic ways to silence make @@ -402,7 +410,7 @@ If you need some teaching material, more illustrations, or a less ‘automake’-centered continuation, some slides for this introduction are available in Alexandre Duret-Lutz’s Autotools Tutorial -(http://www.lrde.epita.fr/~adl/autotools.html). This chapter is the +(https://www.lrde.epita.fr/~adl/autotools.html). This chapter is the written version of the first part of his tutorial. * Menu: @@ -747,17 +755,19 @@ ------------------------------------------------ The GNU Build System distinguishes two trees: the source tree, and the -build tree. +build tree. These are two directories that may be the same, or +different. - The source tree is rooted in the directory containing ‘configure’. -It contains all the sources files (those that are distributed), and may -be arranged using several subdirectories. - - The build tree is rooted in the directory in which ‘configure’ was -run, and is populated with all object files, programs, libraries, and -other derived files built from the sources (and hence not distributed). -The build tree usually has the same subdirectory layout as the source -tree; its subdirectories are created automatically by the build system. + The source tree is rooted in the directory containing the ‘configure’ +script. It contains all the source files (those that are distributed), +and may be arranged using several subdirectories. + + The build tree is rooted in the current directory at the time +‘configure’ was run, and is populated with all object files, programs, +libraries, and other derived files built from the sources (and hence not +distributed). The build tree usually has the same subdirectory layout +as the source tree; its subdirectories are created automatically by the +build system. If ‘configure’ is executed in its own directory, the source and build trees are combined: derived files are constructed in the same @@ -766,8 +776,8 @@ A common request from users is that they want to confine all derived files to a single directory, to keep their source directories -uncluttered. Here is how we could run ‘configure’ to build everything -in a subdirectory called ‘build/’. +uncluttered. Here is how we could run ‘configure’ to create everything +in a build tree (that is, subdirectory) called ‘build/’. ~ % tar zxf ~/amhello-1.0.tar.gz ~ % cd amhello-1.0 @@ -832,7 +842,7 @@ In this scenario, nothing forbids the ‘/nfs/src/amhello-1.0’ directory from being read-only. In fact VPATH builds are also a means of building packages from a read-only medium such as a CD-ROM. (The FSF -used to sell CD-ROM with unpacked source code, before the GNU project +used to sell CD-ROMs with unpacked source code, before the GNU project grew so big.)  @@ -951,8 +961,8 @@ For instance when installing GCC, the GNU Compiler Collection, we can use ‘--target=TARGET’ to specify that we want to build GCC as a cross-compiler for TARGET. Mixing ‘--build’ and ‘--target’, we can -actually cross-compile a cross-compiler; such a three-way -cross-compilation is known as a “Canadian cross”. +cross-compile a cross-compiler; such a three-way cross-compilation is +known as a “Canadian cross”. *Note Specifying the System Type: (autoconf)Specifying Names, for more information about these ‘configure’ options. @@ -1054,8 +1064,8 @@ it additionally ensures most of the use cases presented so far work: • It attempts a full compilation of the package (*note Basic - Installation::), unpacking the newly constructed tarball, running - ‘make’, ‘make check’, ‘make install’, as well as ‘make + Installation::): unpacking the newly constructed tarball, running + ‘make’, ‘make dvi’, ‘make check’, ‘make install’, as well as ‘make installcheck’, and even ‘make dist’, • it tests VPATH builds with read-only source tree (*note VPATH Builds::), @@ -1064,12 +1074,11 @@ • and it checks that ‘DESTDIR’ installations work (*note DESTDIR::). All of these actions are performed in a temporary directory, so that -no root privileges are required. Please note that the exact location -and the exact structure of such a subdirectory (where the extracted -sources are placed, how the temporary build and install directories are -named and how deeply they are nested, etc.) is to be considered an -implementation detail, which can change at any time; so do not rely on -it. +no root privileges are required. The exact location and the exact +structure of such a subdirectory (where the extracted sources are +placed, how the temporary build and install directories are named and +how deeply they are nested, etc.) is to be considered an implementation +detail, which can change at any time; so do not rely on it. Releasing a package that fails ‘make distcheck’ means that one of the scenarios we presented will not work and some users will be @@ -1150,7 +1159,7 @@ A typical setup is that package A will distribute one of the libraries it needs in a subdirectory. This library B is a complete package with its own GNU Build System. The ‘configure’ script of A will -run the ‘configure’ script of B as part of its execution, building and +run the ‘configure’ script of B as part of its execution; building and installing A will also build and install B. Generating a distribution for A will also include B. @@ -1429,7 +1438,7 @@ As you probably noticed, ‘src/main.c’ includes ‘config.h’ so it can use ‘PACKAGE_STRING’. In a real-world project, ‘config.h’ can grow -really big, with one ‘#define’ per feature probed on the system. +quite large, with one ‘#define’ per feature probed on the system. The ‘AC_CONFIG_FILES’ macro declares the list of files that ‘configure’ should create from their ‘*.in’ templates. Automake also @@ -1560,11 +1569,11 @@ Automake maintainer uses to make distributions from the source control system. - Note that most GNU make extensions are not recognized by Automake. + Note that most GNU Make extensions are not recognized by Automake. Using such extensions in a ‘Makefile.am’ will lead to errors or confusing behavior. - A special exception is that the GNU make append operator, ‘+=’, is + A special exception is that the GNU Make append operator, ‘+=’, is supported. This operator appends its right hand argument to the variable specified on the left. Automake will translate the operator into an ordinary ‘=’ operator; ‘+=’ will thus work with any make @@ -1578,7 +1587,7 @@ or “creative” use of whitespace. For example, characters cannot be used between a target name and the following “‘:’” character, and variable assignments shouldn’t be indented with characters. Also, -using more complex macro in target names can cause trouble: +using more complex macros in target names can cause trouble: % cat Makefile.am $(FOO:=x): bar @@ -1593,7 +1602,7 @@ Similarly, a variable defined in ‘Makefile.am’ or ‘AC_SUBST’ed from ‘configure.ac’ will override any definition of the variable that -‘automake’ would ordinarily create. This feature is more often useful +‘automake’ would ordinarily create. This feature is often more useful than the ability to override a rule. Be warned that many of the variables generated by ‘automake’ are considered to be for internal use only, and their names might change in future releases. @@ -1626,35 +1635,83 @@ does make some effort to accommodate those who wish to use it, but do not want to use all the GNU conventions. - To this end, Automake supports three levels of “strictness”—the -strictness indicating how stringently Automake should check standards -conformance. + To this end, Automake supports three levels of “strictness”—how +stringently Automake should enforce conformance with GNU conventions. +Each strictness level can be selected using an option of the same name; +see *note Options::. - The valid strictness levels are: + The strictness levels are: + +‘gnu’ + This is the default level of strictness. Automake will check for + basic compliance with the GNU standards for software packaging. + *Note (standards)Top::, for full details of these standards. + Currently the following checks are made: + + • The files ‘INSTALL’, ‘NEWS’, ‘README’, ‘AUTHORS’, and + ‘ChangeLog’, plus one of ‘COPYING.LIB’, ‘COPYING.LESSER’ or + ‘COPYING’, are required at the topmost directory of the + package. + + If the ‘--add-missing’ option is given, ‘automake’ will add a + generic version of the ‘INSTALL’ file as well as the ‘COPYING’ + file containing the text of the current version of the GNU + General Public License existing at the time of this Automake + release (version 3 as this is written, + ). However, an + existing ‘COPYING’ file will never be overwritten by + ‘automake’. + + • The options ‘no-installman’ and ‘no-installinfo’ are + prohibited. + + Future versions of Automake will add more checks at this level of + strictness; it is advisable to be familiar with the precise + requirements of the GNU standards. + + Future versions of Automake may, at this level of strictness, + require certain non-standard GNU tools to be available to + maintainer-only Makefile rules. For instance, in the future + ‘pathchk’ (*note (coreutils)pathchk invocation::) may be required + to run ‘make dist’. ‘foreign’ Automake will check for only those things that are absolutely - required for proper operations. For instance, whereas GNU - standards dictate the existence of a ‘NEWS’ file, it will not be - required in this mode. This strictness will also turn off some - warnings by default (among them, portability warnings). The name - comes from the fact that Automake is intended to be used for GNU - programs; these relaxed rules are not the standard mode of - operation. - -‘gnu’ - Automake will check—as much as possible—for compliance to the GNU - standards for packages. This is the default. + required for proper operation. For instance, whereas GNU standards + dictate the existence of a ‘NEWS’ file, it will not be required in + this mode. This strictness will also turn off some warnings by + default (among them, portability warnings). ‘gnits’ Automake will check for compliance to the as-yet-unwritten “Gnits standards”. These are based on the GNU standards, but are even more detailed. Unless you are a Gnits standards contributor, it is recommended that you avoid this option until such time as the Gnits - standard is actually published (which may never happen). + standard is published (which is unlikely to ever happen). + + Currently, ‘--gnits’ does all the checks that ‘--gnu’ does, and + checks the following as well: - *Note Gnits::, for more information on the precise implications of -the strictness level. + • ‘make installcheck’ will check to make sure that the ‘--help’ + and ‘--version’ print a usage message and a version string, + respectively. This is the ‘std-options’ option (*note + Options::). + + • ‘make dist’ will check to make sure the ‘NEWS’ file has been + updated to the current version. + + • ‘VERSION’ is checked to make sure its format complies with + Gnits standards. + + • If ‘VERSION’ indicates that this is an alpha release, and the + file ‘README-alpha’ appears in the topmost directory of a + package, then it is included in the distribution. This is + done in ‘--gnits’ mode, and no other, because this mode is the + only one where version number formats are constrained, and + hence the only mode where Automake can automatically determine + whether ‘README-alpha’ should be included. + + • The file ‘THANKS’ is required.  File: automake.info, Node: Uniform, Next: Length Limitations, Prev: Strictness, Up: Generalities @@ -1709,8 +1766,8 @@ Not every sort of object can be installed in every directory. Automake will flag those attempts it finds in error (but see below how -to override the check if you really need to). Automake will also -diagnose obvious misspellings in directory names. +to override the check if you need to). Automake will also diagnose +obvious misspellings in directory names. Sometimes the standard directories—even as augmented by Automake—are not enough. In particular it is sometimes useful, for clarity, to @@ -1727,8 +1784,8 @@ This feature can also be used to override the sanity checks Automake performs to diagnose suspicious directory/primary couples (in the -unlikely case these checks are undesirable, and you really know what -you’re doing). For example, Automake would error out on this input: +unlikely case that you need to omit these checks). For example, +Automake would error out on this input: # Forbidden directory combinations, automake will error out on this. pkglib_PROGRAMS = foo @@ -1774,8 +1831,8 @@ Traditionally, most unix-like systems have a length limitation for the command line arguments and environment contents when creating new processes (see for example - for an overview on this -issue), which of course also applies to commands spawned by ‘make’. + for an overview on +this issue), which of course also applies to commands spawned by ‘make’. POSIX requires this limit to be at least 4096 bytes, and most modern systems have quite high limits (or are unlimited). @@ -1805,7 +1862,7 @@ can happen with above ‘$(data_DATA)’ lists, it limits the amount of arguments passed to external commands. - Unfortunately, some system’s ‘make’ commands may prepend ‘VPATH’ + Unfortunately, some systems’ ‘make’ commands may prepend ‘VPATH’ prefixes like ‘${srcdir}/’ to file names from the source tree automatically (*note Automatic Rule Rewriting: (autoconf)Automatic Rule Rewriting.). In this case, the user may have to switch to use GNU Make, @@ -1924,8 +1981,8 @@ ‘missing’ This wraps a number of programs that are typically only required by - maintainers. If the program in question doesn’t exist, or seems to - old, ‘missing’ will print an informative warning before failing + maintainers. If the program in question doesn’t exist, or seems + too old, ‘missing’ will print an informative warning before failing out, to provide the user with more context and information. ‘mkinstalldirs’ @@ -1946,10 +2003,12 @@ testsuite harness. ‘texinfo.tex’ - Not a program, this file is required for ‘make dvi’, ‘make ps’ and - ‘make pdf’ to work when Texinfo sources are in the package. The - latest version can be downloaded from - . + When Texinfo sources are in the package, this file is required for + ‘make dvi’, ‘make ps’ and ‘make pdf’. The latest version can be + downloaded from . A working + TeX distribution, or at least a ‘tex’ program, is also required. + Furthermore, ‘make dist’ invokes ‘make dvi’, so these become + requirements for making a distribution with Texinfo sources. ‘ylwrap’ This program wraps ‘lex’ and ‘yacc’ to rename their output files. @@ -2124,10 +2183,10 @@ Automake will run ‘autoconf’ to scan ‘configure.ac’ and its dependencies (i.e., ‘aclocal.m4’ and any included file), therefore ‘autoconf’ must be in your ‘PATH’. If there is an ‘AUTOCONF’ variable -in your environment it will be used instead of ‘autoconf’, this allows +in your environment it will be used instead of ‘autoconf’; this allows you to select a particular version of Autoconf. By the way, don’t misunderstand this paragraph: ‘automake’ runs ‘autoconf’ to *scan* your -‘configure.ac’, this won’t build ‘configure’ and you still have to run +‘configure.ac’; this won’t build ‘configure’ and you still have to run ‘autoconf’ yourself for this purpose. ‘automake’ accepts the following options: @@ -2163,8 +2222,8 @@ ‘--print-libdir’ Print the path of the installation directory containing - Automake-provided scripts and data files (like e.g., ‘texinfo.texi’ - and ‘install-sh’). + Automake-provided scripts and data files (e.g., ‘texinfo.texi’ and + ‘install-sh’). ‘-c’ ‘--copy’ @@ -2184,11 +2243,11 @@ ‘--gnits’ Set the global strictness to ‘gnits’. For more information, see - *note Gnits::. + *note Strictness::. ‘--gnu’ Set the global strictness to ‘gnu’. For more information, see - *note Gnits::. This is the default strictness. + *note Strictness::. This is the default strictness. ‘--help’ Print a summary of the command line options and exit. @@ -2224,52 +2283,69 @@ ‘--version’ Print the version number of Automake and exit. -‘-W CATEGORY’ -‘--warnings=CATEGORY’ - Output warnings falling in CATEGORY. CATEGORY can be one of: +‘-W CATEGORY[,CATEGORY...]’ +‘--warnings=CATEGORY[,CATEGORY...]’ + Output warnings about a CATEGORY of potential problems with the + package. CATEGORY can be any of: + + ‘cross’ + Constructs compromising the ability to cross-compile the + package. ‘gnu’ - warnings related to the GNU Coding Standards (*note + Minor deviations from the GNU Coding Standards (*note (standards)Top::). ‘obsolete’ - obsolete features or constructions + Obsolete features or constructions. ‘override’ - user redefinitions of Automake rules or variables + Redefinitions of Automake rules or variables. ‘portability’ - portability issues (e.g., use of ‘make’ features that are - known to be not portable) + Portability issues (e.g., use of ‘make’ features that are + known to be not portable). + ‘portability-recursive’ + Recursive, or nested, Make variable expansions (‘$(foo$(x))’). + These are not universally supported, but are more portable + than the other non-portable constructs diagnosed by + ‘-Wportability’. These warnings are turned on by + ‘-Wportability’ but can then be turned off specifically by + ‘-Wno-portability-recursive’. ‘extra-portability’ - extra portability issues related to obscure tools. One - example of such a tool is the Microsoft ‘lib’ archiver. + Extra portability issues, related to rarely-used tools such as + the Microsoft ‘lib’ archiver. ‘syntax’ - weird syntax, unused variables, typos + Questionable syntax, unused variables, typos, etc. ‘unsupported’ - unsupported or incomplete features + Unsupported or incomplete features. ‘all’ - all the warnings + Turn on all the above categories of warnings. ‘none’ - turn off all the warnings + Turn off all the above categories of warnings. ‘error’ - treat warnings as errors + Treat warnings as errors. A category can be turned off by prefixing its name with ‘no-’. For instance, ‘-Wno-syntax’ will hide the warnings about unused variables. - The categories output by default are ‘obsolete’, ‘syntax’ and - ‘unsupported’. Additionally, ‘gnu’ and ‘portability’ are enabled - in ‘--gnu’ and ‘--gnits’ strictness. + Warnings in the ‘gnu’, ‘obsolete’, ‘portability’, ‘syntax’, and + ‘unsupported’ categories are turned on by default. The ‘gnu’ and + ‘portability’ categories are turned off in ‘--foreign’ strictness. Turning off ‘portability’ will also turn off ‘extra-portability’, and similarly turning on ‘extra-portability’ will also turn on ‘portability’. However, turning on ‘portability’ or turning off ‘extra-portability’ will not affect the other category. + Unknown warning categories supplied as an argument to ‘-W’ will + themselves produce a warning, in the ‘unsupported’ category. This + warning is never treated as an error. + The environment variable ‘WARNINGS’ can contain a comma separated - list of categories to enable. It will be taken into account before - the command-line switches, this way ‘-Wnone’ will also ignore any - warning category enabled by ‘WARNINGS’. This variable is also used - by other tools like ‘autoconf’; unknown categories are ignored for - this reason. + list of categories to enable. ‘-W’ settings on the command line + take precedence; for instance, ‘-Wnone’ also turns off any warning + categories enabled by ‘WARNINGS’. + + Unknown warning categories named in ‘WARNINGS’ are silently + ignored. If the environment variable ‘AUTOMAKE_JOBS’ contains a positive number, it is taken as the maximum number of Perl threads to use in @@ -2447,6 +2523,12 @@ always searched for; some scripts will only be sought if the generated ‘Makefile.in’ requires them. + If ‘AC_CONFIG_AUX_DIR’ is used, it must be given before the call to + ‘AM_INIT_AUTOMAKE’; Automake will warn about this if it is not so. + All other ‘AC_CONFIG_...’ macros are conventionally called after + ‘AM_INIT_AUTOMAKE’, though they may or may not work in other + locations, with or without warnings. + If ‘AC_CONFIG_AUX_DIR’ is not given, the scripts are looked for in their standard locations. For ‘mdate-sh’, ‘texinfo.tex’, and ‘ylwrap’, the standard location is the source directory @@ -2465,20 +2547,21 @@ ‘AC_CONFIG_HEADERS’ Automake will generate rules to rebuild these headers from the corresponding templates (usually, the template for a ‘foo.h’ header - being ‘foo.h.in’). Older versions of Automake required the use of - ‘AM_CONFIG_HEADER’; this is no longer the case, and that macro has - indeed been removed. + being ‘foo.h.in’). As with ‘AC_CONFIG_FILES’ (*note Requirements::), parts of the specification using shell variables will be ignored as far as cleaning, distributing, and rebuilding is concerned. + Older versions of Automake required the use of ‘AM_CONFIG_HEADER’; + this is no longer the case, and that macro has indeed been removed. + ‘AC_CONFIG_LINKS’ Automake will generate rules to remove ‘configure’ generated links on ‘make distclean’ and to distribute named source files as part of ‘make dist’. - As for ‘AC_CONFIG_FILES’ (*note Requirements::), parts of the + As with ‘AC_CONFIG_FILES’ (*note Requirements::), parts of the specification using shell variables will be ignored as far as cleaning and distributing is concerned. (There are no rebuild rules for links.) @@ -2616,7 +2699,7 @@ ‘m4_include’ is seldom used by ‘configure.ac’ authors, but can appear in ‘aclocal.m4’ when ‘aclocal’ detects that some required macros come from files local to your package (as opposed to macros - installed in a system-wide directory, *note aclocal Invocation::). + installed in a system-wide directory; *note aclocal Invocation::).  File: automake.info, Node: aclocal Invocation, Next: Macros, Prev: Optional, Up: configure @@ -2625,9 +2708,9 @@ ============================== Automake includes a number of Autoconf macros that can be used in your -package (*note Macros::); some of them are actually required by Automake -in certain situations. These macros must be defined in your -‘aclocal.m4’; otherwise they will not be seen by ‘autoconf’. +package (*note Macros::); some of them are required by Automake in +certain situations. These macros must be defined in your ‘aclocal.m4’; +otherwise they will not be seen by ‘autoconf’. The ‘aclocal’ program will automatically generate ‘aclocal.m4’ files based on the contents of ‘configure.ac’. This provides a convenient way @@ -2654,7 +2737,7 @@ instead of copying it into ‘aclocal.m4’. This makes the package smaller, eases dependency tracking, and cause the file to be distributed automatically. (*Note Local Macros::, for an example.) Any macro that -is found in a system-wide directory, or via an absolute search path will +is found in a system-wide directory or via an absolute search path will be copied. So use ‘-I `pwd`/reldir’ instead of ‘-I reldir’ whenever some relative directory should be considered outside the package. @@ -2664,10 +2747,10 @@ While computing ‘aclocal.m4’, ‘aclocal’ runs ‘autom4te’ (*note Using ‘Autom4te’: (autoconf)Using autom4te.) in order to trace the macros that -are really used, and omit from ‘aclocal.m4’ all macros that are -mentioned but otherwise unexpanded (this can happen when a macro is -called conditionally). ‘autom4te’ is expected to be in the ‘PATH’, just -as ‘autoconf’. Its location can be overridden using the ‘AUTOM4TE’ +are used, and omit from ‘aclocal.m4’ all macros that are mentioned but +otherwise unexpanded (this can happen when a macro is called +conditionally). ‘autom4te’ is expected to be in the ‘PATH’, just as +‘autoconf’. Its location can be overridden using the ‘AUTOM4TE’ environment variable. * Menu: @@ -2701,13 +2784,13 @@ This is typically used for debugging. ‘--diff[=COMMAND]’ - Run COMMAND on M4 file that would be installed or overwritten by - ‘--install’. The default COMMAND is ‘diff -u’. This option + Run COMMAND on the M4 file that would be installed or overwritten + by ‘--install’. The default COMMAND is ‘diff -u’. This option implies ‘--install’ and ‘--dry-run’. ‘--dry-run’ - Do not actually overwrite (or create) ‘aclocal.m4’ and M4 files - installed by ‘--install’. + Do not overwrite (or create) ‘aclocal.m4’ and M4 files installed by + ‘--install’. ‘--help’ Print a summary of the command line options and exit. @@ -2729,8 +2812,8 @@ ‘--force’ Always overwrite the output file. The default is to overwrite the - output file only when really needed, i.e., when its contents - changes or if one of its dependencies is younger. + output file only when needed, i.e., when its contents change or if + one of its dependencies is younger. This option forces the update of ‘aclocal.m4’ (or the file specified with ‘--output’ below) and only this file, it has @@ -2747,7 +2830,7 @@ third-party packages to determine where to install ‘.m4’ macro files, but _this usage is today discouraged_, since it causes ‘$(prefix)’ not to be thoroughly honored (which violates the GNU - Coding Standards), and a similar semantics can be better obtained + Coding Standards), and similar semantics can be better obtained with the ‘ACLOCAL_PATH’ environment variable; *note Extending aclocal::. @@ -2882,8 +2965,8 @@ 2. ‘/usr/share/aclocal/’ 3. ‘/usr/local/share/aclocal/’ - without the need for ‘-I’ options; ‘-I’ options can be reserved for -project-specific needs (‘my-source-dir/m4/’), rather than using it to +without the need for ‘-I’ options; ‘-I’ options can be reserved for +project-specific needs (‘my-source-dir/m4/’), rather than using them to work around local system-dependent tool installation directories. Similarly, ‘dirlist’ can be handy if you have installed a local copy @@ -2957,17 +3040,17 @@ should be done inside the defined macro, not at the beginning of the file. - Starting with Automake 1.8, ‘aclocal’ will warn about all underquoted -calls to ‘AC_DEFUN’. We realize this will annoy a lot of people, -because ‘aclocal’ was not so strict in the past and many third party -macros are underquoted; and we have to apologize for this temporary -inconvenience. The reason we have to be stricter is that a future -implementation of ‘aclocal’ (*note Future of aclocal::) will have to -temporarily include all of these third party ‘.m4’ files, maybe several -times, including even files that are not actually needed. Doing so -should alleviate many problems of the current implementation, however it -requires a stricter style from the macro authors. Hopefully it is easy -to revise the existing macros. For instance, + Starting with Automake 1.8, ‘aclocal’ warns about all underquoted +calls to ‘AC_DEFUN’. We realize this annoys some people, because +‘aclocal’ was not so strict in the past and many third party macros are +underquoted; and we have to apologize for this temporary inconvenience. +The reason we have to be stricter is that a future implementation of +‘aclocal’ (*note Future of aclocal::) will have to temporarily include +all of these third party ‘.m4’ files, maybe several times, even +including files that end up not being needed. Doing so should alleviate +many problems of the current implementation; however, it requires a +stricter style from macro authors. Hopefully it is easy to revise the +existing macros. For instance, # bad style AC_PREREQ(2.68) @@ -2987,10 +3070,10 @@ ]) Wrapping the ‘AC_PREREQ’ call inside the macro ensures that Autoconf -2.68 will not be required if ‘AX_FOOBAR’ is not actually used. Most -importantly, quoting the first argument of ‘AC_DEFUN’ allows the macro -to be redefined or included twice (otherwise this first argument would -be expanded during the second definition). For consistency we like to +2.68 will not be required if ‘AX_FOOBAR’ is not used. Most importantly, +quoting the first argument of ‘AC_DEFUN’ allows the macro to be +redefined or included twice (otherwise this first argument would be +expanded during the second definition). For consistency we like to quote even arguments such as ‘2.68’ that do not require it. If you have been directed here by the ‘aclocal’ diagnostic but are @@ -3000,7 +3083,7 @@ doing so: people tend to work faster when they aren’t flooded by mails. Another situation where ‘aclocal’ is commonly used is to manage -macros that are used locally by the package, *note Local Macros::. +macros that are used locally by the package; *note Local Macros::.  File: automake.info, Node: Local Macros, Next: Serials, Prev: Extending aclocal, Up: aclocal Invocation @@ -3038,7 +3121,7 @@ Custom macros should be distributed for the same reason that ‘configure.ac’ is: so that other people have all the sources of your -package if they want to work on it. Actually, this distribution happens +package if they want to work on it. In fact, this distribution happens automatically because all ‘m4_include’d files are distributed. However there is no consensus on the distribution of third-party @@ -3115,7 +3198,7 @@ ‘#serial’ line (or the file that has none). Note that a serial number applies to a whole M4 file, not to any -macro it contains. A file can contains multiple macros, but only one +macro it contains. A file can contain multiple macros, but only one serial. Here is a use case that illustrates the use of ‘--install’ and its @@ -3140,7 +3223,7 @@ • ‘configure.ac’ uses ‘AX_THIRD_PARTY’ • No local macros define ‘AX_THIRD_PARTY’ • ‘/usr/share/aclocal/thirdparty.m4’ defines ‘AX_THIRD_PARTY’ with - serial 1. + serial number 1. Because ‘/usr/share/aclocal/thirdparty.m4’ is a system-wide macro and ‘aclocal’ was given the ‘--install’ option, it will copy this file in @@ -3151,9 +3234,9 @@ happens. ‘aclocal’ notices that • ‘configure.ac’ uses ‘AX_THIRD_PARTY’ - • ‘m4/thirdparty.m4’ defines ‘AX_THIRD_PARTY’ with serial 1. + • ‘m4/thirdparty.m4’ defines ‘AX_THIRD_PARTY’ with serial number 1. • ‘/usr/share/aclocal/thirdparty.m4’ defines ‘AX_THIRD_PARTY’ with - serial 1. + serial number 1. Because both files have the same serial number, ‘aclocal’ uses the first it found in its search path order (*note Macro Search Path::). @@ -3170,7 +3253,7 @@ run the situation is the following: • ‘configure.ac’ uses ‘AX_THIRD_PARTY’ - • ‘m4/thirdparty.m4’ defines ‘AX_THIRD_PARTY’ with serial 1. + • ‘m4/thirdparty.m4’ defines ‘AX_THIRD_PARTY’ with serial number 1. • ‘/usr/share/aclocal/thirdparty.m4’ defines ‘AX_THIRD_PARTY’ with serial 2. @@ -3201,11 +3284,11 @@ 6.3.6 The Future of ‘aclocal’ ----------------------------- -‘aclocal’ is expected to disappear. This feature really should not be -offered by Automake. Automake should focus on generating ‘Makefile’s; -dealing with M4 macros really is Autoconf’s job. The fact that some -people install Automake just to use ‘aclocal’, but do not use ‘automake’ -otherwise is an indication of how that feature is misplaced. +Ideally, ‘aclocal’ should not be part of Automake. Automake should +focus on generating ‘Makefile’s; dealing with M4 macros is more +Autoconf’s job. The fact that some people install Automake just to use +‘aclocal’, but do not use ‘automake’ otherwise is an indication of how +that feature is misplaced. The new implementation will probably be done slightly differently. For instance, it could enforce the ‘m4/’-style layout discussed in *note @@ -3219,7 +3302,7 @@ painful. There is a simple precaution that you may take to make that switch more seamless: never call ‘aclocal’ yourself. Keep this guy under the exclusive control of ‘autoreconf’ and Automake’s rebuild -rules. Hopefully you won’t need to worry about things breaking, when +rules. Hopefully you won’t need to worry about things breaking; when ‘aclocal’ disappears, because everything will have been taken care of. If otherwise you used to call ‘aclocal’ directly yourself or from some script, you will quickly notice the change. @@ -3227,18 +3310,18 @@ Many packages come with a script called ‘bootstrap’ or ‘autogen.sh’, that will just call ‘aclocal’, ‘libtoolize’, ‘gettextize’ or ‘autopoint’, ‘autoconf’, ‘autoheader’, and ‘automake’ in the right -order. Actually this is precisely what ‘autoreconf’ can do for you. If +order. In fact, this is precisely what ‘autoreconf’ can do for you. If your package has such a ‘bootstrap’ or ‘autogen.sh’ script, consider using ‘autoreconf’. That should simplify its logic a lot (less things -to maintain, yum!), it’s even likely you will not need the script -anymore, and more to the point you will not call ‘aclocal’ directly -anymore. +to maintain, all to the good), it’s even likely you will not need the +script anymore, and more to the point you will not call ‘aclocal’ +directly anymore. For the time being, third-party packages should continue to install public macros into ‘/usr/share/aclocal/’. If ‘aclocal’ is replaced by another tool it might make sense to rename the directory, but supporting -‘/usr/share/aclocal/’ for backward compatibility should be really easy -provided all macros are properly written (*note Extending aclocal::). +‘/usr/share/aclocal/’ for backward compatibility should be easy provided +all macros are properly written (*note Extending aclocal::).  File: automake.info, Node: Macros, Prev: aclocal Invocation, Up: configure @@ -3281,12 +3364,11 @@ in the ‘PACKAGE’ and ‘VERSION’ arguments (which otherwise defaults, respectively, to the ‘PACKAGE_TARNAME’ and ‘PACKAGE_VERSION’ defined via the ‘AC_INIT’ invocation; *note The ‘AC_INIT’ macro: - (autoconf)AC_INIT.); and this can be still be useful in some - selected situations. Our hope is that future Autoconf versions - will improve their support for package versions defined dynamically - at configure runtime; when (and if) this happens, support for the - two-args ‘AM_INIT_AUTOMAKE’ invocation will likely be removed from - Automake. + (autoconf)AC_INIT.); and this can still be useful in some selected + situations. Our hope is that future Autoconf versions will improve + their support for package versions defined dynamically at configure + runtime; when (and if) this happens, support for the two-args + ‘AM_INIT_AUTOMAKE’ invocation will likely be removed from Automake. If your ‘configure.ac’ has: @@ -3379,7 +3461,7 @@ Silent Rules::). ‘AM_WITH_DMALLOC’ - Add support for the Dmalloc package (http://dmalloc.com/). If the + Add support for the Dmalloc package (https://dmalloc.com/). If the user runs ‘configure’ with ‘--with-dmalloc’, then define ‘WITH_DMALLOC’ and add ‘-ldmalloc’ to ‘LIBS’. @@ -3471,7 +3553,7 @@ instance to build the directory’s contents. Because this approach is very widespread, Automake offers built-in -support for it. However, it is worth nothing that the use of make +support for it. However, it is worth noting that the use of make recursion has its own serious issues and drawbacks, and that it’s well possible to have packages with a multi directory layout that make little or no use of such recursion (examples of such packages are GNU Bison and @@ -3544,7 +3626,7 @@ ‘-local’ targets. % cat configure.ac - AC_INIT([pkg-name], [1.0] + AC_INIT([pkg-name], [1.0]) AM_INIT_AUTOMAKE AM_EXTRA_RECURSIVE_TARGETS([foo]) AC_CONFIG_FILES([Makefile sub/Makefile sub/src/Makefile]) @@ -3571,7 +3653,7 @@ in the case of GNU Inetutils, you want to only build a subset of the entire package. - To illustrate how this works, let’s assume we have two directories + To illustrate how this works, let’s assume we have two directories, ‘src/’ and ‘opt/’. ‘src/’ should always be built, but we want to decide in ‘configure’ whether ‘opt/’ will be built or not. (For this example we will assume that ‘opt/’ should be built when the variable ‘$want_opt’ @@ -3581,11 +3663,11 @@ in ‘opt/’. However ‘make dist’ should always recurse into both ‘src/’ and -‘opt/’. Because ‘opt/’ should be distributed even if it is not needed -in the current configuration. This means ‘opt/Makefile’ should be -created _unconditionally_. +‘opt/’, because ‘opt/’ should be distributed even if it is not needed in +the current configuration. This means ‘opt/Makefile’ should be created +_unconditionally_. - There are two ways to setup a project like this. You can use + There are two ways to set up a project like this. You can use Automake conditionals (*note Conditionals::) or use Autoconf ‘AC_SUBST’ variables (*note Setting Output Variables: (autoconf)Setting Output Variables.). Using Automake conditionals is the preferred solution. @@ -3727,11 +3809,11 @@ • Any directory listed in ‘DIST_SUBDIRS’ and ‘SUBDIRS’ must be configured. - I.e., the ‘Makefile’ must exists or the recursive ‘make’ rules will - not be able to process the directory. + That is, the ‘Makefile’ must exist or the recursive ‘make’ rules + will not be able to process the directory. • Any configured directory must be listed in ‘DIST_SUBDIRS’. - So that the cleaning rules remove the generated ‘Makefile’s. It + This is so the cleaning rules remove the generated ‘Makefile’s. It would be correct to see ‘DIST_SUBDIRS’ as a variable that lists all the directories that have been configured. @@ -3748,15 +3830,16 @@ directories are known to appear in ‘DIST_SUBDIRS’; or writing a ‘dist-hook’ target to distribute these directories). - In few packages, unconfigured directories are not even expected to be -distributed. Although these packages do not require the aforementioned -extra arrangements, there is another pitfall. If the name of a -directory appears in ‘SUBDIRS’ or ‘DIST_SUBDIRS’, ‘automake’ will make -sure the directory exists. Consequently ‘automake’ cannot be run on -such a distribution when one directory has been omitted. One way to -avoid this check is to use the ‘AC_SUBST’ method to declare conditional -directories; since ‘automake’ does not know the values of ‘AC_SUBST’ -variables it cannot ensure the corresponding directory exists. + In a few packages, unconfigured directories are not even expected to +be distributed. Although these packages do not require the +aforementioned extra arrangements, there is another pitfall. If the +name of a directory appears in ‘SUBDIRS’ or ‘DIST_SUBDIRS’, ‘automake’ +will make sure the directory exists. Consequently ‘automake’ cannot be +run on such a distribution when one directory has been omitted. One way +to avoid this check is to use the ‘AC_SUBST’ method to declare +conditional directories; since ‘automake’ does not know the values of +‘AC_SUBST’ variables it cannot ensure the corresponding directory +exists.  File: automake.info, Node: Alternative, Next: Subpackages, Prev: Conditional Subdirectories, Up: Directories @@ -3764,16 +3847,15 @@ 7.3 An Alternative Approach to Subdirectories ============================================= -If you’ve ever read Peter Miller’s excellent paper, Recursive Make -Considered Harmful (http://miller.emu.id.au/pmiller/books/rmch/), the -preceding sections on the use of make recursion will probably come as -unwelcome advice. For those who haven’t read the paper, Miller’s main -thesis is that recursive ‘make’ invocations are both slow and -error-prone. - - Automake provides sufficient cross-directory support (1) to enable -you to write a single ‘Makefile.am’ for a complex multi-directory -package. +If you’ve ever read Peter Miller’s excellent paper, ‘Recursive Make +Considered Harmful’, the preceding sections on the use of make recursion +will probably come as unwelcome advice. For those who haven’t read the +paper, Miller’s main thesis is that recursive ‘make’ invocations are +both slow and error-prone. + + Automake is intended to have sufficient cross-directory support to +enable you to write a single ‘Makefile.am’ for a complex multi-directory +package. (If it seems to be lacking, please report the issue as usual.) By default an installable file specified in a subdirectory will have its directory name stripped before installation. For instance, in this @@ -3810,11 +3892,6 @@ rule, in that there is no particular installation order guarantee for an otherwise equivalent set of variables without ‘nobase_’ prefix. - ---------- Footnotes ---------- - - (1) We believe. This work is new and there are probably warts. -*Note Introduction::, for information on reporting bugs. -  File: automake.info, Node: Subpackages, Prev: Alternative, Up: Directories @@ -3896,9 +3973,9 @@ the parent directory and the grandparent directory. So if the ‘AC_CONFIG_AUX_DIR([.])’ line was removed from ‘hand/configure.ac’, that subpackage would share the auxiliary script of the ‘arm’ package. This -may looks like a gain in size (a few kilobytes), but it is actually a -loss of modularity as the ‘hand’ subpackage is no longer self-contained -(‘make dist’ in the subdirectory will not work anymore). +may look like a gain in size (a few kilobytes), but more importantly, it +is a loss of modularity as the ‘hand’ subpackage is no longer +self-contained (‘make dist’ in the subdirectory will not work anymore). Packages that do not use Automake need more work to be integrated this way. *Note Third-Party Makefiles::. @@ -4010,7 +4087,7 @@ If you need to link against libraries that are not found by ‘configure’, you can use ‘LDADD’ to do so. This variable is used to specify additional objects or libraries to link with; it is inappropriate for -specifying specific linker flags, you should use ‘AM_LDFLAGS’ for this +specifying specific linker flags; you should use ‘AM_LDFLAGS’ for this purpose. Sometimes, multiple programs are built in one directory but do not @@ -4043,8 +4120,8 @@ ‘PROG_LDFLAGS’ variable for this purpose. It is also occasionally useful to have a program depend on some other -target that is not actually part of that program. This can be done -using either the ‘PROG_DEPENDENCIES’ or the ‘EXTRA_PROG_DEPENDENCIES’ +target that is not in fact part of that program. This can be done using +either the ‘PROG_DEPENDENCIES’ or the ‘EXTRA_PROG_DEPENDENCIES’ variable. Each program depends on the contents both variables, but no further interpretation is done. @@ -4109,7 +4186,7 @@ hello_LDADD = $(HELLO_SYSTEM) hello_DEPENDENCIES = $(HELLO_SYSTEM) -You can then setup the ‘$(HELLO_SYSTEM)’ substitution from +You can then set up the ‘$(HELLO_SYSTEM)’ substitution from ‘configure.ac’: ... @@ -4139,7 +4216,7 @@ hello_SOURCES = hello-generic.c hello-common.c endif - In this case, ‘configure.ac’ should setup the ‘LINUX’ conditional + In this case, ‘configure.ac’ should set up the ‘LINUX’ conditional using ‘AM_CONDITIONAL’ (*note Conditionals::). When using conditionals like this you don’t need to use the ‘EXTRA_’ @@ -4301,8 +4378,8 @@ library, or maybe both. Their exact nature cannot be determined until ‘./configure’ is run: not all platforms support all kinds of libraries, and users can explicitly select which libraries should be built. -(However the package’s maintainers can tune the default, *note The -‘AC_PROG_LIBTOOL’ macro: (libtool)AC_PROG_LIBTOOL.) +(However the package’s maintainers can tune the default; *note The +‘LT_INIT’ macro: (libtool)LT_INIT.) Because object files for shared and static libraries must be compiled differently, libtool is also used during compilation. Object files @@ -4313,7 +4390,7 @@ files and how libtool constructs them: this is libtool’s concern, and the last thing one wants is to learn about libtool’s guts. However the existence of these files matters, because they are used as targets and -dependencies in ‘Makefile’s rules when building libtool libraries. +dependencies in ‘Makefile’s’ rules when building libtool libraries. There are situations where you may have to refer to these, for instance when expressing dependencies for building source files conditionally (*note Conditional Libtool Sources::). @@ -4324,7 +4401,7 @@ dlopening facility to load libtool libraries dynamically, and can also achieve static linking where unavoidable. - Before we discuss how to use libtool with Automake in details, it + Before we discuss how to use libtool with Automake in detail, it should be noted that the libtool manual also has a section about how to use Automake with libtool (*note Using Automake with Libtool: (libtool)Using Automake.). @@ -4477,7 +4554,7 @@ Libtool convenience libraries are declared by directory-less variables such as ‘noinst_LTLIBRARIES’, ‘check_LTLIBRARIES’, or even ‘EXTRA_LTLIBRARIES’. Unlike installed libtool libraries they do not -need an ‘-rpath’ flag at link time (actually this is the only +need an ‘-rpath’ flag at link time (this is in fact the only difference). Convenience libraries listed in ‘noinst_LTLIBRARIES’ are always @@ -4514,11 +4591,11 @@ sub22/libsub22.la \ ... - When using such setup, beware that ‘automake’ will assume ‘libtop.la’ -is to be linked with the C linker. This is because ‘libtop_la_SOURCES’ -is empty, so ‘automake’ picks C as default language. If -‘libtop_la_SOURCES’ was not empty, ‘automake’ would select the linker as -explained in *note How the Linker is Chosen::. + When using such a setup, beware that ‘automake’ will assume +‘libtop.la’ is to be linked with the C linker. This is because +‘libtop_la_SOURCES’ is empty, so ‘automake’ picks C as default language. +If ‘libtop_la_SOURCES’ was not empty, ‘automake’ would select the linker +as explained in *note How the Linker is Chosen::. If one of the sublibraries contains non-C source, it is important that the appropriate linker be chosen. One way to achieve this is to @@ -4538,7 +4615,7 @@ ‘EXTRA_*_SOURCES’ variables are used to keep track of source files that might be compiled (this is mostly useful when doing conditional -compilation using ‘AC_SUBST’, *note Conditional Libtool Sources::), and +compilation using ‘AC_SUBST’; *note Conditional Libtool Sources::), and the ‘nodist_’ prefix means the listed sources are not to be distributed (*note Program and Library Variables::). In effect the file ‘dummy.cxx’ does not need to exist in the source tree. Of course if you have some @@ -4594,8 +4671,8 @@ linking flags should be lumped with the other flags passed to the tool invoked by ‘libtool’ (hence the use of ‘LIBRARY_LDFLAGS’ for libtool linking flags). Generic options include ‘--tag=TAG’ and ‘--silent’ -(*note Invoking ‘libtool’: (libtool)Invoking libtool. for more options) -should appear before the mode selection on the command line; in +(*note Invoking ‘libtool’: (libtool)Invoking libtool. for more options). +They should appear before the mode selection on the command line; in ‘Makefile.am’s they should be listed in the ‘LIBRARY_LIBTOOLFLAGS’ variable. @@ -4609,7 +4686,7 @@ The libtool rules also use a ‘LIBTOOLFLAGS’ variable that should not be set in ‘Makefile.am’: this is a user variable (*note Flag Variables -Ordering::. It allows users to run ‘make LIBTOOLFLAGS=--silent’, for +Ordering::). It allows users to run ‘make LIBTOOLFLAGS=--silent’, for instance. Note that the verbosity of ‘libtool’ can also be influenced by the Automake support for silent rules (*note Automake Silent Rules::). @@ -4684,7 +4761,7 @@ (In this trivial case the issue could be avoided by linking ‘libfoo.la’ with ‘prog’ instead of listing ‘foo.c’ in ‘prog_SOURCES’. But let’s -assume we really want to keep ‘prog’ and ‘libfoo.la’ separate.) +assume we want to keep ‘prog’ and ‘libfoo.la’ separate.) Technically, it means that we should build ‘foo.$(OBJEXT)’ for ‘prog’, and ‘foo.lo’ for ‘libfoo.la’. The problem is that in the course @@ -4697,7 +4774,7 @@ A workaround for this issue is to ensure that these two objects get different basenames. As explained in *note Renamed Objects::, this -happens automatically when per-targets flags are used. +happens automatically when per-target flags are used. bin_PROGRAMS = prog prog_SOURCES = prog.c foo.c ... @@ -4760,15 +4837,23 @@ ‘subdir-objects’ is in effect in the current directory then the ‘.o’ file will be put into the subdirectory named after the source file. For instance, with ‘subdir-objects’ enabled, - ‘sub/dir/file.c’ will be compiled to ‘sub/dir/file.o’. Some people - prefer this mode of operation. You can specify ‘subdir-objects’ in - ‘AUTOMAKE_OPTIONS’ (*note Options::). + ‘sub/dir/file.c’ will be compiled to ‘sub/dir/file.o’. Some + projects prefer or require this mode of operation. You can specify + ‘subdir-objects’ in ‘AUTOMAKE_OPTIONS’ (*note Options::). + + When ‘subdir-objects’ is specified, and source files which lie + outside the current directory tree are nevertheless specified, as + in ‘foo_SOURCES = ../lib/other.c’, Automake will still remove + ‘../lib/other.o’, in fact, ‘../lib/*.o’ (e.g., at ‘make clean’, + even though it is arguably wrong for one subdirectory to clean in a + sibling. This may or may not be changed in the future. ‘EXTRA_maude_SOURCES’ Automake needs to know the list of files you intend to compile _statically_. For one thing, this is the only way Automake has of knowing what sort of language support a given ‘Makefile.in’ - requires. (1) This means that, for example, you can’t put a + requires. (There are other, more obscure reasons for this + limitation as well.) This means that, for example, you can’t put a configure substitution like ‘@my_sources@’ into a ‘_SOURCES’ variable. If you intend to conditionally compile source files and use ‘configure’ to substitute the appropriate object names into, @@ -4820,7 +4905,9 @@ ‘maude_LDFLAGS’ This variable is used to pass extra flags to the link step of a program or a shared library. It overrides the ‘AM_LDFLAGS’ - variable. + variable, even if it is defined only in a false branch of a + conditional; in other words, if ‘PROG_LDFLAGS’ is defined at all, + ‘AM_LDFLAGS’ will not be used. ‘maude_LIBTOOLFLAGS’ This variable is used to pass extra options to ‘libtool’. It @@ -4832,12 +4919,12 @@ ‘maude_DEPENDENCIES’ ‘EXTRA_maude_DEPENDENCIES’ It is also occasionally useful to have a target (program or - library) depend on some other file that is not actually part of - that target. This can be done using the ‘_DEPENDENCIES’ variable. - Each target depends on the contents of such a variable, but no - further interpretation is done. + library) depend on some other file that is not in fact part of that + target. This can be done using the ‘_DEPENDENCIES’ variable. Each + target depends on the contents of such a variable, but no further + interpretation is done. - Since these dependencies are associated to the link rule used to + Since these dependencies are associated with the link rule used to create the programs they should normally list files used by the link command. That is ‘*.$(OBJEXT)’, ‘*.a’, or ‘*.la’ files for programs; ‘*.lo’ and ‘*.la’ files for Libtool libraries; and @@ -4881,6 +4968,9 @@ as ‘_CFLAGS’, ‘_LDFLAGS’ or ‘_LIBTOOLFLAGS’, in cases where they apply. + If the variable ‘AM_V_*_LINK’ exists, it is used to output a status + line in silent mode; otherwise, ‘AM_V_GEN’ is used. + ‘maude_CCASFLAGS’ ‘maude_CFLAGS’ ‘maude_CPPFLAGS’ @@ -4907,7 +4997,7 @@ file like ‘sample.c’ will be compiled to produce ‘sample.o’. However, if the program’s ‘_CFLAGS’ variable is set, then the object file will be named, for instance, ‘maude-sample.o’. (See - also *note Renamed Objects::). + also *note Renamed Objects::.) In compilations with per-target flags, the ordinary ‘AM_’ form of the flags variable is _not_ automatically included in the @@ -4939,11 +5029,6 @@ This facility is rarely needed in practice, and we recommend avoiding it until you find it is required. - ---------- Footnotes ---------- - - (1) There are other, more obscure reasons for this limitation as -well. -  File: automake.info, Node: Default _SOURCES, Next: LIBOBJS, Prev: Program and Library Variables, Up: Programs @@ -4967,10 +5052,10 @@ ‘libfoo.a’ will be built using a default source file named ‘libfoo.c’, and ‘sub/libc++.a’ will be built from ‘sub/libc++.c’. (In older versions ‘sub/libc++.a’ would be built from ‘sub_libc___a.c’, i.e., the -default source was the canonized name of the target, with ‘.c’ appended. -We believe the new behavior is more sensible, but for backward -compatibility ‘automake’ will use the old name if a file or a rule with -that name exists and ‘AM_DEFAULT_SOURCE_EXT’ is not used.) +default source was the canonicalized name of the target, with ‘.c’ +appended. We believe the new behavior is more sensible, but for +backward compatibility ‘automake’ will use the old name if a file or a +rule with that name exists and ‘AM_DEFAULT_SOURCE_EXT’ is not used.) Default sources are mainly useful in test suites, when building many test programs each from a single source. For instance, in @@ -5152,8 +5237,8 @@ ‘$(builddir)’, not under ‘$(srcdir)’. This matters especially for packages that use header files placed in sub-directories and want to allow builds outside the source tree (*note VPATH Builds::). In - that case we recommend to use a pair of ‘-I’ options, such as, - e.g., ‘-Isome/subdir -I$(srcdir)/some/subdir’ or + that case we recommend using a pair of ‘-I’ options, such as, e.g., + ‘-Isome/subdir -I$(srcdir)/some/subdir’ or ‘-I$(top_builddir)/some/subdir -I$(top_srcdir)/some/subdir’. Note that the reference to the build tree should come before the reference to the source tree, so that accidentally leftover @@ -5174,8 +5259,8 @@ in preference to the per-executable (or per-library) ‘_CFLAGS’. ‘COMPILE’ - This is the command used to actually compile a C source file. The - file name is appended to form the complete command line. + This is the command used to compile a C source file. The file name + is appended to form the complete command line. ‘AM_LDFLAGS’ This is the variable the ‘Makefile.am’ author can use to pass in @@ -5183,12 +5268,12 @@ preference to the per-executable (or per-library) ‘_LDFLAGS’. ‘LINK’ - This is the command used to actually link a C program. It already - includes ‘-o $@’ and the usual variable references (for instance, - ‘CFLAGS’); it takes as “arguments” the names of the object files - and libraries to link in. This variable is not used when the - linker is overridden with a per-target ‘_LINK’ variable or - per-target flags cause Automake to define such a ‘_LINK’ variable. + This is the command used to link a C program. It already includes + ‘-o $@’ and the usual variable references (for instance, ‘CFLAGS’); + it takes as “arguments” the names of the object files and libraries + to link in. This variable is not used when the linker is + overridden with a per-target ‘_LINK’ variable or per-target flags + cause Automake to define such a ‘_LINK’ variable.  File: automake.info, Node: Yacc and Lex, Next: C++ Support, Prev: Program Variables, Up: Programs @@ -5198,21 +5283,21 @@ Automake has somewhat idiosyncratic support for Yacc and Lex. - Automake assumes that the ‘.c’ file generated by ‘yacc’ (or ‘lex’) + Automake assumes that the ‘.c’ file generated by ‘yacc’ or ‘lex’ should be named using the basename of the input file. That is, for a -yacc source file ‘foo.y’, Automake will cause the intermediate file to +Yacc source file ‘foo.y’, Automake will cause the intermediate file to be named ‘foo.c’ (as opposed to ‘y.tab.c’, which is more traditional). - The extension of a yacc source file is used to determine the -extension of the resulting C or C++ source and header files. Note that -header files are generated only when the ‘-d’ Yacc option is used; see -below for more information about this flag, and how to specify it. -Files with the extension ‘.y’ will thus be turned into ‘.c’ sources and -‘.h’ headers; likewise, ‘.yy’ will become ‘.cc’ and ‘.hh’, ‘.y++’ will -become ‘c++’ and ‘h++’, ‘.yxx’ will become ‘.cxx’ and ‘.hxx’, and ‘.ypp’ -will become ‘.cpp’ and ‘.hpp’. + The extension of a Yacc source file is used to determine the +extension of the resulting C or C++ source and header files. Be aware +that header files are generated only when the option ‘-d’ is given to +Yacc; see below for more information about this flag, and how to specify +it. Files with the extension ‘.y’ will thus be turned into ‘.c’ sources +and ‘.h’ headers; likewise, ‘.yy’ will become ‘.cc’ and ‘.hh’, ‘.y++’ +will become ‘c++’ and ‘h++’, ‘.yxx’ will become ‘.cxx’ and ‘.hxx’, and +‘.ypp’ will become ‘.cpp’ and ‘.hpp’. - Similarly, lex source files can be used to generate C or C++; the + Similarly, Lex source files can be used to generate C or C++; the extensions ‘.l’, ‘.ll’, ‘.l++’, ‘.lxx’, and ‘.lpp’ are recognized. You should never explicitly mention the intermediate (C or C++) file @@ -5222,7 +5307,7 @@ included in any distribution that is made. That way the user doesn’t need to have ‘yacc’ or ‘lex’. - If a ‘yacc’ source file is seen, then your ‘configure.ac’ must define + If a Yacc source file is seen, then your ‘configure.ac’ must define the variable ‘YACC’. This is most easily done by invoking the macro ‘AC_PROG_YACC’ (*note Particular Program Checks: (autoconf)Particular Programs.). @@ -5233,43 +5318,57 @@ ‘AM_YFLAGS’ is usually used to pass the ‘-d’ option to ‘yacc’. Automake knows what this means and will automatically adjust its rules -to update and distribute the header file built by ‘yacc -d’(1). What -Automake cannot guess, though, is where this header will be used: it is -up to you to ensure the header gets built before it is first used. -Typically this is necessary in order for dependency tracking to work -when the header is included by another file. The common solution is -listing the header file in ‘BUILT_SOURCES’ (*note Sources::) as follows. +to update and distribute the header file built by ‘yacc -d’. Caveat: +‘automake’ recognizes ‘-d’ in ‘AM_YFLAGS’ only if it is not clustered +with other options; for example, it won’t be recognized if ‘AM_YFLAGS’ +is ‘-dt’, but it will be if ‘AM_YFLAGS’ is ‘-d -t’ or ‘-t -d’. + + What Automake cannot guess, though, is where this header will be +used: it is up to you to ensure the header gets built before it is first +used. Typically this is necessary in order for dependency tracking to +work when the header is included by another file. The common solution +is listing the header file in ‘BUILT_SOURCES’ (*note Sources::) as +follows. BUILT_SOURCES = parser.h AM_YFLAGS = -d bin_PROGRAMS = foo foo_SOURCES = ... parser.y ... - If a ‘lex’ source file is seen, then your ‘configure.ac’ must define + If a Lex source file is seen, then your ‘configure.ac’ must define the variable ‘LEX’. You can use ‘AC_PROG_LEX’ to do this (*note Particular Program Checks: (autoconf)Particular Programs.), but using -‘AM_PROG_LEX’ macro (*note Macros::) is recommended. +the ‘AM_PROG_LEX’ macro (*note Macros::) is recommended. When ‘lex’ is invoked, it is passed ‘AM_LFLAGS’ and ‘LFLAGS’. The latter is a user variable and the former is intended for the ‘Makefile.am’ author. - When ‘AM_MAINTAINER_MODE’ (*note maintainer-mode::) is used, the -rebuild rule for distributed Yacc and Lex sources are only used when + When ‘AM_MAINTAINER_MODE’ (*note maintainer-mode::) is in effect, the +rebuild rules for distributed Yacc and Lex sources are only used when ‘maintainer-mode’ is enabled, or when the files have been erased. - When ‘lex’ or ‘yacc’ sources are used, ‘automake -a’ automatically + When Yacc or Lex sources are used, ‘automake -a’ automatically installs an auxiliary program called ‘ylwrap’ in your package (*note Auxiliary Programs::). This program is used by the build rules to rename the output of these tools, and makes it possible to include -multiple ‘yacc’ (or ‘lex’) source files in a single directory. (This is -necessary because yacc’s output file name is fixed, and a parallel make -could conceivably invoke more than one instance of ‘yacc’ -simultaneously.) - - For ‘yacc’, simply managing locking is insufficient. The output of -‘yacc’ always uses the same symbol names internally, so it isn’t -possible to link two ‘yacc’ parsers into the same executable. +multiple ‘yacc’ (or ‘lex’) source files in a single directory. This is +necessary because Yacc’s output file name is fixed, and a parallel make +could invoke more than one instance of ‘yacc’ simultaneously. + +* Menu: + +* Linking Multiple Yacc Parsers:: + +8.8.1 Linking Multiple Yacc Parsers +----------------------------------- + + +File: automake.info, Node: Linking Multiple Yacc Parsers, Up: Yacc and Lex + +For ‘yacc’, simply managing locking as with ‘ylwrap’ is insufficient. +The output of ‘yacc’ always uses the same symbol names internally, so it +isn’t possible to link two ‘yacc’ parsers into the same executable. We recommend using the following renaming hack used in ‘gdb’: #define yymaxdepth c_maxdepth @@ -5318,13 +5417,6 @@ you find a parser generator that uses a symbol not covered here, please report the new name so it can be added to the list. - ---------- Footnotes ---------- - - (1) Please note that ‘automake’ recognizes ‘-d’ in ‘AM_YFLAGS’ only -if it is not clustered with other options; for example, it won’t be -recognized if ‘AM_YFLAGS’ is ‘-dt’, but it will be if ‘AM_YFLAGS’ is ‘-d --t’ or ‘-t -d’. -  File: automake.info, Node: C++ Support, Next: Objective C Support, Prev: Yacc and Lex, Up: Programs @@ -5351,11 +5443,11 @@ The maintainer’s variant of ‘CXXFLAGS’. ‘CXXCOMPILE’ - The command used to actually compile a C++ source file. The file - name is appended to form the complete command line. + The command used to compile a C++ source file. The file name is + appended to form the complete command line. ‘CXXLINK’ - The command used to actually link a C++ program. + The command used to link a C++ program.  File: automake.info, Node: Objective C Support, Next: Objective C++ Support, Prev: C++ Support, Up: Programs @@ -5383,11 +5475,11 @@ The maintainer’s variant of ‘OBJCFLAGS’. ‘OBJCCOMPILE’ - The command used to actually compile an Objective C source file. - The file name is appended to form the complete command line. + The command used to compile an Objective C source file. The file + name is appended to form the complete command line. ‘OBJCLINK’ - The command used to actually link an Objective C program. + The command used to link an Objective C program.  File: automake.info, Node: Objective C++ Support, Next: Unified Parallel C Support, Prev: Objective C Support, Up: Programs @@ -5415,11 +5507,11 @@ The maintainer’s variant of ‘OBJCXXFLAGS’. ‘OBJCXXCOMPILE’ - The command used to actually compile an Objective C++ source file. - The file name is appended to form the complete command line. + The command used to compile an Objective C++ source file. The file + name is appended to form the complete command line. ‘OBJCXXLINK’ - The command used to actually link an Objective C++ program. + The command used to link an Objective C++ program.  File: automake.info, Node: Unified Parallel C Support, Next: Assembly Support, Prev: Objective C++ Support, Up: Programs @@ -5446,11 +5538,11 @@ The maintainer’s variant of ‘UPCFLAGS’. ‘UPCCOMPILE’ - The command used to actually compile a Unified Parallel C source - file. The file name is appended to form the complete command line. + The command used to compile a Unified Parallel C source file. The + file name is appended to form the complete command line. ‘UPCLINK’ - The command used to actually link a Unified Parallel C program. + The command used to link a Unified Parallel C program.  File: automake.info, Node: Assembly Support, Next: Fortran 77 Support, Prev: Unified Parallel C Support, Up: Programs @@ -5509,12 +5601,12 @@ The maintainer’s variant of ‘RFLAGS’. ‘F77COMPILE’ - The command used to actually compile a Fortran 77 source file. The - file name is appended to form the complete command line. + The command used to compile a Fortran 77 source file. The file + name is appended to form the complete command line. ‘FLINK’ - The command used to actually link a pure Fortran 77 program or - shared library. + The command used to link a pure Fortran 77 program or shared + library. Automake can handle preprocessing Fortran 77 and Ratfor source files in addition to compiling them(1). Automake also contains some support @@ -5628,7 +5720,7 @@ ---------- Footnotes ---------- (1) For example, the cfortran package -(http://www-zeus.desy.de/~burow/cfortran/) addresses all of these +(https://www-zeus.desy.de/~burow/cfortran/) addresses all of these inter-language issues, and runs under nearly all Fortran 77, C and C++ compilers on nearly all platforms. However, ‘cfortran’ is not yet Free Software, but it will be in the next major release. @@ -5639,7 +5731,7 @@ 8.14.3.1 How the Linker is Chosen ................................. -When a program or library mixes several languages, Automake choose the +When a program or library mixes several languages, Automake chooses the linker according to the following priorities. (The names in parentheses are the variables containing the link command.) @@ -5695,12 +5787,12 @@ The maintainer’s variant of ‘FCFLAGS’. ‘FCCOMPILE’ - The command used to actually compile a Fortran 9x source file. The - file name is appended to form the complete command line. + The command used to compile a Fortran 9x source file. The file + name is appended to form the complete command line. ‘FCLINK’ - The command used to actually link a pure Fortran 9x program or - shared library. + The command used to link a pure Fortran 9x program or shared + library. * Menu: @@ -5768,10 +5860,10 @@ ================= Automake provides initial support for Vala -(). This requires valac version 0.7.0 or +(). This requires valac version 0.7.0 or later, and currently requires the user to use GNU ‘make’. - foo_SOURCES = foo.vala bar.vala zardoc.c + foo_SOURCES = foo.vala bar.vala zardoz.c Any ‘.vala’ file listed in a ‘_SOURCES’ variable will be compiled into C code by the Vala compiler. The generated ‘.c’ files are @@ -5785,19 +5877,22 @@ [ACTION-IF-NOT-FOUND]) Search for a Vala compiler in ‘PATH’. If it is found, the variable ‘VALAC’ is set to point to it (see below for more details). This macro takes three optional arguments. The - first argument, if present, is the minimum version of the Vala - compiler required to compile this package. If a compiler is found - and satisfies MINIMUM-VERSION, then ACTION-IF-FOUND is run (this - defaults to do nothing). Otherwise, ACTION-IF-NOT-FOUND is run. - If ACTION-IF-NOT-FOUND is not specified, the default value is to - print a warning in case no compiler is found, or if a too-old - version of the compiler is found. + first argument, if present, is the minimum version of the Vala API + required to compile this package. For Vala releases, this is the + same as the major and minor release number; e.g., when ‘valac + --version’ reports ‘0.48.7’, ‘valac --api-version’ reports ‘0.48’. + If a compiler is found and satisfies MINIMUM-VERSION, then + ACTION-IF-FOUND is run (this defaults to do nothing). Otherwise, + ACTION-IF-NOT-FOUND is run. If ACTION-IF-NOT-FOUND is not + specified, the default value is to print a warning in case no + compiler is found, or if a too-old version of the compiler is + found. There are a few variables that are used when compiling Vala sources: ‘VALAC’ Absolute path to the Vala compiler, or simply ‘valac’ if no - suitable compiler Vala could be found at configure runtime. + suitable Vala compiler could be found at configure runtime. ‘VALAFLAGS’ Additional arguments for the Vala compiler. @@ -5886,7 +5981,7 @@ bin_PROGRAMS = liver - to this: +to this: bin_PROGRAMS = liver$(EXEEXT) @@ -5924,9 +6019,8 @@ *********************** Automake can handle derived objects that are not C programs. Sometimes -the support for actually building such objects must be explicitly -supplied, but Automake will still automatically handle installation and -distribution. +the support for building such objects must be explicitly supplied, but +Automake can still automatically handle installation and distribution. * Menu: @@ -6025,7 +6119,7 @@ will install the two files as ‘$(includedir)/foo.h’ and ‘$(includedir)/bar.h’. - The ‘nobase_’ prefix is also supported, + The ‘nobase_’ prefix is also supported: nobase_include_HEADERS = foo.h bar/bar.h @@ -6035,8 +6129,8 @@ Usually, only header files that accompany installed libraries need to be installed. Headers used by programs or convenience libraries are not installed. The ‘noinst_HEADERS’ variable can be used for such headers. -However when the header actually belongs to a single convenience library -or program, we recommend listing it in the program’s or library’s +However, when the header belongs to a single convenience library or +program, we recommend listing it in the program’s or library’s ‘_SOURCES’ variable (*note Program Sources::) instead of in ‘noinst_HEADERS’. This is clearer for the ‘Makefile.am’ reader. ‘noinst_HEADERS’ would be the right variable to use in a directory @@ -6100,27 +6194,29 @@ dependency information. The ‘BUILT_SOURCES’ variable is a workaround for this problem. A -source file listed in ‘BUILT_SOURCES’ is made on ‘make all’ or ‘make -check’ (or even ‘make install’) before other targets are processed. -However, such a source file is not _compiled_ unless explicitly -requested by mentioning it in some other ‘_SOURCES’ variable. +source file listed in ‘BUILT_SOURCES’ is made when ‘make all’, ‘make +check’, ‘make install’, ‘make install-exec’ (or ‘make dist’) is run, +before other targets are processed. However, such a source file is not +_compiled_ unless explicitly requested by mentioning it in some other +‘_SOURCES’ variable. So, to conclude our introductory example, we could use ‘BUILT_SOURCES = foo.h’ to ensure ‘foo.h’ gets built before any other target (including ‘foo.o’) during ‘make all’ or ‘make check’. - ‘BUILT_SOURCES’ is actually a bit of a misnomer, as any file which -must be created early in the build process can be listed in this -variable. Moreover, all built sources do not necessarily have to be -listed in ‘BUILT_SOURCES’. For instance, a generated ‘.c’ file doesn’t -need to appear in ‘BUILT_SOURCES’ (unless it is included by another -source), because it’s a known dependency of the associated object. - - It might be important to emphasize that ‘BUILT_SOURCES’ is honored -only by ‘make all’, ‘make check’ and ‘make install’. This means you -cannot build a specific target (e.g., ‘make foo’) in a clean tree if it -depends on a built source. However it will succeed if you have run -‘make all’ earlier, because accurate dependencies are already available. + ‘BUILT_SOURCES’ is a bit of a misnomer, as any file which must be +created early in the build process can be listed in this variable. +Moreover, all built sources do not necessarily have to be listed in +‘BUILT_SOURCES’. For instance, a generated ‘.c’ file doesn’t need to +appear in ‘BUILT_SOURCES’ (unless it is included by another source), +because it’s a known dependency of the associated object. + + To emphasize, ‘BUILT_SOURCES’ is honored only by ‘make all’, ‘make +check’, ‘make install’, and ‘make install-exec’ (and ‘make dist’). This +means you cannot build an arbitrary target (e.g., ‘make foo’) in a clean +tree if it depends on a built source. However it will succeed if you +have run ‘make all’ earlier, because accurate dependencies are already +available. The next section illustrates and discusses the handling of built sources on a toy example. @@ -6245,10 +6341,10 @@ You don’t have to list _all_ the dependencies of ‘foo.o’ explicitly, only those that might need to be built. If a dependency already exists, it will not hinder the first compilation and will be recorded by the -normal dependency tracking code. (Note that after this first -compilation the dependency tracking code will also have recorded the -dependency between ‘foo.o’ and ‘bindir.h’; so our explicit dependency is -really useful to the first build only.) +normal dependency tracking code. (After this first compilation, the +dependency tracking code will also have recorded the dependency between +‘foo.o’ and ‘bindir.h’, so our explicit dependency is only useful to the +first build.) Adding explicit dependencies like this can be a bit dangerous if you are not careful enough. This is due to the way Automake tries not to @@ -6354,8 +6450,8 @@ Byte-compiled Emacs Lisp files are not portable among all versions of Emacs, so it makes sense to turn this off if you expect sites to have -more than one version of Emacs installed. Furthermore, many packages -don’t actually benefit from byte-compilation. Still, we recommend that +more than one version of Emacs installed. Furthermore, many packages do +not actually benefit from byte-compilation. Still, we recommend that you byte-compile your Emacs Lisp sources. It is probably better for sites with strange setups to cope for themselves than to make the installation less nice for everybody else. @@ -6424,7 +6520,7 @@ Any ‘.java’ files listed in a ‘_JAVA’ variable will be compiled with ‘JAVAC’ at build time. By default, ‘.java’ files are not included in -the distribution, you should use the ‘dist_’ prefix to distribute them. +the distribution; you should use the ‘dist_’ prefix to distribute them. Here is a typical setup for distributing ‘.java’ files and installing the ‘.class’ files resulting from their compilation. @@ -6471,25 +6567,25 @@ Automake provides support for Python compilation with the ‘PYTHON’ primary. A typical setup is to call ‘AM_PATH_PYTHON’ in ‘configure.ac’ -and use a line like the following in ‘Makefile.am’: +and use a line like this in ‘Makefile.am’: python_PYTHON = tree.py leave.py - Any files listed in a ‘_PYTHON’ variable will be byte-compiled with -‘py-compile’ at install time. ‘py-compile’ actually creates both -standard (‘.pyc’) and optimized (‘.pyo’) byte-compiled versions of the -source files. Note that because byte-compilation occurs at install -time, any files listed in ‘noinst_PYTHON’ will not be compiled. Python -source files are included in the distribution by default, prepend -‘nodist_’ (as in ‘nodist_python_PYTHON’) to omit them. - - Automake ships with an Autoconf macro called ‘AM_PATH_PYTHON’ that -will determine some Python-related directory variables (see below). If -you have called ‘AM_PATH_PYTHON’ from ‘configure.ac’, then you may use -the variables ‘python_PYTHON’ or ‘pkgpython_PYTHON’ to list Python -source files in your ‘Makefile.am’, depending on where you want your -files installed (see the definitions of ‘pythondir’ and ‘pkgpythondir’ -below). + Python source files are included in the distribution by default; +prepend ‘nodist_’ (as in ‘nodist_python_PYTHON’) to omit them. + + At install time, any files listed in a ‘_PYTHON’ variable will be +byte-compiled with ‘py-compile’. ‘py-compile’ creates both standard +(‘.pyc’) and optimized (‘.pyo’) byte-compiled versions of the source +files. Because byte-compilation occurs at install time, files listed in +‘noinst_PYTHON’ will not be compiled. + + Automake ships with an Autoconf macro named ‘AM_PATH_PYTHON’ that +determines some Python-related directory variables (see below). If you +have called ‘AM_PATH_PYTHON’ from ‘configure.ac’, then you may use the +variables ‘python_PYTHON’ and ‘pkgpython_PYTHON’ to list Python source +files in your ‘Makefile.am’, depending on whether you want your files +installed in ‘pythondir’ or ‘pkgpythondir’, respectively. -- Macro: AM_PATH_PYTHON ([VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) @@ -6503,12 +6599,12 @@ run. If ACTION-IF-NOT-FOUND is not specified, as in the following - example, the default is to abort ‘configure’. + example, the default is to abort ‘configure’: - AM_PATH_PYTHON([2.2]) + AM_PATH_PYTHON([2.5]) This is fine when Python is an absolute requirement for the - package. If Python >= 2.5 was only _optional_ to the package, + package. If Python ≥ 2.5 was only _optional_ for the package, ‘AM_PATH_PYTHON’ could be called as follows. AM_PATH_PYTHON([2.5],, [:]) @@ -6517,7 +6613,7 @@ then that will be the only Python interpreter that is tried. ‘AM_PATH_PYTHON’ creates the following output variables based on - the Python installation found during configuration. + the Python installation found during configuration: ‘PYTHON’ The name of the Python executable, or ‘:’ if no suitable @@ -6525,7 +6621,7 @@ Assuming ACTION-IF-NOT-FOUND is used (otherwise ‘./configure’ will abort if Python is absent), the value of ‘PYTHON’ can be used to - setup a conditional in order to disable the relevant part of a + set up a conditional in order to disable the relevant part of a build as follows. AM_PATH_PYTHON(,, [:]) @@ -6533,17 +6629,21 @@ ‘PYTHON_VERSION’ The Python version number, in the form MAJOR.MINOR (e.g., ‘2.5’). - This is currently the value of ‘sys.version[:3]’. + This is set to be the value of ‘'%u.%u' % sys.version_info[:2]’. ‘PYTHON_PREFIX’ - The string ‘${prefix}’. This term may be used in future work that - needs the contents of Python’s ‘sys.prefix’, but general consensus - is to always use the value from ‘configure’. - ‘PYTHON_EXEC_PREFIX’ - The string ‘${exec_prefix}’. This term may be used in future work - that needs the contents of Python’s ‘sys.exec_prefix’, but general - consensus is to always use the value from ‘configure’. + With no special options given, these have values ‘${prefix}’ and + ‘${exec_prefix}’, respectively (unexpanded; see below). + + The ‘configure’ options ‘--with-python_prefix’ and + ‘--with-python_exec_prefix’ set them to an explicit value. + + The ‘configure’ option ‘--with-python-sys-prefix’ set them to the + values of Python’s ‘sys.prefix’ and ‘sys.exec_prefix’ variables. + These often differ from ‘${prefix}’ and ‘${exec_prefix}’, e.g., on + platforms such as Mac OS x (where Python is usually installed as a + Framework). ‘PYTHON_PLATFORM’ The canonical name used by Python to describe the operating system, @@ -6572,9 +6672,9 @@ This is a convenience variable that is defined as ‘$(pyexecdir)/$(PACKAGE)’. - All of these directory variables have values that start with either -‘${prefix}’ or ‘${exec_prefix}’ unexpanded. This works fine in -‘Makefiles’, but it makes these variables hard to use in ‘configure’. + All of these directory variables have values that can start with +either ‘${prefix}’ or ‘${exec_prefix}’, unexpanded. This works fine in +‘Makefile’s, but it makes these variables hard to use in ‘configure’. This is mandated by the GNU coding standards, so that the user can run ‘make prefix=/foo install’. The Autoconf manual has a section with more details on this topic (*note Installation Directory Variables: @@ -6656,10 +6756,10 @@ file that matches ‘vers*.texi’ just as an automatically generated version file. - Sometimes an info file actually depends on more than one ‘.texi’ -file. For instance, in GNU Hello, ‘hello.texi’ includes the file -‘fdl.texi’. You can tell Automake about these dependencies using the -‘TEXI_TEXINFOS’ variable. Here is how GNU Hello does it: + Often an Info file depends on more than one ‘.texi’ file. For +instance, in GNU Hello, ‘hello.texi’ includes the file ‘fdl.texi’. You +can tell Automake about these dependencies using the ‘TEXI_TEXINFOS’ +variable. Here is how GNU Hello does it: info_TEXINFOS = hello.texi hello_TEXINFOS = fdl.texi @@ -6740,7 +6840,6 @@ file. This defaults to ‘dvips’. ‘TEXINFO_TEX’ - If your package has Texinfo files in many directories, you can use the variable ‘TEXINFO_TEX’ to tell Automake where to find the canonical ‘texinfo.tex’ for your package. The value of this @@ -6818,107 +6917,3 @@ notrans_dist_man3_MANS = bar.3 - -File: automake.info, Node: Install, Next: Clean, Prev: Documentation, Up: Top - -12 What Gets Installed -********************** - -Naturally, Automake handles the details of actually installing your -program once it has been built. All files named by the various -primaries are automatically installed in the appropriate places when the -user runs ‘make install’. - -* Menu: - -* Basics of Installation:: What gets installed where -* The Two Parts of Install:: Installing data and programs separately -* Extending Installation:: Adding your own rules for installation -* Staged Installs:: Installation in a temporary location -* Install Rules for the User:: Useful additional rules - - -File: automake.info, Node: Basics of Installation, Next: The Two Parts of Install, Up: Install - -12.1 Basics of Installation -=========================== - -A file named in a primary is installed by copying the built file into -the appropriate directory. The base name of the file is used when -installing. - - bin_PROGRAMS = hello subdir/goodbye - - In this example, both ‘hello’ and ‘goodbye’ will be installed in -‘$(bindir)’. - - Sometimes it is useful to avoid the basename step at install time. -For instance, you might have a number of header files in subdirectories -of the source tree that are laid out precisely how you want to install -them. In this situation you can use the ‘nobase_’ prefix to suppress -the base name step. For example: - - nobase_include_HEADERS = stdio.h sys/types.h - -will install ‘stdio.h’ in ‘$(includedir)’ and ‘types.h’ in -‘$(includedir)/sys’. - - For most file types, Automake will install multiple files at once, -while avoiding command line length issues (*note Length Limitations::). -Since some ‘install’ programs will not install the same file twice in -one invocation, you may need to ensure that file lists are unique within -one variable such as ‘nobase_include_HEADERS’ above. - - You should not rely on the order in which files listed in one -variable are installed. Likewise, to cater for parallel make, you -should not rely on any particular file installation order even among -different file types (library dependencies are an exception here). - - -File: automake.info, Node: The Two Parts of Install, Next: Extending Installation, Prev: Basics of Installation, Up: Install - -12.2 The Two Parts of Install -============================= - -Automake generates separate ‘install-data’ and ‘install-exec’ rules, in -case the installer is installing on multiple machines that share -directory structure—these targets allow the machine-independent parts to -be installed only once. ‘install-exec’ installs platform-dependent -files, and ‘install-data’ installs platform-independent files. The -‘install’ target depends on both of these targets. While Automake tries -to automatically segregate objects into the correct category, the -‘Makefile.am’ author is, in the end, responsible for making sure this is -done correctly. - - Variables using the standard directory prefixes ‘data’, ‘info’, -‘man’, ‘include’, ‘oldinclude’, ‘pkgdata’, or ‘pkginclude’ are installed -by ‘install-data’. - - Variables using the standard directory prefixes ‘bin’, ‘sbin’, -‘libexec’, ‘sysconf’, ‘localstate’, ‘lib’, or ‘pkglib’ are installed by -‘install-exec’. - - For instance, ‘data_DATA’ files are installed by ‘install-data’, -while ‘bin_PROGRAMS’ files are installed by ‘install-exec’. - - Any variable using a user-defined directory prefix with ‘exec’ in the -name (e.g., ‘myexecbin_PROGRAMS’) is installed by ‘install-exec’. All -other user-defined prefixes are installed by ‘install-data’. - - -File: automake.info, Node: Extending Installation, Next: Staged Installs, Prev: The Two Parts of Install, Up: Install - -12.3 Extending Installation -=========================== - -It is possible to extend this mechanism by defining an -‘install-exec-local’ or ‘install-data-local’ rule. If these rules -exist, they will be run at ‘make install’ time. These rules can do -almost anything; care is required. - - Automake also supports two install hooks, ‘install-exec-hook’ and -‘install-data-hook’. These hooks are run after all other install rules -of the appropriate type, exec or data, have completed. So, for -instance, it is possible to perform post-installation modifications -using an install hook. *Note Extending::, for some examples. - diff -Nru automake-1.16-1.16.1/doc/automake.info-2 automake-1.16-1.16.5/doc/automake.info-2 --- automake-1.16-1.16.1/doc/automake.info-2 2018-03-11 21:21:16.000000000 +0000 +++ automake-1.16-1.16.5/doc/automake.info-2 2021-10-04 02:47:04.000000000 +0000 @@ -1,11 +1,11 @@ -This is automake.info, produced by makeinfo version 6.5 from +This is automake.info, produced by makeinfo version 6.8 from automake.texi. -This manual is for GNU Automake (version 1.16.1, 26 February 2018), a +This manual is for GNU Automake (version 1.16.5, 1 October 2021), a program that creates GNU standards-compliant Makefiles from template files. - Copyright © 1995-2018 Free Software Foundation, Inc. + Copyright © 1995–2021 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, @@ -26,6 +26,110 @@ END-INFO-DIR-ENTRY  +File: automake.info, Node: Install, Next: Clean, Prev: Documentation, Up: Top + +12 What Gets Installed +********************** + +Naturally, Automake handles the details of installing your program once +it has been built. All files named by the various primaries are +automatically installed in the appropriate places when the user runs +‘make install’. + +* Menu: + +* Basics of Installation:: What gets installed where +* The Two Parts of Install:: Installing data and programs separately +* Extending Installation:: Adding your own rules for installation +* Staged Installs:: Installation in a temporary location +* Install Rules for the User:: Useful additional rules + + +File: automake.info, Node: Basics of Installation, Next: The Two Parts of Install, Up: Install + +12.1 Basics of Installation +=========================== + +A file named in a primary is installed by copying the built file into +the appropriate directory. The base name of the file is used when +installing. + + bin_PROGRAMS = hello subdir/goodbye + + In this example, both ‘hello’ and ‘goodbye’ will be installed in +‘$(bindir)’. + + Sometimes it is useful to avoid the basename step at install time. +For instance, you might have a number of header files in subdirectories +of the source tree that are laid out precisely how you want to install +them. In this situation you can use the ‘nobase_’ prefix to suppress +the base name step. For example: + + nobase_include_HEADERS = stdio.h sys/types.h + +will install ‘stdio.h’ in ‘$(includedir)’ and ‘types.h’ in +‘$(includedir)/sys’. + + For most file types, Automake will install multiple files at once, +while avoiding command line length issues (*note Length Limitations::). +Since some ‘install’ programs will not install the same file twice in +one invocation, you may need to ensure that file lists are unique within +one variable such as ‘nobase_include_HEADERS’ above. + + You should not rely on the order in which files listed in one +variable are installed. Likewise, to cater for parallel make, you +should not rely on any particular file installation order even among +different file types (library dependencies are an exception here). + + +File: automake.info, Node: The Two Parts of Install, Next: Extending Installation, Prev: Basics of Installation, Up: Install + +12.2 The Two Parts of Install +============================= + +Automake generates separate ‘install-data’ and ‘install-exec’ rules, in +case the installer is installing on multiple machines that share +directory structure—these targets allow the machine-independent parts to +be installed only once. ‘install-exec’ installs platform-dependent +files, and ‘install-data’ installs platform-independent files. The +‘install’ target depends on both of these targets. While Automake tries +to automatically segregate objects into the correct category, the +‘Makefile.am’ author is, in the end, responsible for making sure this is +done correctly. + + Variables using the standard directory prefixes ‘data’, ‘info’, +‘man’, ‘include’, ‘oldinclude’, ‘pkgdata’, or ‘pkginclude’ are installed +by ‘install-data’. + + Variables using the standard directory prefixes ‘bin’, ‘sbin’, +‘libexec’, ‘sysconf’, ‘localstate’, ‘lib’, or ‘pkglib’ are installed by +‘install-exec’. + + For instance, ‘data_DATA’ files are installed by ‘install-data’, +while ‘bin_PROGRAMS’ files are installed by ‘install-exec’. + + Any variable using a user-defined directory prefix with ‘exec’ in the +name (e.g., ‘myexecbin_PROGRAMS’) is installed by ‘install-exec’. All +other user-defined prefixes are installed by ‘install-data’. + + +File: automake.info, Node: Extending Installation, Next: Staged Installs, Prev: The Two Parts of Install, Up: Install + +12.3 Extending Installation +=========================== + +It is possible to extend this mechanism by defining an +‘install-exec-local’ or ‘install-data-local’ rule. If these rules +exist, they will be run at ‘make install’ time. These rules can do +almost anything; care is required. + + Automake also supports two install hooks, ‘install-exec-hook’ and +‘install-data-hook’. These hooks are run after all other install rules +of the appropriate type, exec or data, have completed. So, for +instance, it is possible to perform post-installation modifications +using an install hook. *Note Extending::, for some examples. + + File: automake.info, Node: Staged Installs, Next: Install Rules for the User, Prev: Extending Installation, Up: Install 12.4 Staged Installs @@ -148,45 +252,71 @@ =========================== The ‘dist’ rule in the generated ‘Makefile.in’ can be used to generate a -gzipped ‘tar’ file and other flavors of archive for distribution. The -file is named based on the ‘PACKAGE’ and ‘VERSION’ variables +gzipped ‘tar’ file and/or other flavors of archives for distribution. +The file is named based on the ‘PACKAGE’ and ‘VERSION’ variables automatically defined by either the ‘AC_INIT’ invocation or by a _deprecated_ two-arguments invocation of the ‘AM_INIT_AUTOMAKE’ macro (see *note Public Macros:: for how these variables get their values, -from either defaults or explicit values – it’s slightly trickier than -one would expect). More precisely the gzipped ‘tar’ file is named -‘${PACKAGE}-${VERSION}.tar.gz’. You can use the ‘make’ variable -‘GZIP_ENV’ to control how gzip is run. The default setting is ‘--best’. +from either defaults or explicit values—it’s slightly trickier than one +would expect). More precisely, the gzipped ‘tar’ file is named +‘${PACKAGE}-${VERSION}.tar.gz’. + + You can set the environment variable ‘TAR’ to override the tar +program used; it defaults to ‘tar’. *Note The Types of Distributions::, +for how to generate other kinds of archives. For the most part, the files to distribute are automatically found by -Automake: all source files are automatically included in a distribution, -as are all ‘Makefile.am’ and ‘Makefile.in’ files. Automake also has a -built-in list of commonly used files that are automatically included if -they are found in the current directory (either physically, or as the -target of a ‘Makefile.am’ rule); this list is printed by ‘automake ---help’. Note that some files in this list are actually distributed -only if other certain conditions hold (for example, the ‘config.h.top’ -and ‘config.h.bot’ files are automatically distributed only if, e.g., -‘AC_CONFIG_HEADERS([config.h])’ is used in ‘configure.ac’). Also, files -that are read by ‘configure’ (i.e. the source files corresponding to the -files specified in various Autoconf macros such as ‘AC_CONFIG_FILES’ and -siblings) are automatically distributed. Files included in a -‘Makefile.am’ (using ‘include’) or in ‘configure.ac’ (using -‘m4_include’), and helper scripts installed with ‘automake ---add-missing’ are also distributed. - - Still, sometimes there are files that must be distributed, but which -are not covered in the automatic rules. These files should be listed in -the ‘EXTRA_DIST’ variable. You can mention files from subdirectories in -‘EXTRA_DIST’. +Automake: + + • All source files are automatically included in a distribution, as + are all ‘Makefile.am’ and ‘Makefile.in’ files. + + • Files that are read by ‘configure’ are automatically distributed. + These are the source files as specified in various Autoconf macros + such as ‘AC_CONFIG_FILES’ and siblings. + + • Files included in a ‘Makefile.am’ (using ‘include’) or in + ‘configure.ac’ (using ‘m4_include’). + + • Automake has a built-in list of commonly used files automatically + included in the distribution if they are found in the current + directory (either physically, or as the target of a ‘Makefile.am’ + rule). Some common examples: ‘ABOUT-GNU’, ‘COPYING’, ‘TODO’. + + This list also includes helper scripts installed with ‘automake + --add-missing’. Some common examples: ‘compile’, ‘config.guess’, + ‘config.rpath’, ‘config.sub’, ‘texinfo.tex’. + + • Automake has another built-in list of files automatically + distributed if they are found either with the plain name, or with + extension ‘.md’ (presumably MarkDown, though this not checked). + They are checked for in that order, so the plain name is preferred. + These are: ‘AUTHORS ChangeLog INSTALL NEWS README README-alpha + THANKS’. + + • A final built-in list of files are those distributed only if other + certain conditions hold. For example, the files ‘config.h.top’ and + ‘config.h.bot’ are automatically distributed only if, e.g., + ‘AC_CONFIG_HEADERS([config.h])’ is used in ‘configure.ac’). + ‘README-alpha’ is another such file, with ‘README-alpha.md’ + distributed if that is what is available; *note Strictness::, for + its conditions for distribution. + +These three lists of files are given in their entirety in the output +from ‘automake --help’. + + Despite all this automatic inclusion, it is still common to have +files to be distributed which are not found by the automatic rules. You +should listed these files in the ‘EXTRA_DIST’ variable. You can mention +files in subdirectories in ‘EXTRA_DIST’. You can also mention a directory in ‘EXTRA_DIST’; in this case the -entire directory will be recursively copied into the distribution. -Please note that this will also copy _everything_ in the directory, -including, e.g., Subversion’s ‘.svn’ private directories or CVS/RCS -version control files; thus we recommend against using this feature -as-is. However, you can use the ‘dist-hook’ feature to ameliorate the -problem; *note The dist Hook::. +entire directory will be recursively copied into the distribution. To +emphasize, this copies _everything_ in the directory, including +temporary editor files, intermediate build files, version control files, +etc.; thus we recommend against using this feature as-is. However, you +can use the ‘dist-hook’ feature to ameliorate the problem; *note The +dist Hook::. If you define ‘SUBDIRS’, Automake will recursively include the subdirectories in the distribution. If ‘SUBDIRS’ is defined @@ -232,22 +362,23 @@ EXTRA_DIST = doc dist-hook: - rm -rf `find $(distdir)/doc -type d -name .svn` + chmod -R u+w $(distdir)/doc + rm -rf `find $(distdir)/doc -type d -name RCS` -Note that the ‘dist-hook’ recipe shouldn’t assume that the regular files -in the distribution directory are writable; this might not be the case -if one is packaging from a read-only source tree, or when a ‘make -distcheck’ is being done. For similar reasons, the recipe shouldn’t -assume that the subdirectories put into the distribution directory as -effect of having them listed in ‘EXTRA_DIST’ are writable. So, if the -‘dist-hook’ recipe wants to modify the content of an existing file (or -‘EXTRA_DIST’ subdirectory) in the distribution directory, it should -explicitly to make it writable first: +The ‘dist-hook’ recipe should not assume that the regular files in the +distribution directory are writable; this might not be the case if one +is packaging from a read-only source tree, or when a ‘make distcheck’ is +being done. Similarly, the recipe should not assume that the +subdirectories put into the distribution directory as a result of being +listed in ‘EXTRA_DIST’ are writable. So, if the ‘dist-hook’ recipe +wants to modify the content of an existing file (or ‘EXTRA_DIST’ +subdirectory) in the distribution directory, it should explicitly to +make it writable first: EXTRA_DIST = README doc dist-hook: chmod u+w $(distdir)/README $(distdir)/doc - echo "Distribution date: `date`" >> README + echo "Distribution date: `date`" >> $(distdir)/README rm -f $(distdir)/doc/HACKING Two variables that come handy when writing ‘dist-hook’ rules are @@ -257,15 +388,15 @@ files from the current directory before creating the tarball. If you are at the top-level directory, then ‘distdir = $(PACKAGE)-$(VERSION)’. When used from subdirectory named ‘foo/’, then ‘distdir = -../$(PACKAGE)-$(VERSION)/foo’. ‘$(distdir)’ can be a relative or -absolute path, do not assume any form. +../$(PACKAGE)-$(VERSION)/foo’. ‘$(distdir)’ can be either a relative or +absolute path; do not assume a particular form. ‘$(top_distdir)’ always points to the root directory of the -distributed tree. At the top-level it’s equal to ‘$(distdir)’. In the +distributed tree. At the top level it’s equal to ‘$(distdir)’. In the ‘foo/’ subdirectory ‘top_distdir = ../$(PACKAGE)-$(VERSION)’. -‘$(top_distdir)’ too can be a relative or absolute path. +‘$(top_distdir)’ can also be either a relative or absolute path. - Note that when packages are nested using ‘AC_CONFIG_SUBDIRS’ (*note + When packages are nested using ‘AC_CONFIG_SUBDIRS’ (*note Subpackages::), then ‘$(distdir)’ and ‘$(top_distdir)’ are relative to the package where ‘make dist’ was run, not to any sub-packages involved. @@ -278,24 +409,26 @@ Automake also generates a ‘distcheck’ rule that can be of help to ensure that a given distribution will actually work. Simplifying a bit, we can say this rule first makes a distribution, and then, _operating from it_, -takes the following steps: +takes the following steps (in this order): • tries to do a ‘VPATH’ build (*note VPATH Builds::), with the ‘srcdir’ and all its content made _read-only_; + • tries to make the printable documentation, if any (with ‘make + dvi’), • runs the test suite (with ‘make check’) on this fresh build; • installs the package in a temporary directory (with ‘make - install’), and tries runs the test suite on the resulting - installation (with ‘make installcheck’); + install’), and runs the test suite on the resulting installation + (with ‘make installcheck’); • checks that the package can be correctly uninstalled (by ‘make uninstall’) and cleaned (by ‘make distclean’); • finally, makes another tarball to ensure the distribution is self-contained. - All of these actions are performed in a temporary directory. Please -note that the exact location and the exact structure of such a directory -(where the read-only sources are placed, how the temporary build and -install directories are named and how deeply they are nested, etc.) is -to be considered an implementation detail, which can change at any time; -so do not reply on it. + All of these actions are performed in a temporary directory. The +exact location and the exact structure of such a directory (where the +read-only sources are placed, how the temporary build and install +directories are named and how deeply they are nested, etc.) is to be +considered an implementation detail, which can change at any time; so do +not rely on it. DISTCHECK_CONFIGURE_FLAGS ------------------------- @@ -316,14 +449,34 @@ there might be few scenarios in which the use of this variable is justified. GNU ‘m4’ offers an example. GNU ‘m4’ configures by default with its experimental and seldom used "changeword" feature disabled; so -in its case it is useful to have ‘make distcheck’ run configure with the -‘--with-changeword’ option, to ensure that the code for changeword +in this case it is useful to have ‘make distcheck’ run configure with +the ‘--with-changeword’ option, to ensure that the code for changeword support still compiles correctly. GNU ‘m4’ also employs the ‘AM_DISTCHECK_CONFIGURE_FLAGS’ variable to stress-test the use of ‘--program-prefix=g’, since at one point the ‘m4’ build system had a bug where ‘make installcheck’ was wrongly assuming it could blindly test "‘m4’", rather than the just-installed "‘gm4’". +dvi and distcheck +----------------- + +Ordinarily, ‘make distcheck’ runs ‘make dvi’. It does nothing if the +distribution contains no Texinfo sources. If the distribution does +contain a Texinfo manual, by default the ‘dvi’ target will run TeX to +make sure it can be successfully processed (*note Texinfo::). + + However, you may wish to test the manual by producing ‘pdf’ (e.g., if +your manual uses images in formats other than ‘eps’), ‘html’ (if you +don’t have TeX at all), some other format, or just skip the test +entirely (not recommended). You can change the target that is run by +setting the variable ‘AM_DISTCHECK_DVI_TARGET’ in your ‘Makefile.am’; +for example, + + AM_DISTCHECK_DVI_TARGET = pdf + + To make ‘dvi’ into a do-nothing target, see the example for +‘EMPTY_AUTOMAKE_TARGETS’ in *note Third-Party Makefiles::. + distcheck-hook -------------- @@ -369,11 +522,11 @@ The above definition is not the default because it’s usually an error if your Makefiles cause some distributed files to be rebuilt when the -user build the package. (Think about the user missing the tool required -to build the file; or if the required tool is built by your package, -consider the cross-compilation case where it can’t be run.) There is an -entry in the FAQ about this (*note Errors with distclean::), make sure -you read it before playing with ‘distcleancheck_listfiles’. +user builds the package. (Think about the user missing the tool +required to build the file; or if the required tool is built by your +package, consider the cross-compilation case where it can’t be run.) +There is an entry in the FAQ about this (*note Errors with distclean::); +make sure you read it before playing with ‘distcleancheck_listfiles’. distuninstallcheck ------------------ @@ -407,35 +560,44 @@ ‘dist-gzip’ Generate a ‘gzip’ tar archive of the distribution. This is the - only format enabled by default. + only format enabled by default. By default, this rule makes ‘gzip’ + use a compression option of ‘--best’. To make it use a different + one, set the ‘GZIP_ENV’ environment variable. For example, ‘make + dist-gzip GZIP_ENV=-7’. ‘dist-bzip2’ Generate a ‘bzip2’ tar archive of the distribution. bzip2 archives - are frequently smaller than gzipped archives. By default, this - rule makes ‘bzip2’ use a compression option of ‘-9’. To make it - use a different one, set the ‘BZIP2’ environment variable. For - example, ‘make dist-bzip2 BZIP2=-7’. + are usually smaller than gzipped archives. By default, this rule + makes ‘bzip2’ use a compression option of ‘-9’. To make it use a + different one, set the ‘BZIP2’ environment variable. ‘dist-lzip’ Generate an ‘lzip’ tar archive of the distribution. ‘lzip’ - archives are frequently smaller than ‘bzip2’-compressed archives. + archives are usually smaller than ‘bzip2’-compressed archives. By + default, this rule makes ‘lzip’ use a compression option of ‘-9’. + To make it use a different one, set the ‘LZIP_OPT’ environment + variable. ‘dist-xz’ Generate an ‘xz’ tar archive of the distribution. ‘xz’ archives - are frequently smaller than ‘bzip2’-compressed archives. By - default, this rule makes ‘xz’ use a compression option of ‘-e’. To - make it use a different one, set the ‘XZ_OPT’ environment variable. - For example, run this command to use the default compression ratio, - but with a progress indicator: ‘make dist-xz XZ_OPT=-ve’. + are usually smaller than ‘bzip2’-compressed archives. By default, + this rule makes ‘xz’ use a compression option of ‘-e’. To make it + use a different one, set the ‘XZ_OPT’ environment variable. For + example, run this command to use the default compression ratio, but + with a progress indicator: ‘make dist-xz XZ_OPT=-ve’. ‘dist-zip’ Generate a ‘zip’ archive of the distribution. -‘dist-tarZ’ - Generate a tar archive of the distribution, compressed with the - historical (and obsolescent) program ‘compress’. This option is - deprecated, and it and the corresponding functionality will be - removed altogether in Automake 2.0. +‘dist-zstd’ + Generate a ‘zstd’ tar archive of the distribution. By default, + this rule makes ‘zstd’ use a compression option of ‘-19’. To use a + different setting, set the ‘ZSTD_OPT’ environment variable. For + example, run this command to use the default compression ratio, but + with a progress indicator: ‘make dist-zstd ZSTD_OPT=-19v’. + However, note that for compatibility with ‘zstd’ itself, you may + instead set the ‘ZSTD_CLEVEL’ environment variable, in which case, + any ‘ZSTD_OPT’ setting is ignored. ‘dist-shar’ Generate a ‘shar’ archive of the distribution. This format archive @@ -443,10 +605,16 @@ corresponding functionality will be removed altogether in Automake 2.0. +‘dist-tarZ’ + Generate a tar archive of the distribution, compressed with the + historical (and obsolescent) program ‘compress’. This option is + deprecated, and it and the corresponding functionality will be + removed altogether in Automake 2.0. + The rule ‘dist’ (and its historical synonym ‘dist-all’) will create archives in all the enabled formats (*note List of Automake options:: for how to change this list). By default, only the ‘dist-gzip’ target -is hooked to ‘dist’. +is enabled by ‘dist’.  File: automake.info, Node: Tests, Next: Rebuilding, Prev: Dist, Up: Top @@ -494,7 +662,7 @@ A _test harness_ (also _testsuite harness_) is a program or software component that executes all (or part of) the defined test cases, -analyzes their outcomes, and report or register these outcomes +analyzes their outcomes, and reports or registers these outcomes appropriately. Again, the details of how this is accomplished (and how the developer and user can influence it or interface with it) varies wildly, and we’ll attempt no precise definition. @@ -507,11 +675,11 @@ simply make no sense on a given system (for example, a test checking a Windows-specific feature makes no sense on a GNU/Linux system). In this case, accordingly to the definition above, the tests can neither be -considered passed nor failed; instead, they are _skipped_ – i.e., they -are not run, or their result is anyway ignored for what concerns the -count of failures an successes. Skips are usually explicitly reported -though, so that the user will be aware that not all of the testsuite has -really run. +considered passed nor failed; instead, they are _skipped_, that is, they +are not run, or their result is in any case ignored for what concerns +the count of failures and successes. Skips are usually explicitly +reported though, so that the user will be aware that not all of the +testsuite has been run. It’s not uncommon, especially during early development stages, that some tests fail for known reasons, and that the developer doesn’t want @@ -525,7 +693,7 @@ Many testing environments and frameworks distinguish between test failures and hard errors. As we’ve seen, a test failure happens when some invariant or expected behaviour of the software under test is not -met. An _hard error_ happens when e.g., the set-up of a test case +met. A _hard error_ happens when e.g., the set-up of a test case scenario fails, or when some other unexpected or highly undesirable condition is encountered (for example, the program under test experiences a segmentation fault). @@ -563,15 +731,15 @@ By default, only the exit statuses of the test scripts are considered when determining the testsuite outcome. But Automake allows also the use of more complex test protocols, either standard (*note Using the TAP -test protocol::) or custom (*note Custom Test Drivers::). Note that you -can’t enable such protocols when the serial harness is used, though. In -the rest of this section we are going to concentrate mostly on -protocol-less tests, since we cover test protocols in a later section -(again, *note Custom Test Drivers::). +test protocol::) or custom (*note Custom Test Drivers::). You can’t +enable such protocols when the serial harness is used, though. In the +rest of this section we are going to concentrate mostly on protocol-less +tests, since we cover test protocols in a later section (again, *note +Custom Test Drivers::). When no test protocol is in use, an exit status of 0 from a test script will denote a success, an exit status of 77 a skipped test, an -exit status of 99 an hard error, and any other exit status will denote a +exit status of 99 a hard error, and any other exit status will denote a failure. You may define the variable ‘XFAIL_TESTS’ to a list of tests (usually @@ -594,7 +762,7 @@ case is expected to be printed in addition to the name of the test script. The possible results (whose meanings should be clear from the previous *note Generalities about Testing::) are ‘PASS’, ‘FAIL’, ‘SKIP’, -‘XFAIL’, ‘XPASS’ and ‘ERROR’. Here is an example of output from an +‘XFAIL’, ‘XPASS’ and ‘ERROR’. Here is an example of output from a hypothetical testsuite that uses both plain and TAP tests: PASS: foo.sh PASS: zardoz.tap 1 - Daemon started @@ -607,7 +775,25 @@ A testsuite summary (expected to report at least the number of run, skipped and failed tests) will be printed at the end of the testsuite -run. +run. By default, the first line of the summary has the form: + + Testsuite summary for PACKAGE-STRING + +where PACKAGE-STRING is the name and version of the package. If you +have several independent test suites for different parts of the package, +though, it can be misleading for each suite to imply it is for the whole +package. Or, in complex projects, you may wish to add the current +directory or other information to the testsuite header line. So you can +override the ‘ for PACKAGE-STRING’ suffix on that line by setting the +‘AM_TESTSUITE_SUMMARY_HEADER’ variable. The value of this variable is +used unquoted in a shell echo command, so you must include any necessary +quotes. For example, the default value is + + AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' + +including the double quotes (interpreted by the shell) and the leading +space (since the value is output directly after the ‘Testsuite +summary’). The ‘$(PACKAGE_STRING)’ is substituted by ‘make’. If the standard output is connected to a capable terminal, then the test results and the summary are colored appropriately. The developer @@ -628,12 +814,38 @@ in particular for the ‘distcheck’ rule (*note Checking the Distribution::). - The ‘AM_TESTS_ENVIRONMENT’ and ‘TESTS_ENVIRONMENT’ variables can be -used to run initialization code and set environment variables for the -test scripts. The former variable is developer-reserved, and can be -defined in the ‘Makefile.am’, while the latter is reserved for the user, -which can employ it to extend or override the settings in the former; -for this to work portably, however, the contents of a non-empty + Automake ensures that each file listed in ‘TESTS’ is built before it +is run; you can list both source and derived programs (or scripts) in +‘TESTS’; the generated rule will look both in ‘srcdir’ and ‘‘..’’. For +instance, you might want to run a C program as a test. To do this you +would list its name in ‘TESTS’ and also in ‘check_PROGRAMS’, and then +specify it as you would any other program. + + Programs listed in ‘check_PROGRAMS’ (and ‘check_LIBRARIES’, +‘check_LTLIBRARIES’, ...) are only built during ‘make check’, not +during ‘make all’. You should list there any program needed by your +tests that does not need to be built by ‘make all’. The programs in +‘check_PROGRAMS’ are _not_ automatically added to ‘TESTS’ because +‘check_PROGRAMS’ usually lists programs used by the tests, not the tests +themselves. If all your programs are in fact test cases, you can set +‘TESTS = $(check_PROGRAMS)’. + +* Menu: + +* Testsuite Environment Overrides:: + + +File: automake.info, Node: Testsuite Environment Overrides, Up: Scripts-based Testsuites + +15.2.1.1 Testsuite Environment Overrides +........................................ + +The ‘AM_TESTS_ENVIRONMENT’ and ‘TESTS_ENVIRONMENT’ variables can be used +to run initialization code and set environment variables for the test +scripts. The former variable is developer-reserved, and can be defined +in the ‘Makefile.am’, while the latter is reserved for the user, which +can employ it to extend or override the settings in the former; for this +to work portably, however, the contents of a non-empty ‘AM_TESTS_ENVIRONMENT’ _must_ be terminated by a semicolon. The ‘AM_TESTS_FD_REDIRECT’ variable can be used to define file @@ -644,7 +856,7 @@ close-on-exec flag on file descriptors opened with the ‘exec’ builtin, thus rendering an idiom like ‘AM_TESTS_ENVIRONMENT = exec 9>&2;’ ineffectual. This issue also affects some Bourne shells, such as the -HP-UX’s ‘/bin/sh’, +HP-UX’s ‘/bin/sh’. AM_TESTS_ENVIRONMENT = \ ## Some environment initializations are kept in a separate shell @@ -656,41 +868,36 @@ if test -d /usr/xpg4/bin; then \ PATH=/usr/xpg4/bin:$$PATH; export PATH; \ fi; + ## With this, the test scripts will be able to print diagnostic ## messages to the original standard error stream, even if the test ## driver redirects the stderr of the test scripts to a log file ## before executing them. AM_TESTS_FD_REDIRECT = 9>&2 -Note however that ‘AM_TESTS_ENVIRONMENT’ is, for historical and -implementation reasons, _not_ supported by the serial harness (*note -Serial Test Harness::). - - Automake ensures that each file listed in ‘TESTS’ is built before it -is run; you can list both source and derived programs (or scripts) in -‘TESTS’; the generated rule will look both in ‘srcdir’ and ‘.’. For -instance, you might want to run a C program as a test. To do this you -would list its name in ‘TESTS’ and also in ‘check_PROGRAMS’, and then -specify it as you would any other program. - - Programs listed in ‘check_PROGRAMS’ (and ‘check_LIBRARIES’, -‘check_LTLIBRARIES’...) are only built during ‘make check’, not during -‘make all’. You should list there any program needed by your tests that -does not need to be built by ‘make all’. Note that ‘check_PROGRAMS’ are -_not_ automatically added to ‘TESTS’ because ‘check_PROGRAMS’ usually -lists programs used by the tests, not the tests themselves. Of course -you can set ‘TESTS = $(check_PROGRAMS)’ if all your programs are test -cases. + As another example, a notice that a test is starting can be emitted +using ‘AM_TESTS_ENVIRONMENT’ (for package maintainers) or +‘TESTS_ENVIRONMENT’ by users: + + make -j12 ... TESTS_ENVIRONMENT='echo RUNNING: "$$f";' check + +The shell variable ‘$f’ contains the test name. (Although technically +this is not guaranteed, in practice it is extremely unlikely to ever +change.) This can be helpful to see when trying to debug test failures. + + Notwithstanding these benefits, ‘AM_TESTS_ENVIRONMENT’ is, for +historical and implementation reasons, _not_ supported by the serial +harness (*note Serial Test Harness::).  File: automake.info, Node: Serial Test Harness, Next: Parallel Test Harness, Prev: Scripts-based Testsuites, Up: Simple Tests -15.2.2 Older (and discouraged) serial test harness +15.2.2 Older (and discouraged) Serial Test Harness -------------------------------------------------- First, note that today the use of this harness is strongly discouraged in favour of the parallel test harness (*note Parallel Test Harness::). -Still, there are _few_ situations when the advantages offered by the +Still, there are a _few_ situations when the advantages offered by the parallel harness are irrelevant, and when test concurrency can even cause tricky problems. In those cases, it might make sense to still use the serial harness, for simplicity and reliability (we still suggest @@ -718,10 +925,9 @@ freeing the ‘TESTS_ENVIRONMENT’ variable for the user (*note Parallel Test Harness::). - Another, less serious limit of the serial harness is that it doesn’t -really distinguish between simple failures and hard errors; this is due -to historical reasons only, and might be fixed in future Automake -versions. + Another, less serious limitation of the serial harness is that it +doesn’t distinguish between simple failures and hard errors; this is for +historical reasons, and might be fixed in future Automake versions.  File: automake.info, Node: Parallel Test Harness, Prev: Serial Test Harness, Up: Simple Tests @@ -819,12 +1025,21 @@ env TESTS="foo.test bar.test" make -e check - Note however that the command above will unconditionally overwrite - the ‘test-suite.log’ file, thus clobbering the recorded results of - any previous testsuite run. This might be undesirable for packages - whose testsuite takes long time to execute. Luckily, this problem - can easily be avoided by overriding also ‘TEST_SUITE_LOG’ at - runtime; for example, + If you’re using a recursive make setup, you’ll probably also need + to override ‘SUBDIRS’: + + env TESTS="foo.test bar.test" make -e check SUBDIRS= + + Otherwise, the test harness will descend into all subdirectories, + where the tests presumably do not exist, and thus fail. (Patch to + provide better behavior would be welcome.) + + Another issue: the command above will unconditionally overwrite the + ‘test-suite.log’ file, thus clobbering the recorded results of any + previous testsuite run. This might be undesirable for packages + whose testsuite takes a long time to execute. Luckily, this + problem can easily be avoided by also overriding ‘TEST_SUITE_LOG’ + at runtime; for example, env TEST_SUITE_LOG=partial.log TESTS="..." make -e check @@ -883,7 +1098,7 @@ cycle, it may even be useful to specify compiled programs in ‘EXTRA_PROGRAMS’ instead of with ‘check_PROGRAMS’, as the former allows intertwined compilation and test execution (but note that -‘EXTRA_PROGRAMS’ are not cleaned automatically, *note Uniform::). +‘EXTRA_PROGRAMS’ are not cleaned automatically; *note Uniform::). The variables ‘TESTS’ and ‘XFAIL_TESTS’ may contain conditional parts as well as configure substitutions. In the latter case, however, @@ -942,9 +1157,9 @@ consider the test script exit status (this is done for example by the default test driver used by the parallel test harness, described in the previous section). Other drivers might implement more complex and -advanced test protocols, which might require them to parse and -interpreter the output emitted by the test script they’re running -(examples of such protocols are TAP and SubUnit). +advanced test protocols, which might require them to parse and interpret +the output emitted by the test script they’re running (examples of such +protocols are TAP and SubUnit). It’s very important to note that, even when using custom test drivers, most of the infrastructure described in the previous section @@ -1004,12 +1219,12 @@ ---------------------------------- Note that _the APIs described here are still highly experimental_, and -will very likely undergo tightenings and likely also extensive changes -in the future, to accommodate for new features or to satisfy additional +will very likely undergo tightening and possibly extensive changes in +the future, to accommodate for new features or to satisfy additional portability requirements. The main characteristic of these APIs is that they are designed to -share as much infrastructure, semantics, and implementation details as +share as much infrastructure, semantics, and implementation detail as possible with the parallel test harness and its default driver. * Menu: @@ -1130,9 +1345,9 @@ Currently, the value of this field is needed only to be reported (more or less verbatim) in the generated global log file ‘$(TEST_SUITE_LOG)’, so it’s quite free-form. For example, a test - script which run 10 test cases, 6 of which pass and 4 of which are + script which runs 10 test cases, 6 of which pass and 4 of which are skipped, could reasonably have a ‘PASS/SKIP’ value for this field, - while a test script which run 19 successful tests and one failed + while a test script which runs 19 successful tests and one failed test could have an ‘ALMOST PASSED’ value. What happens when two or more ‘:test-global-result:’ fields are present in the same ‘.trs’ file is undefined behaviour. @@ -1151,7 +1366,7 @@ Then the corresponding test script will be re-run by ‘make check’, will contribute with _five_ test results to the testsuite summary (three of these tests being successful, one failed, and one skipped), and the -content of the corresponding ‘.log’ file will _not_ be copied in the +content of the corresponding ‘.log’ file will _not_ be copied into the global log file ‘test-suite.log’.  @@ -1209,23 +1424,23 @@ Automake harness will present the results on the console in the usual fashion (*note Testsuite progress on console::), and will use the ‘.trs’ files (*note Basics of test metadata::) to store the test results and -related metadata. Apart from that, it will try to remain as much -compatible as possible with pre-existing and widespread utilities, such -as the ‘prove’ utility -(http://search.cpan.org/~andya/Test-Harness/bin/prove), at least for the -simpler usages. +related metadata. Apart from that, it will try to remain as compatible +as possible with pre-existing and widespread utilities, such as the +‘prove’ utility +(https://metacpan.org/pod/distribution/Test-Harness/bin/prove), at least +for the simpler usages. TAP started its life as part of the test harness for Perl, but today it has been (mostly) standardized, and has various independent implementations in different languages; among them, C, C++, Perl, Python, PHP, and Java. For a semi-official specification of the TAP -protocol, please refer to the documentation of ‘Test::Harness::TAP’ -(http://search.cpan.org/~petdance/Test-Harness/lib/Test/Harness/TAP.pod). +protocol, please refer to the documentation of ‘Test::Harness’ +(https://metacpan.org/pod/Test::Harness). The most relevant real-world usages of TAP are obviously in the -testsuites of ‘perl’ and of many perl modules. Still, also other -important third-party packages, such as ‘git’ (http://git-scm.com/), use -TAP in their testsuite. +testsuites of ‘perl’ and of many Perl modules. Still, other important +third-party packages, such as ‘git’ (https://git-scm.com/), also use TAP +in their testsuite.  File: automake.info, Node: Use TAP with the Automake test harness, Next: Incompatibilities with other TAP parsers and drivers, Prev: Introduction to TAP, Up: Using the TAP test protocol @@ -1243,8 +1458,8 @@ tests. See the example below for clarification. Apart from the options common to all the Automake test drivers (*note -Command-line arguments for test drivers::), the ‘tap-driver.sh’ supports -the following options, whose names are chosen for enhanced compatibility +Command-line arguments for test drivers::), ‘tap-driver.sh’ supports the +following options, whose names are chosen for enhanced compatibility with the ‘prove’ utility. ‘--ignore-exit’ @@ -1253,9 +1468,10 @@ exits with a non-zero status. This option has effect also on non-zero exit statuses due to termination by a signal. ‘--comments’ - Instruct the test driver to display TAP diagnostic (i.e., lines + Instruct the test driver to display TAP diagnostics (i.e., lines beginning with the ‘#’ character) in the testsuite progress output - too; by default, TAP diagnostic is only copied to the ‘.log’ file. + too; by default, TAP diagnostics are only copied to the ‘.log’ + file. ‘--no-comments’ Revert the effects of ‘--comments’. ‘--merge’ @@ -1270,13 +1486,13 @@ ‘--no-merge’ Revert the effects of ‘--merge’. ‘--diagnostic-string=STRING’ - Change the string that introduces TAP diagnostic from the default + Change the string that introduces TAP diagnostics from the default value of “‘#’” to ‘STRING’. This can be useful if your TAP-based test scripts produce verbose output on which they have limited control (because, say, the output comes from other tools invoked in the scripts), and it might contain text that gets spuriously - interpreted as TAP diagnostic: such an issue can be solved by - redefining the string that activates TAP diagnostic to a value you + interpreted as TAP diagnostics: such an issue can be solved by + redefining the string that activates TAP diagnostics to a value you know won’t appear by chance in the tests’ output. Note however that this feature is non-standard, as the “official” TAP protocol does not allow for such a customization; so don’t use it if you can @@ -1360,7 +1576,7 @@ ----------------------------------------------------------- For implementation or historical reasons, the TAP driver and harness as -implemented by Automake have some minors incompatibilities with the +implemented by Automake have some minor incompatibilities with the mainstream versions, which you should be aware of. • A ‘Bail out!’ directive doesn’t stop the whole testsuite, but only @@ -1369,10 +1585,10 @@ (and code sharing) with the “hard error” concept of the default testsuite driver. • The ‘version’ and ‘pragma’ directives are not supported. - • The ‘--diagnostic-string’ option of our driver allows to modify the - string that introduces TAP diagnostic from the default value of - “‘#’”. The standard TAP protocol has currently no way to allow - this, so if you use it your diagnostic will be lost to more + • The ‘--diagnostic-string’ option of our driver allows modification + of the string that introduces TAP diagnostics from the default + value of “‘#’”. The standard TAP protocol currently has no way to + allow this, so if you use it your diagnostic will be lost to more compliant tools like ‘prove’ and ‘Test::Harness’ • And there are probably some other small and yet undiscovered incompatibilities, especially in corner cases or with rare usages. @@ -1386,28 +1602,27 @@ Here are some links to more extensive official or third-party documentation and resources about the TAP protocol and related tools and libraries. - • ‘Test::Harness::TAP’ - (http://search.cpan.org/~petdance/Test-Harness/lib/Test/Harness/TAP.pod), - the (mostly) official documentation about the TAP format and - protocol. - • ‘prove’ (http://search.cpan.org/~andya/Test-Harness/bin/prove), - the most famous command-line TAP test driver, included in the + • ‘Test::Harness’ (https://metacpan.org/pod/Test::Harness), the + (mostly) official documentation about the TAP format and protocol. + • ‘prove’ + (https://metacpan.org/pod/distribution/Test-Harness/bin/prove), the + most famous command-line TAP test driver, included in the distribution of ‘perl’ and ‘Test::Harness’ - (http://search.cpan.org/~andya/Test-Harness/lib/Test/Harness.pm). - • The TAP wiki (http://testanything.org/wiki/index.php/Main_Page). - • A “gentle introduction” to testing for perl coders: + (https://metacpan.org/pod/distribution/Test-Harness/lib/Test/Harness.pm). + • The TAP wiki (https://testanything.org/). + • A “gentle introduction” to testing for Perl coders: ‘Test::Tutorial’ - (http://search.cpan.org/dist/Test-Simple/lib/Test/Tutorial.pod). + (https://metacpan.org/pod/distribution/Test-Simple/lib/Test/Tutorial.pod). • ‘Test::Simple’ - (http://search.cpan.org/~mschwern/Test-Simple/lib/Test/Simple.pm) + (https://metacpan.org/pod/distribution/Test-Simple/lib/Test/Simple.pm) and ‘Test::More’ - (http://search.cpan.org/~mschwern/Test-Simple/lib/Test/More.pm), - the standard perl testing libraries, which are based on TAP. + (https://metacpan.org/pod/distribution/Test-Simple/lib/Test/More.pm), + the standard Perl testing libraries, which are based on TAP. • C TAP Harness - (http://www.eyrie.org/~eagle/software/c-tap-harness/), a C-based + (https://www.eyrie.org/~eagle/software/c-tap-harness/), a C-based project implementing both a TAP producer and a TAP consumer. - • tap4j (http://www.tap4j.org/), a Java-based project implementing - both a TAP producer and a TAP consumer. + • tap4j (https://tap4j.org/), a Java-based project implementing both + a TAP producer and a TAP consumer.  File: automake.info, Node: DejaGnu Tests, Next: Install Tests, Prev: Using the TAP test protocol, Up: Tests @@ -1415,7 +1630,7 @@ 15.5 DejaGnu Tests ================== -If ‘dejagnu’ (https://ftp.gnu.org/gnu/dejagnu/) appears in +If ‘dejagnu’ (*note Introduction: (dejagnu)Top.) appears in ‘AUTOMAKE_OPTIONS’, then a ‘dejagnu’-based test suite is assumed. The variable ‘DEJATOOL’ is a list of names that are passed, one at a time, as the ‘--tool’ argument to ‘runtest’ invocations; it defaults to the @@ -1480,7 +1695,7 @@ variables ‘CONFIGURE_DEPENDENCIES’ and ‘CONFIG_STATUS_DEPENDENCIES’ can be used to list these extra dependencies. These variables should be defined in all ‘Makefile’s of the tree (because these two rebuild rules -are output in all them), so it is safer and easier to ‘AC_SUBST’ them +are output in all of them), so it is safer and easier to ‘AC_SUBST’ them from ‘configure.ac’. For instance, the following statement will cause ‘configure’ to be rerun each time ‘version.sh’ is changed. @@ -1540,6 +1755,13 @@ number is bumped, when only ‘configure’ had to be rerun in the previous setup. + GNU Make, at least, has an option ‘--always-make’ which tells Make to +consider that all targets are out of date. This interacts badly with +Automake-generated Makefiles, which implement their own careful rules +for when to regenerate Makefiles, as described above. The result is an +endless loop, or other poor behavior. The only thing to do, as far as +we know, is to refrain from using ‘--always-make’. +  File: automake.info, Node: Options, Next: Miscellaneous, Prev: Rebuilding, Up: Top @@ -1576,7 +1798,7 @@ level and warning categories. As a general rule, strictness-implied warnings are overridden by those specified by explicit options. For example, even if ‘portability’ warnings are disabled by default in -‘foreign’ strictness, an usage like this will end up enabling them: +‘foreign’ strictness, a usage like this will end up enabling them: AUTOMAKE_OPTIONS = -Wportability foreign @@ -1602,8 +1824,9 @@ ‘gnu’ ‘foreign’ - Set the strictness as appropriate. The ‘gnits’ option also implies - options ‘readme-alpha’ and ‘check-news’. + Set the strictness as appropriate. *Note Strictness::. The + ‘gnits’ option also implies options ‘readme-alpha’ and + ‘check-news’. ‘check-news’ Cause ‘make dist’ to fail unless the current version number appears @@ -1625,6 +1848,9 @@ ‘dist-zip’ Hook ‘dist-zip’ to ‘dist’. +‘dist-zstd’ + Hook ‘dist-zstd’ to ‘dist’. + ‘dist-shar’ Hook ‘dist-shar’ to ‘dist’. Use of this option is deprecated, as the ‘shar’ format is obsolescent and problematic. Support for it @@ -1640,7 +1866,7 @@ ‘make dist’. Such long file names are generally considered not to be portable in tarballs. See the ‘tar-v7’ and ‘tar-ustar’ options below. This option should be used in the top-level ‘Makefile.am’ - or as an argument of ‘AM_INIT_AUTOMAKE’ in ‘configure.ac’, it will + or as an argument of ‘AM_INIT_AUTOMAKE’ in ‘configure.ac’; it will be ignored otherwise. It will also be ignored in sub-packages of nested packages (*note Subpackages::). @@ -1668,6 +1894,17 @@ Don’t emit any code related to ‘dist’ target. This is useful when a package has its own method for making distributions. +‘no-dist-built-sources’ + Don’t build ‘BUILT_SOURCES’ as part of ‘dist’. This option can be + set if building the distribution only requires the source files, + and doesn’t compile anything as a side-effect. The default is for + ‘$(distdir)’ to depend on ‘$(BUILT_SOURCES)’ because it is common, + at least among GNU packages, to want to build the program to + generate man pages with ‘help2man’ (*note Errors with distclean::). + Admittedly the default behavior should perhaps be to omit the + dependency, but to preserve compatibility, we don’t want to change + it now. + ‘no-dist-gzip’ Do not hook ‘dist-gzip’ to ‘dist’. @@ -1746,7 +1983,7 @@ subdirectory of the build directory corresponding to the subdirectory of the source file. For instance, if the source file is ‘subdir/file.cxx’, then the output file would be - ‘subdir/file.o’. + ‘subdir/file.o’. *Note Program and Library Variables::. ‘tar-v7’ ‘tar-ustar’ @@ -1755,8 +1992,8 @@ These three mutually exclusive options select the tar format to use when generating tarballs with ‘make dist’. (The tar file created is then compressed according to the set of ‘no-dist-gzip’, - ‘dist-bzip2’, ‘dist-lzip’, ‘dist-xz’ and ‘dist-tarZ’ options in - use.) + ‘dist-bzip2’, ‘dist-lzip’, ‘dist-xz’, ‘dist-zstd’ and ‘dist-tarZ’ + options in use.) These options must be passed as arguments to ‘AM_INIT_AUTOMAKE’ (*note Macros::) because they can require additional configure @@ -1767,7 +2004,7 @@ default. This antiquated format is understood by all tar implementations and supports file names with up to 99 characters. When given longer file names some tar implementations will diagnose - the problem while other will generate broken tarballs or use + the problem while others will generate broken tarballs or use non-portable extensions. Furthermore, the V7 format cannot store empty directories. When using this format, consider using the ‘filename-length-max=99’ option to catch file names too long. @@ -1775,22 +2012,22 @@ ‘tar-ustar’ selects the ustar format defined by POSIX 1003.1-1988. This format is old enough to be portable: As of 2018, it is supported by the native ‘tar’ command on GNU, FreeBSD, NetBSD, - OpenBSD, AIX, HP-UX, Solaris, at least. It fully supports empty - directories. It can store file names with up to 256 characters, - provided that the file name can be split at directory separator in - two parts, first of them being at most 155 bytes long. So, in most - cases the maximum file name length will be shorter than 256 - characters. + OpenBSD, AIX, HP-UX, and Solaris, at least. It fully supports + empty directories. It can store file names with up to 256 + characters, provided that the file name can be split at directory + separator in two parts, first of them being at most 155 bytes long. + So, in most cases the maximum file name length will be shorter than + 256 characters. ‘tar-pax’ selects the new pax interchange format defined by POSIX 1003.1-2001. It does not limit the length of file names. However, this format is very young and should probably be restricted to packages that target only very modern platforms. As of 2018, this format is supported by the native ‘tar’ command only on GNU, - FreeBSD, OpenBSD system; it is not supported by the native ‘tar’ - command on NetBSD, AIX, HP-UX, Solaris. There are moves to change - the pax format in an upward-compatible way, so this option may - refer to a more recent version in the future. + FreeBSD, and OpenBSD systems; it is not supported by the native + ‘tar’ command on NetBSD, AIX, HP-UX, or Solaris. There are moves + to change the pax format in an upward-compatible way, so this + option may refer to a more recent version in the future. *Note Controlling the Archive Format: (tar)Formats, for further discussion about tar formats. @@ -1801,8 +2038,8 @@ VERSION A version number (e.g., ‘0.30’) can be specified. If Automake is - not newer than the version specified, creation of the ‘Makefile.in’ - will be suppressed. + not the same version or newer than the version specified, creation + of the ‘Makefile.in’ will be suppressed. ‘-WCATEGORY’ or ‘--warnings=CATEGORY’ These options behave exactly like their command-line counterpart @@ -1841,9 +2078,9 @@ If any C, C++ or Fortran 77 source code or headers are present, then ‘tags’ and ‘TAGS’ rules will be generated for the directory. All files listed using the ‘_SOURCES’, ‘_HEADERS’, and ‘_LISP’ primaries will be -used to generate tags. Note that generated source files that are not -distributed must be declared in variables like ‘nodist_noinst_HEADERS’ -or ‘nodist_PROG_SOURCES’ or they will be ignored. +used to generate tags. Generated source files that are not distributed +must be declared in variables like ‘nodist_noinst_HEADERS’ or +‘nodist_PROG_SOURCES’ or they will be ignored. A ‘tags’ rule will be output at the topmost directory of a multi-directory package. When run from this topmost directory, ‘make @@ -1854,7 +2091,9 @@ is defined. This variable is intended for use in directories that contain taggable source that ‘etags’ does not understand. The user can use the ‘ETAGSFLAGS’ to pass additional flags to ‘etags’; -‘AM_ETAGSFLAGS’ is also available for use in ‘Makefile.am’. +‘AM_ETAGSFLAGS’ is also available for use in ‘Makefile.am’. The +variable ‘ETAGS’ is the name of the program to invoke (by default +‘etags’). Here is how Automake generates tags for its source, and for nodes in its Texinfo file: @@ -1984,7 +2223,7 @@ 20 Conditionals *************** -Automake supports a simple type of conditionals. +Automake supports a simple type of conditional. These conditionals are not the same as conditionals in GNU Make. Automake conditionals are checked at configure time by the ‘configure’ @@ -2013,8 +2252,8 @@ -- Macro: AM_CONDITIONAL (CONDITIONAL, CONDITION) The conditional name, CONDITIONAL, should be a simple string starting with a letter and containing only letters, digits, and - underscores. It must be different from ‘TRUE’ and ‘FALSE’ that are - reserved by Automake. + underscores. It must be different from ‘TRUE’ and ‘FALSE’, which + are reserved by Automake. The shell CONDITION (suitable for use in a shell ‘if’ statement) is evaluated when ‘configure’ is run. Note that you must arrange for @@ -2127,7 +2366,7 @@ Libtool Sources::).  -File: automake.info, Node: Silencing Make, Next: Gnits, Prev: Conditionals, Up: Top +File: automake.info, Node: Silencing Make, Next: Not Enough, Prev: Conditionals, Up: Top 21 Silencing ‘make’ ******************* @@ -2173,7 +2412,7 @@  File: automake.info, Node: Tricks For Silencing Make, Next: Automake Silent Rules, Prev: Make verbosity, Up: Silencing Make -21.2 Standard and generic ways to silence make +21.2 Standard and generic ways to silence Make ============================================== Here we describe some common idioms/tricks to obtain a quieter make @@ -2193,9 +2432,9 @@ embodies an “all or nothing” strategy, i.e., either everything is silenced, or nothing is; this lack of granularity can sometimes be a fatal flaw. Moreover, when the ‘-s’ flag is used, the ‘make’ - output might turn out to be too much terse; in case of errors, the - user won’t be able to easily see what rule or command have caused - them, or even, in case of tools with poor error reporting, what the + output might turn out to be too terse; in case of errors, the user + won’t be able to easily see what rule or command have caused them, + or even, in case of tools with poor error reporting, what the errors were! • ‘make >/dev/null || make’ @@ -2208,7 +2447,7 @@ However, calling ‘make’ two times in a row might hide errors (especially intermittent ones), or subtly change the expected - semantic of the ‘make’ calls — things these which can clearly make + semantics of the ‘make’ calls — these things can clearly make debugging and error assessment very difficult. • ‘make --no-print-directory’ @@ -2227,7 +2466,7 @@  File: automake.info, Node: Automake Silent Rules, Prev: Tricks For Silencing Make, Up: Silencing Make -21.3 How Automake can help in silencing make +21.3 How Automake can help in silencing Make ============================================ The tricks and idioms for silencing ‘make’ described in the previous @@ -2267,7 +2506,7 @@ mv -f .deps/func.Tpo .deps/func.Po gcc -Wall -o foo main.o func.o - Clean up, so that we we can rebuild everything from scratch. + Clean up, so that we can rebuild everything from scratch. % make clean test -z "foo" || rm -f foo rm -f *.o @@ -2322,9 +2561,9 @@ user with enough information to prepare a good bug report in case anything breaks. - Still, notwithstanding the rationales above, a developer who really -wants to make silent rules enabled by default in his own package can do -so by calling ‘AM_SILENT_RULES([yes])’ in ‘configure.ac’. + Still, notwithstanding the rationales above, developers who wants to +make silent rules enabled by default in their own packages can do so by +calling ‘AM_SILENT_RULES([yes])’ in ‘configure.ac’. Users who prefer to have silent rules enabled by default can edit their ‘config.site’ file to make the variable ‘enable_silent_rules’ @@ -2344,7 +2583,7 @@ of POSIX are likely to require nested variable expansion, so this minor limitation should go away with time. - To extend the silent mode to your own rules, you have few choices: + To extend the silent mode to your own rules, you have a few choices: • You can use the predefined variable ‘AM_V_GEN’ as a prefix to commands that should output a status line in silent mode, and @@ -2354,7 +2593,7 @@ • You can silence a recipe unconditionally with ‘@’, and then use the predefined variable ‘AM_V_P’ to know whether make is being run in - silent or verbose mode, adjust the verbose information your recipe + silent or verbose mode; adjust the verbose information your recipe displays accordingly: generate-headers: @@ -2378,61 +2617,9 @@ the “Entering/Leaving directory ...” messages are to be disabled.  -File: automake.info, Node: Gnits, Next: Not Enough, Prev: Silencing Make, Up: Top - -22 The effect of ‘--gnu’ and ‘--gnits’ -************************************** - -The ‘--gnu’ option (or ‘gnu’ in the ‘AUTOMAKE_OPTIONS’ variable) causes -‘automake’ to check the following: - - • The files ‘INSTALL’, ‘NEWS’, ‘README’, ‘AUTHORS’, and ‘ChangeLog’, - plus one of ‘COPYING.LIB’, ‘COPYING.LESSER’ or ‘COPYING’, are - required at the topmost directory of the package. - - If the ‘--add-missing’ option is given, ‘automake’ will add a - generic version of the ‘INSTALL’ file as well as the ‘COPYING’ file - containing the text of the current version of the GNU General - Public License existing at the time of this Automake release - (version 3 as this is written, - ). However, an existing - ‘COPYING’ file will never be overwritten by ‘automake’. - - • The options ‘no-installman’ and ‘no-installinfo’ are prohibited. - - Note that this option will be extended in the future to do even more -checking; it is advisable to be familiar with the precise requirements -of the GNU standards. Also, ‘--gnu’ can require certain non-standard -GNU programs to exist for use by various maintainer-only rules; for -instance, in the future ‘pathchk’ might be required for ‘make dist’. - - The ‘--gnits’ option does everything that ‘--gnu’ does, and checks -the following as well: - - • ‘make installcheck’ will check to make sure that the ‘--help’ and - ‘--version’ really print a usage message and a version string, - respectively. This is the ‘std-options’ option (*note Options::). - - • ‘make dist’ will check to make sure the ‘NEWS’ file has been - updated to the current version. - - • ‘VERSION’ is checked to make sure its format complies with Gnits - standards. +File: automake.info, Node: Not Enough, Next: Distributing, Prev: Silencing Make, Up: Top - • If ‘VERSION’ indicates that this is an alpha release, and the file - ‘README-alpha’ appears in the topmost directory of a package, then - it is included in the distribution. This is done in ‘--gnits’ - mode, and no other, because this mode is the only one where version - number formats are constrained, and hence the only mode where - Automake can automatically determine whether ‘README-alpha’ should - be included. - - • The file ‘THANKS’ is required. - - -File: automake.info, Node: Not Enough, Next: Distributing, Prev: Gnits, Up: Top - -23 When Automake Isn’t Enough +22 When Automake Isn’t Enough ***************************** In some situations, where Automake is not up to one task, one has to @@ -2446,7 +2633,7 @@  File: automake.info, Node: Extending, Next: Third-Party Makefiles, Up: Not Enough -23.1 Extending Automake Rules +22.1 Extending Automake Rules ============================= With some minor exceptions (for example ‘_PROGRAMS’ variables, ‘TESTS’, @@ -2546,12 +2733,12 @@ directory, not on the primary used (*note The Two Parts of Install::). So a ‘foo_SCRIPTS’ will be installed by ‘install-data’, and a ‘barexec_SCRIPTS’ will be installed by ‘install-exec’. You should -define your hooks consequently. +define your hooks accordingly.  File: automake.info, Node: Third-Party Makefiles, Prev: Extending, Up: Not Enough -23.2 Third-Party ‘Makefile’s +22.2 Third-Party ‘Makefile’s ============================ In most projects all ‘Makefile’s are generated by Automake. In some @@ -2622,9 +2809,9 @@ If you have ever used Gettext in a project, this is a good example of how third-party ‘Makefile’s can be used with Automake. The ‘Makefile’s -‘gettextize’ puts in the ‘po/’ and ‘intl/’ directories are handwritten -‘Makefile’s that implement all of these targets. That way they can be -added to ‘SUBDIRS’ in Automake packages. +that ‘gettextize’ puts in the ‘po/’ and ‘intl/’ directories are +handwritten ‘Makefile’s that implement all of these targets. That way +they can be added to ‘SUBDIRS’ in Automake packages. Directories that are only listed in ‘DIST_SUBDIRS’ but not in ‘SUBDIRS’ need only the ‘distclean’, ‘maintainer-clean’, and ‘distdir’ @@ -2640,33 +2827,36 @@ .PHONY: $(EMPTY_AUTOMAKE_TARGETS) $(EMPTY_AUTOMAKE_TARGETS): + To be clear, there is nothing special about the variable name +‘EMPTY_AUTOMAKE_TARGETS’; the name could be anything. + Another aspect of integrating third-party build systems is whether they support VPATH builds (*note VPATH Builds::). Obviously if the subpackage does not support VPATH builds the whole package will not support VPATH builds. This in turns means that ‘make distcheck’ will not work, because it relies on VPATH builds. Some people can live -without this (actually, many Automake users have never heard of ‘make +without this (indeed, many Automake users have never heard of ‘make distcheck’). Other people may prefer to revamp the existing ‘Makefile’s -to support VPATH. Doing so does not necessarily require Automake, only +to support VPATH. Doing so does not necessarily require Automake; only Autoconf is needed (*note Build Directories: (autoconf)Build Directories.). The necessary substitutions: ‘@srcdir@’, ‘@top_srcdir@’, and ‘@top_builddir@’ are defined by ‘configure’ when it processes a ‘Makefile’ (*note Preset Output Variables: (autoconf)Preset Output -Variables.), they are not computed by the Makefile like the +Variables.); they are not computed by the Makefile like the aforementioned ‘$(distdir)’ and ‘$(top_distdir)’ variables. It is sometimes inconvenient to modify a third-party ‘Makefile’ to introduce the above required targets. For instance, one may want to keep the third-party sources untouched to ease upgrades to new versions. - Here are two other ideas. If GNU make is assumed, one possibility is + Here are two other ideas. If GNU Make is assumed, one possibility is to add to that subdirectory a ‘GNUmakefile’ that defines the required targets and includes the third-party ‘Makefile’. For this to work in VPATH builds, ‘GNUmakefile’ must lie in the build directory; the easiest way to do this is to write a ‘GNUmakefile.in’ instead, and have it -processed with ‘AC_CONFIG_FILES’ from the outer package. For example if -we assume ‘Makefile’ defines all targets except the documentation -targets, and that the ‘check’ target is actually called ‘test’, we could +processed with ‘AC_CONFIG_FILES’ from the outer package. For example, +if we assume ‘Makefile’ defines all targets except the documentation +targets, and that the real ‘check’ target is named ‘test’, we could write ‘GNUmakefile’ (or ‘GNUmakefile.in’) like this: # First, include the real Makefile @@ -2713,7 +2903,7 @@  File: automake.info, Node: Distributing, Next: API Versioning, Prev: Not Enough, Up: Top -24 Distributing ‘Makefile.in’s +23 Distributing ‘Makefile.in’s ****************************** Automake places no restrictions on the distribution of the resulting @@ -2729,7 +2919,7 @@  File: automake.info, Node: API Versioning, Next: Upgrading, Prev: Distributing, Up: Top -25 Automake API Versioning +24 Automake API Versioning ************************** New Automake releases usually include bug fixes and new features. @@ -2747,7 +2937,7 @@ This means you can install several versions of Automake in the same ‘$prefix’, and can select an arbitrary Automake version by running ‘automake-1.6’ or ‘automake-1.7’ without juggling with ‘$PATH’. -Furthermore, ‘Makefile’’s generated by Automake 1.6 will use +Furthermore, ‘Makefile’s generated by Automake 1.6 will use ‘automake-1.6’ explicitly in their rebuild rules. The number ‘1.6’ in ‘automake-1.6’ is Automake’s API version, not @@ -2782,7 +2972,7 @@ What is not in the API ====================== -Every undocumented variable, target, or command line option, is not part +Every undocumented variable, target, or command line option is not part of the API. You should avoid using them, as they could change from one version to the other (even in bug fix releases, if this helps to fix a bug). @@ -2794,10 +2984,10 @@  File: automake.info, Node: Upgrading, Next: FAQ, Prev: API Versioning, Up: Top -26 Upgrading a Package to a Newer Automake Version +25 Upgrading a Package to a Newer Automake Version ************************************************** -Automake maintains three kind of files in a package. +Automake maintains three kinds of files in a package. • ‘aclocal.m4’ • ‘Makefile.in’s @@ -2813,7 +3003,7 @@ regenerate all of them when upgrading to a newer Automake release. The usual way to do that is - aclocal # with any option needed (such a -I m4) + aclocal # with any option needed (such as -I m4) autoconf automake --add-missing --force-missing @@ -2825,7 +3015,7 @@ overridden by new versions (*note automake Invocation::). It is important to regenerate all of these files each time Automake -is upgraded, even between bug fixes releases. For instance, it is not +is upgraded, even between bug fix releases. For instance, it is not unusual for a bug fix to involve changes to both the rules generated in ‘Makefile.in’ and the supporting M4 macros copied to ‘aclocal.m4’. @@ -2842,7 +3032,7 @@  File: automake.info, Node: FAQ, Next: Copying This Manual, Prev: Upgrading, Up: Top -27 Frequently Asked Questions about Automake +26 Frequently Asked Questions about Automake ******************************************** This chapter covers some questions that often come up on the mailing @@ -2866,7 +3056,7 @@  File: automake.info, Node: CVS, Next: maintainer-mode, Up: FAQ -27.1 CVS and generated files +26.1 CVS and generated files ============================ Background: distributed generated Files @@ -2876,13 +3066,14 @@ like ‘configure’ or ‘Makefile.in’. These files were generated on the developer’s machine and are distributed so that end-users do not have to install the maintainer tools required to rebuild them. Other generated -files like Lex scanners, Yacc parsers, or Info documentation, are -usually distributed on similar grounds. +files like Lex scanners, Yacc parsers, or Info documentation are usually +distributed on similar grounds. - Automake output rules in ‘Makefile’s to rebuild these files. For -instance, ‘make’ will run ‘autoconf’ to rebuild ‘configure’ whenever -‘configure.ac’ is changed. This makes development safer by ensuring a -‘configure’ is never out-of-date with respect to ‘configure.ac’. + Automake output generates rules in ‘Makefile’s to rebuild these +files. For instance, ‘make’ will run ‘autoconf’ to rebuild ‘configure’ +whenever ‘configure.ac’ is changed. This makes development safer by +ensuring a ‘configure’ is never out-of-date with respect to +‘configure.ac’. As generated files shipped in packages are up-to-date, and because ‘tar’ preserves times-tamps, these rebuild rules are not triggered when @@ -2900,7 +3091,7 @@ However, during ‘cvs update’, files will have the date of the update, not the original timestamp of this revision. This is meant to make sure -that ‘make’ notices sources files have been updated. +that ‘make’ notices that sources files have been updated. This timestamp shift is troublesome when both sources and generated files are kept under CVS. Because CVS processes files in lexical order, @@ -2920,15 +3111,15 @@ ................ • The CVS repository contains all distributed files so you know - exactly what is distributed, and you can checkout any prior version - entirely. + exactly what is distributed, and you can check out any prior + version entirely. • Maintainers can see how generated files evolve (for instance, you can see what happens to your ‘Makefile.in’s when you upgrade Automake and make sure they look OK). - • Users do not need the autotools to build a checkout of the project, - it works just like a released tarball. + • Users do not need Autotools to build a check-out of the project; it + works just like a released tarball. • If users use ‘cvs update’ to update their copy, instead of ‘cvs checkout’ to fetch a fresh one, timestamps will be inaccurate. @@ -2945,12 +3136,12 @@ Maintainers interested in keeping their package buildable from a CVS checkout even for those users that lack maintainer-specific - tools might want to provide an helper script (or to enhance their + tools might want to provide a helper script (or to enhance their existing bootstrap script) to fix the timestamps after a ‘cvs update’ or a ‘git checkout’, to prevent spurious rebuilds. In case of a project committing the Autotools-generated files, as well as - the generated ‘.info’ files, such script might look something like - this: + the generated ‘.info’ files, such a script might look something + like this: #!/bin/sh # fix-timestamp.sh: prevents useless rebuilds after "cvs update" @@ -2971,7 +3162,7 @@ touch doc/*.info • In distributed development, developers are likely to have different - version of the maintainer tools installed. In this case rebuilds + versions of the maintainer tools installed. In this case rebuilds triggered by timestamp lossage will lead to spurious changes to generated files. There are several solutions to this: @@ -3009,7 +3200,7 @@ This way developers are not annoyed by changes to generated files. It does not matter if they all have different versions (assuming they -are compatible, of course). And finally, timestamps are not lost, +are compatible, of course). And finally, timestamps are not lost; changes to sources files can’t be missed as in the ‘Makefile.am’/‘Makefile.in’ example discussed earlier. @@ -3021,11 +3212,10 @@ Allowing developers to use different versions of their tools can also hide bugs during distributed development. Indeed, developers will be using (hence testing) their own generated files, instead of the -generated files that will be released actually. The developer who -prepares the tarball might be using a version of the tool that produces -bogus output (for instance a non-portable C file), something other -developers could have noticed if they weren’t using their own versions -of this tool. +generated files that will be released. The developer who prepares the +tarball might be using a version of the tool that produces bogus output +(for instance a non-portable C file), something other developers could +have noticed if they weren’t using their own versions of this tool. Third-party Files ----------------- @@ -3038,13 +3228,13 @@ These files, whether they are kept under CVS or not, raise similar concerns about version mismatch between developers’ tools. The Gettext -manual has a section about this, see *note CVS Issues: (gettext)CVS -Issues. +manual has a section about this; see *note Integrating with Version +Control Systems: (gettext)Version Control Issues.  File: automake.info, Node: maintainer-mode, Next: Wildcards, Prev: CVS, Up: FAQ -27.2 ‘missing’ and ‘AM_MAINTAINER_MODE’ +26.2 ‘missing’ and ‘AM_MAINTAINER_MODE’ ======================================= ‘missing’ @@ -3053,9 +3243,9 @@ The ‘missing’ script is a wrapper around several maintainer tools, designed to warn users if a maintainer tool is required but missing. Typical maintainer tools are ‘autoconf’, ‘automake’, ‘bison’, etc. -Because file generated by these tools are shipped with the other sources -of a package, these tools shouldn’t be required during a user build and -they are not checked for in ‘configure’. +Because files generated by these tools are shipped with the other +sources of a package, these tools shouldn’t be required during a user +build and they are not checked for in ‘configure’. However, if for some reason a rebuild rule is triggered and involves a missing tool, ‘missing’ will notice it and warn the user, even @@ -3065,26 +3255,27 @@ error message like ‘sh: TOOL: command not found’. Similarly, ‘missing’ will warn the user if it detects that a maintainer tool it attempted to use seems too old (be warned that diagnosing this correctly is typically -more difficult that detecting missing tools, and requires cooperation +more difficult than detecting missing tools, and requires cooperation from the tool itself, so it won’t always work). If the required tool is installed, ‘missing’ will run it and won’t -attempt to continue after failures. This is correct during development: -developers love fixing failures. However, users with missing or too old -maintainer tools may get an error when the rebuild rule is spuriously -triggered, halting the build. This failure to let the build continue is -one of the arguments of the ‘AM_MAINTAINER_MODE’ advocates. +attempt to continue after failures. This is correct behavior during +development: developers love fixing failures. However, users with +missing or too old maintainer tools may get an error when the rebuild +rule is spuriously triggered, halting the build. This failure to let +the build continue is one of the arguments of the ‘AM_MAINTAINER_MODE’ +advocates. ‘AM_MAINTAINER_MODE’ -------------------- ‘AM_MAINTAINER_MODE’ allows you to choose whether the so called "rebuild rules" should be enabled or disabled. With -‘AM_MAINTAINER_MODE([enable])’, they are enabled by default, otherwise +‘AM_MAINTAINER_MODE([enable])’, they are enabled by default; otherwise they are disabled by default. In the latter case, if you have ‘AM_MAINTAINER_MODE’ in ‘configure.ac’, and run ‘./configure && make’, then ‘make’ will *never* attempt to rebuild ‘configure’, ‘Makefile.in’s, -Lex or Yacc outputs, etc. I.e., this disables build rules for files +Lex or Yacc outputs, etc. That is, this disables build rules for files that are usually distributed and that users should normally not have to update. @@ -3093,7 +3284,7 @@ ‘configure’. People use ‘AM_MAINTAINER_MODE’ either because they do not want their -users (or themselves) annoyed by timestamps lossage (*note CVS::), or +users (or themselves) annoyed by timestamp lossage (*note CVS::), or because they simply can’t stand the rebuild rules and prefer running maintainer tools explicitly. @@ -3104,7 +3295,7 @@ Several years ago François Pinard pointed out several arguments against this ‘AM_MAINTAINER_MODE’ macro. Most of them relate to insecurity. By removing dependencies you get non-dependable builds: -changes to sources files can have no effect on generated files and this +changes to source files can have no effect on generated files and this can be very confusing when unnoticed. He adds that security shouldn’t be reserved to maintainers (what ‘--enable-maintainer-mode’ suggests), on the contrary. If one user has to modify a ‘Makefile.am’, then either @@ -3113,8 +3304,8 @@ nothing happens and the user doesn’t notice it (this is what happens when rebuild rules are disabled by ‘AM_MAINTAINER_MODE’). - Jim Meyering, the inventor of the ‘AM_MAINTAINER_MODE’ macro was -swayed by François’s arguments, and got rid of ‘AM_MAINTAINER_MODE’ in + Jim Meyering, the inventor of the ‘AM_MAINTAINER_MODE’ macro, was +swayed by François’ arguments, and got rid of ‘AM_MAINTAINER_MODE’ in all of his packages. Still many people continue to use ‘AM_MAINTAINER_MODE’, because it @@ -3125,7 +3316,7 @@  File: automake.info, Node: Wildcards, Next: Limitations on File Names, Prev: maintainer-mode, Up: FAQ -27.3 Why doesn’t Automake support wildcards? +26.3 Why doesn’t Automake support wildcards? ============================================ Developers are lazy. They would often like to use wildcards in @@ -3156,7 +3347,7 @@ e.g., NetBSD ‘make’ will not expand globs such as ‘*’ in prerequisites of a target. - • Finally, it’s really hard to _forget_ to add a file to + • Finally, it’s quite hard to _forget_ to add a file to ‘Makefile.am’: files that are not listed in ‘Makefile.am’ are not compiled or installed, so you can’t even test them. @@ -3194,7 +3385,7 @@  File: automake.info, Node: Limitations on File Names, Next: Errors with distclean, Prev: Wildcards, Up: FAQ -27.4 Limitations on File Names +26.4 Limitations on File Names ============================== Automake attempts to support all kinds of file names, even those that @@ -3253,7 +3444,7 @@  File: automake.info, Node: Errors with distclean, Next: Flag Variables Ordering, Prev: Limitations on File Names, Up: FAQ -27.5 Errors with distclean +26.5 Errors with distclean ========================== This is a diagnostic you might encounter while running ‘make distcheck’. @@ -3266,14 +3457,14 @@ build directory after ‘make distclean’ has run are listed after this error. - This diagnostic really covers two kinds of errors: + This diagnostic covers two kinds of errors: • files that are forgotten by distclean; • distributed files that are erroneously rebuilt. The former left-over files are not distributed, so the fix is to mark -them for cleaning (*note Clean::), this is obvious and doesn’t deserve -more explanations. +them for cleaning (*note Clean::); this is obvious and doesn’t deserve +more explanation. The latter bug is not always easy to understand and fix, so let’s proceed with an example. Suppose our package contains a program for @@ -3312,10 +3503,10 @@ depend on non-distributed built files. If you distribute something generated, distribute its sources. - One way to fix the above example, while still distributing ‘foo.1’ is -to not depend on ‘foo$(EXEEXT)’. For instance, assuming ‘foo --version’ -and ‘foo --help’ do not change unless ‘foo.c’ or ‘configure.ac’ change, -we could write the following ‘Makefile.am’: + One way to fix the above example, while still distributing ‘foo.1’, +is to not depend on ‘foo$(EXEEXT)’. For instance, assuming ‘foo +--version’ and ‘foo --help’ do not change unless ‘foo.c’ or +‘configure.ac’ change, we could write the following ‘Makefile.am’: bin_PROGRAMS = foo foo_SOURCES = foo.c @@ -3333,8 +3524,8 @@ We could also decide not to distribute ‘foo.1’. In this case it’s fine to have ‘foo.1’ dependent upon ‘foo$(EXEEXT)’, since both will have -to be rebuilt. However it would be impossible to build the package in a -cross-compilation, because building ‘foo.1’ involves an _execution_ of +to be rebuilt. However, it would be impossible to build the package in +a cross-compilation, because building ‘foo.1’ involves an _execution_ of ‘foo$(EXEEXT)’. Another context where such errors are common is when distributed @@ -3371,7 +3562,7 @@  File: automake.info, Node: Flag Variables Ordering, Next: Renamed Objects, Prev: Errors with distclean, Up: FAQ -27.6 Flag Variables Ordering +26.6 Flag Variables Ordering ============================ What is the difference between ‘AM_CFLAGS’, ‘CFLAGS’, and @@ -3389,19 +3580,19 @@ ---------------------- This section attempts to answer all the above questions. We will mostly -discuss ‘CPPFLAGS’ in our examples, but actually the answer holds for -all the compile flags used in Automake: ‘CCASFLAGS’, ‘CFLAGS’, -‘CPPFLAGS’, ‘CXXFLAGS’, ‘FCFLAGS’, ‘FFLAGS’, ‘GCJFLAGS’, ‘LDFLAGS’, -‘LFLAGS’, ‘LIBTOOLFLAGS’, ‘OBJCFLAGS’, ‘OBJCXXFLAGS’, ‘RFLAGS’, -‘UPCFLAGS’, and ‘YFLAGS’. +discuss ‘CPPFLAGS’ in our examples, but the answer holds for all the +compile flags used in Automake: ‘CCASFLAGS’, ‘CFLAGS’, ‘CPPFLAGS’, +‘CXXFLAGS’, ‘FCFLAGS’, ‘FFLAGS’, ‘GCJFLAGS’, ‘LDFLAGS’, ‘LFLAGS’, +‘LIBTOOLFLAGS’, ‘OBJCFLAGS’, ‘OBJCXXFLAGS’, ‘RFLAGS’, ‘UPCFLAGS’, and +‘YFLAGS’. ‘CPPFLAGS’, ‘AM_CPPFLAGS’, and ‘mumble_CPPFLAGS’ are three variables -that can be used to pass flags to the C preprocessor (actually these -variables are also used for other languages like C++ or preprocessed -Fortran). ‘CPPFLAGS’ is the user variable (*note User Variables::), -‘AM_CPPFLAGS’ is the Automake variable, and ‘mumble_CPPFLAGS’ is the -variable specific to the ‘mumble’ target (we call this a per-target -variable, *note Program and Library Variables::). +that can be used to pass flags to the C preprocessor ( these variables +are also used for other languages like C++ or preprocessed Fortran). +‘CPPFLAGS’ is the user variable (*note User Variables::), ‘AM_CPPFLAGS’ +is the Automake variable, and ‘mumble_CPPFLAGS’ is the variable specific +to the ‘mumble’ target (we call this a per-target variable, *note +Program and Library Variables::). Automake always uses two of these variables when compiling C sources files. When compiling an object file for the ‘mumble’ target, the first @@ -3437,22 +3628,27 @@ It is also not uncommon to override a user variable at ‘make’-time. Many installers do this with ‘prefix’, but this can be useful with -compiler flags too. For instance, if, while debugging a C++ project, -you need to disable optimization in one specific object file, you can -run something like +compiler flags too. For instance, while debugging a C++ project, if you +need to disable optimization in one specific object file, you can run +something like rm file.o make CXXFLAGS=-O0 file.o make The reason ‘$(CPPFLAGS)’ appears after ‘$(AM_CPPFLAGS)’ or -‘$(mumble_CPPFLAGS)’ in the compile command is that users should always -have the last say. It probably makes more sense if you think about it -while looking at the ‘CXXFLAGS=-O0’ above, which should supersede any -other switch from ‘AM_CXXFLAGS’ or ‘mumble_CXXFLAGS’ (and this of course -replaces the previous value of ‘CXXFLAGS’). +‘$(mumble_CPPFLAGS)’ in the compile command is that users should have +the last say. In the example above, the desire is for the +‘CXXFLAGS=-O0’ to supersede any other switch from ‘AM_CXXFLAGS’ or +‘mumble_CXXFLAGS’. + + It’s true that not all options to all programs can be overridden. So +in general, users could conceivably want to place options at arbitrary +places in the command line, but Automake does not support this. It +would be difficult to make such generality comprehensible. Being able +to specify the final options commonly suffices. - You should never redefine a user variable such as ‘CPPFLAGS’ in + Thus, you should never redefine a user variable such as ‘CPPFLAGS’ in ‘Makefile.am’. Use ‘automake -Woverride’ to diagnose such mistakes. Even something like @@ -3471,8 +3667,8 @@ variables to perform a test, but you should reset their values afterwards. In contrast, it is OK to modify the ‘AM_’ variables within ‘configure’ if you ‘AC_SUBST’ them, but it is rather rare that you need -to do this, unless you really want to change the default definitions of -the ‘AM_’ variables in all ‘Makefile’s. +to do this, unless you want to change the default definitions of the +‘AM_’ variables in all ‘Makefile’s. What we recommend is that you define extra flags in separate variables. For instance, you may write an Autoconf macro that computes @@ -3507,8 +3703,8 @@ Finally, we have avoided naming the variable of the example ‘LIBFOO_LDFLAGS’ (with an underscore) because that would cause Automake -to think that this is actually a per-target variable (like -‘mumble_LDFLAGS’) for some non-declared ‘LIBFOO’ target. +to think that this is a per-target variable (like ‘mumble_LDFLAGS’) for +some non-declared ‘LIBFOO’ target. Other Variables --------------- @@ -3516,18 +3712,18 @@ There are other variables in Automake that follow similar principles to allow user options. For instance, Texinfo rules (*note Texinfo::) use ‘MAKEINFOFLAGS’ and ‘AM_MAKEINFOFLAGS’. Similarly, DejaGnu tests (*note -DejaGnu Tests::) use ‘RUNTESTDEFAULTFLAGS’ and ‘AM_RUNTESTDEFAULTFLAGS’. -The tags and ctags rules (*note Tags::) use ‘ETAGSFLAGS’, -‘AM_ETAGSFLAGS’, ‘CTAGSFLAGS’, and ‘AM_CTAGSFLAGS’. Java rules (*note -Java::) use ‘JAVACFLAGS’ and ‘AM_JAVACFLAGS’. None of these rules -support per-target flags (yet). +DejaGnu Tests::) use ‘RUNTESTFLAGS’ and ‘AM_RUNTESTFLAGS’. The tags and +ctags rules (*note Tags::) use ‘ETAGSFLAGS’, ‘AM_ETAGSFLAGS’, +‘CTAGSFLAGS’, and ‘AM_CTAGSFLAGS’. Java rules (*note Java::) use +‘JAVACFLAGS’ and ‘AM_JAVACFLAGS’. None of these rules support +per-target flags (yet). To some extent, even ‘AM_MAKEFLAGS’ (*note Subdirectories::) obeys this naming scheme. The slight difference is that ‘MAKEFLAGS’ is passed to sub-‘make’s implicitly by ‘make’ itself. ‘ARFLAGS’ (*note A Library::) is usually defined by Automake and has -neither ‘AM_’ nor per-target cousin. +neither an ‘AM_’ nor a per-target cousin. Finally you should not think that the existence of a per-target variable implies the existence of an ‘AM_’ variable or of a user @@ -3539,7 +3735,7 @@  File: automake.info, Node: Renamed Objects, Next: Per-Object Flags, Prev: Flag Variables Ordering, Up: FAQ -27.7 Why are object files sometimes renamed? +26.7 Why are object files sometimes renamed? ============================================ This happens when per-target compilation flags are used. Object files @@ -3559,9 +3755,9 @@ ‘automake’ outputs rules to build two different objects: ‘true-generic.o’ and ‘false-generic.o’. - ‘automake’ doesn’t actually look whether source files are shared to -decide if it must rename objects. It will just rename all objects of a -target as soon as it sees per-target compilation flags used. + Automake doesn’t actually determine whether source files are shared +to decide if it must rename objects. It just renames all objects of a +target as soon as it sees that per-target compilation flags are used. It’s OK to share object files when per-target compilation flags are not used. For instance, ‘true’ and ‘false’ will both use ‘version.o’ in @@ -3578,11 +3774,11 @@  File: automake.info, Node: Per-Object Flags, Next: Multiple Outputs, Prev: Renamed Objects, Up: FAQ -27.8 Per-Object Flags Emulation +26.8 Per-Object Flags Emulation =============================== One of my source files needs to be compiled with different flags. How - do I do? + do I do that? Automake supports per-program and per-library compilation flags (see *note Program and Library Variables:: and *note Flag Variables @@ -3596,14 +3792,14 @@ ‘foo-foo.o’, ‘foo-bar.o’, and ‘foo-main.o’ will all be compiled with ‘-some -flags’. (If you wonder about the names of these object files, see *note Renamed Objects::.) Note that ‘foo_CFLAGS’ gives the flags to -use when compiling all the C sources of the _program_ ‘foo’, it has +use when compiling all the C sources of the _program_ ‘foo’; it has nothing to do with ‘foo.c’ or ‘foo-foo.o’ specifically. What if ‘foo.c’ needs to be compiled into ‘foo.o’ using some specific flags, that none of the other files requires? Obviously per-program flags are not directly applicable here. Something like per-object flags are expected, i.e., flags that would be used only when creating -‘foo-foo.o’. Automake does not support that, however this is easy to +‘foo-foo.o’. Automake does not support that; however this is easy to simulate using a library that contains only that object, and compiling this library with per-library flags. @@ -3640,7 +3836,7 @@  File: automake.info, Node: Multiple Outputs, Next: Hard-Coded Install Paths, Prev: Per-Object Flags, Up: FAQ -27.9 Handling Tools that Produce Many Outputs +26.9 Handling Tools that Produce Many Outputs ============================================= This section describes a ‘make’ idiom that can be used when a tool @@ -3657,9 +3853,9 @@ data.c data.h: data.foo foo data.foo -What the above rule really says is that ‘data.c’ and ‘data.h’ each -depend on ‘data.foo’, and can each be built by running ‘foo data.foo’. -In other words it is equivalent to: +What the above rule says is that ‘data.c’ and ‘data.h’ each depend on +‘data.foo’, and can each be built by running ‘foo data.foo’. In other +words it is equivalent to: # We do not want this. data.c: data.foo @@ -3726,11 +3922,24 @@ foo data.foo data.h: data.c ## Recover from the removal of $@ + @test -f $@ || rm -f data.c + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) data.c + + It is tempting to use a single test as follows: + + data.h: data.c + ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f data.c; \ $(MAKE) $(AM_MAKEFLAGS) data.c; \ fi +but that would break ‘make -n’: at least GNU ‘make’ and Solaris ‘make’ +execute recipes containing the ‘$(MAKE)’ string even when they are +running in dry mode. So if we didn’t break the recipe above in two +invocations, the file ‘data.c’ would be removed even upon ‘make -n’. +Not nice. + The above scheme can be extended to handle more outputs and more inputs. One of the outputs is selected to serve as a witness to the successful completion of the command, it depends upon all inputs, and @@ -3742,10 +3951,8 @@ foo data.foo data.bar data.h data.w data.x: data.c ## Recover from the removal of $@ - @if test -f $@; then :; else \ - rm -f data.c; \ - $(MAKE) $(AM_MAKEFLAGS) data.c; \ - fi + @test -f $@ || rm -f data.c + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) data.c However there are now three minor problems in this setup. One is related to the timestamp ordering of ‘data.h’, ‘data.w’, ‘data.x’, and @@ -3761,23 +3968,20 @@ ‘data.h’ is created before ‘data.c’. Then we have a weird situation. The next time ‘make’ is run, ‘data.h’ will appear older than ‘data.c’, the second rule will be triggered, a shell will be started to execute -the ‘if...fi’ command, but actually it will just execute the ‘then’ -branch, that is: nothing. In other words, because the witness we -selected is not the first file created by ‘foo’, ‘make’ will start a -shell to do nothing each time it is run. +the ‘if...fi’ command, but it will just execute the ‘then’ branch, that +is: nothing. In other words, because the witness we selected is not the +first file created by ‘foo’, ‘make’ will start a shell to do nothing +each time it is run. A simple riposte is to fix the timestamps when this happens. data.c: data.foo data.bar foo data.foo data.bar data.h data.w data.x: data.c - @if test -f $@; then \ - touch $@; \ - else \ + @test ! -f $@ || touch $@ ## Recover from the removal of $@ - rm -f data.c; \ - $(MAKE) $(AM_MAKEFLAGS) data.c; \ - fi + @test -f $@ || rm -f data.c + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) data.c Another solution is to use a different and dedicated file as witness, rather than using any of ‘foo’’s outputs. @@ -3789,10 +3993,8 @@ @mv -f data.tmp $@ data.c data.h data.w data.x: data.stamp ## Recover from the removal of $@ - @if test -f $@; then :; else \ - rm -f data.stamp; \ - $(MAKE) $(AM_MAKEFLAGS) data.stamp; \ - fi + @test -f $@ || rm -f data.stamp + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) data.stamp ‘data.tmp’ is created before ‘foo’ is run, so it has a timestamp older than output files output by ‘foo’. It is then renamed to @@ -3923,7 +4125,7 @@  File: automake.info, Node: Hard-Coded Install Paths, Next: Debugging Make Rules, Prev: Multiple Outputs, Up: FAQ -27.10 Installing to Hard-Coded Locations +26.10 Installing to Hard-Coded Locations ======================================== My package needs to install some configuration file. I tried to use @@ -3936,15 +4138,15 @@ My package needs to populate the installation directory of another package at install-time. I can easily compute that installation directory in ‘configure’, but if I install files therein, - ‘make distcheck’ fails. How else should I do? + ‘make distcheck’ fails. How else should I do it? These two setups share their symptoms: ‘make distcheck’ fails because -they are installing files to hard-coded paths. In the later case the -path is not really hard-coded in the package, but we can consider it to -be hard-coded in the system (or in whichever tool that supplies the -path). As long as the path does not use any of the standard directory -variables (‘$(prefix)’, ‘$(bindir)’, ‘$(datadir)’, etc.), the effect -will be the same: user-installations are impossible. +they are installing files to hard-coded paths. In the latter case the +path is not hard-coded in the package, but we can consider it to be +hard-coded in the system (or in whichever tool that supplies the path). +As long as the path does not use any of the standard directory variables +(‘$(prefix)’, ‘$(bindir)’, ‘$(datadir)’, etc.), the effect will be the +same: user-installations are impossible. As a (non-root) user who wants to install a package, you usually have no right to install anything in ‘/usr’ or ‘/usr/local’. So you do @@ -3963,7 +4165,7 @@ sysconf_DATA = afile -by default ‘sysconfdir’ will be ‘$(prefix)/etc’, because this is what +By default ‘sysconfdir’ will be ‘$(prefix)/etc’, because this is what the GNU Standards require. When such a package is installed on an FHS compliant system, the installer will have to set ‘--sysconfdir=/etc’. As the maintainer of the package you should not be concerned by such @@ -3981,11 +4183,11 @@ /usr/lib/python2.5/site-packages If you indeed use this absolute path to install your shared library, -non-root users will not be able to install the package, hence distcheck +non-root users will not be able to install the package; hence distcheck fails. - Let’s do better. The ‘sysconfig.get_python_lib()’ function actually -accepts a third argument that will replace Python’s installation prefix. + Let’s do better. The ‘sysconfig.get_python_lib()’ function accepts a +third argument that will replace Python’s installation prefix. % python -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1,0,"${exec_prefix}")' @@ -3995,20 +4197,21 @@ • root users can install your package with the same ‘--prefix’ as Python (you get the behavior of the previous attempt) - • non-root users can install your package too, they will have the + • non-root users can install your package too; they will have the extension module in a place that is not searched by Python but they can work around this using environment variables (and if you installed scripts that use this shared library, it’s easy to tell - Python were to look in the beginning of your script, so the script + Python where to look in the beginning of your script, so the script works in both cases). The ‘AM_PATH_PYTHON’ macro uses similar commands to define ‘$(pythondir)’ and ‘$(pyexecdir)’ (*note Python::). Of course not all tools are as advanced as Python regarding that -substitution of PREFIX. So another strategy is to figure the part of -the installation directory that must be preserved. For instance, here -is how ‘AM_PATH_LISPDIR’ (*note Emacs Lisp::) computes ‘$(lispdir)’: +substitution of PREFIX. So another strategy is to figure out the part +of the installation directory that must be preserved. For instance, +here is how ‘AM_PATH_LISPDIR’ (*note Emacs Lisp::) computes +‘$(lispdir)’: $EMACS -batch -Q -eval '(while load-path (princ (concat (car load-path) "\n")) @@ -4023,19 +4226,19 @@ }' conftest.out` - I.e., it just picks the first directory that looks like + That is, it just picks the first directory that looks like ‘*/lib/*emacs/site-lisp’ or ‘*/share/*emacs/site-lisp’ in the search path of emacs, and then substitutes ‘${libdir}’ or ‘${datadir}’ appropriately. The emacs case looks complicated because it processes a list and -expects two possible layouts, otherwise it’s easy, and the benefits for -non-root users are really worth the extra ‘sed’ invocation. +expects two possible layouts; otherwise it’s easy, and the benefits for +non-root users are worth the extra ‘sed’ invocation.  File: automake.info, Node: Debugging Make Rules, Next: Reporting Bugs, Prev: Hard-Coded Install Paths, Up: FAQ -27.11 Debugging Make Rules +26.11 Debugging Make Rules ========================== The rules and dependency trees generated by ‘automake’ can get rather @@ -4047,27 +4250,30 @@ • If less verbose output has been enabled in the package with the use of silent rules (*note Automake Silent Rules::), you can use ‘make V=1’ to see the commands being executed. + • ‘make -n’ can help show what would be done without actually doing - it. Note however, that this will _still execute_ commands prefixed - with ‘+’, and, when using GNU ‘make’, commands that contain the - strings ‘$(MAKE)’ or ‘${MAKE}’ (*note (make)Instead of - Execution::). Typically, this is helpful to show what recursive - rules would do, but it means that, in your own rules, you should - not mix such recursion with actions that change any files.(1) - Furthermore, note that GNU ‘make’ will update prerequisites for the - ‘Makefile’ file itself even with ‘-n’ (*note (make)Remaking - Makefiles::). + it. However, this _still executes_ commands prefixed with ‘+’, + and, when using GNU ‘make’, commands that contain the strings + ‘$(MAKE)’ or ‘${MAKE}’ (*note (make)Instead of Execution::). + Typically, this is helpful to show what recursive rules would do, + but it means that, in your own rules, you should not mix such + recursion with actions that change any files.(1) Furthermore, note + that GNU ‘make’ will update prerequisites for the ‘Makefile’ file + itself even with ‘-n’ (*note (make)Remaking Makefiles::). + • ‘make SHELL="/bin/bash -vx"’ can help debug complex rules. *Note (autoconf)The Make Macro SHELL::, for some portability quirks associated with this construct. + • ‘echo 'print: ; @echo "$(VAR)"' | make -f Makefile -f - print’ can be handy to examine the expanded value of variables. You may need to use a target other than ‘print’ if that is already used or a file with that name exists. + • provides a modified GNU ‘make’ command called ‘remake’ that copes with complex GNU - ‘make’-specific Makefiles and allows to trace execution, examine - variables, and call rules interactively, much like a debugger. + ‘make’-specific Makefiles and allows tracing execution, examining + variables, and calling rules interactively, much like a debugger. ---------- Footnotes ---------- @@ -4078,42 +4284,37 @@  File: automake.info, Node: Reporting Bugs, Prev: Debugging Make Rules, Up: FAQ -27.12 Reporting Bugs +26.12 Reporting Bugs ==================== -Most nontrivial software has bugs. Automake is no exception. Although -we cannot promise we can or will fix a bug, and we might not even agree -that it is a bug, we want to hear about problems you encounter. Often -we agree they are bugs and want to fix them. - - To make it possible for us to fix a bug, please report it. In order -to do so effectively, it helps to know when and how to do it. - - Before reporting a bug, it is a good idea to see if it is already -known. You can look at the GNU Bug Tracker (https://debbugs.gnu.org/) -and the bug-automake mailing list archives +Most nontrivial software has bugs. Automake is no exception. We cannot +promise we can or will fix a bug, and we might not even agree that it is +a bug, but we want to hear about problems you encounter. Often we agree +they are bugs and want to fix them. + + So, to make it possible for us to fix a bug, please report it. If +you can, though, it is helpful if you check if it is already known. You +can look at the GNU Bug Tracker (https://debbugs.gnu.org/) and the +bug-automake mailing list archives (https://lists.gnu.org/archive/html/bug-automake/) for previous bug -reports. We previously used a Gnats database -(http://sourceware.org/cgi-bin/gnatsweb.pl?database=automake) for bug -tracking, so some bugs might have been reported there already. Please -do not use it for new bug reports, however. - - If the bug is not already known, it should be reported. It is very -important to report bugs in a way that is useful and efficient. For -this, please familiarize yourself with How to Report Bugs Effectively -(http://www.chiark.greenend.org.uk/~sgtatham/bugs.html) and How to Ask +reports. (We previously used a Gnats database for bug tracking, but it +is no longer online.) + + If the bug is not already known, it should be reported. To report +bugs in a way that is useful and efficient, please read How to Report +Bugs Effectively +(https://www.chiark.greenend.org.uk/~sgtatham/bugs.html) and How to Ask Questions the Smart Way -(http://catb.org/~esr/faqs/smart-questions.html). This helps you and -developers to save time which can then be spent on fixing more bugs and -implementing more features. +(http://catb.org/~esr/faqs/smart-questions.html). Good bug reports save +time for everyone. For a bug report, a feature request or other suggestions, please send email to . This will then open a new bug in the bug tracker (https://debbugs.gnu.org/automake). Be sure to include the -versions of Autoconf and Automake that you use. Ideally, post a minimal -‘Makefile.am’ and ‘configure.ac’ that reproduces the problem you -encounter. If you have encountered test suite failures, please attach -the ‘test-suite.log’ file. +versions of Autoconf and Automake that you use and the kind of system +you’re on. Ideally, post a minimal ‘Makefile.am’ and ‘configure.ac’ +that reproduces the problem you encounter. If you have encountered test +suite failures, please attach the ‘test-suite.log’ file.  File: automake.info, Node: Copying This Manual, Next: Indices, Prev: FAQ, Up: Top @@ -4133,8 +4334,8 @@ Version 1.3, 3 November 2008 - Copyright © 2000-2018 Free Software Foundation, Inc. - + Copyright © 2000–2021 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -4277,7 +4478,7 @@ have printed covers) of the Document, numbering more than 100, and the Document’s license notice requires Cover Texts, you must enclose the copies in covers that carry, clearly and legibly, all - of these Cover Texts: Front-Cover Texts on the front cover, and + these Cover Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on the back cover. Both covers must also clearly and legibly identify you as the publisher of these copies. The front cover must present the full title with all words of the title @@ -4531,7 +4732,7 @@ the GNU Free Documentation License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. See - . + . Each version of the License is given a distinguishing version number. If the Document specifies that a particular numbered @@ -4635,75 +4836,78 @@ * AC_CONFIG_AUX_DIR: Optional. (line 19) * AC_CONFIG_AUX_DIR <1>: Subpackages. (line 6) * AC_CONFIG_FILES: Requirements. (line 15) -* AC_CONFIG_HEADERS: Optional. (line 44) -* AC_CONFIG_LIBOBJ_DIR: Optional. (line 40) +* AC_CONFIG_FILES <1>: Basics of Distribution. + (line 26) +* AC_CONFIG_HEADERS: Optional. (line 50) +* AC_CONFIG_LIBOBJ_DIR: Optional. (line 46) * AC_CONFIG_LIBOBJ_DIR <1>: LIBOBJS. (line 51) -* AC_CONFIG_LINKS: Optional. (line 55) +* AC_CONFIG_LINKS: Optional. (line 62) * AC_CONFIG_SUBDIRS: Subpackages. (line 6) +* AC_CONFIG_SUBDIRS <1>: The dist Hook. (line 49) * AC_DEFUN: Extending aclocal. (line 36) -* AC_F77_LIBRARY_LDFLAGS: Optional. (line 101) -* AC_FC_SRCEXT: Optional. (line 107) +* AC_F77_LIBRARY_LDFLAGS: Optional. (line 108) +* AC_FC_SRCEXT: Optional. (line 114) * AC_INIT: Public Macros. (line 15) -* AC_LIBOBJ: Optional. (line 65) +* AC_LIBOBJ: Optional. (line 72) * AC_LIBOBJ <1>: LTLIBOBJS. (line 6) * AC_LIBOBJ <2>: LIBOBJS. (line 11) -* AC_LIBSOURCE: Optional. (line 66) +* AC_LIBSOURCE: Optional. (line 73) * AC_LIBSOURCE <1>: LIBOBJS. (line 17) -* AC_LIBSOURCES: Optional. (line 67) +* AC_LIBSOURCES: Optional. (line 74) * AC_OUTPUT: Requirements. (line 15) * AC_PREREQ: Extending aclocal. (line 36) -* AC_PROG_CXX: Optional. (line 85) -* AC_PROG_F77: Optional. (line 97) -* AC_PROG_FC: Optional. (line 112) -* AC_PROG_LEX: Public Macros. (line 95) -* AC_PROG_LEX <1>: Optional. (line 127) -* AC_PROG_LIBTOOL: Optional. (line 117) -* AC_PROG_OBJC: Optional. (line 89) -* AC_PROG_OBJCXX: Optional. (line 93) -* AC_PROG_RANLIB: Optional. (line 81) -* AC_PROG_YACC: Optional. (line 121) -* AC_REQUIRE_AUX_FILE: Optional. (line 131) -* AC_SUBST: Optional. (line 139) -* AM_CONDITIONAL: Optional. (line 152) +* AC_PROG_CXX: Optional. (line 92) +* AC_PROG_F77: Optional. (line 104) +* AC_PROG_FC: Optional. (line 119) +* AC_PROG_LEX: Public Macros. (line 94) +* AC_PROG_LEX <1>: Optional. (line 134) +* AC_PROG_LIBTOOL: Optional. (line 124) +* AC_PROG_OBJC: Optional. (line 96) +* AC_PROG_OBJCXX: Optional. (line 100) +* AC_PROG_RANLIB: Optional. (line 88) +* AC_PROG_YACC: Optional. (line 128) +* AC_REQUIRE_AUX_FILE: Optional. (line 138) +* AC_SUBST: Optional. (line 146) +* AM_CONDITIONAL: Optional. (line 159) * AM_CONDITIONAL <1>: Usage of Conditionals. (line 6) * AM_CONDITIONAL <2>: Usage of Conditionals. (line 9) -* AM_COND_IF: Optional. (line 155) +* AM_COND_IF: Optional. (line 162) * AM_COND_IF <1>: Usage of Conditionals. (line 66) * AM_COND_IF <2>: Usage of Conditionals. (line 70) * AM_DEP_TRACK: Private Macros. (line 14) -* AM_GNU_GETTEXT: Optional. (line 161) -* AM_GNU_GETTEXT_INTL_SUBDIR: Optional. (line 167) +* AM_GNU_GETTEXT: Optional. (line 168) +* AM_GNU_GETTEXT_INTL_SUBDIR: Optional. (line 174) * AM_INIT_AUTOMAKE: Requirements. (line 6) * AM_INIT_AUTOMAKE <1>: Public Macros. (line 7) * AM_MAINTAINER_MODE: Rebuilding. (line 9) -* AM_MAINTAINER_MODE <1>: maintainer-mode. (line 37) -* AM_MAINTAINER_MODE([DEFAULT-MODE]): Optional. (line 172) +* AM_MAINTAINER_MODE <1>: maintainer-mode. (line 38) +* AM_MAINTAINER_MODE([DEFAULT-MODE]): Optional. (line 179) * AM_MAKE_INCLUDE: Private Macros. (line 20) -* AM_MISSING_PROG: Public Macros. (line 111) +* AM_MISSING_PROG: Public Macros. (line 110) * AM_OUTPUT_DEPENDENCY_COMMANDS: Private Macros. (line 15) -* AM_PATH_LISPDIR: Public Macros. (line 61) +* AM_PATH_LISPDIR: Public Macros. (line 60) * AM_PATH_PYTHON: Python. (line 28) -* AM_PROG_AR: Public Macros. (line 76) -* AM_PROG_AS: Public Macros. (line 83) -* AM_PROG_CC_C_O: Public Macros. (line 88) -* AM_PROG_GCJ: Public Macros. (line 100) +* AM_PROG_AR: Public Macros. (line 75) +* AM_PROG_AS: Public Macros. (line 82) +* AM_PROG_CC_C_O: Public Macros. (line 87) +* AM_PROG_GCJ: Public Macros. (line 99) * AM_PROG_INSTALL_STRIP: Private Macros. (line 25) -* AM_PROG_LEX: Public Macros. (line 95) +* AM_PROG_LEX: Public Macros. (line 94) * AM_PROG_MKDIR_P: Obsolete Macros. (line 14) -* AM_PROG_UPC: Public Macros. (line 105) +* AM_PROG_UPC: Public Macros. (line 104) * AM_PROG_VALAC: Vala Support. (line 20) * AM_SANITY_CHECK: Private Macros. (line 30) * AM_SET_DEPDIR: Private Macros. (line 13) -* AM_SILENT_RULES: Public Macros. (line 119) -* AM_SUBST_NOTMAKE(VAR): Optional. (line 180) -* AM_WITH_DMALLOC: Public Macros. (line 123) +* AM_SILENT_RULES: Public Macros. (line 118) +* AM_SUBST_NOTMAKE(VAR): Optional. (line 187) +* AM_WITH_DMALLOC: Public Macros. (line 122) * m4_include: Basics of Distribution. - (line 17) -* m4_include <1>: Optional. (line 190) + (line 30) +* m4_include <1>: Optional. (line 197)  File: automake.info, Node: Variable Index, Next: General Index, Prev: Macro Index, Up: Indices @@ -4745,7 +4949,7 @@ * AM_CCASFLAGS: Assembly Support. (line 10) * AM_CFLAGS: Program Variables. (line 50) * AM_COLOR_TESTS: Scripts-based Testsuites. - (line 67) + (line 85) * AM_CPPFLAGS: Program Variables. (line 16) * AM_CPPFLAGS <1>: Assembly Support. (line 10) * AM_CXXFLAGS: C++ Support. (line 22) @@ -4755,8 +4959,8 @@ * AM_DEFAULT_VERBOSITY: Automake Silent Rules. (line 120) * AM_DISTCHECK_CONFIGURE_FLAGS: Checking the Distribution. - (line 28) -* AM_ETAGSFLAGS: Tags. (line 25) + (line 30) +* AM_ETAGSFLAGS: Tags. (line 27) * AM_EXT_LOG_DRIVER_FLAGS: Declaring Custom Test Drivers. (line 6) * AM_EXT_LOG_FLAGS: Parallel Test Harness. @@ -4766,11 +4970,11 @@ * AM_GCJFLAGS: Java Support with gcj. (line 26) * AM_INSTALLCHECK_STD_OPTIONS_EXEMPT: List of Automake options. - (line 135) + (line 150) * AM_JAVACFLAGS: Java. (line 44) * AM_LDFLAGS: Linking. (line 10) * AM_LDFLAGS <1>: Program Variables. (line 59) -* AM_LFLAGS: Yacc and Lex. (line 60) +* AM_LFLAGS: Yacc and Lex. (line 65) * AM_LIBTOOLFLAGS: Libtool Flags. (line 6) * AM_LOG_DRIVER_FLAGS: Declaring Custom Test Drivers. (line 6) @@ -4784,25 +4988,27 @@ (line 22) * AM_RFLAGS: Fortran 77 Support. (line 28) * AM_RUNTESTFLAGS: DejaGnu Tests. (line 24) -* AM_TESTS_ENVIRONMENT: Scripts-based Testsuites. - (line 86) -* AM_TESTS_FD_REDIRECT: Scripts-based Testsuites. - (line 94) +* AM_TESTSUITE_SUMMARY_HEADER: Scripts-based Testsuites. + (line 69) +* AM_TESTS_ENVIRONMENT: Testsuite Environment Overrides. + (line 6) +* AM_TESTS_FD_REDIRECT: Testsuite Environment Overrides. + (line 14) * AM_UPCFLAGS: Unified Parallel C Support. (line 21) * AM_UPDATE_INFO_DIR: Texinfo. (line 92) * AM_V: Automake Silent Rules. (line 120) -* AM_VALAFLAGS: Vala Support. (line 41) +* AM_VALAFLAGS: Vala Support. (line 44) * AM_V_at: Automake Silent Rules. (line 120) * AM_V_GEN: Automake Silent Rules. (line 120) * AM_YFLAGS: Yacc and Lex. (line 37) -* AR: Public Macros. (line 76) +* AR: Public Macros. (line 75) * AUTOCONF: automake Invocation. (line 28) * AUTOM4TE: aclocal Invocation. (line 44) -* AUTOMAKE_JOBS: automake Invocation. (line 178) +* AUTOMAKE_JOBS: automake Invocation. (line 195) * AUTOMAKE_LIBDIR: automake Invocation. (line 64) * AUTOMAKE_OPTIONS: Public Macros. (line 10) * AUTOMAKE_OPTIONS <1>: Dependencies. (line 34) @@ -4812,12 +5018,14 @@ * bin_SCRIPTS: Scripts. (line 18) * build_triplet: Optional. (line 14) * BUILT_SOURCES: Sources. (line 27) +* BUILT_SOURCES, and dist target: List of Automake options. + (line 81) * BZIP2: The Types of Distributions. - (line 13) + (line 17) * CC: Program Variables. (line 12) -* CCAS: Public Macros. (line 83) +* CCAS: Public Macros. (line 82) * CCAS <1>: Assembly Support. (line 10) -* CCASFLAGS: Public Macros. (line 83) +* CCASFLAGS: Public Macros. (line 82) * CCASFLAGS <1>: Assembly Support. (line 10) * CFLAGS: Program Variables. (line 12) * check_: Uniform. (line 95) @@ -4825,6 +5033,8 @@ (line 6) * check_PROGRAMS: Program Sources. (line 6) * check_PROGRAMS <1>: Default _SOURCES. (line 28) +* check_PROGRAMS <2>: Scripts-based Testsuites. + (line 111) * check_SCRIPTS: Scripts. (line 18) * CLASSPATH_ENV: Java. (line 53) * CLEANFILES: Clean. (line 13) @@ -4833,6 +5043,12 @@ * CONFIG_STATUS_DEPENDENCIES: Rebuilding. (line 12) * CPPFLAGS: Program Variables. (line 12) * CPPFLAGS <1>: Assembly Support. (line 10) +* CSCOPE: Tags. (line 57) +* CSCOPEFLAGS: Tags. (line 57) +* CSCOPE_ARGS: Tags. (line 57) +* CTAGS: Tags. (line 43) +* CTAGSFLAGS: Tags. (line 43) +* CTAGS_ARGS: Tags. (line 43) * CXX: C++ Support. (line 16) * CXXCOMPILE: C++ Support. (line 25) * CXXFLAGS: C++ Support. (line 19) @@ -4849,20 +5065,20 @@ * DISABLE_HARD_ERRORS: Scripts-based Testsuites. (line 32) * DISTCHECK_CONFIGURE_FLAGS: Checking the Distribution. - (line 28) + (line 30) * distcleancheck_listfiles: Checking the Distribution. - (line 70) + (line 92) * distcleancheck_listfiles <1>: Errors with distclean. (line 112) * DISTCLEANFILES: Clean. (line 13) * DISTCLEANFILES <1>: Checking the Distribution. - (line 70) -* distdir: The dist Hook. (line 33) + (line 92) +* distdir: The dist Hook. (line 34) * distdir <1>: Third-Party Makefiles. (line 25) * distuninstallcheck_listfiles: Checking the Distribution. - (line 106) -* dist_: Alternative. (line 29) + (line 128) +* dist_: Alternative. (line 28) * dist_ <1>: Fine-grained Distribution Control. (line 6) * dist_lisp_LISP: Emacs Lisp. (line 11) @@ -4870,19 +5086,22 @@ * DIST_SUBDIRS: Subdirectories with AM_CONDITIONAL. (line 25) * DIST_SUBDIRS <1>: Basics of Distribution. - (line 47) + (line 73) * DVIPS: Texinfo. (line 141) -* EMACS: Public Macros. (line 61) -* ETAGSFLAGS: Tags. (line 25) -* ETAGS_ARGS: Tags. (line 25) +* EMACS: Public Macros. (line 60) +* EMPTY_AUTOMAKE_TARGETS: Third-Party Makefiles. + (line 88) +* ETAGS: Tags. (line 27) +* ETAGSFLAGS: Tags. (line 27) +* ETAGS_ARGS: Tags. (line 27) * EXPECT: DejaGnu Tests. (line 19) * EXTRA_DIST: Basics of Distribution. - (line 34) + (line 60) * EXTRA_maude_DEPENDENCIES: Linking. (line 41) * EXTRA_maude_DEPENDENCIES <1>: Program and Library Variables. - (line 119) + (line 129) * EXTRA_maude_SOURCES: Program and Library Variables. - (line 53) + (line 60) * EXTRA_PROGRAMS: Conditional Programs. (line 15) * EXT_LOG_COMPILE: Parallel Test Harness. @@ -4909,15 +5128,15 @@ * FLIBS: Mixing Fortran 77 With C and C++. (line 21) * FLINK: Fortran 77 Support. (line 35) -* GCJ: Public Macros. (line 100) -* GCJFLAGS: Public Macros. (line 100) +* GCJ: Public Macros. (line 99) +* GCJFLAGS: Public Macros. (line 99) * GCJFLAGS <1>: Java Support with gcj. (line 16) * GCJLINK: How the Linker is Chosen. (line 10) -* GTAGS_ARGS: Tags. (line 60) -* GZIP_ENV: Basics of Distribution. - (line 14) +* GTAGS_ARGS: Tags. (line 62) +* GZIP_ENV: The Types of Distributions. + (line 10) * HEADERS: Uniform. (line 101) * host_triplet: Optional. (line 14) * INCLUDES: Program Variables. (line 44) @@ -4929,10 +5148,10 @@ * JAVAROOT: Java. (line 49) * LDADD: Linking. (line 10) * LDFLAGS: Program Variables. (line 12) -* LFLAGS: Yacc and Lex. (line 60) +* LFLAGS: Yacc and Lex. (line 65) * libexec_PROGRAMS: Program Sources. (line 6) * libexec_SCRIPTS: Scripts. (line 18) -* LIBOBJS: Optional. (line 68) +* LIBOBJS: Optional. (line 75) * LIBOBJS <1>: LTLIBOBJS. (line 6) * LIBOBJS <2>: LIBOBJS. (line 6) * LIBRARIES: Uniform. (line 101) @@ -4944,7 +5163,7 @@ * LINK <1>: How the Linker is Chosen. (line 17) * LISP: Uniform. (line 101) -* lispdir: Public Macros. (line 61) +* lispdir: Public Macros. (line 60) * lisp_LISP: Emacs Lisp. (line 6) * localstate_DATA: Data. (line 9) * LOG_COMPILE: Parallel Test Harness. @@ -4962,6 +5181,8 @@ * LTLIBOBJS: LTLIBOBJS. (line 6) * LTLIBOBJS <1>: LIBOBJS. (line 6) * LTLIBRARIES: Uniform. (line 101) +* LZIP_OPT: The Types of Distributions. + (line 23) * MAINTAINERCLEANFILES: Clean. (line 13) * MAKE: Subdirectories. (line 29) * MAKEINFO: Texinfo. (line 99) @@ -4970,58 +5191,58 @@ * MANS: Uniform. (line 101) * man_MANS: Man Pages. (line 6) * maude_AR: Program and Library Variables. - (line 68) + (line 76) * maude_CCASFLAGS: Program and Library Variables. - (line 170) + (line 183) * maude_CFLAGS: Program and Library Variables. - (line 171) + (line 184) * maude_CPPFLAGS: Program and Library Variables. - (line 172) + (line 185) * maude_CXXFLAGS: Program and Library Variables. - (line 173) + (line 186) * maude_DEPENDENCIES: Linking. (line 41) * maude_DEPENDENCIES <1>: Program and Library Variables. - (line 118) + (line 128) * maude_FFLAGS: Program and Library Variables. - (line 174) + (line 187) * maude_GCJFLAGS: Program and Library Variables. - (line 175) + (line 188) * maude_LDADD: Linking. (line 17) * maude_LDADD <1>: Program and Library Variables. - (line 86) + (line 94) * maude_LDFLAGS: Linking. (line 37) * maude_LDFLAGS <1>: Program and Library Variables. - (line 106) + (line 114) * maude_LFLAGS: Program and Library Variables. - (line 176) + (line 189) * maude_LIBADD: A Library. (line 26) * maude_LIBADD <1>: Program and Library Variables. - (line 78) + (line 86) * maude_LIBTOOLFLAGS: Libtool Flags. (line 6) * maude_LIBTOOLFLAGS <1>: Program and Library Variables. - (line 111) + (line 121) * maude_LINK: Program and Library Variables. - (line 154) + (line 164) * maude_OBJCFLAGS: Program and Library Variables. - (line 177) + (line 190) * maude_OBJCXXFLAGS: Program and Library Variables. - (line 178) + (line 191) * maude_RFLAGS: Program and Library Variables. - (line 179) + (line 192) * maude_SHORTNAME: Program and Library Variables. - (line 210) + (line 223) * maude_SOURCES: Program and Library Variables. (line 18) * maude_UPCFLAGS: Program and Library Variables. - (line 180) + (line 193) * maude_YFLAGS: Program and Library Variables. - (line 181) -* MISSING: Public Macros. (line 111) + (line 194) +* MISSING: Public Macros. (line 110) * MKDIR_P: Obsolete Macros. (line 14) * mkdir_p: Obsolete Macros. (line 14) * MOSTLYCLEANFILES: Clean. (line 13) -* nobase_: Alternative. (line 23) -* nodist_: Alternative. (line 29) +* nobase_: Alternative. (line 22) +* nodist_: Alternative. (line 28) * nodist_ <1>: Fine-grained Distribution Control. (line 6) * noinst_: Uniform. (line 90) @@ -5064,20 +5285,20 @@ * pkglibexec_SCRIPTS: Scripts. (line 18) * pkglib_LIBRARIES: A Library. (line 6) * pkglib_LTLIBRARIES: Libtool Libraries. (line 6) -* pkgpyexecdir: Python. (line 105) -* pkgpythondir: Python. (line 91) +* pkgpyexecdir: Python. (line 109) +* pkgpythondir: Python. (line 95) * PROGRAMS: Uniform. (line 17) * PROGRAMS <1>: Uniform. (line 101) -* pyexecdir: Python. (line 96) +* pyexecdir: Python. (line 100) * PYTHON: Uniform. (line 101) * PYTHON <1>: Python. (line 56) -* pythondir: Python. (line 87) -* PYTHON_EXEC_PREFIX: Python. (line 77) -* PYTHON_PLATFORM: Python. (line 82) +* pythondir: Python. (line 91) +* PYTHON_EXEC_PREFIX: Python. (line 73) +* PYTHON_PLATFORM: Python. (line 86) * PYTHON_PREFIX: Python. (line 72) * PYTHON_VERSION: Python. (line 68) * RECHECK_LOGS: Parallel Test Harness. - (line 118) + (line 127) * RFLAGS: Fortran 77 Support. (line 25) * RUNTEST: DejaGnu Tests. (line 19) * RUNTESTDEFAULTFLAGS: DejaGnu Tests. (line 14) @@ -5091,17 +5312,23 @@ * SOURCES <1>: Default _SOURCES. (line 6) * SUBDIRS: Subdirectories. (line 8) * SUBDIRS <1>: Basics of Distribution. - (line 47) + (line 73) * SUFFIXES: Suffixes. (line 6) +* sys.exec_prefix Python variable: Python. (line 74) +* sys.platform Python variable: Python. (line 87) +* sys.prefix Python variable: Python. (line 74) +* sys.version_info Python variable: Python. (line 69) * sysconf_DATA: Data. (line 9) -* TAGS_DEPENDENCIES: Tags. (line 35) +* TAGS_DEPENDENCIES: Tags. (line 37) +* TAR: Basics of Distribution. + (line 16) * target_triplet: Optional. (line 14) * TESTS: Scripts-based Testsuites. - (line 86) + (line 104) * TESTS <1>: Parallel Test Harness. (line 12) -* TESTS_ENVIRONMENT: Scripts-based Testsuites. - (line 86) +* TESTS_ENVIRONMENT: Testsuite Environment Overrides. + (line 6) * TEST_EXTENSIONS: Parallel Test Harness. (line 34) * TEST_LOGS: Parallel Test Harness. @@ -5113,10 +5340,10 @@ * TEXINFOS: Uniform. (line 101) * TEXINFOS <1>: Texinfo. (line 65) * TEXINFO_TEX: Texinfo. (line 145) -* top_distdir: The dist Hook. (line 33) +* top_distdir: The dist Hook. (line 34) * top_distdir <1>: Third-Party Makefiles. (line 25) -* UPC: Public Macros. (line 105) +* UPC: Public Macros. (line 104) * UPC <1>: Unified Parallel C Support. (line 15) * UPCCOMPILE: Unified Parallel C Support. @@ -5129,21 +5356,25 @@ (line 16) * V: Automake Silent Rules. (line 88) -* VALAC: Vala Support. (line 34) -* VALAFLAGS: Vala Support. (line 38) +* VALAC: Vala Support. (line 37) +* VALAFLAGS: Vala Support. (line 41) * VERBOSE: Parallel Test Harness. (line 26) * VERSION: Basics of Distribution. (line 6) -* WARNINGS: automake Invocation. (line 171) +* WARNINGS: automake Invocation. (line 187) * WARNINGS <1>: aclocal Options. (line 95) -* WITH_DMALLOC: Public Macros. (line 123) +* WITH_DMALLOC: Public Macros. (line 122) * XFAIL_TESTS: Scripts-based Testsuites. (line 32) * XZ_OPT: The Types of Distributions. - (line 24) -* YACC: Optional. (line 122) + (line 30) +* YACC: Optional. (line 129) * YFLAGS: Yacc and Lex. (line 37) +* ZSTD_CLEVEL: The Types of Distributions. + (line 41) +* ZSTD_OPT: The Types of Distributions. + (line 41)  File: automake.info, Node: General Index, Prev: Variable Index, Up: Indices @@ -5159,33 +5390,34 @@ * $(LIBOBJS) and empty libraries: LIBOBJS. (line 72) * +=: General Operation. (line 24) * --add-missing: automake Invocation. (line 41) +* --always-make GNU Make option: Rebuilding. (line 77) * --automake-acdir: aclocal Options. (line 9) * --build=BUILD: Cross-Compilation. (line 14) * --copy: automake Invocation. (line 75) * --diff: aclocal Options. (line 22) * --disable-dependency-tracking: Dependency Tracking. (line 33) -* --disable-maintainer-mode: Optional. (line 173) +* --disable-maintainer-mode: Optional. (line 180) * --disable-silent-rules: Automake Silent Rules. (line 85) * --dry-run: aclocal Options. (line 27) * --enable-debug, example: Usage of Conditionals. (line 21) * --enable-dependency-tracking: Dependency Tracking. (line 43) -* --enable-maintainer-mode: Optional. (line 173) +* --enable-maintainer-mode: Optional. (line 180) * --enable-silent-rules: Automake Silent Rules. (line 85) * --force: aclocal Options. (line 49) * --force-missing: automake Invocation. (line 80) -* --foreign: automake Invocation. (line 86) -* --gnits: automake Invocation. (line 90) -* --gnits, complete description: Gnits. (line 29) -* --gnu: automake Invocation. (line 94) -* --gnu, complete description: Gnits. (line 6) -* --gnu, required files: Gnits. (line 6) +* --foreign: Strictness. (line 51) +* --foreign <1>: automake Invocation. (line 86) +* --gnits: Strictness. (line 58) +* --gnits <1>: automake Invocation. (line 90) +* --gnu: Strictness. (line 18) +* --gnu <1>: automake Invocation. (line 94) * --help: automake Invocation. (line 98) * --help <1>: aclocal Options. (line 31) * --help check: List of Automake options. - (line 129) + (line 144) * --help=recursive: Nested Packages. (line 30) * --host=HOST: Cross-Compilation. (line 16) * --include-deps: automake Invocation. (line 106) @@ -5208,10 +5440,13 @@ * --version: automake Invocation. (line 129) * --version <1>: aclocal Options. (line 76) * --version check: List of Automake options. - (line 129) + (line 144) * --warnings: automake Invocation. (line 133) * --warnings <1>: aclocal Options. (line 80) -* --with-dmalloc: Public Macros. (line 123) +* --with-dmalloc: Public Macros. (line 122) +* --with-python-sys-prefix: Python. (line 74) +* --with-python_exec_prefix: Python. (line 74) +* --with-python_prefix: Python. (line 74) * -a: automake Invocation. (line 41) * -c: automake Invocation. (line 74) * -f: automake Invocation. (line 79) @@ -5232,6 +5467,7 @@ * .la suffix, defined: Libtool Concept. (line 6) * .log files: Parallel Test Harness. (line 12) +* .pyc, .pyo files: Python. (line 15) * .trs files: Parallel Test Harness. (line 12) * :copy-in-global-log:: Log files generation and test results recording. @@ -5311,7 +5547,7 @@ (line 20) * AM_LIBTOOLFLAGS and LIBTOOLFLAGS: Flag Variables Ordering. (line 20) -* AM_MAINTAINER_MODE, purpose: maintainer-mode. (line 37) +* AM_MAINTAINER_MODE, purpose: maintainer-mode. (line 38) * AM_OBJCFLAGS and OBJCFLAGS: Flag Variables Ordering. (line 20) * AM_OBJCXXFLAGS and OBJXXCFLAGS: Flag Variables Ordering. @@ -5323,6 +5559,7 @@ * AM_YFLAGS and YFLAGS: Flag Variables Ordering. (line 20) * Append operator: General Operation. (line 24) +* ar-lib: Auxiliary Programs. (line 16) * ARG_MAX: Length Limitations. (line 6) * autogen.sh and autoreconf: Error required file ltmain.sh not found. (line 6) @@ -5332,6 +5569,8 @@ * Automake parser, limitations of: General Operation. (line 33) * Automake requirements: Introduction. (line 26) * Automake requirements <1>: Requirements. (line 6) +* Automake targets, no-op: Third-Party Makefiles. + (line 88) * automake, invocation: automake Invocation. (line 6) * automake, invoking: automake Invocation. (line 6) * Automake, recursive operation: General Operation. (line 58) @@ -5348,13 +5587,15 @@ * autoupdate: Obsolete Macros. (line 6) * Auxiliary programs: Auxiliary Programs. (line 6) * Avoiding man page renaming: Man Pages. (line 54) -* Avoiding path stripping: Alternative. (line 23) +* Avoiding path stripping: Alternative. (line 22) * Binary package: DESTDIR. (line 22) * bootstrap and autoreconf: Error required file ltmain.sh not found. (line 6) -* Bugs, reporting: Introduction. (line 30) +* Bugs, reporting: Reporting Bugs. (line 6) * build tree and source tree: VPATH Builds. (line 6) * BUILT_SOURCES, defined: Sources. (line 27) +* bzip2: The Types of Distributions. + (line 17) * C++ support: C++ Support. (line 6) * canonicalizing Automake variables: Canonicalization. (line 6) * CCASFLAGS and AM_CCASFLAGS: Flag Variables Ordering. @@ -5368,7 +5609,7 @@ * check <2>: Extending. (line 41) * check-local: Extending. (line 41) * check-news: List of Automake options. - (line 14) + (line 15) * check_ primary prefix, definition: Uniform. (line 95) * check_PROGRAMS example: Default _SOURCES. (line 28) * clean: Standard Targets. (line 27) @@ -5376,15 +5617,18 @@ * clean-local: Clean. (line 15) * clean-local <1>: Extending. (line 41) * Colorized testsuite output: Scripts-based Testsuites. - (line 67) + (line 85) * command line length limit: Length Limitations. (line 6) * Comment, special to Automake: General Operation. (line 68) * Compilation of Java to bytecode: Java. (line 6) * Compilation of Java to native code: Java Support with gcj. (line 6) +* compile: Auxiliary Programs. (line 20) * Compile Flag Variables: Flag Variables Ordering. (line 20) * Complete example: Complete. (line 6) +* compress: The Types of Distributions. + (line 57) * Conditional example, --enable-debug: Usage of Conditionals. (line 21) * conditional libtool libraries: Conditional Libtool Libraries. @@ -5396,8 +5640,10 @@ * Conditional SUBDIRS: Conditional Subdirectories. (line 6) * Conditionals: Conditionals. (line 6) -* config.guess: automake Invocation. (line 39) +* config.guess: Auxiliary Programs. (line 30) +* config.guess <1>: automake Invocation. (line 39) * config.site example: config.site. (line 6) +* config.sub: Auxiliary Programs. (line 30) * configuration variables, overriding: Standard Configuration Variables. (line 6) * Configuration, basics: Basic Installation. (line 6) @@ -5416,13 +5662,13 @@ (line 20) * cross-compilation: Cross-Compilation. (line 6) * cross-compilation example: Cross-Compilation. (line 25) -* CVS and generated files: CVS. (line 49) +* CVS and generated files: CVS. (line 50) * CVS and third-party files: CVS. (line 167) -* CVS and timestamps: CVS. (line 28) +* CVS and timestamps: CVS. (line 29) * CXXFLAGS and AM_CXXFLAGS: Flag Variables Ordering. (line 20) * DATA primary, defined: Data. (line 6) -* debug build, example: VPATH Builds. (line 46) +* debug build, example: VPATH Builds. (line 48) * debugging rules: Debugging Make Rules. (line 6) * default source, Libtool modules example: Default _SOURCES. (line 38) @@ -5432,8 +5678,9 @@ * definitions, conflicts: Extending. (line 14) * dejagnu: DejaGnu Tests. (line 19) * dejagnu <1>: List of Automake options. - (line 18) -* depcomp: Dependencies. (line 22) + (line 19) +* depcomp: Auxiliary Programs. (line 40) +* depcomp <1>: Dependencies. (line 22) * dependencies and distributed files: Errors with distclean. (line 6) * Dependency tracking: Dependency Tracking. (line 6) @@ -5448,46 +5695,54 @@ * dist: Standard Targets. (line 35) * dist <1>: Basics of Distribution. (line 6) +* dist-all: The Types of Distributions. + (line 62) * dist-bzip2: The Types of Distributions. - (line 18) + (line 17) * dist-bzip2 <1>: List of Automake options. - (line 22) + (line 23) * dist-bzip2 <2>: List of Automake options. - (line 22) + (line 23) * dist-gzip: The Types of Distributions. - (line 11) + (line 10) * dist-hook: The dist Hook. (line 6) * dist-hook <1>: Extending. (line 66) * dist-lzip: The Types of Distributions. - (line 22) + (line 23) * dist-lzip <1>: List of Automake options. - (line 25) + (line 26) * dist-lzip <2>: List of Automake options. - (line 25) + (line 26) * dist-shar: The Types of Distributions. - (line 45) + (line 51) * dist-shar <1>: List of Automake options. - (line 36) + (line 40) * dist-shar <2>: List of Automake options. - (line 34) + (line 38) * dist-tarZ: The Types of Distributions. - (line 39) + (line 57) * dist-tarZ <1>: List of Automake options. - (line 41) + (line 45) * dist-tarZ <2>: List of Automake options. - (line 39) + (line 43) * dist-xz: The Types of Distributions. (line 30) * dist-xz <1>: List of Automake options. - (line 28) + (line 29) * dist-xz <2>: List of Automake options. - (line 28) + (line 29) * dist-zip: The Types of Distributions. - (line 33) + (line 37) * dist-zip <1>: List of Automake options. - (line 31) + (line 32) * dist-zip <2>: List of Automake options. - (line 31) + (line 32) +* dist-zstd: The Types of Distributions. + (line 41) +* dist-zstd <1>: List of Automake options. + (line 35) +* dist-zstd <2>: List of Automake options. + (line 35) * distcheck: Creating amhello. (line 100) * distcheck <1>: Checking the Distribution. (line 6) @@ -5495,7 +5750,7 @@ (line 10) * distcheck example: Creating amhello. (line 100) * distcheck-hook: Checking the Distribution. - (line 55) + (line 77) * distclean: Standard Targets. (line 29) * distclean <1>: Extending. (line 41) * distclean <2>: Errors with distclean. @@ -5505,7 +5760,7 @@ * distclean-local: Clean. (line 15) * distclean-local <1>: Extending. (line 41) * distcleancheck: Checking the Distribution. - (line 70) + (line 92) * distdir: Third-Party Makefiles. (line 25) * Distinction between errors and failures in testsuites: Generalities about Testing. @@ -5513,25 +5768,32 @@ * Distributions, preparation: Preparing Distributions. (line 6) * distuninstallcheck: Checking the Distribution. - (line 106) -* dist_ and nobase_: Alternative. (line 29) + (line 128) +* dist_ and nobase_: Alternative. (line 28) * dist_ and notrans_: Man Pages. (line 63) * DIST_SUBDIRS, explained: SUBDIRS vs DIST_SUBDIRS. (line 6) -* dmalloc, support for: Public Macros. (line 123) +* dmalloc, support for: Public Macros. (line 122) +* do-nothing Automake targets: Third-Party Makefiles. + (line 88) * dvi: Texinfo. (line 25) -* dvi <1>: Extending. (line 41) +* dvi <1>: Checking the Distribution. + (line 57) +* dvi <2>: Extending. (line 41) * DVI output using Texinfo: Texinfo. (line 6) * dvi-local: Extending. (line 41) -* E-mail, bug reports: Introduction. (line 30) * EDITION Texinfo flag: Texinfo. (line 35) * else: Usage of Conditionals. (line 36) +* empty Automake targets: Third-Party Makefiles. + (line 88) * Empty libraries: A Library. (line 48) * Empty libraries and $(LIBOBJS): LIBOBJS. (line 72) * empty _SOURCES: Default _SOURCES. (line 44) * endif: Usage of Conditionals. (line 36) +* eps images: Checking the Distribution. + (line 60) * Example conditional --enable-debug: Usage of Conditionals. (line 21) * Example conditional AC_CONFIG_FILES: Usage of Conditionals. @@ -5572,7 +5834,7 @@ * file names, limitations on: Limitations on File Names. (line 6) * filename-length-max=99: List of Automake options. - (line 44) + (line 48) * Files distributed with Automake: automake Invocation. (line 39) * First line of Makefile.am: General Operation. (line 74) * Flag variables, ordering: Flag Variables Ordering. @@ -5585,7 +5847,7 @@ (line 38) * foreign <1>: List of Automake options. (line 9) -* foreign strictness: Strictness. (line 10) +* foreign strictness: Strictness. (line 51) * Fortran 77 support: Fortran 77 Support. (line 6) * Fortran 77, mixing with C and C++: Mixing Fortran 77 With C and C++. (line 6) @@ -5594,14 +5856,14 @@ * Fortran 9x support: Fortran 9x Support. (line 6) * GCJFLAGS and AM_GCJFLAGS: Flag Variables Ordering. (line 20) -* generated files and CVS: CVS. (line 49) +* generated files and CVS: CVS. (line 50) * generated files, distributed: CVS. (line 9) * Gettext support: gettext. (line 6) * git-dist: General Operation. (line 12) * git-dist, non-standard example: General Operation. (line 12) * gnits: List of Automake options. (line 9) -* gnits strictness: Strictness. (line 10) +* gnits strictness: Strictness. (line 58) * gnu: List of Automake options. (line 9) * GNU Build System, basics: Basic Installation. (line 6) @@ -5610,38 +5872,42 @@ * GNU Build System, use cases: Use Cases. (line 6) * GNU Coding Standards: GNU Build System. (line 29) * GNU Gettext support: gettext. (line 6) -* GNU make extensions: General Operation. (line 20) +* GNU Make extensions: General Operation. (line 20) * GNU Makefile standards: Introduction. (line 12) -* gnu strictness: Strictness. (line 10) +* gnu strictness: Strictness. (line 18) * GNUmakefile including Makefile: Third-Party Makefiles. - (line 111) + (line 114) +* gzip: The Types of Distributions. + (line 10) * hard error: Generalities about Testing. (line 48) * Header files in _SOURCES: Program Sources. (line 39) * HEADERS primary, defined: Headers. (line 6) * HEADERS, installation directories: Headers. (line 6) * Hello World example: Hello World. (line 6) +* help2man, and dist target: List of Automake options. + (line 81) * hook targets: Extending. (line 66) -* HP-UX 10, lex problems: Public Macros. (line 95) +* HP-UX 10, lex problems: Public Macros. (line 94) * html: Texinfo. (line 25) * html <1>: Extending. (line 41) * HTML output using Texinfo: Texinfo. (line 6) * html-local: Extending. (line 41) -* id: Tags. (line 43) +* id: Tags. (line 45) * if: Usage of Conditionals. (line 36) * include: Basics of Distribution. - (line 17) + (line 30) * include <1>: Include. (line 6) * include, distribution: Basics of Distribution. - (line 17) + (line 30) * Including Makefile fragment: Include. (line 6) * indentation in Makefile.am: General Operation. (line 33) * info: List of Automake options. - (line 93) + (line 108) * info <1>: Extending. (line 41) * info-in-builddir: List of Automake options. - (line 53) + (line 57) * info-local: Extending. (line 41) * install: Standard Targets. (line 18) * install <1>: The Two Parts of Install. @@ -5675,13 +5941,13 @@ * install-html-local: Extending. (line 41) * install-info: Texinfo. (line 85) * install-info <1>: List of Automake options. - (line 93) + (line 108) * install-info <2>: Extending. (line 41) * install-info target: Texinfo. (line 85) * install-info-local: Extending. (line 41) * install-man: Man Pages. (line 32) * install-man <1>: List of Automake options. - (line 99) + (line 114) * install-man target: Man Pages. (line 32) * install-pdf: Texinfo. (line 25) * install-pdf <1>: Extending. (line 41) @@ -5689,6 +5955,7 @@ * install-ps: Texinfo. (line 25) * install-ps <1>: Extending. (line 41) * install-ps-local: Extending. (line 41) +* install-sh: Auxiliary Programs. (line 46) * install-strip: Standard Targets. (line 21) * install-strip <1>: Install Rules for the User. (line 7) @@ -5719,12 +5986,12 @@ * Java to native code, compilation: Java Support with gcj. (line 6) * lazy test execution: Parallel Test Harness. - (line 118) + (line 127) * LDADD and -l: Linking. (line 70) * LDFLAGS and AM_LDFLAGS: Flag Variables Ordering. (line 20) -* lex problems with HP-UX 10: Public Macros. (line 95) -* lex, multiple lexers: Yacc and Lex. (line 68) +* lex problems with HP-UX 10: Public Macros. (line 94) +* lex, multiple lexers: Yacc and Lex. (line 73) * LFLAGS and AM_LFLAGS: Flag Variables Ordering. (line 20) * libltdl, introduction: Libtool Concept. (line 29) @@ -5749,6 +6016,8 @@ * Limitations of automake parser: General Operation. (line 33) * Linking Fortran 77 with C and C++: Mixing Fortran 77 With C and C++. (line 6) +* Linking multiple yacc parsers: Linking Multiple Yacc Parsers. + (line 3) * LISP primary, defined: Emacs Lisp. (line 6) * LN_S example: Extending. (line 86) * local targets: Extending. (line 37) @@ -5757,8 +6026,10 @@ * LTLIBRARIES primary, defined: Libtool Libraries. (line 6) * ltmain.sh not found: Error required file ltmain.sh not found. (line 6) +* lzip: The Types of Distributions. + (line 23) * m4_include, distribution: Basics of Distribution. - (line 17) + (line 30) * Macro search path: Macro Search Path. (line 6) * macro serial numbers: Serials. (line 6) * Macros Automake recognizes: Optional. (line 6) @@ -5772,12 +6043,12 @@ * make distclean, diagnostic: Errors with distclean. (line 6) * make distcleancheck: Checking the Distribution. - (line 70) + (line 92) * make distuninstallcheck: Checking the Distribution. - (line 106) + (line 128) * make install support: Install. (line 6) * make installcheck, testing --help and --version: List of Automake options. - (line 129) + (line 144) * Make rules, overriding: General Operation. (line 46) * Make targets, overriding: General Operation. (line 46) * Makefile fragment, including: Include. (line 6) @@ -5787,8 +6058,10 @@ * Man page renaming, avoiding: Man Pages. (line 54) * MANS primary, defined: Man Pages. (line 6) * many outputs, rules with: Multiple Outputs. (line 6) -* mdate-sh: Texinfo. (line 35) +* mdate-sh: Auxiliary Programs. (line 50) +* mdate-sh <1>: Texinfo. (line 35) * MinGW cross-compilation example: Cross-Compilation. (line 25) +* missing program: Auxiliary Programs. (line 54) * missing, purpose: maintainer-mode. (line 9) * Mixed language example: Mixing Fortran 77 With C and C++. (line 34) @@ -5797,50 +6070,55 @@ * Mixing Fortran 77 with C and/or C++: Mixing Fortran 77 With C and C++. (line 6) * mkdir -p, macro check: Obsolete Macros. (line 14) +* mkinstalldirs: Auxiliary Programs. (line 60) * modules, libtool: Libtool Modules. (line 6) * mostlyclean: Extending. (line 41) * mostlyclean-local: Clean. (line 15) * mostlyclean-local <1>: Extending. (line 41) -* multiple configurations, example: VPATH Builds. (line 46) +* multiple configurations, example: VPATH Builds. (line 48) * Multiple configure.ac files: automake Invocation. (line 6) -* Multiple lex lexers: Yacc and Lex. (line 68) +* Multiple lex lexers: Yacc and Lex. (line 73) * multiple outputs, rules with: Multiple Outputs. (line 6) -* Multiple yacc parsers: Yacc and Lex. (line 68) +* Multiple yacc parsers: Yacc and Lex. (line 73) * Nested packages: Nested Packages. (line 6) * Nesting packages: Subpackages. (line 6) -* no-define: Public Macros. (line 55) +* no-define: Public Macros. (line 54) * no-define <1>: List of Automake options. - (line 58) + (line 62) * no-dependencies: Dependencies. (line 34) * no-dependencies <1>: List of Automake options. - (line 66) + (line 70) * no-dist: List of Automake options. - (line 73) -* no-dist-gzip: List of Automake options. (line 77) +* no-dist-built-sources: List of Automake options. + (line 81) +* no-dist-gzip: List of Automake options. + (line 92) * no-dist-gzip <1>: List of Automake options. - (line 77) + (line 92) * no-exeext: List of Automake options. - (line 80) + (line 95) * no-installinfo: Texinfo. (line 85) * no-installinfo <1>: List of Automake options. - (line 90) + (line 105) * no-installinfo option: Texinfo. (line 85) * no-installman: Man Pages. (line 32) * no-installman <1>: List of Automake options. - (line 96) + (line 111) * no-installman option: Man Pages. (line 32) +* no-op Automake targets: Third-Party Makefiles. + (line 88) * no-texinfo.tex: List of Automake options. - (line 106) -* nobase_ and dist_ or nodist_: Alternative. (line 29) -* nobase_ prefix: Alternative. (line 23) -* nodist_ and nobase_: Alternative. (line 29) + (line 121) +* nobase_ and dist_ or nodist_: Alternative. (line 28) +* nobase_ prefix: Alternative. (line 22) +* nodist_ and nobase_: Alternative. (line 28) * nodist_ and notrans_: Man Pages. (line 63) * noinst_ primary prefix, definition: Uniform. (line 90) * Non-GNU packages: Strictness. (line 6) * Non-standard targets: General Operation. (line 12) * nostdinc: List of Automake options. - (line 102) + (line 117) * notrans_ and dist_ or nodist_: Man Pages. (line 63) * notrans_ prefix: Man Pages. (line 54) * OBJCFLAGS and AM_OBJCFLAGS: Flag Variables Ordering. @@ -5853,29 +6131,31 @@ * Objects in subdirectory: Program and Library Variables. (line 51) * obsolete macros: Obsolete Macros. (line 6) -* optimized build, example: VPATH Builds. (line 46) +* optimized build, example: VPATH Builds. (line 48) * Option, --warnings=CATEGORY: List of Automake options. - (line 213) + (line 228) * Option, -WCATEGORY: List of Automake options. - (line 213) + (line 228) * Option, check-news: List of Automake options. - (line 14) + (line 15) * Option, dejagnu: List of Automake options. - (line 18) + (line 19) * Option, dist-bzip2: List of Automake options. - (line 22) + (line 23) * Option, dist-lzip: List of Automake options. - (line 25) + (line 26) * Option, dist-shar: List of Automake options. - (line 34) + (line 38) * Option, dist-tarZ: List of Automake options. - (line 39) + (line 43) * Option, dist-xz: List of Automake options. - (line 28) + (line 29) * Option, dist-zip: List of Automake options. - (line 31) + (line 32) +* Option, dist-zstd: List of Automake options. + (line 35) * Option, filename-length-max=99: List of Automake options. - (line 44) + (line 48) * Option, foreign: List of Automake options. (line 9) * Option, gnits: List of Automake options. @@ -5883,49 +6163,51 @@ * Option, gnu: List of Automake options. (line 9) * Option, info-in-builddir: List of Automake options. - (line 53) + (line 57) * Option, no-define: List of Automake options. - (line 58) + (line 62) * Option, no-dependencies: List of Automake options. - (line 66) + (line 70) * Option, no-dist: List of Automake options. - (line 73) -* Option, no-dist-gzip: List of Automake options. (line 77) +* Option, no-dist-built-sources: List of Automake options. + (line 81) +* Option, no-dist-gzip: List of Automake options. + (line 92) * Option, no-exeext: List of Automake options. - (line 80) + (line 95) * Option, no-installinfo: Texinfo. (line 85) * Option, no-installinfo <1>: List of Automake options. - (line 90) + (line 105) * Option, no-installman: Man Pages. (line 32) * Option, no-installman <1>: List of Automake options. - (line 96) + (line 111) * Option, no-texinfo.tex: List of Automake options. - (line 106) + (line 121) * Option, nostdinc: List of Automake options. - (line 102) + (line 117) * Option, parallel-tests: List of Automake options. - (line 114) + (line 129) * Option, readme-alpha: List of Automake options. - (line 120) + (line 135) * Option, serial-tests: List of Automake options. - (line 110) + (line 125) * Option, tar-pax: List of Automake options. - (line 159) + (line 174) * Option, tar-ustar: List of Automake options. - (line 159) + (line 174) * Option, tar-v7: List of Automake options. - (line 159) + (line 174) * Option, VERSION: List of Automake options. - (line 208) + (line 223) * Option, warnings: List of Automake options. - (line 213) + (line 228) * Options, aclocal: aclocal Options. (line 6) * Options, automake: automake Invocation. (line 37) * Options, std-options: List of Automake options. - (line 129) + (line 144) * Options, subdir-objects: List of Automake options. - (line 150) + (line 165) * Ordering flag variables: Flag Variables Ordering. (line 6) * Overriding make rules: General Operation. (line 46) @@ -5933,24 +6215,26 @@ * Overriding make variables: General Operation. (line 51) * overriding rules: Extending. (line 26) * overriding semantics: Extending. (line 26) +* Overriding testsuite environment: Testsuite Environment Overrides. + (line 6) * PACKAGE, directory: Uniform. (line 19) -* PACKAGE, prevent definition: Public Macros. (line 55) +* PACKAGE, prevent definition: Public Macros. (line 54) * Packages, nested: Nested Packages. (line 6) * Packages, preparation: Preparing Distributions. (line 6) * Parallel build trees: VPATH Builds. (line 6) * parallel-tests: List of Automake options. - (line 114) -* Path stripping, avoiding: Alternative. (line 23) + (line 129) +* Path stripping, avoiding: Alternative. (line 22) * pax format: List of Automake options. - (line 159) + (line 174) * pdf: Texinfo. (line 25) * pdf <1>: Extending. (line 41) * PDF output using Texinfo: Texinfo. (line 6) * pdf-local: Extending. (line 41) * Per-object flags, emulated: Per-Object Flags. (line 6) * per-target compilation flags, defined: Program and Library Variables. - (line 182) + (line 195) * pkgdatadir, defined: Uniform. (line 19) * pkgincludedir, defined: Uniform. (line 19) * pkglibdir, defined: Uniform. (line 19) @@ -5980,22 +6264,23 @@ * Programs, renaming during installation: Renaming. (line 6) * prog_LDADD, defined: Linking. (line 12) * Proxy Makefile for third-party packages: Third-Party Makefiles. - (line 128) + (line 131) * ps: Texinfo. (line 25) * ps <1>: Extending. (line 41) * PS output using Texinfo: Texinfo. (line 6) * ps-local: Extending. (line 41) +* py-compile: Auxiliary Programs. (line 70) * PYTHON primary, defined: Python. (line 6) * Ratfor programs: Preprocessing Fortran 77. (line 6) -* read-only source tree: VPATH Builds. (line 89) +* read-only source tree: VPATH Builds. (line 91) +* README-alpha: Strictness. (line 78) * readme-alpha: List of Automake options. - (line 120) -* README-alpha: Gnits. (line 42) + (line 135) * rebuild rules: Rebuilding. (line 6) * rebuild rules <1>: CVS. (line 9) * recheck: Parallel Test Harness. - (line 130) + (line 139) * Recognized macros by Automake: Optional. (line 6) * Recursive operation of Automake: General Operation. (line 58) * recursive targets and third-party Makefiles: Third-Party Makefiles. @@ -6005,7 +6290,7 @@ * Register test result: Log files generation and test results recording. (line 24) * Renaming programs: Renaming. (line 6) -* Reporting bugs: Introduction. (line 30) +* Reporting bugs: Reporting Bugs. (line 6) * Requirements of Automake: Requirements. (line 6) * Requirements, Automake: Introduction. (line 26) * Restrictions for JAVA: Java. (line 27) @@ -6032,8 +6317,10 @@ * serial number and --install: aclocal Options. (line 42) * serial numbers in macros: Serials. (line 6) * serial-tests: List of Automake options. - (line 110) + (line 125) * serial-tests, Using: Serial Test Harness. (line 6) +* shar: The Types of Distributions. + (line 51) * Shared libraries, support for: A Shared Library. (line 6) * Silencing make: Silencing Make. (line 6) * Silent make: Silencing Make. (line 6) @@ -6041,22 +6328,23 @@ * Silent rules: Silencing Make. (line 6) * silent rules and libtool: Automake Silent Rules. (line 59) +* site-packages Python directory: Python. (line 92) * site.exp: DejaGnu Tests. (line 26) * source tree and build tree: VPATH Builds. (line 6) -* source tree, read-only: VPATH Builds. (line 89) +* source tree, read-only: VPATH Builds. (line 91) * SOURCES primary, defined: Program Sources. (line 32) * Special Automake comment: General Operation. (line 68) * Staged installation: DESTDIR. (line 14) * std-options: List of Automake options. - (line 129) + (line 144) * Strictness, command line: automake Invocation. (line 37) * Strictness, defined: Strictness. (line 10) -* Strictness, foreign: Strictness. (line 10) -* Strictness, gnits: Strictness. (line 10) -* Strictness, gnu: Strictness. (line 10) +* Strictness, foreign: Strictness. (line 51) +* Strictness, gnits: Strictness. (line 58) +* Strictness, gnu: Strictness. (line 18) * su, before make install: Basic Installation. (line 49) * subdir-objects: List of Automake options. - (line 150) + (line 165) * Subdirectories, building conditionally: Conditional Subdirectories. (line 6) * Subdirectories, configured conditionally: Unconfigured Subdirectories. @@ -6092,15 +6380,17 @@ * tags: Tags. (line 9) * TAGS support: Tags. (line 6) * tar formats: List of Automake options. - (line 159) + (line 174) * tar-pax: List of Automake options. - (line 159) + (line 174) * tar-ustar: List of Automake options. - (line 159) + (line 174) * tar-v7: List of Automake options. - (line 159) + (line 174) * Target, install-info: Texinfo. (line 85) * Target, install-man: Man Pages. (line 32) +* targets, making into no-op: Third-Party Makefiles. + (line 88) * test case: Generalities about Testing. (line 11) * Test case result, registering: Log files generation and test results recording. @@ -6118,8 +6408,11 @@ * test skip: Generalities about Testing. (line 29) * Test suites: Tests. (line 6) +* test-driver: Auxiliary Programs. (line 73) * Tests, expected failure: Scripts-based Testsuites. (line 32) +* Testsuite environment overrides: Testsuite Environment Overrides. + (line 6) * testsuite harness: Generalities about Testing. (line 18) * Testsuite progress on console: Scripts-based Testsuites. @@ -6128,12 +6421,13 @@ * Texinfo flag, UPDATED: Texinfo. (line 35) * Texinfo flag, UPDATED-MONTH: Texinfo. (line 35) * Texinfo flag, VERSION: Texinfo. (line 35) -* texinfo.tex: Texinfo. (line 70) +* texinfo.tex: Auxiliary Programs. (line 77) +* texinfo.tex <1>: Texinfo. (line 70) * TEXINFOS primary, defined: Texinfo. (line 6) * third-party files and CVS: CVS. (line 167) * Third-party packages, interfacing with: Third-Party Makefiles. (line 6) -* timestamps and CVS: CVS. (line 28) +* timestamps and CVS: CVS. (line 29) * Transforming program names: Renaming. (line 6) * trees, source vs. build: VPATH Builds. (line 6) * true Example: true. (line 6) @@ -6152,7 +6446,7 @@ * uninstall-hook: Extending. (line 66) * uninstall-local: Extending. (line 41) * Unit tests: Parallel Test Harness. - (line 154) + (line 163) * Unpacking: Basic Installation. (line 27) * UPCFLAGS and AM_UPCFLAGS: Flag Variables Ordering. (line 20) @@ -6162,15 +6456,15 @@ * user variables: User Variables. (line 6) * Using aclocal: configure. (line 6) * ustar format: List of Automake options. - (line 159) + (line 174) * v7 tar format: List of Automake options. - (line 159) + (line 174) * Vala Support: Vala Support. (line 6) * variables, conflicting: Extending. (line 14) * Variables, overriding: General Operation. (line 51) * variables, reserved for the user: User Variables. (line 6) * VERSION Texinfo flag: Texinfo. (line 35) -* VERSION, prevent definition: Public Macros. (line 55) +* VERSION, prevent definition: Public Macros. (line 54) * version.m4, example: Rebuilding. (line 12) * version.sh, example: Rebuilding. (line 12) * versioned binaries, installing: Extending. (line 86) @@ -6181,9 +6475,16 @@ (line 39) * xpass: Generalities about Testing. (line 39) -* yacc, multiple parsers: Yacc and Lex. (line 68) +* xz: The Types of Distributions. + (line 30) +* yacc, multiple parsers: Yacc and Lex. (line 73) * YFLAGS and AM_YFLAGS: Flag Variables Ordering. (line 20) -* ylwrap: Yacc and Lex. (line 68) +* ylwrap: Auxiliary Programs. (line 85) +* ylwrap <1>: Yacc and Lex. (line 73) * zardoz example: Complete. (line 35) +* zip: The Types of Distributions. + (line 37) +* zstd: The Types of Distributions. + (line 41) diff -Nru automake-1.16-1.16.1/doc/automake.texi automake-1.16-1.16.5/doc/automake.texi --- automake-1.16-1.16.1/doc/automake.texi 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/doc/automake.texi 2021-10-01 19:30:59.000000000 +0000 @@ -25,7 +25,7 @@ @value{UPDATED}), a program that creates GNU standards-compliant Makefiles from template files. -Copyright @copyright{} 1995-2018 Free Software Foundation, Inc. +Copyright @copyright{} 1995--2021 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -62,6 +62,7 @@ @insertcopying @end titlepage +@shortcontents @contents @c We use the following macros to define indices: @@ -118,7 +119,6 @@ * Include:: Including extra files in an Automake template * Conditionals:: Conditionals * Silencing Make:: Obtain less verbose output from @command{make} -* Gnits:: The effect of @option{--gnu} and @option{--gnits} * Not Enough:: When Automake is not Enough * Distributing:: Distributing the Makefile.in * API Versioning:: About compatibility between Automake versions @@ -193,6 +193,7 @@ Autoconf macros supplied with Automake * Public Macros:: Macros that you can use. +* Obsolete Macros:: Macros that will soon be removed. * Private Macros:: Macros that you should not use. Directories @@ -257,6 +258,10 @@ * Error required file ltmain.sh not found:: The need to run libtoolize * Objects created both with libtool and without:: Avoid a specific build race +Yacc and Lex support + +* Linking Multiple Yacc Parsers:: + Fortran 77 Support * Preprocessing Fortran 77:: Preprocessing Fortran 77 sources @@ -313,7 +318,7 @@ Support for test suites -* Generalities about Testing:: Generic concepts and terminology about testing +* Generalities about Testing:: Concepts and terminology about testing * Simple Tests:: Listing test scripts in @code{TESTS} * Custom Test Drivers:: Writing and using custom test drivers * Using the TAP test protocol:: Integrating test scripts that use the TAP protocol @@ -326,12 +331,9 @@ * Serial Test Harness:: Older (and discouraged) serial test harness * Parallel Test Harness:: Generic concurrent test harness -Using the TAP test protocol +Scripts-based Testsuites -* Introduction to TAP:: -* Use TAP with the Automake test harness:: -* Incompatibilities with other TAP parsers and drivers:: -* Links and external resources on TAP:: +* Testsuite Environment Overrides:: Custom Test Drivers @@ -345,6 +347,13 @@ * Log files generation and test results recording:: * Testsuite progress output:: +Using the TAP test protocol + +* Introduction to TAP:: +* Use TAP with the Automake test harness:: +* Incompatibilities with other TAP parsers and drivers:: +* Links and external resources on TAP:: + Changing Automake's Behavior * Options generalities:: Semantics of Automake option @@ -360,7 +369,7 @@ * Usage of Conditionals:: Declaring conditional content * Limits of Conditionals:: Enclosing complete statements -Silencing Make +Silencing @command{make} * Make verbosity:: Make is verbose by default * Tricks For Silencing Make:: Standard and generic ways to silence make @@ -442,10 +451,6 @@ fully GNU standards-compliant, and do not require @command{perl} in order to be built. -@cindex Bugs, reporting -@cindex Reporting bugs -@cindex E-mail, bug reports - For more information on bug reports, @xref{Reporting Bugs}. @node Autotools Introduction @@ -465,7 +470,7 @@ If you need some teaching material, more illustrations, or a less @command{automake}-centered continuation, some slides for this introduction are available in Alexandre Duret-Lutz's -@uref{http://www.lrde.epita.fr/@/~adl/@/autotools.html, +@uref{https://www.lrde.epita.fr/@/~adl/@/autotools.html, Autotools Tutorial}. This chapter is the written version of the first part of his tutorial. @@ -860,13 +865,14 @@ @cindex trees, source vs.@: build The GNU Build System distinguishes two trees: the source tree, and -the build tree. +the build tree. These are two directories that may be the same, or +different. -The source tree is rooted in the directory containing -@file{configure}. It contains all the sources files (those that are +The source tree is rooted in the directory containing the +@file{configure} script. It contains all the source files (those that are distributed), and may be arranged using several subdirectories. -The build tree is rooted in the directory in which @file{configure} +The build tree is rooted in the current directory at the time @file{configure} was run, and is populated with all object files, programs, libraries, and other derived files built from the sources (and hence not distributed). The build tree usually has the same subdirectory layout @@ -880,8 +886,8 @@ A common request from users is that they want to confine all derived files to a single directory, to keep their source directories -uncluttered. Here is how we could run @file{configure} to build -everything in a subdirectory called @file{build/}. +uncluttered. Here is how we could run @file{configure} to create +everything in a build tree (that is, subdirectory) called @file{build/}. @example ~ % @kbd{tar zxf ~/amhello-1.0.tar.gz} @@ -967,7 +973,7 @@ In this scenario, nothing forbids the @file{/nfs/src/amhello-1.0} directory from being read-only. In fact VPATH builds are also a means of building packages from a read-only medium such as a CD-ROM. (The -FSF used to sell CD-ROM with unpacked source code, before the GNU +FSF used to sell CD-ROMs with unpacked source code, before the GNU project grew so big.) @node Two-Part Install @@ -1102,8 +1108,8 @@ For instance when installing GCC, the GNU Compiler Collection, we can use @option{--target=@/@var{target}} to specify that we want to build GCC as a cross-compiler for @var{target}. Mixing @option{--build} and -@option{--target}, we can actually cross-compile a cross-compiler; -such a three-way cross-compilation is known as a @dfn{Canadian cross}. +@option{--target}, we can cross-compile a cross-compiler; such a +three-way cross-compilation is known as a @dfn{Canadian cross}. @xref{Specifying Names, , Specifying the System Type, autoconf, The Autoconf Manual}, for more information about these @command{configure} @@ -1230,9 +1236,9 @@ @itemize @bullet @item It attempts a full compilation of the package (@pxref{Basic -Installation}), unpacking the newly constructed tarball, running -@code{make}, @code{make check}, @code{make install}, as well as -@code{make installcheck}, and even @code{make dist}, +Installation}): unpacking the newly constructed tarball, running +@code{make}, @code{make dvi}, @code{make check}, @code{make install}, +as well as @code{make installcheck}, and even @code{make dist}, @item it tests VPATH builds with read-only source tree (@pxref{VPATH Builds}), @item @@ -1242,12 +1248,13 @@ and it checks that @code{DESTDIR} installations work (@pxref{DESTDIR}). @end itemize -All of these actions are performed in a temporary directory, so that no -root privileges are required. Please note that the exact location and the -exact structure of such a subdirectory (where the extracted sources are -placed, how the temporary build and install directories are named and how -deeply they are nested, etc.) is to be considered an implementation detail, -which can change at any time; so do not rely on it. +All of these actions are performed in a temporary directory, so that +no root privileges are required. The exact location and the exact +structure of such a subdirectory (where the extracted sources are +placed, how the temporary build and install directories are named and +how deeply they are nested, etc.) is to be considered an +implementation detail, which can change at any time; so do not rely on +it. Releasing a package that fails @code{make distcheck} means that one of the scenarios we presented will not work and some users will be @@ -1337,7 +1344,7 @@ A typical setup is that package A will distribute one of the libraries it needs in a subdirectory. This library B is a complete package with its own GNU Build System. The @command{configure} script of A will -run the @command{configure} script of B as part of its execution, +run the @command{configure} script of B as part of its execution; building and installing A will also build and install B. Generating a distribution for A will also include B. @@ -1669,7 +1676,7 @@ As you probably noticed, @file{src/main.c} includes @file{config.h} so it can use @code{PACKAGE_STRING}. In a real-world project, -@file{config.h} can grow really big, with one @samp{#define} per +@file{config.h} can grow quite large, with one @samp{#define} per feature probed on the system. The @code{AC_CONFIG_FILES} macro declares the list of files that @@ -1813,15 +1820,15 @@ @code{git-dist} target, which the Automake maintainer uses to make distributions from the source control system. -@cindex GNU make extensions +@cindex GNU Make extensions -Note that most GNU make extensions are not recognized by Automake. Using +Note that most GNU Make extensions are not recognized by Automake. Using such extensions in a @file{Makefile.am} will lead to errors or confusing behavior. @cindex Append operator @cmindex += -A special exception is that the GNU make append operator, @samp{+=}, is +A special exception is that the GNU Make append operator, @samp{+=}, is supported. This operator appends its right hand argument to the variable specified on the left. Automake will translate the operator into an ordinary @samp{=} operator; @samp{+=} will thus work with any make program. @@ -1840,7 +1847,7 @@ and the following ``@code{:}'' character, and variable assignments shouldn't be indented with @key{TAB} characters. @c Keep this in sync with doc-parsing-buglets-colneq-subst.sh -Also, using more complex macro in target names can cause trouble: +Also, using more complex macros in target names can cause trouble: @example % @kbd{cat Makefile.am} @@ -1867,7 +1874,7 @@ Similarly, a variable defined in @file{Makefile.am} or @code{AC_SUBST}ed from @file{configure.ac} will override any definition of the variable that @command{automake} would ordinarily -create. This feature is more often useful than the ability to +create. This feature is often more useful than the ability to override a rule. Be warned that many of the variables generated by @command{automake} are considered to be for internal use only, and their names might change in future releases. @@ -1911,7 +1918,9 @@ @node Strictness @section Strictness - +@c "Gnits" used to be a separate section. +@c This @anchor allows old links to still work. +@anchor{Gnits} @cindex Non-GNU packages While Automake is intended to be used by maintainers of GNU packages, it @@ -1919,44 +1928,108 @@ not want to use all the GNU conventions. @cindex Strictness, defined -@cindex Strictness, @option{foreign} -@cindex @option{foreign} strictness +To this end, Automake supports three levels of @dfn{strictness}---how +stringently Automake should enforce conformance with GNU conventions. +Each strictness level can be selected using an option of the same name; +see @ref{Options}. + +The strictness levels are: + +@table @option +@item gnu @cindex Strictness, @option{gnu} @cindex @option{gnu} strictness -@cindex Strictness, @option{gnits} -@cindex @option{gnits} strictness +@opindex --gnu +This is the default level of strictness. Automake will check for +basic compliance with the GNU standards for software packaging. +@xref{Top,,, standards, The GNU Coding Standards}, for full details +of these standards. Currently the following checks are made: + +@itemize @bullet +@item +The files @file{INSTALL}, @file{NEWS}, @file{README}, @file{AUTHORS}, +and @file{ChangeLog}, plus one of @file{COPYING.LIB}, @file{COPYING.LESSER} +or @file{COPYING}, are required at the topmost directory of the package. + +If the @option{--add-missing} option is given, @command{automake} will +add a generic version of the @file{INSTALL} file as well as the +@file{COPYING} file containing the text of the current version of the +GNU General Public License existing at the time of this Automake release +(version 3 as this is written, +@uref{https://www.gnu.org/@/copyleft/@/gpl.html}). +However, an existing @file{COPYING} file will never be overwritten by +@command{automake}. -To this end, Automake supports three levels of @dfn{strictness}---the -strictness indicating how stringently Automake should check standards -conformance. +@item +The options @option{no-installman} and @option{no-installinfo} are +prohibited. +@end itemize -The valid strictness levels are: +Future versions of Automake will add more checks at this level of +strictness; it is advisable to be familiar with the precise requirements +of the GNU standards. + +Future versions of Automake may, at this level of strictness, require +certain non-standard GNU tools to be available to maintainer-only +Makefile rules. For instance, in the future @command{pathchk} +(@pxref{pathchk invocation,,, coreutils, GNU Coreutils}) +may be required to run @samp{make dist}. -@table @option @item foreign +@cindex Strictness, @option{foreign} +@cindex @option{foreign} strictness +@opindex --foreign Automake will check for only those things that are absolutely -required for proper operations. For instance, whereas GNU standards +required for proper operation. For instance, whereas GNU standards dictate the existence of a @file{NEWS} file, it will not be required in this mode. This strictness will also turn off some warnings by default (among them, portability warnings). -The name comes from the fact that Automake is intended to be -used for GNU programs; these relaxed rules are not the standard mode of -operation. - -@item gnu -Automake will check---as much as possible---for compliance to the GNU -standards for packages. This is the default. @item gnits +@cindex Strictness, @option{gnits} +@cindex @option{gnits} strictness +@opindex --gnits Automake will check for compliance to the as-yet-unwritten @dfn{Gnits standards}. These are based on the GNU standards, but are even more detailed. Unless you are a Gnits standards contributor, it is recommended that you avoid this option until such time as the Gnits -standard is actually published (which may never happen). +standard is published (which is unlikely to ever happen). + +Currently, @option{--gnits} does all the checks that +@option{--gnu} does, and checks the following as well: + +@itemize @bullet +@item +@samp{make installcheck} will check to make sure that the +@option{--help} and @option{--version} print a usage message and a +version string, respectively. This is the @option{std-options} option +(@pxref{Options}). + +@item +@samp{make dist} will check to make sure the @file{NEWS} file has been +updated to the current version. + +@item +@code{VERSION} is checked to make sure its format complies with Gnits +standards. +@c FIXME xref when standards are finished + +@item +@cindex @file{README-alpha} +If @code{VERSION} indicates that this is an alpha release, and the file +@file{README-alpha} appears in the topmost directory of a package, then +it is included in the distribution. This is done in @option{--gnits} +mode, and no other, because this mode is the only one where version +number formats are constrained, and hence the only mode where Automake +can automatically determine whether @file{README-alpha} should be +included. + +@item +The file @file{THANKS} is required. +@end itemize + @end table -@xref{Gnits}, for more information on the precise implications of the -strictness level. @node Uniform @@ -2034,10 +2107,10 @@ variable names; thus one writes @samp{bin_PROGRAMS} and not @samp{bindir_PROGRAMS}. -Not every sort of object can be installed in every directory. Automake -will flag those attempts it finds in error (but see below how to override -the check if you really need to). -Automake will also diagnose obvious misspellings in directory names. +Not every sort of object can be installed in every directory. +Automake will flag those attempts it finds in error (but see below how +to override the check if you need to). Automake will also diagnose +obvious misspellings in directory names. @cindex Extending list of installation directories @cindex Installation directories, extending list @@ -2061,8 +2134,8 @@ This feature can also be used to override the sanity checks Automake performs to diagnose suspicious directory/primary couples (in the -unlikely case these checks are undesirable, and you really know what -you're doing). For example, Automake would error out on this input: +unlikely case that you need to omit these checks). For example, +Automake would error out on this input: @c Should be tested in primary-prefix-invalid-couples.sh @example @@ -2135,7 +2208,7 @@ Traditionally, most unix-like systems have a length limitation for the command line arguments and environment contents when creating new processes (see for example -@uref{http://www.in-ulm.de/@/~mascheck/@/various/@/argmax/} for an +@uref{https://www.in-ulm.de/@/~mascheck/@/various/@/argmax/} for an overview on this issue), which of course also applies to commands spawned by @command{make}. POSIX requires this limit to be at least 4096 bytes, and most modern @@ -2174,7 +2247,7 @@ names, as can happen with above @code{$(data_DATA)} lists, it limits the amount of arguments passed to external commands. -Unfortunately, some system's @command{make} commands may prepend +Unfortunately, some systems' @command{make} commands may prepend @code{VPATH} prefixes like @samp{$@{srcdir@}/} to file names from the source tree automatically (@pxref{Automatic Rule Rewriting, , Automatic Rule Rewriting, autoconf, The Autoconf Manual}). In this case, the user @@ -2257,10 +2330,12 @@ @table @code @item ar-lib +@cmindex ar-lib This is a wrapper primarily for the Microsoft lib archiver, to make it more POSIX-like. @item compile +@cmindex compile This is a wrapper for compilers that do not accept options @option{-c} and @option{-o} at the same time. It is only used when absolutely required. Such compilers are rare, with the Microsoft C/C++ Compiler @@ -2271,6 +2346,8 @@ @item config.guess @itemx config.sub +@cmindex config.guess +@cmindex config.sub These two programs compute the canonical triplets for the given build, host, or target architecture. These programs are updated regularly to support new architectures and fix probes broken by changes in new @@ -2281,26 +2358,31 @@ release. @item depcomp +@cmindex depcomp This program understands how to run a compiler so that it will generate not only the desired output but also dependency information that is then used by the automatic dependency tracking feature (@pxref{Dependencies}). @item install-sh +@cmindex install-sh This is a replacement for the @command{install} program that works on platforms where @command{install} is unavailable or unusable. @item mdate-sh +@cmindex mdate-sh This script is used to generate a @file{version.texi} file. It examines a file and prints some date information about it. @item missing +@cmindex missing @r{program} This wraps a number of programs that are typically only required by -maintainers. If the program in question doesn't exist, or seems to old, +maintainers. If the program in question doesn't exist, or seems too old, @command{missing} will print an informative warning before failing out, to provide the user with more context and information. @item mkinstalldirs +@cmindex mkinstalldirs This script used to be a wrapper around @samp{mkdir -p}, which is not portable. Now we prefer to use @samp{install-sh -d} when @command{configure} finds that @samp{mkdir -p} does not work, this makes one less script to @@ -2311,19 +2393,26 @@ longer installed automatically, and it should be safe to remove it. @item py-compile +@cmindex py-compile This is used to byte-compile Python scripts. @item test-driver +@cmindex test-driver This implements the default test driver offered by the parallel testsuite harness. @item texinfo.tex -Not a program, this file is required for @samp{make dvi}, @samp{make -ps} and @samp{make pdf} to work when Texinfo sources are in the -package. The latest version can be downloaded from -@url{https://www.gnu.org/software/texinfo/}. +@cmindex texinfo.tex +When Texinfo sources are in the package, this file is required for +@samp{make dvi}, @samp{make ps} and @samp{make pdf}. The latest +version can be downloaded from +@url{https://www.gnu.org/software/texinfo/}. A working @TeX{} +distribution, or at least a @file{tex} program, is also required. +Furthermore, @samp{make dist} invokes @samp{make dvi}, so these become +requirements for making a distribution with Texinfo sources. @item ylwrap +@cmindex ylwrap This program wraps @command{lex} and @command{yacc} to rename their output files. It also ensures that, for instance, multiple @command{yacc} instances can be invoked in a single directory in @@ -2535,10 +2624,10 @@ its dependencies (i.e., @file{aclocal.m4} and any included file), therefore @command{autoconf} must be in your @env{PATH}. If there is an @env{AUTOCONF} variable in your environment it will be used -instead of @command{autoconf}, this allows you to select a particular +instead of @command{autoconf}; this allows you to select a particular version of Autoconf. By the way, don't misunderstand this paragraph: @command{automake} runs @command{autoconf} to @strong{scan} your -@file{configure.ac}, this won't build @file{configure} and you still +@file{configure.ac}; this won't build @file{configure} and you still have to run @command{autoconf} yourself for this purpose. @cindex @command{automake} options @@ -2587,7 +2676,7 @@ @item --print-libdir @opindex --print-libdir Print the path of the installation directory containing Automake-provided -scripts and data files (like e.g., @file{texinfo.texi} and +scripts and data files (e.g., @file{texinfo.texi} and @file{install-sh}). @item -c @@ -2614,12 +2703,12 @@ @item --gnits @opindex --gnits Set the global strictness to @option{gnits}. For more information, see -@ref{Gnits}. +@ref{Strictness}. @item --gnu @opindex --gnu Set the global strictness to @option{gnu}. For more information, see -@ref{Gnits}. This is the default strictness. +@ref{Strictness}. This is the default strictness. @item --help @opindex --help @@ -2664,45 +2753,55 @@ @opindex --version Print the version number of Automake and exit. -@item -W CATEGORY -@itemx --warnings=@var{category} +@item -W @var{category}[,@var{category}...] +@itemx --warnings=@var{category}[,@var{category}...] @opindex -W @opindex --warnings -Output warnings falling in @var{category}. @var{category} can be -one of: +Output warnings about a @var{category} of potential problems with the +package. @var{category} can be any of: + @table @code +@item cross +Constructs compromising the ability to cross-compile the package. @item gnu -warnings related to the GNU Coding Standards +Minor deviations from the GNU Coding Standards (@pxref{Top, , , standards, The GNU Coding Standards}). @item obsolete -obsolete features or constructions +Obsolete features or constructions. @item override -user redefinitions of Automake rules or variables +Redefinitions of Automake rules or variables. @item portability -portability issues (e.g., use of @command{make} features that are -known to be not portable) +Portability issues (e.g., use of @command{make} features that are +known to be not portable). +@item portability-recursive +Recursive, or nested, Make variable expansions (@code{$(foo$(x))}). +These are not universally supported, but are more portable than the +other non-portable constructs diagnosed by @option{-Wportability}. +These warnings are turned on by @option{-Wportability} but can then be +turned off specifically by @option{-Wno-portability-recursive}. @item extra-portability -extra portability issues related to obscure tools. One example of such -a tool is the Microsoft @command{lib} archiver. +Extra portability issues, related to rarely-used tools such as +the Microsoft @command{lib} archiver. @item syntax -weird syntax, unused variables, typos +Questionable syntax, unused variables, typos, etc. @item unsupported -unsupported or incomplete features +Unsupported or incomplete features. @item all -all the warnings +Turn on all the above categories of warnings. @item none -turn off all the warnings +Turn off all the above categories of warnings. @item error -treat warnings as errors +Treat warnings as errors. @end table A category can be turned off by prefixing its name with @samp{no-}. For instance, @option{-Wno-syntax} will hide the warnings about unused variables. -The categories output by default are @samp{obsolete}, @samp{syntax} and -@samp{unsupported}. Additionally, @samp{gnu} and @samp{portability} -are enabled in @option{--gnu} and @option{--gnits} strictness. +Warnings in the @samp{gnu}, @samp{obsolete}, @samp{portability}, +@samp{syntax}, and @samp{unsupported} categories are turned on by +default. The @samp{gnu} and @samp{portability} categories are turned +off in @option{--foreign} strictness. @c Checked by extra-portability.sh Turning off @samp{portability} will also turn off @samp{extra-portability}, @@ -2710,13 +2809,17 @@ @samp{portability}. However, turning on @samp{portability} or turning off @samp{extra-portability} will not affect the other category. +Unknown warning categories supplied as an argument to @option{-W} will +themselves produce a warning, in the @samp{unsupported} category. This +warning is never treated as an error. + @vindex WARNINGS The environment variable @env{WARNINGS} can contain a comma separated -list of categories to enable. It will be taken into account before the -command-line switches, this way @option{-Wnone} will also ignore any -warning category enabled by @env{WARNINGS}. This variable is also used -by other tools like @command{autoconf}; unknown categories are ignored -for this reason. +list of categories to enable. @option{-W} settings on the command line +take precedence; for instance, @option{-Wnone} also turns off any +warning categories enabled by @env{WARNINGS}. + +Unknown warning categories named in @env{WARNINGS} are silently ignored. @end table @@ -2949,6 +3052,12 @@ Not all scripts are always searched for; some scripts will only be sought if the generated @file{Makefile.in} requires them. +If @code{AC_CONFIG_AUX_DIR} is used, it must be given before the call +to @code{AM_INIT_AUTOMAKE}; Automake will warn about this if it is not +so. All other @code{AC_CONFIG_...} macros are conventionally called +after @code{AM_INIT_AUTOMAKE}, though they may or may not work in +other locations, with or without warnings. + If @code{AC_CONFIG_AUX_DIR} is not given, the scripts are looked for in their standard locations. For @file{mdate-sh}, @file{texinfo.tex}, and @file{ylwrap}, the standard location is the @@ -2969,20 +3078,22 @@ @item AC_CONFIG_HEADERS Automake will generate rules to rebuild these headers from the corresponding templates (usually, the template for a @file{foo.h} -header being @file{foo.h.in}). Older versions of Automake -required the use of @code{AM_CONFIG_HEADER}; this is no longer -the case, and that macro has indeed been removed. +header being @file{foo.h.in}). As with @code{AC_CONFIG_FILES} (@pxref{Requirements}), parts of the specification using shell variables will be ignored as far as cleaning, distributing, and rebuilding is concerned. +Older versions of Automake required the use of +@code{AM_CONFIG_HEADER}; this is no longer the case, and that macro +has indeed been removed. + @item AC_CONFIG_LINKS Automake will generate rules to remove @file{configure} generated links on @samp{make distclean} and to distribute named source files as part of @samp{make dist}. -As for @code{AC_CONFIG_FILES} (@pxref{Requirements}), parts of the +As with @code{AC_CONFIG_FILES} (@pxref{Requirements}), parts of the specification using shell variables will be ignored as far as cleaning and distributing is concerned. (There are no rebuild rules for links.) @@ -3130,7 +3241,7 @@ @code{m4_include} is seldom used by @file{configure.ac} authors, but can appear in @file{aclocal.m4} when @command{aclocal} detects that some required macros come from files local to your package (as opposed to -macros installed in a system-wide directory, @pxref{aclocal Invocation}). +macros installed in a system-wide directory; @pxref{aclocal Invocation}). @end ftable @@ -3145,9 +3256,9 @@ @cindex Invoking @command{aclocal} @cindex @command{aclocal}, Invoking -Automake includes a number of Autoconf macros that can be used in -your package (@pxref{Macros}); some of them are actually required by -Automake in certain situations. These macros must be defined in your +Automake includes a number of Autoconf macros that can be used in your +package (@pxref{Macros}); some of them are required by Automake in +certain situations. These macros must be defined in your @file{aclocal.m4}; otherwise they will not be seen by @command{autoconf}. @@ -3179,7 +3290,7 @@ @file{aclocal.m4}. This makes the package smaller, eases dependency tracking, and cause the file to be distributed automatically. (@xref{Local Macros}, for an example.) Any macro that is found in a -system-wide directory, or via an absolute search path will be copied. +system-wide directory or via an absolute search path will be copied. So use @samp{-I `pwd`/reldir} instead of @samp{-I reldir} whenever some relative directory should be considered outside the package. @@ -3192,9 +3303,9 @@ While computing @file{aclocal.m4}, @command{aclocal} runs @command{autom4te} (@pxref{Using autom4te, , Using @command{Autom4te}, autoconf, The Autoconf Manual}) in order to trace the macros that are -really used, and omit from @file{aclocal.m4} all macros that are -mentioned but otherwise unexpanded (this can happen when a macro is -called conditionally). @command{autom4te} is expected to be in the +used, and omit from @file{aclocal.m4} all macros that are mentioned +but otherwise unexpanded (this can happen when a macro is called +conditionally). @command{autom4te} is expected to be in the @env{PATH}, just as @command{autoconf}. Its location can be overridden using the @env{AUTOM4TE} environment variable. @@ -3234,14 +3345,14 @@ @item --diff[=@var{command}] @opindex --diff -Run @var{command} on M4 file that would be installed or overwritten +Run @var{command} on the M4 file that would be installed or overwritten by @option{--install}. The default @var{command} is @samp{diff -u}. This option implies @option{--install} and @option{--dry-run}. @item --dry-run @opindex --dry-run -Do not actually overwrite (or create) @file{aclocal.m4} and M4 -files installed by @option{--install}. +Do not overwrite (or create) @file{aclocal.m4} and M4 files installed +by @option{--install}. @item --help @opindex --help @@ -3269,8 +3380,8 @@ @item --force @opindex --force -Always overwrite the output file. The default is to overwrite the output -file only when really needed, i.e., when its contents changes or if one +Always overwrite the output file. The default is to overwrite the +output file only when needed, i.e., when its contents change or if one of its dependencies is younger. This option forces the update of @file{aclocal.m4} (or the file @@ -3290,7 +3401,7 @@ third-party packages to determine where to install @file{.m4} macro files, but @emph{this usage is today discouraged}, since it causes @samp{$(prefix)} not to be thoroughly honored (which violates the -GNU Coding Standards), and a similar semantics can be better obtained +GNU Coding Standards), and similar semantics can be better obtained with the @env{ACLOCAL_PATH} environment variable; @pxref{Extending aclocal}. @item --verbose @@ -3457,9 +3568,10 @@ @item @code{/usr/local/share/aclocal/} @end enumerate +@noindent without the need for @option{-I} options; @option{-I} options can be reserved for project-specific needs (@file{my-source-dir/m4/}), rather than -using it to work around local system-dependent tool installation +using them to work around local system-dependent tool installation directories. Similarly, @file{dirlist} can be handy if you have installed a local @@ -3548,16 +3660,16 @@ @acindex AC_DEFUN @acindex AC_PREREQ -Starting with Automake 1.8, @command{aclocal} will warn about all -underquoted calls to @code{AC_DEFUN}. We realize this will annoy a -lot of people, because @command{aclocal} was not so strict in the past -and many third party macros are underquoted; and we have to apologize -for this temporary inconvenience. The reason we have to be stricter -is that a future implementation of @command{aclocal} (@pxref{Future of +Starting with Automake 1.8, @command{aclocal} warns about all +underquoted calls to @code{AC_DEFUN}. We realize this annoys some +people, because @command{aclocal} was not so strict in the past and +many third party macros are underquoted; and we have to apologize for +this temporary inconvenience. The reason we have to be stricter is +that a future implementation of @command{aclocal} (@pxref{Future of aclocal}) will have to temporarily include all of these third party -@file{.m4} files, maybe several times, including even files that are -not actually needed. Doing so should alleviate many problems of the -current implementation, however it requires a stricter style from the +@file{.m4} files, maybe several times, even including files that end +up not being needed. Doing so should alleviate many problems of the +current implementation; however, it requires a stricter style from macro authors. Hopefully it is easy to revise the existing macros. For instance, @@ -3584,10 +3696,10 @@ @end example Wrapping the @code{AC_PREREQ} call inside the macro ensures that -Autoconf 2.68 will not be required if @code{AX_FOOBAR} is not actually -used. Most importantly, quoting the first argument of @code{AC_DEFUN} -allows the macro to be redefined or included twice (otherwise this -first argument would be expanded during the second definition). For +Autoconf 2.68 will not be required if @code{AX_FOOBAR} is not used. +Most importantly, quoting the first argument of @code{AC_DEFUN} allows +the macro to be redefined or included twice (otherwise this first +argument would be expanded during the second definition). For consistency we like to quote even arguments such as @code{2.68} that do not require it. @@ -3599,7 +3711,7 @@ flooded by mails. Another situation where @command{aclocal} is commonly used is to -manage macros that are used locally by the package, @ref{Local +manage macros that are used locally by the package; @ref{Local Macros}. @node Local Macros @@ -3637,7 +3749,7 @@ Custom macros should be distributed for the same reason that @file{configure.ac} is: so that other people have all the sources of -your package if they want to work on it. Actually, this distribution +your package if they want to work on it. In fact, this distribution happens automatically because all @code{m4_include}d files are distributed. @@ -3729,7 +3841,7 @@ the older @samp{#serial} line (or the file that has none). Note that a serial number applies to a whole M4 file, not to any macro -it contains. A file can contains multiple macros, but only one +it contains. A file can contain multiple macros, but only one serial. Here is a use case that illustrates the use of @option{--install} and @@ -3763,7 +3875,7 @@ No local macros define @code{AX_THIRD_PARTY} @item @file{/usr/share/aclocal/thirdparty.m4} defines @code{AX_THIRD_PARTY} -with serial 1. +with serial @w{number 1}. @end itemize @noindent @@ -3780,10 +3892,10 @@ @file{configure.ac} uses @code{AX_THIRD_PARTY} @item @file{m4/thirdparty.m4} defines @code{AX_THIRD_PARTY} -with serial 1. +with serial @w{number 1}. @item @file{/usr/share/aclocal/thirdparty.m4} defines @code{AX_THIRD_PARTY} -with serial 1. +with serial @w{number 1}. @end itemize @noindent @@ -3799,7 +3911,7 @@ Now suppose the system-wide third-party macro is changed. This can happen if the package installing this macro is updated. Let's suppose -the new macro has serial number 2. The next time @samp{aclocal --install} +the new macro has serial @w{number 2}. The next time @samp{aclocal --install} is run the situation is the following: @itemize @bullet @@ -3807,10 +3919,10 @@ @file{configure.ac} uses @code{AX_THIRD_PARTY} @item @file{m4/thirdparty.m4} defines @code{AX_THIRD_PARTY} -with serial 1. +with serial @w{number 1}. @item @file{/usr/share/aclocal/thirdparty.m4} defines @code{AX_THIRD_PARTY} -with serial 2. +with @w{serial 2}. @end itemize @noindent @@ -3842,12 +3954,11 @@ @subsection The Future of @command{aclocal} @cindex @command{aclocal}'s scheduled death -@command{aclocal} is expected to disappear. This feature really -should not be offered by Automake. Automake should focus on -generating @file{Makefile}s; dealing with M4 macros really is -Autoconf's job. The fact that some people install Automake just to use -@command{aclocal}, but do not use @command{automake} otherwise is an -indication of how that feature is misplaced. +Ideally, @command{aclocal} should not be part of Automake. Automake +should focus on generating @file{Makefile}s; dealing with M4 macros is +more Autoconf's job. The fact that some people install Automake just +to use @command{aclocal}, but do not use @command{automake} otherwise +is an indication of how that feature is misplaced. The new implementation will probably be done slightly differently. For instance, it could enforce the @file{m4/}-style layout discussed in @@ -3862,7 +3973,7 @@ make that switch more seamless: never call @command{aclocal} yourself. Keep this guy under the exclusive control of @command{autoreconf} and Automake's rebuild rules. Hopefully you won't need to worry about -things breaking, when @command{aclocal} disappears, because everything +things breaking; when @command{aclocal} disappears, because everything will have been taken care of. If otherwise you used to call @command{aclocal} directly yourself or from some script, you will quickly notice the change. @@ -3871,19 +3982,19 @@ @file{autogen.sh}, that will just call @command{aclocal}, @command{libtoolize}, @command{gettextize} or @command{autopoint}, @command{autoconf}, @command{autoheader}, and @command{automake} in -the right order. Actually this is precisely what @command{autoreconf} +the right order. In fact, this is precisely what @command{autoreconf} can do for you. If your package has such a @file{bootstrap} or @file{autogen.sh} script, consider using @command{autoreconf}. That -should simplify its logic a lot (less things to maintain, yum!), it's -even likely you will not need the script anymore, and more to the point -you will not call @command{aclocal} directly anymore. +should simplify its logic a lot (less things to maintain, all to the +good), it's even likely you will not need the script anymore, and more +to the point you will not call @command{aclocal} directly anymore. For the time being, third-party packages should continue to install public macros into @file{/usr/share/aclocal/}. If @command{aclocal} is replaced by another tool it might make sense to rename the directory, but supporting @file{/usr/share/aclocal/} for backward -compatibility should be really easy provided all macros are properly -written (@pxref{Extending aclocal}). +compatibility should be easy provided all macros are properly written +(@pxref{Extending aclocal}). @@ -3929,7 +4040,7 @@ defaults, respectively, to the @code{PACKAGE_TARNAME} and @code{PACKAGE_VERSION} defined via the @code{AC_INIT} invocation; @pxref{AC_INIT, , The @code{AC_INIT} macro, autoconf, The Autoconf Manual}); -and this can be still be useful in some selected situations. +and this can still be useful in some selected situations. Our hope is that future Autoconf versions will improve their support for package versions defined dynamically at configure runtime; when (and if) this happens, support for the two-args @code{AM_INIT_AUTOMAKE} @@ -4064,7 +4175,7 @@ @cindex @command{dmalloc}, support for @vindex WITH_DMALLOC @opindex --with-dmalloc -Add support for the @uref{http://dmalloc.com/, Dmalloc package}. If +Add support for the @uref{https://dmalloc.com/, Dmalloc package}. If the user runs @command{configure} with @option{--with-dmalloc}, then define @code{WITH_DMALLOC} and add @option{-ldmalloc} to @code{LIBS}. @@ -4167,7 +4278,7 @@ new @command{make} instance to build the directory's contents. Because this approach is very widespread, Automake offers built-in -support for it. However, it is worth nothing that the use of make +support for it. However, it is worth noting that the use of make recursion has its own serious issues and drawbacks, and that it's well possible to have packages with a multi directory layout that make little or no use of such recursion (examples of such packages @@ -4254,7 +4365,7 @@ @example % @kbd{cat configure.ac} -AC_INIT([pkg-name], [1.0] +AC_INIT([pkg-name], [1.0]) AM_INIT_AUTOMAKE AM_EXTRA_RECURSIVE_TARGETS([foo]) AC_CONFIG_FILES([Makefile sub/Makefile sub/src/Makefile]) @@ -4283,7 +4394,7 @@ like in the case of GNU Inetutils, you want to only build a subset of the entire package. -To illustrate how this works, let's assume we have two directories +To illustrate how this works, let's assume we have two directories, @file{src/} and @file{opt/}. @file{src/} should always be built, but we want to decide in @command{configure} whether @file{opt/} will be built or not. (For this example we will assume that @file{opt/} should be @@ -4293,11 +4404,11 @@ then maybe in @file{opt/}. However @samp{make dist} should always recurse into both @file{src/} -and @file{opt/}. Because @file{opt/} should be distributed even if it +and @file{opt/}, because @file{opt/} should be distributed even if it is not needed in the current configuration. This means @file{opt/Makefile} should be created @emph{unconditionally}. -There are two ways to setup a project like this. You can use Automake +There are two ways to set up a project like this. You can use Automake conditionals (@pxref{Conditionals}) or use Autoconf @code{AC_SUBST} variables (@pxref{Setting Output Variables, , Setting Output Variables, autoconf, The Autoconf Manual}). Using Automake @@ -4452,11 +4563,11 @@ @item Any directory listed in @code{DIST_SUBDIRS} and @code{SUBDIRS} must be configured. -I.e., the @file{Makefile} must exists or the recursive @command{make} +That is, the @file{Makefile} must exist or the recursive @command{make} rules will not be able to process the directory. @item Any configured directory must be listed in @code{DIST_SUBDIRS}. -So that the cleaning rules remove the generated @file{Makefile}s. +This is so the cleaning rules remove the generated @file{Makefile}s. It would be correct to see @code{DIST_SUBDIRS} as a variable that lists all the directories that have been configured. @end itemize @@ -4478,7 +4589,7 @@ distribute these directories). @cindex Subdirectories, not distributed -In few packages, unconfigured directories are not even expected to +In a few packages, unconfigured directories are not even expected to be distributed. Although these packages do not require the aforementioned extra arrangements, there is another pitfall. If the name of a directory appears in @code{SUBDIRS} or @code{DIST_SUBDIRS}, @@ -4492,18 +4603,16 @@ @node Alternative @section An Alternative Approach to Subdirectories -If you've ever read Peter Miller's excellent paper, -@uref{http://miller.emu.id.au/pmiller/books/rmch/, -Recursive Make Considered Harmful}, the preceding sections on the use of -make recursion will probably come as unwelcome advice. For those who +If you've ever read Peter Miller's excellent paper, @cite{Recursive +Make Considered Harmful}, the preceding sections on the use of make +recursion will probably come as unwelcome advice. For those who haven't read the paper, Miller's main thesis is that recursive @command{make} invocations are both slow and error-prone. -Automake provides sufficient cross-directory support @footnote{We -believe. This work is new and there are probably warts. -@xref{Introduction}, for information on reporting bugs.} to enable you -to write a single @file{Makefile.am} for a complex multi-directory -package. +Automake is intended to have sufficient cross-directory support to +enable you to write a single @file{Makefile.am} for a complex +multi-directory package. (If it seems to be lacking, please report +the issue as usual.) By default an installable file specified in a subdirectory will have its directory name stripped before installation. For instance, in this @@ -4569,7 +4678,6 @@ @acindex AC_CONFIG_SUBDIRS @acindex AC_CONFIG_AUX_DIR - In the GNU Build System, packages can be nested to arbitrary depth. This means that a package can embed other packages with their own @file{configure}, @file{Makefile}s, etc. @@ -4654,14 +4762,14 @@ package, and another one in the @file{hand/} subdirectory for the @code{hand} package. -The historical default is to search for these auxiliary scripts in -the parent directory and the grandparent directory. So if the +The historical default is to search for these auxiliary scripts in the +parent directory and the grandparent directory. So if the @samp{AC_CONFIG_AUX_DIR([.])} line was removed from @file{hand/configure.ac}, that subpackage would share the auxiliary -script of the @code{arm} package. This may looks like a gain in size -(a few kilobytes), but it is actually a loss of modularity as the -@code{hand} subpackage is no longer self-contained (@samp{make dist} -in the subdirectory will not work anymore). +script of the @code{arm} package. This may look like a gain in size +(a few kilobytes), but more importantly, it is a loss of modularity as +the @code{hand} subpackage is no longer self-contained (@samp{make +dist} in the subdirectory will not work anymore). Packages that do not use Automake need more work to be integrated this way. @xref{Third-Party Makefiles}. @@ -4788,7 +4896,7 @@ If you need to link against libraries that are not found by @command{configure}, you can use @code{LDADD} to do so. This variable is used to specify additional objects or libraries to link with; it is -inappropriate for specifying specific linker flags, you should use +inappropriate for specifying specific linker flags; you should use @code{AM_LDFLAGS} for this purpose. @vindex LDADD @vindex AM_LDFLAGS @@ -4834,7 +4942,7 @@ @vindex maude_DEPENDENCIES @vindex EXTRA_maude_DEPENDENCIES It is also occasionally useful to have a program depend on some other -target that is not actually part of that program. This can be done +target that is not in fact part of that program. This can be done using either the @code{@var{prog}_DEPENDENCIES} or the @code{EXTRA_@var{prog}_DEPENDENCIES} variable. Each program depends on the contents both variables, but no further interpretation is done. @@ -4908,7 +5016,7 @@ @end example @noindent -You can then setup the @samp{$(HELLO_SYSTEM)} substitution from +You can then set up the @samp{$(HELLO_SYSTEM)} substitution from @file{configure.ac}: @example @@ -4941,7 +5049,7 @@ endif @end example -In this case, @file{configure.ac} should setup the @code{LINUX} +In this case, @file{configure.ac} should set up the @code{LINUX} conditional using @code{AM_CONDITIONAL} (@pxref{Conditionals}). When using conditionals like this you don't need to use the @@ -5133,7 +5241,7 @@ determined until @file{./configure} is run: not all platforms support all kinds of libraries, and users can explicitly select which libraries should be built. (However the package's maintainers can -tune the default, @pxref{AC_PROG_LIBTOOL, , The @code{AC_PROG_LIBTOOL} +tune the default; @pxref{LT_INIT, , The @code{LT_INIT} macro, libtool, The Libtool Manual}.) @cindex suffix @file{.lo}, defined @@ -5147,7 +5255,7 @@ @file{.lo} files and how libtool constructs them: this is libtool's concern, and the last thing one wants is to learn about libtool's guts. However the existence of these files matters, because they are -used as targets and dependencies in @file{Makefile}s rules when +used as targets and dependencies in @file{Makefile}s' rules when building libtool libraries. There are situations where you may have to refer to these, for instance when expressing dependencies for building source files conditionally (@pxref{Conditional Libtool @@ -5161,7 +5269,7 @@ This offers a portable dlopening facility to load libtool libraries dynamically, and can also achieve static linking where unavoidable. -Before we discuss how to use libtool with Automake in details, it +Before we discuss how to use libtool with Automake in detail, it should be noted that the libtool manual also has a section about how to use Automake with libtool (@pxref{Using Automake, , Using Automake with Libtool, libtool, The Libtool Manual}). @@ -5344,7 +5452,7 @@ Libtool convenience libraries are declared by directory-less variables such as @code{noinst_LTLIBRARIES}, @code{check_LTLIBRARIES}, or even @code{EXTRA_LTLIBRARIES}. Unlike installed libtool libraries they do -not need an @option{-rpath} flag at link time (actually this is the only +not need an @option{-rpath} flag at link time (this is in fact the only difference). Convenience libraries listed in @code{noinst_LTLIBRARIES} are always @@ -5384,7 +5492,7 @@ @dots{} @end example -When using such setup, beware that @command{automake} will assume +When using such a setup, beware that @command{automake} will assume @file{libtop.la} is to be linked with the C linker. This is because @code{libtop_la_SOURCES} is empty, so @command{automake} picks C as default language. If @code{libtop_la_SOURCES} was not empty, @@ -5412,7 +5520,7 @@ @samp{EXTRA_*_SOURCES} variables are used to keep track of source files that might be compiled (this is mostly useful when doing -conditional compilation using @code{AC_SUBST}, @pxref{Conditional +conditional compilation using @code{AC_SUBST}; @pxref{Conditional Libtool Sources}), and the @code{nodist_} prefix means the listed sources are not to be distributed (@pxref{Program and Library Variables}). In effect the file @file{dummy.cxx} does not need to @@ -5478,7 +5586,7 @@ @samp{@var{library}_LDFLAGS} for libtool linking flags). Generic options include @option{--tag=@var{tag}} and @option{--silent} (@pxref{Invoking libtool, , Invoking @command{libtool}, libtool, The -Libtool Manual} for more options) should appear before the mode +Libtool Manual} for more options). They should appear before the mode selection on the command line; in @file{Makefile.am}s they should be listed in the @samp{@var{library}_LIBTOOLFLAGS} variable. @@ -5493,7 +5601,7 @@ The libtool rules also use a @code{LIBTOOLFLAGS} variable that should not be set in @file{Makefile.am}: this is a user variable (@pxref{Flag -Variables Ordering}. It allows users to run @samp{make +Variables Ordering}). It allows users to run @samp{make LIBTOOLFLAGS=--silent}, for instance. Note that the verbosity of @command{libtool} can also be influenced by the Automake support for silent rules (@pxref{Automake Silent Rules}). @@ -5577,8 +5685,8 @@ @noindent (In this trivial case the issue could be avoided by linking @file{libfoo.la} with @file{prog} instead of listing @file{foo.c} in -@code{prog_SOURCES}. But let's assume we really want to keep -@file{prog} and @file{libfoo.la} separate.) +@code{prog_SOURCES}. But let's assume we want to keep @file{prog} and +@file{libfoo.la} separate.) Technically, it means that we should build @file{foo.$(OBJEXT)} for @file{prog}, and @file{foo.lo} for @file{libfoo.la}. The problem is @@ -5593,7 +5701,7 @@ A workaround for this issue is to ensure that these two objects get different basenames. As explained in @ref{Renamed Objects}, this -happens automatically when per-targets flags are used. +happens automatically when per-target flags are used. @example bin_PROGRAMS = prog @@ -5662,18 +5770,25 @@ @file{.o} file will be put into the subdirectory named after the source file. For instance, with @option{subdir-objects} enabled, @file{sub/dir/file.c} will be compiled to @file{sub/dir/file.o}. Some -people prefer this mode of operation. You can specify +projects prefer or require this mode of operation. You can specify @option{subdir-objects} in @code{AUTOMAKE_OPTIONS} (@pxref{Options}). @cindex Subdirectory, objects in @cindex Objects in subdirectory +@c https://bugs.gnu.org/20699 +When @option{subdir-objects} is specified, and source files which lie +outside the current directory tree are nevertheless specified, as in +@code{foo_SOURCES = ../lib/other.c}, Automake will still remove +@file{../lib/other.o}, in fact, @file{../lib/*.o} (e.g., at @code{make +clean}, even though it is arguably wrong for one subdirectory to +clean in a sibling. This may or may not be changed in the future. @item EXTRA_maude_SOURCES Automake needs to know the list of files you intend to compile @emph{statically}. For one thing, this is the only way Automake has of knowing what sort of language support a given @file{Makefile.in} -requires. @footnote{There are other, more obscure reasons for -this limitation as well.} This means that, for example, you can't put a +requires. (There are other, more obscure reasons for +this limitation as well.) This means that, for example, you can't put a configure substitution like @samp{@@my_sources@@} into a @samp{_SOURCES} variable. If you intend to conditionally compile source files and use @file{configure} to substitute the appropriate object names into, e.g., @@ -5729,7 +5844,11 @@ @item maude_LDFLAGS This variable is used to pass extra flags to the link step of a program -or a shared library. It overrides the @code{AM_LDFLAGS} variable. +or a shared library. It overrides the @code{AM_LDFLAGS} variable, +even if it is defined only in a false branch of a conditional; in +other words, if @code{@var{prog}_LDFLAGS} is defined at all, +@code{AM_LDFLAGS} will not be used. +@c https://bugs.gnu.org/34925 @item maude_LIBTOOLFLAGS This variable is used to pass extra options to @command{libtool}. @@ -5741,12 +5860,12 @@ @item maude_DEPENDENCIES @itemx EXTRA_maude_DEPENDENCIES It is also occasionally useful to have a target (program or library) -depend on some other file that is not actually part of that target. +depend on some other file that is not in fact part of that target. This can be done using the @code{_DEPENDENCIES} variable. Each target depends on the contents of such a variable, but no further interpretation is done. -Since these dependencies are associated to the link rule used to +Since these dependencies are associated with the link rule used to create the programs they should normally list files used by the link command. That is @file{*.$(OBJEXT)}, @file{*.a}, or @file{*.la} files for programs; @file{*.lo} and @file{*.la} files for Libtool libraries; @@ -5793,6 +5912,9 @@ @code{_CFLAGS}, @code{_LDFLAGS} or @code{_LIBTOOLFLAGS}, in cases where they apply. +If the variable @code{AM_V_*_LINK} exists, it is used to output a +status line in silent mode; otherwise, @code{AM_V_GEN} is used. + @item maude_CCASFLAGS @itemx maude_CFLAGS @itemx maude_CPPFLAGS @@ -5829,7 +5951,7 @@ like @file{sample.c} will be compiled to produce @file{sample.o}. However, if the program's @code{_CFLAGS} variable is set, then the object file will be named, for instance, @file{maude-sample.o}. (See -also @ref{Renamed Objects}). +also @ref{Renamed Objects}.) In compilations with per-target flags, the ordinary @samp{AM_} form of the flags variable is @emph{not} automatically included in the @@ -5897,7 +6019,7 @@ @file{libfoo.c}, and @file{sub/libc++.a} will be built from @file{sub/libc++.c}. (In older versions @file{sub/libc++.a} would be built from @file{sub_libc___a.c}, i.e., the default source -was the canonized name of the target, with @file{.c} appended. +was the canonicalized name of the target, with @file{.c} appended. We believe the new behavior is more sensible, but for backward compatibility @command{automake} will use the old name if a file or a rule with that name exists and @code{AM_DEFAULT_SOURCE_EXT} is not used.) @@ -6132,7 +6254,7 @@ not under @code{$(srcdir)}. This matters especially for packages that use header files placed in sub-directories and want to allow builds outside the source tree (@pxref{VPATH Builds}). In that case we -recommend to use a pair of @option{-I} options, such as, e.g., +recommend using a pair of @option{-I} options, such as, e.g., @samp{-Isome/subdir -I$(srcdir)/some/subdir} or @samp{-I$(top_builddir)/some/subdir -I$(top_srcdir)/some/subdir}. Note that the reference to the build tree should come before the @@ -6155,8 +6277,8 @@ @code{_CFLAGS}. @item COMPILE -This is the command used to actually compile a C source file. The -file name is appended to form the complete command line. +This is the command used to compile a C source file. The file name is +appended to form the complete command line. @item AM_LDFLAGS This is the variable the @file{Makefile.am} author can use to pass @@ -6164,12 +6286,13 @@ preference to the per-executable (or per-library) @code{_LDFLAGS}. @item LINK -This is the command used to actually link a C program. It already -includes @samp{-o $@@} and the usual variable references (for instance, -@code{CFLAGS}); it takes as ``arguments'' the names of the object files -and libraries to link in. This variable is not used when the linker is -overridden with a per-target @code{_LINK} variable or per-target flags -cause Automake to define such a @code{_LINK} variable. +This is the command used to link a C program. It already includes +@samp{-o $@@} and the usual variable references (for instance, +@code{CFLAGS}); it takes as ``arguments'' the names of the object +files and libraries to link in. This variable is not used when the +linker is overridden with a per-target @code{_LINK} variable or +per-target flags cause Automake to define such a @code{_LINK} +variable. @end vtable @@ -6179,14 +6302,14 @@ Automake has somewhat idiosyncratic support for Yacc and Lex. Automake assumes that the @file{.c} file generated by @command{yacc} -(or @command{lex}) should be named using the basename of the input -file. That is, for a yacc source file @file{foo.y}, Automake will +or @command{lex} should be named using the basename of the input +file. That is, for a Yacc source file @file{foo.y}, Automake will cause the intermediate file to be named @file{foo.c} (as opposed to @file{y.tab.c}, which is more traditional). -The extension of a yacc source file is used to determine the extension -of the resulting C or C++ source and header files. Note that header -files are generated only when the @option{-d} Yacc option is used; see +The extension of a Yacc source file is used to determine the extension +of the resulting C or C++ source and header files. Be aware that header +files are generated only when the option @option{-d} is given to Yacc; see below for more information about this flag, and how to specify it. Files with the extension @file{.y} will thus be turned into @file{.c} sources and @file{.h} headers; likewise, @file{.yy} will become @@ -6194,7 +6317,7 @@ @file{h++}, @file{.yxx} will become @file{.cxx} and @file{.hxx}, and @file{.ypp} will become @file{.cpp} and @file{.hpp}. -Similarly, lex source files can be used to generate C or C++; the +Similarly, Lex source files can be used to generate C or C++; the extensions @file{.l}, @file{.ll}, @file{.l++}, @file{.lxx}, and @file{.lpp} are recognized. @@ -6205,10 +6328,10 @@ will be included in any distribution that is made. That way the user doesn't need to have @command{yacc} or @command{lex}. -If a @command{yacc} source file is seen, then your @file{configure.ac} must +If a Yacc source file is seen, then your @file{configure.ac} must define the variable @code{YACC}. This is most easily done by invoking -the macro @code{AC_PROG_YACC} (@pxref{Particular Programs, , Particular -Program Checks, autoconf, The Autoconf Manual}). +the macro @code{AC_PROG_YACC} (@pxref{Particular Programs, , +Particular Program Checks, autoconf, The Autoconf Manual}). @vindex YFLAGS @vindex AM_YFLAGS @@ -6219,17 +6342,18 @@ @code{AM_YFLAGS} is usually used to pass the @option{-d} option to @command{yacc}. Automake knows what this means and will automatically adjust its rules to update and distribute the header file built by -@samp{yacc -d}@footnote{Please note that @command{automake} recognizes -@option{-d} in @code{AM_YFLAGS} only if it is not clustered with other -options; for example, it won't be recognized if @code{AM_YFLAGS} is -@option{-dt}, but it will be if @code{AM_YFLAGS} is @option{-d -t} or -@option{-t -d}.}. -What Automake cannot guess, though, is where this -header will be used: it is up to you to ensure the header gets built -before it is first used. Typically this is necessary in order for -dependency tracking to work when the header is included by another -file. The common solution is listing the header file in -@code{BUILT_SOURCES} (@pxref{Sources}) as follows. +@samp{yacc -d}. Caveat: @command{automake} recognizes @option{-d} in +@code{AM_YFLAGS} only if it is not clustered with other options; for +example, it won't be recognized if @code{AM_YFLAGS} is @option{-dt}, +but it will be if @code{AM_YFLAGS} is @option{-d -t} or @option{-t +-d}. + +What Automake cannot guess, though, is where this header will be used: +it is up to you to ensure the header gets built before it is first +used. Typically this is necessary in order for dependency tracking to +work when the header is included by another file. The common solution +is listing the header file in @code{BUILT_SOURCES} (@pxref{Sources}) +as follows. @example BUILT_SOURCES = parser.h @@ -6238,11 +6362,11 @@ foo_SOURCES = @dots{} parser.y @dots{} @end example -If a @command{lex} source file is seen, then your @file{configure.ac} -must define the variable @code{LEX}. You can use @code{AC_PROG_LEX} -to do this (@pxref{Particular Programs, , Particular Program Checks, -autoconf, The Autoconf Manual}), but using @code{AM_PROG_LEX} macro -(@pxref{Macros}) is recommended. +If a Lex source file is seen, then your @file{configure.ac} must +define the variable @code{LEX}. You can use @code{AC_PROG_LEX} to do +this (@pxref{Particular Programs, , Particular Program Checks, +autoconf, The Autoconf Manual}), but using the @code{AM_PROG_LEX} +macro (@pxref{Macros}) is recommended. @vindex LFLAGS @vindex AM_LFLAGS @@ -6250,9 +6374,10 @@ @code{LFLAGS}. The latter is a user variable and the former is intended for the @file{Makefile.am} author. -When @code{AM_MAINTAINER_MODE} (@pxref{maintainer-mode}) is used, the -rebuild rule for distributed Yacc and Lex sources are only used when -@code{maintainer-mode} is enabled, or when the files have been erased. +When @code{AM_MAINTAINER_MODE} (@pxref{maintainer-mode}) is in effect, +the rebuild rules for distributed Yacc and Lex sources are only used +when @code{maintainer-mode} is enabled, or when the files have been +erased. @cindex @command{ylwrap} @cindex @command{yacc}, multiple parsers @@ -6260,19 +6385,28 @@ @cindex Multiple @command{lex} lexers @cindex @command{lex}, multiple lexers -When @command{lex} or @command{yacc} sources are used, @code{automake -a} -automatically installs an auxiliary program called @command{ylwrap} in -your package (@pxref{Auxiliary Programs}). -This program is used by the build rules to rename the output of these -tools, and makes it possible to include multiple @command{yacc} (or -@command{lex}) source files in a single directory. (This is necessary -because yacc's output file name is fixed, and a parallel make could -conceivably invoke more than one instance of @command{yacc} -simultaneously.) - -For @command{yacc}, simply managing locking is insufficient. The output of -@command{yacc} always uses the same symbol names internally, so it isn't -possible to link two @command{yacc} parsers into the same executable. +When Yacc or Lex sources are used, @code{automake -a} automatically +installs an auxiliary program called @command{ylwrap} in your package +(@pxref{Auxiliary Programs}). This program is used by the build rules +to rename the output of these tools, and makes it possible to include +multiple @command{yacc} (or @command{lex}) source files in a single +directory. This is necessary because Yacc's output file name is +fixed, and a parallel make could invoke more than one instance of +@command{yacc} simultaneously. + +@menu +* Linking Multiple Yacc Parsers:: +@end menu + +@subsection Linking Multiple Yacc Parsers +@node Linking Multiple Yacc Parsers + +@cindex Linking multiple @command{yacc} parsers + +For @command{yacc}, simply managing locking as with @code{ylwrap} is +insufficient. The output of @command{yacc} always uses the same +symbol names internally, so it isn't possible to link two +@command{yacc} parsers into the same executable. We recommend using the following renaming hack used in @command{gdb}: @example @@ -6351,11 +6485,11 @@ The maintainer's variant of @code{CXXFLAGS}. @item CXXCOMPILE -The command used to actually compile a C++ source file. The file name -is appended to form the complete command line. +The command used to compile a C++ source file. The file name is +appended to form the complete command line. @item CXXLINK -The command used to actually link a C++ program. +The command used to link a C++ program. @end vtable @@ -6386,11 +6520,11 @@ The maintainer's variant of @code{OBJCFLAGS}. @item OBJCCOMPILE -The command used to actually compile an Objective C source file. The -file name is appended to form the complete command line. +The command used to compile an Objective C source file. The file name +is appended to form the complete command line. @item OBJCLINK -The command used to actually link an Objective C program. +The command used to link an Objective C program. @end vtable @@ -6421,11 +6555,11 @@ The maintainer's variant of @code{OBJCXXFLAGS}. @item OBJCXXCOMPILE -The command used to actually compile an Objective C++ source file. The -file name is appended to form the complete command line. +The command used to compile an Objective C++ source file. The file +name is appended to form the complete command line. @item OBJCXXLINK -The command used to actually link an Objective C++ program. +The command used to link an Objective C++ program. @end vtable @@ -6455,11 +6589,11 @@ The maintainer's variant of @code{UPCFLAGS}. @item UPCCOMPILE -The command used to actually compile a Unified Parallel C source file. -The file name is appended to form the complete command line. +The command used to compile a Unified Parallel C source file. The +file name is appended to form the complete command line. @item UPCLINK -The command used to actually link a Unified Parallel C program. +The command used to link a Unified Parallel C program. @end vtable @@ -6527,13 +6661,11 @@ The maintainer's variant of @code{RFLAGS}. @item F77COMPILE -The command used to actually compile a Fortran 77 source file. The file -name is appended to form the complete command line. +The command used to compile a Fortran 77 source file. The file name +is appended to form the complete command line. @item FLINK -The command used to actually link a pure Fortran 77 program or shared -library. - +The command used to link a pure Fortran 77 program or shared library. @end vtable Automake can handle preprocessing Fortran 77 and Ratfor source files in @@ -6617,7 +6749,7 @@ However, there are many other issues related to mixing Fortran 77 with other languages that are @emph{not} (currently) handled by Automake, but that are handled by other packages@footnote{For example, -@uref{http://www-zeus.desy.de/~burow/cfortran/, the cfortran package} +@uref{https://www-zeus.desy.de/~burow/cfortran/, the cfortran package} addresses all of these inter-language issues, and runs under nearly all Fortran 77, C and C++ compilers on nearly all platforms. However, @command{cfortran} is not yet Free Software, but it will be in the next @@ -6685,7 +6817,7 @@ @cindex Automatic linker selection @cindex Selecting the linker automatically -When a program or library mixes several languages, Automake choose the +When a program or library mixes several languages, Automake chooses the linker according to the following priorities. (The names in parentheses are the variables containing the link command.) @@ -6764,13 +6896,11 @@ The maintainer's variant of @code{FCFLAGS}. @item FCCOMPILE -The command used to actually compile a Fortran 9x source file. The file -name is appended to form the complete command line. +The command used to compile a Fortran 9x source file. The file name +is appended to form the complete command line. @item FCLINK -The command used to actually link a pure Fortran 9x program or shared -library. - +The command used to link a pure Fortran 9x program or shared library. @end vtable @menu @@ -6852,12 +6982,12 @@ @cindex Support for Vala Automake provides initial support for Vala -(@uref{http://www.vala-project.org/}). +(@uref{https://www.vala-project.org/}). This requires valac version 0.7.0 or later, and currently requires the user to use GNU @command{make}. @example -foo_SOURCES = foo.vala bar.vala zardoc.c +foo_SOURCES = foo.vala bar.vala zardoz.c @end example Any @file{.vala} file listed in a @code{_SOURCES} variable will be @@ -6873,12 +7003,15 @@ Search for a Vala compiler in @env{PATH}. If it is found, the variable @code{VALAC} is set to point to it (see below for more details). This macro takes three optional arguments. The first argument, if present, -is the minimum version of the Vala compiler required to compile this -package. If a compiler is found and satisfies @var{minimum-version}, -then @var{action-if-found} is run (this defaults to do nothing). -Otherwise, @var{action-if-not-found} is run. If @var{action-if-not-found} -is not specified, the default value is to print a warning in case no -compiler is found, or if a too-old version of the compiler is found. +is the minimum version of the Vala API required to compile this package. +For Vala releases, this is the same as the major and minor release +number; e.g., when @code{valac --version} reports @code{0.48.7}, +@code{valac --api-version} reports @code{0.48}. If a compiler is found +and satisfies @var{minimum-version}, then @var{action-if-found} is run +(this defaults to do nothing). Otherwise, @var{action-if-not-found} is +run. If @var{action-if-not-found} is not specified, the default value +is to print a warning in case no compiler is found, or if a too-old +version of the compiler is found. @end defmac There are a few variables that are used when compiling Vala sources: @@ -6886,7 +7019,7 @@ @vtable @code @item VALAC Absolute path to the Vala compiler, or simply @samp{valac} if no -suitable compiler Vala could be found at configure runtime. +suitable Vala compiler could be found at configure runtime. @item VALAFLAGS Additional arguments for the Vala compiler. @@ -6992,6 +7125,7 @@ bin_PROGRAMS = liver @end example +@noindent to this: @example @@ -7030,9 +7164,9 @@ @node Other Objects @chapter Other Derived Objects -Automake can handle derived objects that are not C programs. Sometimes -the support for actually building such objects must be explicitly -supplied, but Automake will still automatically handle installation and +Automake can handle derived objects that are not C programs. +Sometimes the support for building such objects must be explicitly +supplied, but Automake can still automatically handle installation and distribution. @menu @@ -7169,7 +7303,7 @@ will install the two files as @file{$(includedir)/foo.h} and @file{$(includedir)/bar.h}. -The @code{nobase_} prefix is also supported, +The @code{nobase_} prefix is also supported: @example nobase_include_HEADERS = foo.h bar/bar.h @@ -7183,7 +7317,7 @@ Usually, only header files that accompany installed libraries need to be installed. Headers used by programs or convenience libraries are not installed. The @code{noinst_HEADERS} variable can be used for -such headers. However when the header actually belongs to a single +such headers. However, when the header belongs to a single convenience library or program, we recommend listing it in the program's or library's @code{_SOURCES} variable (@pxref{Program Sources}) instead of in @code{noinst_HEADERS}. This is clearer for @@ -7264,31 +7398,31 @@ @cindex @code{BUILT_SOURCES}, defined The @code{BUILT_SOURCES} variable is a workaround for this problem. A -source file listed in @code{BUILT_SOURCES} is made on @samp{make all} -or @samp{make check} (or even @samp{make install}) before other -targets are processed. However, such a source file is not -@emph{compiled} unless explicitly requested by mentioning it in some -other @code{_SOURCES} variable. +source file listed in @code{BUILT_SOURCES} is made when @samp{make +all}, @samp{make check}, @samp{make install}, @samp{make install-exec} +(or @code{make dist}) is run, before other targets are processed. +However, such a source file is not @emph{compiled} unless explicitly +requested by mentioning it in some other @code{_SOURCES} variable. So, to conclude our introductory example, we could use @samp{BUILT_SOURCES = foo.h} to ensure @file{foo.h} gets built before any other target (including @file{foo.o}) during @samp{make all} or @samp{make check}. -@code{BUILT_SOURCES} is actually a bit of a misnomer, as any file which -must be created early in the build process can be listed in this -variable. Moreover, all built sources do not necessarily have to be -listed in @code{BUILT_SOURCES}. For instance, a generated @file{.c} file -doesn't need to appear in @code{BUILT_SOURCES} (unless it is included by -another source), because it's a known dependency of the associated +@code{BUILT_SOURCES} is a bit of a misnomer, as any file which must be +created early in the build process can be listed in this variable. +Moreover, all built sources do not necessarily have to be listed in +@code{BUILT_SOURCES}. For instance, a generated @file{.c} file +doesn't need to appear in @code{BUILT_SOURCES} (unless it is included +by another source), because it's a known dependency of the associated object. -It might be important to emphasize that @code{BUILT_SOURCES} is -honored only by @samp{make all}, @samp{make check} and @samp{make -install}. This means you cannot build a specific target (e.g., -@samp{make foo}) in a clean tree if it depends on a built source. -However it will succeed if you have run @samp{make all} earlier, -because accurate dependencies are already available. +To emphasize, @code{BUILT_SOURCES} is honored only by @samp{make all}, +@samp{make check}, @samp{make install}, and @code{make install-exec} +(and @samp{make dist}). This means you cannot build an arbitrary +target (e.g., @samp{make foo}) in a clean tree if it depends on a +built source. However it will succeed if you have run @samp{make all} +earlier, because accurate dependencies are already available. The next section illustrates and discusses the handling of built sources on a toy example. @@ -7421,11 +7555,10 @@ You don't have to list @emph{all} the dependencies of @file{foo.o} explicitly, only those that might need to be built. If a dependency already exists, it will not hinder the first compilation and will be -recorded by the normal dependency tracking code. (Note that after -this first compilation the dependency tracking code will also have -recorded the dependency between @file{foo.o} and -@file{bindir.h}; so our explicit dependency is really useful to -the first build only.) +recorded by the normal dependency tracking code. (After this first +compilation, the dependency tracking code will also have recorded the +dependency between @file{foo.o} and @file{bindir.h}, so our explicit +dependency is only useful to the first build.) Adding explicit dependencies like this can be a bit dangerous if you are not careful enough. This is due to the way Automake tries not to @@ -7544,7 +7677,7 @@ Byte-compiled Emacs Lisp files are not portable among all versions of Emacs, so it makes sense to turn this off if you expect sites to have more than one version of Emacs installed. Furthermore, many packages -don't actually benefit from byte-compilation. Still, we recommend +do not actually benefit from byte-compilation. Still, we recommend that you byte-compile your Emacs Lisp sources. It is probably better for sites with strange setups to cope for themselves than to make the installation less nice for everybody else. @@ -7623,7 +7756,7 @@ Any @file{.java} files listed in a @code{_JAVA} variable will be compiled with @code{JAVAC} at build time. By default, @file{.java} -files are not included in the distribution, you should use the +files are not included in the distribution; you should use the @code{dist_} prefix to distribute them. Here is a typical setup for distributing @file{.java} files and @@ -7683,31 +7816,34 @@ Automake provides support for Python compilation with the @code{PYTHON} primary. A typical setup is to call -@code{AM_PATH_PYTHON} in @file{configure.ac} and use a line like the -following in @file{Makefile.am}: +@code{AM_PATH_PYTHON} in @file{configure.ac} and use a line like this +in @file{Makefile.am}: @example python_PYTHON = tree.py leave.py @end example -Any files listed in a @code{_PYTHON} variable will be byte-compiled -with @command{py-compile} at install time. @command{py-compile} -actually creates both standard (@file{.pyc}) and optimized -(@file{.pyo}) byte-compiled versions of the source files. Note that -because byte-compilation occurs at install time, any files listed in -@code{noinst_PYTHON} will not be compiled. Python source files are -included in the distribution by default, prepend @code{nodist_} (as in -@code{nodist_python_PYTHON}) to omit them. - -Automake ships with an Autoconf macro called @code{AM_PATH_PYTHON} -that will determine some Python-related directory variables (see -below). If you have called @code{AM_PATH_PYTHON} from -@file{configure.ac}, then you may use the variables +Python source files are included in the distribution by default; +prepend @code{nodist_} (as in @code{nodist_python_PYTHON}) to omit +them. + +@cindex @file{.pyc}, @file{.pyo} files +At install time, any files listed in a @code{_PYTHON} variable will be +byte-compiled with @command{py-compile}. @command{py-compile} creates +both standard (@file{.pyc}) and optimized (@file{.pyo}) byte-compiled +versions of the source files. Because byte-compilation occurs at +install time, files listed in @code{noinst_PYTHON} will not be +compiled. + +Automake ships with an Autoconf macro named @code{AM_PATH_PYTHON} that +determines some Python-related directory variables (see below). If +you have called @code{AM_PATH_PYTHON} from @file{configure.ac}, then +you may use the variables @c Keep in sync with primary-prefix-couples-documented-valid.sh -@code{python_PYTHON} or @code{pkgpython_PYTHON} to list Python source -files in your @file{Makefile.am}, depending on where you want your files -installed (see the definitions of @code{pythondir} and -@code{pkgpythondir} below). +@code{python_PYTHON} and @code{pkgpython_PYTHON} to list Python source +files in your @file{Makefile.am}, depending on whether you want your +files installed in @code{pythondir} or @code{pkgpythondir}, +respectively. @defmac AM_PATH_PYTHON (@ovar{version}, @ovar{action-if-found}, @ovar{action-if-not-found}) @@ -7721,15 +7857,15 @@ run. If @var{action-if-not-found} is not specified, as in the following -example, the default is to abort @command{configure}. +example, the default is to abort @command{configure}: @example -AM_PATH_PYTHON([2.2]) +AM_PATH_PYTHON([2.5]) @end example @noindent This is fine when Python is an absolute requirement for the package. -If Python >= 2.5 was only @emph{optional} to the package, +If Python @geq{} 2.5 was only @emph{optional} for the package, @code{AM_PATH_PYTHON} could be called as follows. @example @@ -7740,7 +7876,7 @@ called, then that will be the only Python interpreter that is tried. @code{AM_PATH_PYTHON} creates the following output variables based on -the Python installation found during configuration. +the Python installation found during configuration: @end defmac @vtable @code @@ -7750,7 +7886,7 @@ Assuming @var{action-if-not-found} is used (otherwise @file{./configure} will abort if Python is absent), the value of @code{PYTHON} can be used -to setup a conditional in order to disable the relevant part of a build +to set up a conditional in order to disable the relevant part of a build as follows. @example @@ -7759,26 +7895,38 @@ @end example @item PYTHON_VERSION +@vindex sys.version_info @r{Python variable} The Python version number, in the form @var{major}.@var{minor} -(e.g., @samp{2.5}). This is currently the value of -@samp{sys.version[:3]}. +(e.g., @samp{2.5}). This is set to be the value of +@samp{'%u.%u' % sys.version_info[:2]}. @item PYTHON_PREFIX -The string @samp{$@{prefix@}}. This term may be used in future work -that needs the contents of Python's @samp{sys.prefix}, but general -consensus is to always use the value from @command{configure}. - -@item PYTHON_EXEC_PREFIX -The string @samp{$@{exec_prefix@}}. This term may be used in future work -that needs the contents of Python's @samp{sys.exec_prefix}, but general -consensus is to always use the value from @command{configure}. +@itemx PYTHON_EXEC_PREFIX +@opindex --with-python-sys-prefix +@opindex --with-python_prefix +@opindex --with-python_exec_prefix +@vindex sys.prefix @r{Python variable} +@vindex sys.exec_prefix @r{Python variable} +With no special options given, these have values @samp{$@{prefix@}} +and @samp{$@{exec_prefix@}}, respectively (unexpanded; see below). + +The @file{configure} options @option{--with-python_prefix} +and @option{--with-python_exec_prefix} set them to an explicit value. + +The @file{configure} option @option{--with-python-sys-prefix} set them +to the values of Python's @samp{sys.prefix} and @samp{sys.exec_prefix} +variables. These often differ from @samp{$@{prefix@}} and +@samp{$@{exec_prefix@}}, e.g., on platforms such as Mac@tie{}OS@tie{}x +(where Python is usually installed as a Framework). @item PYTHON_PLATFORM +@vindex sys.platform @r{Python variable} The canonical name used by Python to describe the operating system, as given by @samp{sys.platform}. This value is sometimes needed when building Python extensions. @item pythondir +@cindex @file{site-packages} Python directory The directory name for the @file{site-packages} subdirectory of the standard Python install tree. @@ -7804,9 +7952,9 @@ @samp{$(pyexecdir)/$(PACKAGE)}. @end vtable -All of these directory variables have values that start with either -@samp{$@{prefix@}} or @samp{$@{exec_prefix@}} unexpanded. This works -fine in @file{Makefiles}, but it makes these variables hard to use in +All of these directory variables have values that can start with either +@samp{$@{prefix@}} or @samp{$@{exec_prefix@}}, unexpanded. This works +fine in @file{Makefile}s, but it makes these variables hard to use in @file{configure}. This is mandated by the GNU coding standards, so that the user can run @samp{make prefix=/foo install}. The Autoconf manual has a section with more details on this topic @@ -7921,10 +8069,11 @@ Texinfo file that matches @file{vers*.texi} just as an automatically generated version file. -Sometimes an info file actually depends on more than one @file{.texi} -file. For instance, in GNU Hello, @file{hello.texi} includes the file +Often an Info file depends on more than one @file{.texi} file. For +instance, in GNU Hello, @file{hello.texi} includes the file @file{fdl.texi}. You can tell Automake about these dependencies using -the @code{@var{texi}_TEXINFOS} variable. Here is how GNU Hello does it: +the @code{@var{texi}_TEXINFOS} variable. Here is how GNU Hello does +it: @vindex TEXINFOS @vindex _TEXINFOS @@ -8027,7 +8176,6 @@ @file{.dvi} file. This defaults to @samp{dvips}. @item TEXINFO_TEX - If your package has Texinfo files in many directories, you can use the variable @code{TEXINFO_TEX} to tell Automake where to find the canonical @file{texinfo.tex} for your package. The value of this variable should @@ -8145,10 +8293,10 @@ @cindex Installation support @cindex @samp{make install} support -Naturally, Automake handles the details of actually installing your -program once it has been built. All files named by the various -primaries are automatically installed in the appropriate places when the -user runs @samp{make install}. +Naturally, Automake handles the details of installing your program +once it has been built. All files named by the various primaries are +automatically installed in the appropriate places when the user runs +@samp{make install}. @menu * Basics of Installation:: What gets installed where @@ -8395,53 +8543,91 @@ @vindex VERSION @trindex dist The @code{dist} rule in the generated @file{Makefile.in} can be used -to generate a gzipped @code{tar} file and other flavors of archive for -distribution. The file is named based on the @code{PACKAGE} and +to generate a gzipped @code{tar} file and/or other flavors of archives +for distribution. The file is named based on the @code{PACKAGE} and @code{VERSION} variables automatically defined by either the @code{AC_INIT} invocation or by a @emph{deprecated} two-arguments -invocation of the @code{AM_INIT_AUTOMAKE} macro (see @ref{Public Macros} -for how these variables get their values, from either defaults or explicit -values -- it's slightly trickier than one would expect). -More precisely the gzipped @code{tar} file is named +invocation of the @code{AM_INIT_AUTOMAKE} macro (see @ref{Public +Macros} for how these variables get their values, from either defaults +or explicit values---it's slightly trickier than one would expect). +More precisely, the gzipped @code{tar} file is named @samp{$@{PACKAGE@}-$@{VERSION@}.tar.gz}. -@vindex GZIP_ENV -You can use the @command{make} variable @code{GZIP_ENV} to control how gzip -is run. The default setting is @option{--best}. + +@c See automake #9822. +@vindex TAR +You can set the environment variable @code{TAR} to override the tar +program used; it defaults to @code{tar}. @xref{The Types of +Distributions}, for how to generate other kinds of archives. + +For the most part, the files to distribute are automatically found by +Automake: + +@itemize @bullet +@item +All source files are automatically included in a distribution, as are +all @file{Makefile.am} and @file{Makefile.in} files. + +@acindex AC_CONFIG_FILES +@item +Files that are read by @command{configure} are automatically +distributed. These are the source files as specified in various +Autoconf macros such as @code{AC_CONFIG_FILES} and siblings. @cindex @code{m4_include}, distribution @cindex @code{include}, distribution @acindex m4_include @cmindex include -For the most part, the files to distribute are automatically found by -Automake: all source files are automatically included in a distribution, -as are all @file{Makefile.am} and @file{Makefile.in} files. Automake also -has a built-in list of commonly used files that are automatically -included if they are found in the current directory (either physically, -or as the target of a @file{Makefile.am} rule); this list is printed by -@samp{automake --help}. Note that some files in this list are actually -distributed only if other certain conditions hold (for example, +@item +Files included in a @file{Makefile.am} (using @code{include}) or in +@file{configure.ac} (using @code{m4_include}). + +@item +Automake has a built-in list of commonly used files automatically +included in the distribution if they are found in the current +directory (either physically, or as the target of a @file{Makefile.am} +rule). Some common examples: @file{ABOUT-GNU}, @file{COPYING}, +@file{TODO}. + +This list also includes helper scripts installed with @samp{automake +--add-missing}. Some common examples: @file{compile}, +@file{config.guess}, @file{config.rpath}, @file{config.sub}, +@file{texinfo.tex}. + +@item +Automake has another built-in list of files automatically distributed +if they are found either with the plain name, or with extension +@file{.md} (presumably MarkDown, though this not checked). They are +checked for in that order, so the plain name is preferred. These are: +@file{AUTHORS ChangeLog INSTALL NEWS README README-alpha THANKS}. + +@item +A final built-in list of files are those distributed only if other +certain conditions hold. For example, @c Keep in sync with autodist-config-headers.sh -the @file{config.h.top} and @file{config.h.bot} files are automatically -distributed only if, e.g., @samp{AC_CONFIG_HEADERS([config.h])} is used -in @file{configure.ac}). Also, files that are read by @command{configure} -(i.e.@: the source files corresponding to the files specified in various -Autoconf macros such as @code{AC_CONFIG_FILES} and siblings) are -automatically distributed. Files included in a @file{Makefile.am} (using -@code{include}) or in @file{configure.ac} (using @code{m4_include}), and -helper scripts installed with @samp{automake --add-missing} are also -distributed. +the files @file{config.h.top} and @file{config.h.bot} are +automatically distributed only if, e.g., +@samp{AC_CONFIG_HEADERS([config.h])} is used in @file{configure.ac}). +@file{README-alpha} is another such file, with @file{README-alpha.md} +distributed if that is what is available; @pxref{Strictness}, for its +conditions for distribution. + +@end itemize + +@noindent +These three lists of files are given in their entirety in the output +from @code{automake --help}. @vindex EXTRA_DIST -Still, sometimes there are files that must be distributed, but which -are not covered in the automatic rules. These files should be listed in -the @code{EXTRA_DIST} variable. You can mention files from -subdirectories in @code{EXTRA_DIST}. - -You can also mention a directory in @code{EXTRA_DIST}; in this case the -entire directory will be recursively copied into the distribution. -Please note that this will also copy @emph{everything} in the directory, -including, e.g., Subversion's @file{.svn} private directories or CVS/RCS -version control files; thus we recommend against using this feature +Despite all this automatic inclusion, it is still common to have files +to be distributed which are not found by the automatic rules. You +should listed these files in the @code{EXTRA_DIST} variable. You can +mention files in subdirectories in @code{EXTRA_DIST}. + +You can also mention a directory in @code{EXTRA_DIST}; in this case +the entire directory will be recursively copied into the distribution. +To emphasize, this copies @emph{everything} in the directory, +including temporary editor files, intermediate build files, version +control files, etc.; thus we recommend against using this feature as-is. However, you can use the @code{dist-hook} feature to ameliorate the problem; @pxref{The dist Hook}. @@ -8495,26 +8681,27 @@ @example EXTRA_DIST = doc dist-hook: - rm -rf `find $(distdir)/doc -type d -name .svn` + chmod -R u+w $(distdir)/doc + rm -rf `find $(distdir)/doc -type d -name RCS` @end example @c The caveats described here should be documented in 'disthook.sh'. @noindent -Note that the @code{dist-hook} recipe shouldn't assume that the regular -files in the distribution directory are writable; this might not be the -case if one is packaging from a read-only source tree, or when a -@code{make distcheck} is being done. For similar reasons, the recipe -shouldn't assume that the subdirectories put into the distribution -directory as effect of having them listed in @code{EXTRA_DIST} are -writable. So, if the @code{dist-hook} recipe wants to modify the -content of an existing file (or @code{EXTRA_DIST} subdirectory) in the -distribution directory, it should explicitly to make it writable first: +The @code{dist-hook} recipe should not assume that the regular files +in the distribution directory are writable; this might not be the case +if one is packaging from a read-only source tree, or when a @code{make +distcheck} is being done. Similarly, the recipe should not assume +that the subdirectories put into the distribution directory as a +result of being listed in @code{EXTRA_DIST} are writable. So, if the +@code{dist-hook} recipe wants to modify the content of an existing +file (or @code{EXTRA_DIST} subdirectory) in the distribution +directory, it should explicitly to make it writable first: @example EXTRA_DIST = README doc dist-hook: chmod u+w $(distdir)/README $(distdir)/doc - echo "Distribution date: `date`" >> README + echo "Distribution date: `date`" >> $(distdir)/README rm -f $(distdir)/doc/HACKING @end example @@ -8528,16 +8715,17 @@ tarball. If you are at the top-level directory, then @samp{distdir = $(PACKAGE)-$(VERSION)}. When used from subdirectory named @file{foo/}, then @samp{distdir = ../$(PACKAGE)-$(VERSION)/foo}. -@samp{$(distdir)} can be a relative or absolute path, do not assume -any form. +@samp{$(distdir)} can be either a relative or absolute path; do not +assume a particular form. @samp{$(top_distdir)} always points to the root directory of the -distributed tree. At the top-level it's equal to @samp{$(distdir)}. -In the @file{foo/} subdirectory -@samp{top_distdir = ../$(PACKAGE)-$(VERSION)}. -@samp{$(top_distdir)} too can be a relative or absolute path. +distributed tree. At the top level it's equal to @samp{$(distdir)}. +In the @file{foo/} subdirectory @samp{top_distdir = +../$(PACKAGE)-$(VERSION)}. @samp{$(top_distdir)} can also be either a +relative or absolute path. -Note that when packages are nested using @code{AC_CONFIG_SUBDIRS} +@acindex AC_CONFIG_SUBDIRS +When packages are nested using @code{AC_CONFIG_SUBDIRS} (@pxref{Subpackages}), then @samp{$(distdir)} and @samp{$(top_distdir)} are relative to the package where @samp{make dist} was run, not to any sub-packages involved. @@ -8550,16 +8738,18 @@ Automake also generates a @code{distcheck} rule that can be of help to ensure that a given distribution will actually work. Simplifying a bit, we can say this rule first makes a distribution, and then, -@emph{operating from it}, takes the following steps: +@emph{operating from it}, takes the following steps (in this order): @itemize @item tries to do a @code{VPATH} build (@pxref{VPATH Builds}), with the @code{srcdir} and all its content made @emph{read-only}; @item +tries to make the printable documentation, if any (with @command{make dvi}), +@item runs the test suite (with @command{make check}) on this fresh build; @item installs the package in a temporary directory (with @command{make -install}), and tries runs the test suite on the resulting installation +install}), and runs the test suite on the resulting installation (with @command{make installcheck}); @item checks that the package can be correctly uninstalled (by @command{make @@ -8569,12 +8759,12 @@ self-contained. @end itemize -All of these actions are performed in a temporary directory. Please -note that the exact location and the exact structure of such a directory -(where the read-only sources are placed, how the temporary build and -install directories are named and how deeply they are nested, etc.) is -to be considered an implementation detail, which can change at any time; -so do not reply on it. +All of these actions are performed in a temporary directory. The +exact location and the exact structure of such a directory (where the +read-only sources are placed, how the temporary build and install +directories are named and how deeply they are nested, etc.) is to be +considered an implementation detail, which can change at any time; so +do not rely on it. @vindex AM_DISTCHECK_CONFIGURE_FLAGS @vindex DISTCHECK_CONFIGURE_FLAGS @@ -8599,7 +8789,7 @@ is justified. GNU @command{m4} offers an example. GNU @command{m4} configures by default with its experimental and seldom used "changeword" feature -disabled; so in its case it is useful to have @command{make distcheck} +disabled; so in this case it is useful to have @command{make distcheck} run configure with the @option{--with-changeword} option, to ensure that the code for changeword support still compiles correctly. GNU @command{m4} also employs the @code{AM_DISTCHECK_CONFIGURE_FLAGS} @@ -8608,6 +8798,30 @@ installcheck} was wrongly assuming it could blindly test "@command{m4}", rather than the just-installed "@command{gm4}". +@trindex dvi +@subheading dvi and distcheck +@cindex @code{eps} images +Ordinarily, @command{make distcheck} runs @command{make dvi}. It does +nothing if the distribution contains no Texinfo sources. If the +distribution does contain a Texinfo manual, by default the @code{dvi} +target will run @TeX{} to make sure it can be successfully processed +(@pxref{Texinfo}). + +However, you may wish to test the manual by producing @code{pdf} +(e.g., if your manual uses images in formats other than @code{eps}), +@code{html} (if you don't have @TeX{} at all), some other format, or +just skip the test entirely (not recommended). You can change the +target that is run by setting the variable +@code{AM_DISTCHECK_DVI_TARGET} in your @code{Makefile.am}; for +example, + +@example +AM_DISTCHECK_DVI_TARGET = pdf +@end example + +To make @code{dvi} into a do-nothing target, see the example for +@code{EMPTY_AUTOMAKE_TARGETS} in @ref{Third-Party Makefiles}. + @trindex distcheck-hook @subheading distcheck-hook If the @code{distcheck-hook} rule is defined in your top-level @@ -8662,10 +8876,10 @@ The above definition is not the default because it's usually an error if your Makefiles cause some distributed files to be rebuilt when the user -build the package. (Think about the user missing the tool required to +builds the package. (Think about the user missing the tool required to build the file; or if the required tool is built by your package, consider the cross-compilation case where it can't be run.) There is -an entry in the FAQ about this (@pxref{Errors with distclean}), make +an entry in the FAQ about this (@pxref{Errors with distclean}); make sure you read it before playing with @code{distcleancheck_listfiles}. @cindex @samp{make distuninstallcheck} @@ -8701,59 +8915,89 @@ @table @asis @item @code{dist-gzip} -Generate a @samp{gzip} tar archive of the distribution. This is the -only format enabled by default. @trindex dist-gzip +@cmindex gzip +@vindex GZIP_ENV +Generate a @samp{gzip} tar archive of the distribution. This is the +only format enabled by default. By default, this rule makes +@command{gzip} use a compression option of @option{--best}. To make +it use a different one, set the @env{GZIP_ENV} environment variable. +For example, @samp{make dist-gzip GZIP_ENV=-7}. -@vindex BZIP2 @item @code{dist-bzip2} -Generate a @samp{bzip2} tar archive of the distribution. bzip2 archives -are frequently smaller than gzipped archives. -By default, this rule makes @samp{bzip2} use a compression option of @option{-9}. -To make it use a different one, set the @env{BZIP2} environment variable. -For example, @samp{make dist-bzip2 BZIP2=-7}. @trindex dist-bzip2 +@cmindex bzip2 +@vindex BZIP2 +Generate a @samp{bzip2} tar archive of the distribution. bzip2 +archives are usually smaller than gzipped archives. By default, this +rule makes @samp{bzip2} use a compression option of @option{-9}. To +make it use a different one, set the @env{BZIP2} environment variable. @item @code{dist-lzip} -Generate an @samp{lzip} tar archive of the distribution. @command{lzip} -archives are frequently smaller than @command{bzip2}-compressed archives. @trindex dist-lzip +@cmindex lzip +@vindex LZIP_OPT +Generate an @samp{lzip} tar archive of the distribution. +@command{lzip} archives are usually smaller than +@command{bzip2}-compressed archives. By default, this rule makes +@samp{lzip} use a compression option of @option{-9}. To make it use a +different one, set the @env{LZIP_OPT} environment variable. -@vindex XZ_OPT @item @code{dist-xz} +@trindex dist-xz +@cmindex xz +@vindex XZ_OPT Generate an @samp{xz} tar archive of the distribution. @command{xz} -archives are frequently smaller than @command{bzip2}-compressed archives. +archives are usually smaller than @command{bzip2}-compressed archives. By default, this rule makes @samp{xz} use a compression option of @option{-e}. To make it use a different one, set the @env{XZ_OPT} environment variable. For example, run this command to use the -default compression ratio, but with a progress indicator: -@samp{make dist-xz XZ_OPT=-ve}. -@trindex dist-xz +default compression ratio, but with a progress indicator: @samp{make +dist-xz XZ_OPT=-ve}. +@trindex dist-zip +@cmindex zip @item @code{dist-zip} Generate a @samp{zip} archive of the distribution. -@trindex dist-zip -@item @code{dist-tarZ} -Generate a tar archive of the distribution, compressed with the -historical (and obsolescent) program @command{compress}. This -option is deprecated, and it and the corresponding functionality -will be removed altogether in Automake 2.0. -@trindex dist-tarZ +@item @code{dist-zstd} +@trindex dist-zstd +@cmindex zstd +@vindex ZSTD_OPT +@vindex ZSTD_CLEVEL +Generate a @code{zstd} tar archive of the distribution. By default, +this rule makes @command{zstd} use a compression option of +@option{-19}. To use a different setting, set the @env{ZSTD_OPT} +environment variable. For example, run this command to use the +default compression ratio, but with a progress indicator: @samp{make +dist-zstd ZSTD_OPT=-19v}. However, note that for compatibility with +@command{zstd} itself, you may instead set the @env{ZSTD_CLEVEL} +environment variable, in which case, any @env{ZSTD_OPT} setting is +ignored. @item @code{dist-shar} +@trindex dist-shar +@cmindex shar Generate a @samp{shar} archive of the distribution. This format archive is obsolescent, and use of this option is deprecated. It and the corresponding functionality will be removed altogether in Automake 2.0. -@trindex dist-shar + +@item @code{dist-tarZ} +@trindex dist-tarZ +@cmindex compress +Generate a tar archive of the distribution, compressed with the +historical (and obsolescent) program @command{compress}. This +option is deprecated, and it and the corresponding functionality +will be removed altogether in Automake 2.0. @end table +@trindex dist-all The rule @code{dist} (and its historical synonym @code{dist-all}) will create archives in all the enabled formats (@pxref{List of Automake options} for how to change this list). By default, only -the @code{dist-gzip} target is hooked to @code{dist}. +the @code{dist-gzip} target is enabled by @code{dist}. @node Tests @@ -8804,7 +9048,7 @@ @cindex testsuite harness A @emph{test harness} (also @emph{testsuite harness}) is a program or software component that executes all (or part of) the defined test cases, -analyzes their outcomes, and report or register these outcomes +analyzes their outcomes, and reports or registers these outcomes appropriately. Again, the details of how this is accomplished (and how the developer and user can influence it or interface with it) varies wildly, and we'll attempt no precise definition. @@ -8818,13 +9062,13 @@ @cindex test skip Sometimes, tests can rely on non-portable tools or prerequisites, or simply make no sense on a given system (for example, a test checking a -Windows-specific feature makes no sense on a GNU/Linux system). In this -case, accordingly to the definition above, the tests can neither be -considered passed nor failed; instead, they are @emph{skipped} -- i.e., -they are not run, or their result is anyway ignored for what concerns -the count of failures an successes. Skips are usually explicitly -reported though, so that the user will be aware that not all of the -testsuite has really run. +Windows-specific feature makes no sense on a GNU/Linux system). In +this case, accordingly to the definition above, the tests can neither +be considered passed nor failed; instead, they are @emph{skipped}, +that is, they are not run, or their result is in any case ignored for +what concerns the count of failures and successes. Skips are usually +explicitly reported though, so that the user will be aware that not +all of the testsuite has been run. @cindex xfail @cindex expected failure @@ -8845,7 +9089,7 @@ @cindex Distinction between errors and failures in testsuites Many testing environments and frameworks distinguish between test failures and hard errors. As we've seen, a test failure happens when some invariant -or expected behaviour of the software under test is not met. An @emph{hard +or expected behaviour of the software under test is not met. A @emph{hard error} happens when e.g., the set-up of a test case scenario fails, or when some other unexpected or highly undesirable condition is encountered (for example, the program under test experiences a segmentation fault). @@ -8878,7 +9122,7 @@ By default, only the exit statuses of the test scripts are considered when determining the testsuite outcome. But Automake allows also the use of more complex test protocols, either standard (@pxref{Using the TAP test -protocol}) or custom (@pxref{Custom Test Drivers}). Note that you can't +protocol}) or custom (@pxref{Custom Test Drivers}). You can't enable such protocols when the serial harness is used, though. In the rest of this section we are going to concentrate mostly on protocol-less tests, since we cover test protocols in a later section @@ -8888,7 +9132,7 @@ @cindex Exit status 99, special interpretation When no test protocol is in use, an exit status of 0 from a test script will denote a success, an exit status of 77 a skipped test, an exit status of 99 -an hard error, and any other exit status will denote a failure. +a hard error, and any other exit status will denote a failure. @cindex Tests, expected failure @cindex Expected test failure @@ -8919,7 +9163,7 @@ possible results (whose meanings should be clear from the previous @ref{Generalities about Testing}) are @code{PASS}, @code{FAIL}, @code{SKIP}, @code{XFAIL}, @code{XPASS} and @code{ERROR}. Here is an -example of output from an hypothetical testsuite that uses both plain +example of output from a hypothetical testsuite that uses both plain and TAP tests: @c Keep in sync with tap-doc.sh @example @@ -8936,7 +9180,34 @@ @noindent A testsuite summary (expected to report at least the number of run, skipped and failed tests) will be printed at the end of the testsuite -run. +run. By default, the first line of the summary has the form: + +@example +Testsuite summary for @var{package-string} +@end example + +@c See automake bug#11745. +@vindex AM_TESTSUITE_SUMMARY_HEADER +@noindent +where @var{package-string} is the name and version of the package. If +you have several independent test suites for different parts of the +package, though, it can be misleading for each suite to imply it is +for the whole package. Or, in complex projects, you may wish to add +the current directory or other information to the testsuite header +line. So you can override the @samp{ for @var{package-string}} suffix +on that line by setting the @code{AM_TESTSUITE_SUMMARY_HEADER} +variable. The value of this variable is used unquoted in a shell echo +command, so you must include any necessary quotes. For example, the +default value is + +@example +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' +@end example + +@noindent +including the double quotes (interpreted by the shell) and the leading +space (since the value is output directly after the @samp{Testsuite +summary}). The @code{$(PACKAGE_STRING)} is substituted by @code{make}. @anchor{Simple tests and color-tests} @vindex AM_COLOR_TESTS @@ -8962,6 +9233,35 @@ (@pxref{Checking the Distribution}). @vindex TESTS +Automake ensures that each file listed in @code{TESTS} is built before +it is run; you can list both source and derived programs (or scripts) +in @code{TESTS}; the generated rule will look both in @code{srcdir} and +`@file{..}'. For instance, you might want to run a C program as a test. +To do this you would list its name in @code{TESTS} and also in +@code{check_PROGRAMS}, and then specify it as you would any other +program. + +@vindex check_PROGRAMS +Programs listed in @code{check_PROGRAMS} (and @code{check_LIBRARIES}, +@code{check_LTLIBRARIES}, ...) are only built during @code{make +check}, not during @code{make all}. You should list there any program +needed by your tests that does not need to be built by @code{make +all}. The programs in @code{check_PROGRAMS} are @emph{not} +automatically added to @code{TESTS} because @code{check_PROGRAMS} +usually lists programs used by the tests, not the tests themselves. +If all your programs are in fact test cases, you can set @code{TESTS = +$(check_PROGRAMS)}. + +@menu +* Testsuite Environment Overrides:: +@end menu + +@node Testsuite Environment Overrides +@subsubsection Testsuite Environment Overrides + +@cindex Testsuite environment overrides +@cindex Overriding testsuite environment + @vindex TESTS_ENVIRONMENT @vindex AM_TESTS_ENVIRONMENT The @code{AM_TESTS_ENVIRONMENT} and @code{TESTS_ENVIRONMENT} variables can @@ -8981,7 +9281,7 @@ flag on file descriptors opened with the @command{exec} builtin, thus rendering an idiom like @code{AM_TESTS_ENVIRONMENT = exec 9>&2;} ineffectual. This issue also affects some Bourne shells, such as the -HP-UX's @command{/bin/sh}, +HP-UX's @command{/bin/sh}. @c Keep in sync with tests-environment-backcompat.sh @example @@ -8995,6 +9295,7 @@ if test -d /usr/xpg4/bin; then \ PATH=/usr/xpg4/bin:$$PATH; export PATH; \ fi; + @c $$ restore font-lock ## With this, the test scripts will be able to print diagnostic ## messages to the original standard error stream, even if the test @@ -9003,35 +9304,32 @@ AM_TESTS_FD_REDIRECT = 9>&2 @end example -@noindent -Note however that @code{AM_TESTS_ENVIRONMENT} is, for historical and -implementation reasons, @emph{not} supported by the serial harness -(@pxref{Serial Test Harness}). +@c https://bugs.gnu.org/49309 +As another example, a notice that a test is starting can be emitted +using @code{AM_TESTS_ENVIRONMENT} (for package maintainers) or +@code{TESTS_ENVIRONMENT} by users: -Automake ensures that each file listed in @code{TESTS} is built before -it is run; you can list both source and derived programs (or scripts) -in @code{TESTS}; the generated rule will look both in @code{srcdir} and -@file{.}. For instance, you might want to run a C program as a test. -To do this you would list its name in @code{TESTS} and also in -@code{check_PROGRAMS}, and then specify it as you would any other -program. +@example +make -j12 ... TESTS_ENVIRONMENT='echo RUNNING: "$$f";' check +@end example -Programs listed in @code{check_PROGRAMS} (and @code{check_LIBRARIES}, -@code{check_LTLIBRARIES}...) are only built during @code{make check}, -not during @code{make all}. You should list there any program needed -by your tests that does not need to be built by @code{make all}. Note -that @code{check_PROGRAMS} are @emph{not} automatically added to -@code{TESTS} because @code{check_PROGRAMS} usually lists programs used -by the tests, not the tests themselves. Of course you can set -@code{TESTS = $(check_PROGRAMS)} if all your programs are test cases. +@noindent +The shell variable @code{$f} contains the test name. (Although +technically this is not guaranteed, in practice it is extremely +unlikely to ever change.) This can be helpful to see when trying to +debug test failures. + +Notwithstanding these benefits, @code{AM_TESTS_ENVIRONMENT} is, for +historical and implementation reasons, @emph{not} supported by the +serial harness (@pxref{Serial Test Harness}). @node Serial Test Harness -@subsection Older (and discouraged) serial test harness +@subsection Older (and discouraged) Serial Test Harness @cindex @option{serial-tests}, Using First, note that today the use of this harness is strongly discouraged in favour of the parallel test harness (@pxref{Parallel Test Harness}). -Still, there are @emph{few} situations when the advantages offered by +Still, there are a @emph{few} situations when the advantages offered by the parallel harness are irrelevant, and when test concurrency can even cause tricky problems. In those cases, it might make sense to still use the serial harness, for simplicity and reliability (we still @@ -9062,9 +9360,9 @@ benefit of freeing the @code{TESTS_ENVIRONMENT} variable for the user (@pxref{Parallel Test Harness}). -Another, less serious limit of the serial harness is that it doesn't -really distinguish between simple failures and hard errors; this is -due to historical reasons only, and might be fixed in future Automake +Another, less serious limitation of the serial harness is that it +doesn't distinguish between simple failures and hard errors; this is +for historical reasons, and might be fixed in future Automake versions. @node Parallel Test Harness @@ -9202,11 +9500,23 @@ env TESTS="foo.test bar.test" make -e check @end example -Note however that the command above will unconditionally overwrite the +@c https://bugs.gnu.org/42883 +If you're using a recursive make setup, you'll probably also need to +override @code{SUBDIRS}: + +@example +env TESTS="foo.test bar.test" make -e check SUBDIRS= +@end example + +Otherwise, the test harness will descend into all subdirectories, +where the tests presumably do not exist, and thus fail. (Patch to +provide better behavior would be welcome.) + +Another issue: the command above will unconditionally overwrite the @file{test-suite.log} file, thus clobbering the recorded results of any previous testsuite run. This might be undesirable for packages -whose testsuite takes long time to execute. Luckily, this problem can -easily be avoided by overriding also @code{TEST_SUITE_LOG} at runtime; +whose testsuite takes a long time to execute. Luckily, this problem can +easily be avoided by also overriding @code{TEST_SUITE_LOG} at runtime; for example, @c Keep in sync with parallel-tests-log-override-2.sh @@ -9286,7 +9596,7 @@ may even be useful to specify compiled programs in @code{EXTRA_PROGRAMS} instead of with @code{check_PROGRAMS}, as the former allows intertwined compilation and test execution (but note that @code{EXTRA_PROGRAMS} are -not cleaned automatically, @pxref{Uniform}). +not cleaned automatically; @pxref{Uniform}). The variables @code{TESTS} and @code{XFAIL_TESTS} may contain conditional parts as well as configure substitutions. In the latter @@ -9341,7 +9651,7 @@ consider the test script exit status (this is done for example by the default test driver used by the parallel test harness, described in the previous section). Other drivers might implement more complex and -advanced test protocols, which might require them to parse and interpreter +advanced test protocols, which might require them to parse and interpret the output emitted by the test script they're running (examples of such protocols are TAP and SubUnit). @@ -9383,8 +9693,8 @@ colorization, @code{XFAIL_TESTS}, and hard errors are supported and handled is left to the individual test drivers. -@c TODO: We should really add a working example in the doc/ directory, -@c TODO: and reference if from here. +@c TODO: We should add a working example in the doc/ directory, +@c TODO: and reference it from here. @node Declaring Custom Test Drivers @subsection Declaring Custom Test Drivers @@ -9409,7 +9719,7 @@ two sets of variables can, and often do, usefully and legitimately coexist. -@c TODO: We should really be able to point to a clarifying example here! +@c TODO: We should point to a clarifying example here! The developer-reserved variable @code{AM_LOG_DRIVER_FLAGS} and the user-reserved variable @code{LOG_DRIVER_FLAGS} can be used to define @@ -9424,13 +9734,13 @@ @node API for Custom Test Drivers @subsection API for Custom Test Drivers -Note that @emph{the APIs described here are still highly experimental}, -and will very likely undergo tightenings and likely also extensive changes -in the future, to accommodate for new features or to satisfy additional -portability requirements. +Note that @emph{the APIs described here are still highly +experimental}, and will very likely undergo tightening and possibly +extensive changes in the future, to accommodate for new features or to +satisfy additional portability requirements. The main characteristic of these APIs is that they are designed to share -as much infrastructure, semantics, and implementation details as possible +as much infrastructure, semantics, and implementation detail as possible with the parallel test harness and its default driver. @menu @@ -9565,9 +9875,9 @@ This is used to declare the "global result" of the script. Currently, the value of this field is needed only to be reported (more or less verbatim) in the generated global log file @code{$(TEST_SUITE_LOG)}, -so it's quite free-form. For example, a test script which run 10 test +so it's quite free-form. For example, a test script which runs 10 test cases, 6 of which pass and 4 of which are skipped, could reasonably have -a @code{PASS/SKIP} value for this field, while a test script which run +a @code{PASS/SKIP} value for this field, while a test script which runs 19 successful tests and one failed test could have an @code{ALMOST PASSED} value. What happens when two or more @code{:test-global-result:} fields are present in the same @file{.trs} file is undefined behaviour. @@ -9592,7 +9902,7 @@ will contribute with @emph{five} test results to the testsuite summary (three of these tests being successful, one failed, and one skipped), and the content of the corresponding @file{.log} file will @emph{not} be -copied in the global log file @file{test-suite.log}. +copied into the global log file @file{test-suite.log}. @node Testsuite progress output @subsubsection Testsuite progress output @@ -9641,8 +9951,9 @@ fashion (@pxref{Testsuite progress on console}), and will use the @file{.trs} files (@pxref{Basics of test metadata}) to store the test results and related metadata. Apart from that, it will try to remain -as much compatible as possible with pre-existing and widespread utilities, -such as the @uref{http://search.cpan.org/~andya/Test-Harness/bin/prove, +as compatible as possible with pre-existing and widespread utilities, +such as the +@uref{https://metacpan.org/pod/distribution/Test-Harness/bin/prove, @command{prove} utility}, at least for the simpler usages. TAP started its life as part of the test harness for Perl, but today @@ -9650,13 +9961,12 @@ implementations in different languages; among them, C, C++, Perl, Python, PHP, and Java. For a semi-official specification of the TAP protocol, please refer to the documentation of -@uref{http://search.cpan.org/~petdance/Test-Harness/lib/Test/Harness/TAP.pod, - @samp{Test::Harness::TAP}}. +@uref{https://metacpan.org/pod/Test::Harness, @samp{Test::Harness}}. The most relevant real-world usages of TAP are obviously in the testsuites -of @command{perl} and of many perl modules. Still, also other important -third-party packages, such as @uref{http://git-scm.com/, @command{git}}, -use TAP in their testsuite. +of @command{perl} and of many Perl modules. Still, other important +third-party packages, such as @uref{https://git-scm.com/, @command{git}}, +also use TAP in their testsuite. @node Use TAP with the Automake test harness @subsection Use TAP with the Automake test harness @@ -9671,7 +9981,7 @@ below for clarification. Apart from the options common to all the Automake test drivers -(@pxref{Command-line arguments for test drivers}), the @file{tap-driver.sh} +(@pxref{Command-line arguments for test drivers}), @file{tap-driver.sh} supports the following options, whose names are chosen for enhanced compatibility with the @command{prove} utility. @@ -9683,9 +9993,9 @@ non-zero status. This option has effect also on non-zero exit statuses due to termination by a signal. @item --comments -Instruct the test driver to display TAP diagnostic (i.e., lines beginning +Instruct the test driver to display TAP diagnostics (i.e., lines beginning with the @samp{#} character) in the testsuite progress output too; by -default, TAP diagnostic is only copied to the @file{.log} file. +default, TAP diagnostics are only copied to the @file{.log} file. @item --no-comments Revert the effects of @option{--comments}. @item --merge @@ -9700,13 +10010,13 @@ @item --no-merge Revert the effects of @option{--merge}. @item --diagnostic-string=@var{STRING} -Change the string that introduces TAP diagnostic from the default value +Change the string that introduces TAP diagnostics from the default value of ``@code{#}'' to @code{@var{STRING}}. This can be useful if your TAP-based test scripts produce verbose output on which they have limited control (because, say, the output comes from other tools invoked in the scripts), and it might contain text that gets spuriously interpreted as -TAP diagnostic: such an issue can be solved by redefining the string that -activates TAP diagnostic to a value you know won't appear by chance in +TAP diagnostics: such an issue can be solved by redefining the string that +activates TAP diagnostics to a value you know won't appear by chance in the tests' output. Note however that this feature is non-standard, as the ``official'' TAP protocol does not allow for such a customization; so don't use it if you can avoid it. @@ -9792,7 +10102,7 @@ @subsection Incompatibilities with other TAP parsers and drivers For implementation or historical reasons, the TAP driver and harness as -implemented by Automake have some minors incompatibilities with the +implemented by Automake have some minor incompatibilities with the mainstream versions, which you should be aware of. @itemize @bullet @@ -9804,9 +10114,9 @@ @item The @code{version} and @code{pragma} directives are not supported. @item -The @option{--diagnostic-string} option of our driver allows to modify -the string that introduces TAP diagnostic from the default value -of ``@code{#}''. The standard TAP protocol has currently no way to +The @option{--diagnostic-string} option of our driver allows modification of +the string that introduces TAP diagnostics from the default value +of ``@code{#}''. The standard TAP protocol currently has no way to allow this, so if you use it your diagnostic will be lost to more compliant tools like @command{prove} and @code{Test::Harness} @item @@ -9823,45 +10133,45 @@ tools and libraries. @itemize @bullet @item -@uref{http://search.cpan.org/~petdance/Test-Harness/lib/Test/Harness/TAP.pod, - @samp{Test::Harness::TAP}}, +@uref{https://metacpan.org/pod/Test::Harness, @samp{Test::Harness}}, the (mostly) official documentation about the TAP format and protocol. @item -@uref{http://search.cpan.org/~andya/Test-Harness/bin/prove, +@uref{https://metacpan.org/pod/distribution/Test-Harness/bin/prove, @command{prove}}, the most famous command-line TAP test driver, included in the distribution of @command{perl} and -@uref{http://search.cpan.org/~andya/Test-Harness/lib/Test/Harness.pm, +@uref{https://metacpan.org/pod/distribution/Test-Harness/lib/Test/Harness.pm, @samp{Test::Harness}}. @item -The @uref{http://testanything.org/wiki/index.php/Main_Page,TAP wiki}. +The @uref{https://testanything.org/,TAP wiki}. @item -A ``gentle introduction'' to testing for perl coders: -@uref{http://search.cpan.org/dist/Test-Simple/lib/Test/Tutorial.pod, +A ``gentle introduction'' to testing for Perl coders: +@uref{https://metacpan.org/pod/distribution/Test-Simple/lib/Test/Tutorial.pod, @samp{Test::Tutorial}}. @item -@uref{http://search.cpan.org/~mschwern/Test-Simple/lib/Test/Simple.pm, +@uref{https://metacpan.org/pod/distribution/Test-Simple/lib/Test/Simple.pm, @samp{Test::Simple}} and -@uref{http://search.cpan.org/~mschwern/Test-Simple/lib/Test/More.pm, +@uref{https://metacpan.org/pod/distribution/Test-Simple/lib/Test/More.pm, @samp{Test::More}}, -the standard perl testing libraries, which are based on TAP. +the standard Perl testing libraries, which are based on TAP. @item -@uref{http://www.eyrie.org/~eagle/software/c-tap-harness/,C TAP Harness}, +@uref{https://www.eyrie.org/~eagle/software/c-tap-harness/,C TAP Harness}, a C-based project implementing both a TAP producer and a TAP consumer. @item -@uref{http://www.tap4j.org/,tap4j}, +@uref{https://tap4j.org/,tap4j}, a Java-based project implementing both a TAP producer and a TAP consumer. @end itemize @node DejaGnu Tests @section DejaGnu Tests -If @uref{https://ftp.gnu.org/gnu/dejagnu/, @command{dejagnu}} appears in -@code{AUTOMAKE_OPTIONS}, then a @command{dejagnu}-based test suite is -assumed. The variable @code{DEJATOOL} is a list of names that are -passed, one at a time, as the @option{--tool} argument to -@command{runtest} invocations; it defaults to the name of the package. +If @command{dejagnu} (@pxref{Top, , Introduction, dejagnu, DejaGnu}) +appears in @code{AUTOMAKE_OPTIONS}, then a @command{dejagnu}-based +test suite is assumed. The variable @code{DEJATOOL} is a list of +names that are passed, one at a time, as the @option{--tool} argument +to @command{runtest} invocations; it defaults to the name of the +package. The variable @code{RUNTESTDEFAULTFLAGS} holds the @option{--tool} and @option{--srcdir} flags that are passed to dejagnu by default; this can be @@ -9935,7 +10245,7 @@ @code{CONFIG_STATUS_DEPENDENCIES} can be used to list these extra dependencies. These variables should be defined in all @file{Makefile}s of the tree (because these two rebuild rules are -output in all them), so it is safer and easier to @code{AC_SUBST} them +output in all of them), so it is safer and easier to @code{AC_SUBST} them from @file{configure.ac}. For instance, the following statement will cause @file{configure} to be rerun each time @file{version.sh} is changed. @@ -10010,6 +10320,15 @@ will now be rerun each time the version number is bumped, when only @file{configure} had to be rerun in the previous setup. +@opindex --always-make @r{GNU Make option} +GNU Make, at least, has an option @option{--always-make} which tells +Make to consider that all targets are out of date. This interacts +badly with Automake-generated Makefiles, which implement their own +careful rules for when to regenerate Makefiles, as described above. +The result is an endless loop, or other poor behavior. The only thing +to do, as far as we know, is to refrain from using +@option{--always-make}. + @node Options @chapter Changing Automake's Behavior @@ -10041,7 +10360,7 @@ level and warning categories. As a general rule, strictness-implied warnings are overridden by those specified by explicit options. For example, even if @samp{portability} warnings are disabled by default -in @option{foreign} strictness, an usage like this will end up enabling +in @option{foreign} strictness, a usage like this will end up enabling them: @example @@ -10083,8 +10402,9 @@ @opindex gnu @opindex foreign -Set the strictness as appropriate. The @option{gnits} option also -implies options @option{readme-alpha} and @option{check-news}. +Set the strictness as appropriate. @xref{Strictness}. +The @option{gnits} option also implies options @option{readme-alpha} and +@option{check-news}. @item @option{check-news} @cindex Option, @option{check-news} @@ -10121,6 +10441,12 @@ Hook @code{dist-zip} to @code{dist}. @trindex dist-zip +@item @option{dist-zstd} +@cindex Option, @option{dist-zstd} +@opindex dist-zstd +Hook @code{dist-zstd} to @code{dist}. +@trindex dist-zstd + @item @option{dist-shar} @cindex Option, @option{dist-shar} @opindex dist-shar @@ -10146,7 +10472,7 @@ be portable in tarballs. See the @option{tar-v7} and @option{tar-ustar} options below. This option should be used in the top-level @file{Makefile.am} or as an argument of @code{AM_INIT_AUTOMAKE} in -@file{configure.ac}, it will be ignored otherwise. It will also be +@file{configure.ac}; it will be ignored otherwise. It will also be ignored in sub-packages of nested packages (@pxref{Subpackages}). @item @option{info-in-builddir} @@ -10183,6 +10509,21 @@ Don't emit any code related to @code{dist} target. This is useful when a package has its own method for making distributions. +@item @option{no-dist-built-sources} +@cindex Option, @option{no-dist-built-sources} +@opindex no-dist-built-sources +@cindex @command{help2man}, and @samp{dist} target +@vindex BUILT_SOURCES, and @samp{dist} target +Don't build @code{BUILT_SOURCES} as part of @code{dist}. This option +can be set if building the distribution only requires the source +files, and doesn't compile anything as a side-effect. The default is +for @samp{$(distdir)} to depend on @samp{$(BUILT_SOURCES)} because it +is common, at least among GNU packages, to want to build the program +to generate man pages with @code{help2man} (@pxref{Errors with +distclean}). Admittedly the default behavior should perhaps be to +omit the dependency, but to preserve compatibility, we don't want to +change it now. + @item @option{no-dist-gzip} @cindex Option, @option{no-dist-gzip} @opindex no-dist-gzip @@ -10294,7 +10635,7 @@ subdirectory of the build directory corresponding to the subdirectory of the source file. For instance, if the source file is @file{subdir/file.cxx}, then the output file would be -@file{subdir/file.o}. +@file{subdir/file.o}. @xref{Program and Library Variables}. @anchor{tar-formats} @item @option{tar-v7} @@ -10314,8 +10655,8 @@ These three mutually exclusive options select the tar format to use when generating tarballs with @samp{make dist}. (The tar file created is then compressed according to the set of @option{no-dist-gzip}, -@option{dist-bzip2}, @option{dist-lzip}, @option{dist-xz} and -@option{dist-tarZ} options in use.) +@option{dist-bzip2}, @option{dist-lzip}, @option{dist-xz}, +@option{dist-zstd} and @option{dist-tarZ} options in use.) These options must be passed as arguments to @code{AM_INIT_AUTOMAKE} (@pxref{Macros}) because they can require additional configure checks. @@ -10326,7 +10667,7 @@ default. This antiquated format is understood by all tar implementations and supports file names with up to 99 characters. When given longer file names some tar implementations will diagnose the -problem while other will generate broken tarballs or use non-portable +problem while others will generate broken tarballs or use non-portable extensions. Furthermore, the V7 format cannot store empty directories. When using this format, consider using the @option{filename-length-max=99} option to catch file names too long. @@ -10334,7 +10675,7 @@ @option{tar-ustar} selects the ustar format defined by POSIX 1003.1-1988. This format is old enough to be portable: As of 2018, it is supported by the native @code{tar} command on -GNU, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, Solaris, at least. +GNU, FreeBSD, NetBSD, OpenBSD, AIX, HP-UX, and Solaris, at least. It fully supports empty directories. It can store file names with up to 256 characters, provided that the file name can be split at directory separator in two parts, first of them being at most 155 @@ -10346,8 +10687,8 @@ this format is very young and should probably be restricted to packages that target only very modern platforms. As of 2018, this format is supported by the native @code{tar} command only -on GNU, FreeBSD, OpenBSD system; it is not supported by the native -@code{tar} command on NetBSD, AIX, HP-UX, Solaris. +on GNU, FreeBSD, and OpenBSD systems; it is not supported by the native +@code{tar} command on NetBSD, AIX, HP-UX, or Solaris. There are moves to change the pax format in an upward-compatible way, so this option may refer to a more recent version in the future. @@ -10362,6 +10703,7 @@ @item @var{version} @cindex Option, @var{version} A version number (e.g., @samp{0.30}) can be specified. If Automake is not +the same version or newer than the version specified, creation of the @file{Makefile.in} will be suppressed. @@ -10407,10 +10749,10 @@ If any C, C++ or Fortran 77 source code or headers are present, then @code{tags} and @code{TAGS} rules will be generated for the directory. All files listed using the @code{_SOURCES}, @code{_HEADERS}, and -@code{_LISP} primaries will be used to generate tags. Note that -generated source files that are not distributed must be declared in -variables like @code{nodist_noinst_HEADERS} or -@code{nodist_@var{prog}_SOURCES} or they will be ignored. +@code{_LISP} primaries will be used to generate tags. Generated +source files that are not distributed must be declared in variables +like @code{nodist_noinst_HEADERS} or @code{nodist_@var{prog}_SOURCES} +or they will be ignored. A @code{tags} rule will be output at the topmost directory of a multi-directory package. When run from this topmost directory, @@ -10422,10 +10764,12 @@ directories that contain taggable source that @command{etags} does not understand. The user can use the @code{ETAGSFLAGS} to pass additional flags to @command{etags}; @code{AM_ETAGSFLAGS} is also -available for use in @file{Makefile.am}. +available for use in @file{Makefile.am}. The variable @code{ETAGS} +is the name of the program to invoke (by default @command{etags}). @vindex ETAGS_ARGS @vindex ETAGSFLAGS @vindex AM_ETAGSFLAGS +@vindex ETAGS Here is how Automake generates tags for its source, and for nodes in its Texinfo file: @@ -10445,6 +10789,9 @@ is the name of the program to invoke (by default @command{ctags}); @code{CTAGSFLAGS} can be used by the user to pass additional flags, and @code{AM_CTAGSFLAGS} can be used by the @file{Makefile.am}. +@vindex CTAGS_ARGS +@vindex CTAGSFLAGS +@vindex CTAGS @trindex id Automake will also generate an @code{ID} rule that will run @@ -10462,6 +10809,9 @@ with non-GNU make implementations (especially with make implementations performing @ref{Automatic Rule Rewriting, , VPATH rewrites, autoconf, The Autoconf Manual}). +@vindex CSCOPE_ARGS +@vindex CSCOPEFLAGS +@vindex CSCOPE Finally, Automake also emits rules to support the @uref{https://www.gnu.org/software/global/, GNU Global Tags program}. @@ -10578,7 +10928,7 @@ @cindex Conditionals -Automake supports a simple type of conditionals. +Automake supports a simple type of conditional. These conditionals are not the same as conditionals in GNU Make. Automake conditionals are checked at configure time by the @@ -10606,8 +10956,8 @@ @defmac AM_CONDITIONAL (@var{conditional}, @var{condition}) The conditional name, @var{conditional}, should be a simple string starting with a letter and containing only letters, digits, and -underscores. It must be different from @samp{TRUE} and @samp{FALSE} -that are reserved by Automake. +underscores. It must be different from @samp{TRUE} and @samp{FALSE}, +which are reserved by Automake. The shell @var{condition} (suitable for use in a shell @code{if} statement) is evaluated when @command{configure} is run. Note that you @@ -10792,7 +11142,7 @@ the easy detection of potentially important warning messages. @node Tricks For Silencing Make -@section Standard and generic ways to silence make +@section Standard and generic ways to silence Make Here we describe some common idioms/tricks to obtain a quieter make output, with their relative advantages and drawbacks. In the next @@ -10813,7 +11163,7 @@ an ``all or nothing'' strategy, i.e., either everything is silenced, or nothing is; this lack of granularity can sometimes be a fatal flaw. Moreover, when the @option{-s} flag is used, the @command{make} output -might turn out to be too much terse; in case of errors, the user won't +might turn out to be too terse; in case of errors, the user won't be able to easily see what rule or command have caused them, or even, in case of tools with poor error reporting, what the errors were! @@ -10825,8 +11175,8 @@ an easy determination of the error location and causes. However, calling @command{make} two times in a row might hide errors -(especially intermittent ones), or subtly change the expected semantic -of the @command{make} calls --- things these which can clearly make +(especially intermittent ones), or subtly change the expected semantics +of the @command{make} calls --- these things can clearly make debugging and error assessment very difficult. @item @command{make --no-print-directory} @@ -10850,7 +11200,7 @@ @end itemize @node Automake Silent Rules -@section How Automake can help in silencing make +@section How Automake can help in silencing Make The tricks and idioms for silencing @command{make} described in the previous section can be useful from time to time, but we've seen that @@ -10890,7 +11240,7 @@ mv -f .deps/func.Tpo .deps/func.Po gcc -Wall -o foo main.o func.o -@i{Clean up, so that we we can rebuild everything from scratch.} +@i{Clean up, so that we can rebuild everything from scratch.} % @kbd{make clean} test -z "foo" || rm -f foo rm -f *.o @@ -10958,9 +11308,9 @@ it provides the casual user with enough information to prepare a good bug report in case anything breaks. -Still, notwithstanding the rationales above, a developer who really -wants to make silent rules enabled by default in his own package can -do so by calling @code{AM_SILENT_RULES([yes])} in @file{configure.ac}. +Still, notwithstanding the rationales above, developers who wants to +make silent rules enabled by default in their own packages can do so +by calling @code{AM_SILENT_RULES([yes])} in @file{configure.ac}. @c Keep in sync with silent-configsite.sh Users who prefer to have silent rules enabled by default can edit their @@ -10968,7 +11318,7 @@ default to @samp{yes}. This should still allow disabling silent rules at @command{configure} time and at @command{make} time. -@c FIXME: there's really a need to specify this explicitly? +@c FIXME: is there a need to specify this explicitly? For portability to different @command{make} implementations, package authors are advised to not set the variable @code{V} inside the @file{Makefile.am} file, to allow the user to override the value for subdirectories as well. @@ -10987,7 +11337,7 @@ @vindex @code{AM_DEFAULT_VERBOSITY} @vindex @code{AM_V} @vindex @code{AM_DEFAULT_V} -To extend the silent mode to your own rules, you have few choices: +To extend the silent mode to your own rules, you have a few choices: @itemize @bullet @@ -11001,7 +11351,7 @@ @item You can silence a recipe unconditionally with @code{@@}, and then use the predefined variable @code{AM_V_P} to know whether make is being run -in silent or verbose mode, adjust the verbose information your recipe +in silent or verbose mode; adjust the verbose information your recipe displays accordingly: @example @@ -11033,77 +11383,6 @@ @command{make} if the ``@i{Entering/Leaving directory ...}'' messages are to be disabled. -@node Gnits -@chapter The effect of @option{--gnu} and @option{--gnits} - -@cindex @option{--gnu}, required files -@cindex @option{--gnu}, complete description - -The @option{--gnu} option (or @option{gnu} in the -@code{AUTOMAKE_OPTIONS} variable) causes @command{automake} to check -the following: - -@itemize @bullet -@item -The files @file{INSTALL}, @file{NEWS}, @file{README}, @file{AUTHORS}, -and @file{ChangeLog}, plus one of @file{COPYING.LIB}, @file{COPYING.LESSER} -or @file{COPYING}, are required at the topmost directory of the package. - -If the @option{--add-missing} option is given, @command{automake} will -add a generic version of the @file{INSTALL} file as well as the -@file{COPYING} file containing the text of the current version of the -GNU General Public License existing at the time of this Automake release -(version 3 as this is written, @uref{https://www.gnu.org/@/copyleft/@/gpl.html}). -However, an existing @file{COPYING} file will never be overwritten by -@command{automake}. - -@item -The options @option{no-installman} and @option{no-installinfo} are -prohibited. -@end itemize - -Note that this option will be extended in the future to do even more -checking; it is advisable to be familiar with the precise requirements -of the GNU standards. Also, @option{--gnu} can require certain -non-standard GNU programs to exist for use by various maintainer-only -rules; for instance, in the future @command{pathchk} might be required for -@samp{make dist}. - -@cindex @option{--gnits}, complete description - -The @option{--gnits} option does everything that @option{--gnu} does, and -checks the following as well: - -@itemize @bullet -@item -@samp{make installcheck} will check to make sure that the @option{--help} -and @option{--version} really print a usage message and a version string, -respectively. This is the @option{std-options} option (@pxref{Options}). - -@item -@samp{make dist} will check to make sure the @file{NEWS} file has been -updated to the current version. - -@item -@code{VERSION} is checked to make sure its format complies with Gnits -standards. -@c FIXME xref when standards are finished - -@item -@cindex @file{README-alpha} -If @code{VERSION} indicates that this is an alpha release, and the file -@file{README-alpha} appears in the topmost directory of a package, then -it is included in the distribution. This is done in @option{--gnits} -mode, and no other, because this mode is the only one where version -number formats are constrained, and hence the only mode where Automake -can automatically determine whether @file{README-alpha} should be -included. - -@item -The file @file{THANKS} is required. -@end itemize - - @node Not Enough @chapter When Automake Isn't Enough @@ -11302,7 +11581,7 @@ @c Keep in sync with primary-prefix-couples-documented-valid.sh So a @code{foo_SCRIPTS} will be installed by @code{install-data}, and a @code{barexec_SCRIPTS} will be installed by -@code{install-exec}. You should define your hooks consequently. +@code{install-exec}. You should define your hooks accordingly. @c FIXME should include discussion of variables you can use in these @c rules @@ -11387,7 +11666,7 @@ If you have ever used Gettext in a project, this is a good example of how third-party @file{Makefile}s can be used with Automake. The -@file{Makefile}s @command{gettextize} puts in the @file{po/} and +@file{Makefile}s that @command{gettextize} puts in the @file{po/} and @file{intl/} directories are handwritten @file{Makefile}s that implement all of these targets. That way they can be added to @code{SUBDIRS} in Automake packages. @@ -11403,26 +11682,35 @@ third-party project with no documentation or tag support, you could simply augment its @file{Makefile} as follows: +@vindex EMPTY_AUTOMAKE_TARGETS +@cindex Automake targets, no-op +@cindex do-nothing Automake targets +@cindex empty Automake targets +@cindex no-op Automake targets +@cindex targets, making into no-op @example EMPTY_AUTOMAKE_TARGETS = dvi pdf ps info html tags ctags .PHONY: $(EMPTY_AUTOMAKE_TARGETS) $(EMPTY_AUTOMAKE_TARGETS): @end example +To be clear, there is nothing special about the variable name +@code{EMPTY_AUTOMAKE_TARGETS}; the name could be anything. + Another aspect of integrating third-party build systems is whether they support VPATH builds (@pxref{VPATH Builds}). Obviously if the subpackage does not support VPATH builds the whole package will not support VPATH builds. This in turns means that @samp{make distcheck} will not work, because it relies on VPATH builds. Some people can -live without this (actually, many Automake users have never heard of +live without this (indeed, many Automake users have never heard of @samp{make distcheck}). Other people may prefer to revamp the existing @file{Makefile}s to support VPATH@. Doing so does not -necessarily require Automake, only Autoconf is needed (@pxref{Build +necessarily require Automake; only Autoconf is needed (@pxref{Build Directories, , Build Directories, autoconf, The Autoconf Manual}). The necessary substitutions: @samp{@@srcdir@@}, @samp{@@top_srcdir@@}, and @samp{@@top_builddir@@} are defined by @file{configure} when it processes a @file{Makefile} (@pxref{Preset Output Variables, , Preset -Output Variables, autoconf, The Autoconf Manual}), they are not +Output Variables, autoconf, The Autoconf Manual}); they are not computed by the Makefile like the aforementioned @samp{$(distdir)} and @samp{$(top_distdir)} variables. @@ -11432,17 +11720,17 @@ versions. @cindex @file{GNUmakefile} including @file{Makefile} -Here are two other ideas. If GNU make is assumed, one possibility is +Here are two other ideas. If GNU Make is assumed, one possibility is to add to that subdirectory a @file{GNUmakefile} that defines the required targets and includes the third-party @file{Makefile}. For this to work in VPATH builds, @file{GNUmakefile} must lie in the build directory; the easiest way to do this is to write a @file{GNUmakefile.in} instead, and have it processed with -@code{AC_CONFIG_FILES} from the outer package. For example if we +@code{AC_CONFIG_FILES} from the outer package. For example, if we assume @file{Makefile} defines all targets except the documentation -targets, and that the @code{check} target is actually called -@code{test}, we could write @file{GNUmakefile} (or -@file{GNUmakefile.in}) like this: +targets, and that the real @code{check} target is named @code{test}, +we could write @file{GNUmakefile} (or @file{GNUmakefile.in}) like +this: @example # First, include the real Makefile @@ -11523,7 +11811,7 @@ means you can install several versions of Automake in the same @samp{$prefix}, and can select an arbitrary Automake version by running @command{automake-1.6} or @command{automake-1.7} without juggling with -@samp{$PATH}. Furthermore, @file{Makefile}'s generated by Automake 1.6 +@samp{$PATH}. Furthermore, @file{Makefile}s generated by Automake 1.6 will use @command{automake-1.6} explicitly in their rebuild rules. The number @samp{1.6} in @command{automake-1.6} is Automake's API version, @@ -11563,7 +11851,7 @@ @heading What is not in the API -Every undocumented variable, target, or command line option, is not part +Every undocumented variable, target, or command line option is not part of the API@. You should avoid using them, as they could change from one version to the other (even in bug fix releases, if this helps to fix a bug). @@ -11575,7 +11863,7 @@ @node Upgrading @chapter Upgrading a Package to a Newer Automake Version -Automake maintains three kind of files in a package. +Automake maintains three kinds of files in a package. @itemize @item @file{aclocal.m4} @@ -11595,7 +11883,7 @@ The usual way to do that is @example -aclocal # with any option needed (such a -I m4) +aclocal # with any option needed (such as -I m4) autoconf automake --add-missing --force-missing @end example @@ -11611,7 +11899,7 @@ overridden by new versions (@pxref{automake Invocation}). It is important to regenerate all of these files each time Automake is -upgraded, even between bug fixes releases. For instance, it is not +upgraded, even between bug fix releases. For instance, it is not unusual for a bug fix to involve changes to both the rules generated in @file{Makefile.in} and the supporting M4 macros copied to @file{aclocal.m4}. @@ -11661,10 +11949,10 @@ generated on the developer's machine and are distributed so that end-users do not have to install the maintainer tools required to rebuild them. Other generated files like Lex scanners, Yacc parsers, -or Info documentation, are usually distributed on similar grounds. +or Info documentation are usually distributed on similar grounds. -Automake output rules in @file{Makefile}s to rebuild these files. For -instance, @command{make} will run @command{autoconf} to rebuild +Automake output generates rules in @file{Makefile}s to rebuild these files. +For instance, @command{make} will run @command{autoconf} to rebuild @file{configure} whenever @file{configure.ac} is changed. This makes development safer by ensuring a @file{configure} is never out-of-date with respect to @file{configure.ac}. @@ -11686,7 +11974,7 @@ However, during @command{cvs update}, files will have the date of the update, not the original timestamp of this revision. This is meant to -make sure that @command{make} notices sources files have been updated. +make sure that @command{make} notices that sources files have been updated. This timestamp shift is troublesome when both sources and generated files are kept under CVS@. Because CVS processes files in lexical @@ -11709,7 +11997,7 @@ @itemize @bullet @item The CVS repository contains all distributed files so you know exactly -what is distributed, and you can checkout any prior version entirely. +what is distributed, and you can check out any prior version entirely. @item Maintainers can see how generated files evolve (for instance, you can @@ -11717,7 +12005,7 @@ and make sure they look OK). @item -Users do not need the autotools to build a checkout of the project, it +Users do not need Autotools to build a check-out of the project; it works just like a released tarball. @item @@ -11735,11 +12023,11 @@ Maintainers interested in keeping their package buildable from a CVS checkout even for those users that lack maintainer-specific tools might -want to provide an helper script (or to enhance their existing bootstrap +want to provide a helper script (or to enhance their existing bootstrap script) to fix the timestamps after a @command{cvs update} or a @command{git checkout}, to prevent spurious rebuilds. In case of a project committing the Autotools-generated -files, as well as the generated @file{.info} files, such script might +files, as well as the generated @file{.info} files, such a script might look something like this: @smallexample @@ -11764,7 +12052,7 @@ @item In distributed development, developers are likely to have different -version of the maintainer tools installed. In this case rebuilds +versions of the maintainer tools installed. In this case rebuilds triggered by timestamp lossage will lead to spurious changes to generated files. There are several solutions to this: @@ -11809,7 +12097,7 @@ This way developers are not annoyed by changes to generated files. It does not matter if they all have different versions (assuming they are -compatible, of course). And finally, timestamps are not lost, changes +compatible, of course). And finally, timestamps are not lost; changes to sources files can't be missed as in the @file{Makefile.am}/@file{Makefile.in} example discussed earlier. @@ -11821,11 +12109,11 @@ Allowing developers to use different versions of their tools can also hide bugs during distributed development. Indeed, developers will be using (hence testing) their own generated files, instead of the -generated files that will be released actually. The developer who -prepares the tarball might be using a version of the tool that -produces bogus output (for instance a non-portable C file), something -other developers could have noticed if they weren't using their own -versions of this tool. +generated files that will be released. The developer who prepares the +tarball might be using a version of the tool that produces bogus +output (for instance a non-portable C file), something other +developers could have noticed if they weren't using their own versions +of this tool. @subheading Third-party Files @cindex CVS and third-party files @@ -11839,8 +12127,8 @@ These files, whether they are kept under CVS or not, raise similar concerns about version mismatch between developers' tools. The -Gettext manual has a section about this, see @ref{CVS Issues, CVS -Issues, Integrating with CVS, gettext, GNU gettext tools}. +Gettext manual has a section about this; see @ref{Version Control Issues,, +Integrating with Version Control Systems, gettext, GNU gettext tools}. @node maintainer-mode @section @command{missing} and @code{AM_MAINTAINER_MODE} @@ -11851,7 +12139,7 @@ The @command{missing} script is a wrapper around several maintainer tools, designed to warn users if a maintainer tool is required but missing. Typical maintainer tools are @command{autoconf}, -@command{automake}, @command{bison}, etc. Because file generated by +@command{automake}, @command{bison}, etc. Because files generated by these tools are shipped with the other sources of a package, these tools shouldn't be required during a user build and they are not checked for in @file{configure}. @@ -11864,11 +12152,11 @@ error message like @samp{sh: @var{tool}: command not found}. Similarly, @command{missing} will warn the user if it detects that a maintainer tool it attempted to use seems too old (be warned that diagnosing this -correctly is typically more difficult that detecting missing tools, and +correctly is typically more difficult than detecting missing tools, and requires cooperation from the tool itself, so it won't always work). If the required tool is installed, @command{missing} will run it and -won't attempt to continue after failures. This is correct during +won't attempt to continue after failures. This is correct behavior during development: developers love fixing failures. However, users with missing or too old maintainer tools may get an error when the rebuild rule is spuriously triggered, halting the build. This failure to let @@ -11881,20 +12169,20 @@ @code{AM_MAINTAINER_MODE} allows you to choose whether the so called "rebuild rules" should be enabled or disabled. With -@code{AM_MAINTAINER_MODE([enable])}, they are enabled by default, -otherwise they are disabled by default. In the latter case, if -you have @code{AM_MAINTAINER_MODE} in @file{configure.ac}, and run -@samp{./configure && make}, then @command{make} will *never* attempt to -rebuild @file{configure}, @file{Makefile.in}s, Lex or Yacc outputs, etc. -I.e., this disables build rules for files that are usually distributed -and that users should normally not have to update. +@code{AM_MAINTAINER_MODE([enable])}, they are enabled by default; +otherwise they are disabled by default. In the latter case, if you +have @code{AM_MAINTAINER_MODE} in @file{configure.ac}, and run +@samp{./configure && make}, then @command{make} will *never* attempt +to rebuild @file{configure}, @file{Makefile.in}s, Lex or Yacc outputs, +etc. That is, this disables build rules for files that are usually +distributed and that users should normally not have to update. The user can override the default setting by passing either @samp{--enable-maintainer-mode} or @samp{--disable-maintainer-mode} to @command{configure}. People use @code{AM_MAINTAINER_MODE} either because they do not want their -users (or themselves) annoyed by timestamps lossage (@pxref{CVS}), or +users (or themselves) annoyed by timestamp lossage (@pxref{CVS}), or because they simply can't stand the rebuild rules and prefer running maintainer tools explicitly. @@ -11905,7 +12193,7 @@ Several years ago Fran@,{c}ois Pinard pointed out several arguments against this @code{AM_MAINTAINER_MODE} macro. Most of them relate to insecurity. By removing dependencies you get non-dependable builds: -changes to sources files can have no effect on generated files and this +changes to source files can have no effect on generated files and this can be very confusing when unnoticed. He adds that security shouldn't be reserved to maintainers (what @option{--enable-maintainer-mode} suggests), on the contrary. If one user has to modify a @@ -11915,8 +12203,8 @@ happens and the user doesn't notice it (this is what happens when rebuild rules are disabled by @code{AM_MAINTAINER_MODE}). -Jim Meyering, the inventor of the @code{AM_MAINTAINER_MODE} macro was -swayed by Fran@,{c}ois's arguments, and got rid of +Jim Meyering, the inventor of the @code{AM_MAINTAINER_MODE} macro, was +swayed by Fran@,{c}ois' arguments, and got rid of @code{AM_MAINTAINER_MODE} in all of his packages. Still many people continue to use @code{AM_MAINTAINER_MODE}, because @@ -11964,9 +12252,9 @@ prerequisites of a target. @item -Finally, it's really hard to @emph{forget} to add a file to -@file{Makefile.am}: files that are not listed in @file{Makefile.am} are -not compiled or installed, so you can't even test them. +Finally, it's quite hard to @emph{forget} to add a file to +@file{Makefile.am}: files that are not listed in @file{Makefile.am} +are not compiled or installed, so you can't even test them. @end itemize Still, these are philosophical objections, and as such you may disagree, @@ -12065,7 +12353,7 @@ Nowadays it is no longer worth worrying about the 8.3 limits of DOS file systems. -@c FIXME This should probably be moved in the "Checking the Distribution" +@c FIXME This should probably be moved to the "Checking the Distribution" @c FIXME section... @node Errors with distclean @section Errors with distclean @@ -12085,7 +12373,7 @@ Files left in the build directory after @samp{make distclean} has run are listed after this error. -This diagnostic really covers two kinds of errors: +This diagnostic covers two kinds of errors: @itemize @bullet @item @@ -12095,8 +12383,8 @@ @end itemize The former left-over files are not distributed, so the fix is to mark -them for cleaning (@pxref{Clean}), this is obvious and doesn't deserve -more explanations. +them for cleaning (@pxref{Clean}); this is obvious and doesn't deserve +more explanation. The latter bug is not always easy to understand and fix, so let's proceed with an example. Suppose our package contains a program for @@ -12142,7 +12430,7 @@ generated, distribute its sources. One way to fix the above example, while still distributing -@file{foo.1} is to not depend on @file{foo$(EXEEXT)}. For instance, +@file{foo.1}, is to not depend on @file{foo$(EXEEXT)}. For instance, assuming @command{foo --version} and @command{foo --help} do not change unless @file{foo.c} or @file{configure.ac} change, we could write the following @file{Makefile.am}: @@ -12167,7 +12455,7 @@ We could also decide not to distribute @file{foo.1}. In this case it's fine to have @file{foo.1} dependent upon @file{foo$(EXEEXT)}, since both will have to be rebuilt. -However it would be impossible to build the package in a +However, it would be impossible to build the package in a cross-compilation, because building @file{foo.1} involves an @emph{execution} of @file{foo$(EXEEXT)}. @@ -12273,17 +12561,17 @@ @cindex @code{YFLAGS} and @code{AM_YFLAGS} This section attempts to answer all the above questions. We will -mostly discuss @code{CPPFLAGS} in our examples, but actually the -answer holds for all the compile flags used in Automake: -@code{CCASFLAGS}, @code{CFLAGS}, @code{CPPFLAGS}, @code{CXXFLAGS}, -@code{FCFLAGS}, @code{FFLAGS}, @code{GCJFLAGS}, @code{LDFLAGS}, -@code{LFLAGS}, @code{LIBTOOLFLAGS}, @code{OBJCFLAGS}, @code{OBJCXXFLAGS}, +mostly discuss @code{CPPFLAGS} in our examples, but the answer holds +for all the compile flags used in Automake: @code{CCASFLAGS}, +@code{CFLAGS}, @code{CPPFLAGS}, @code{CXXFLAGS}, @code{FCFLAGS}, +@code{FFLAGS}, @code{GCJFLAGS}, @code{LDFLAGS}, @code{LFLAGS}, +@code{LIBTOOLFLAGS}, @code{OBJCFLAGS}, @code{OBJCXXFLAGS}, @code{RFLAGS}, @code{UPCFLAGS}, and @code{YFLAGS}. @code{CPPFLAGS}, @code{AM_CPPFLAGS}, and @code{mumble_CPPFLAGS} are -three variables that can be used to pass flags to the C preprocessor -(actually these variables are also used for other languages like C++ -or preprocessed Fortran). @code{CPPFLAGS} is the user variable +three variables that can be used to pass flags to the C preprocessor ( +these variables are also used for other languages like C++ or +preprocessed Fortran). @code{CPPFLAGS} is the user variable (@pxref{User Variables}), @code{AM_CPPFLAGS} is the Automake variable, and @code{mumble_CPPFLAGS} is the variable specific to the @code{mumble} target (we call this a per-target variable, @@ -12330,8 +12618,8 @@ It is also not uncommon to override a user variable at @command{make}-time. Many installers do this with @code{prefix}, but -this can be useful with compiler flags too. For instance, if, while -debugging a C++ project, you need to disable optimization in one +this can be useful with compiler flags too. For instance, while +debugging a C++ project, if you need to disable optimization in one specific object file, you can run something like @example @@ -12341,16 +12629,21 @@ @end example The reason @samp{$(CPPFLAGS)} appears after @samp{$(AM_CPPFLAGS)} or -@samp{$(mumble_CPPFLAGS)} in the compile command is that users -should always have the last say. It probably makes more sense if you -think about it while looking at the @samp{CXXFLAGS=-O0} above, which -should supersede any other switch from @code{AM_CXXFLAGS} or -@code{mumble_CXXFLAGS} (and this of course replaces the previous value -of @code{CXXFLAGS}). - -You should never redefine a user variable such as @code{CPPFLAGS} in -@file{Makefile.am}. Use @samp{automake -Woverride} to diagnose such -mistakes. Even something like +@samp{$(mumble_CPPFLAGS)} in the compile command is that users should +have the last say. In the example above, the desire is for the +@samp{CXXFLAGS=-O0} to supersede any other switch from +@code{AM_CXXFLAGS} or @code{mumble_CXXFLAGS}. + +@c https://bugs.gnu.org/35526 +It's true that not all options to all programs can be overridden. So +in general, users could conceivably want to place options at arbitrary +places in the command line, but Automake does not support this. It +would be difficult to make such generality comprehensible. Being able +to specify the final options commonly suffices. + +Thus, you should never redefine a user variable such as +@code{CPPFLAGS} in @file{Makefile.am}. Use @samp{automake -Woverride} +to diagnose such mistakes. Even something like @example CPPFLAGS = -DDATADIR=\"$(datadir)\" @@CPPFLAGS@@ @@ -12374,9 +12667,9 @@ to modify these variables to perform a test, but you should reset their values afterwards. In contrast, it is OK to modify the @samp{AM_} variables within @file{configure} if you @code{AC_SUBST} -them, but it is rather rare that you need to do this, unless you -really want to change the default definitions of the @samp{AM_} -variables in all @file{Makefile}s. +them, but it is rather rare that you need to do this, unless you want +to change the default definitions of the @samp{AM_} variables in all +@file{Makefile}s. What we recommend is that you define extra flags in separate variables. For instance, you may write an Autoconf macro that computes @@ -12415,7 +12708,7 @@ Finally, we have avoided naming the variable of the example @code{LIBFOO_LDFLAGS} (with an underscore) because that would cause -Automake to think that this is actually a per-target variable (like +Automake to think that this is a per-target variable (like @code{mumble_LDFLAGS}) for some non-declared @code{LIBFOO} target. @subheading Other Variables @@ -12423,8 +12716,8 @@ There are other variables in Automake that follow similar principles to allow user options. For instance, Texinfo rules (@pxref{Texinfo}) use @code{MAKEINFOFLAGS} and @code{AM_MAKEINFOFLAGS}. Similarly, -DejaGnu tests (@pxref{DejaGnu Tests}) use @code{RUNTESTDEFAULTFLAGS} and -@code{AM_RUNTESTDEFAULTFLAGS}. The tags and ctags rules +DejaGnu tests (@pxref{DejaGnu Tests}) use @code{RUNTESTFLAGS} and +@code{AM_RUNTESTFLAGS}. The tags and ctags rules (@pxref{Tags}) use @code{ETAGSFLAGS}, @code{AM_ETAGSFLAGS}, @code{CTAGSFLAGS}, and @code{AM_CTAGSFLAGS}. Java rules (@pxref{Java}) use @code{JAVACFLAGS} and @code{AM_JAVACFLAGS}. None @@ -12436,7 +12729,7 @@ @command{make} itself. @code{ARFLAGS} (@pxref{A Library}) is usually defined by Automake and -has neither @code{AM_} nor per-target cousin. +has neither an @code{AM_} nor a per-target cousin. Finally you should not think that the existence of a per-target variable implies the existence of an @code{AM_} variable or of a user @@ -12470,10 +12763,9 @@ build two different objects: @file{true-generic.o} and @file{false-generic.o}. -@command{automake} doesn't actually look whether source files are -shared to decide if it must rename objects. It will just rename all -objects of a target as soon as it sees per-target compilation flags -used. +Automake doesn't actually determine whether source files are shared to +decide if it must rename objects. It just renames all objects of a +target as soon as it sees that per-target compilation flags are used. It's OK to share object files when per-target compilation flags are not used. For instance, @file{true} and @file{false} will both use @@ -12496,7 +12788,7 @@ @display One of my source files needs to be compiled with different flags. How -do I do? +do I do that? @end display Automake supports per-program and per-library compilation flags (see @@ -12515,14 +12807,14 @@ compiled with @samp{-some -flags}. (If you wonder about the names of these object files, see @ref{Renamed Objects}.) Note that @code{foo_CFLAGS} gives the flags to use when compiling all the C -sources of the @emph{program} @code{foo}, it has nothing to do with +sources of the @emph{program} @code{foo}; it has nothing to do with @file{foo.c} or @file{foo-foo.o} specifically. What if @file{foo.c} needs to be compiled into @file{foo.o} using some specific flags, that none of the other files requires? Obviously per-program flags are not directly applicable here. Something like per-object flags are expected, i.e., flags that would be used only -when creating @file{foo-foo.o}. Automake does not support that, +when creating @file{foo-foo.o}. Automake does not support that; however this is easy to simulate using a library that contains only that object, and compiling this library with per-library flags. @@ -12584,9 +12876,9 @@ @end example @noindent -What the above rule really says is that @file{data.c} and -@file{data.h} each depend on @file{data.foo}, and can each be built by -running @samp{foo data.foo}. In other words it is equivalent to: +What the above rule says is that @file{data.c} and @file{data.h} each +depend on @file{data.foo}, and can each be built by running @samp{foo +data.foo}. In other words it is equivalent to: @example # We do not want this. @@ -12672,12 +12964,29 @@ foo data.foo data.h: data.c ## Recover from the removal of $@@ + @@test -f $@@ || rm -f data.c + @@test -f $@@ || $(MAKE) $(AM_MAKEFLAGS) data.c +@end example + +It is tempting to use a single test as follows: + +@example +data.h: data.c +## Recover from the removal of $@@ @@if test -f $@@; then :; else \ rm -f data.c; \ $(MAKE) $(AM_MAKEFLAGS) data.c; \ fi @end example +@noindent +but that would break @samp{make -n}: at least GNU @command{make} and +Solaris @command{make} execute recipes containing the @samp{$(MAKE)} +string even when they are running in dry mode. So if we didn't break +the recipe above in two invocations, the file @file{data.c} would be +removed even upon @samp{make -n}. Not nice. + + The above scheme can be extended to handle more outputs and more inputs. One of the outputs is selected to serve as a witness to the successful completion of the command, it depends upon all inputs, and @@ -12690,10 +12999,8 @@ foo data.foo data.bar data.h data.w data.x: data.c ## Recover from the removal of $@@ - @@if test -f $@@; then :; else \ - rm -f data.c; \ - $(MAKE) $(AM_MAKEFLAGS) data.c; \ - fi + @@test -f $@@ || rm -f data.c + @@test -f $@@ || $(MAKE) $(AM_MAKEFLAGS) data.c @end example However there are now three minor problems in this setup. One is related @@ -12712,10 +13019,10 @@ weird situation. The next time @command{make} is run, @file{data.h} will appear older than @file{data.c}, the second rule will be triggered, a shell will be started to execute the @samp{if@dots{}fi} -command, but actually it will just execute the @code{then} branch, -that is: nothing. In other words, because the witness we selected is -not the first file created by @command{foo}, @command{make} will start -a shell to do nothing each time it is run. +command, but it will just execute the @code{then} branch, that is: +nothing. In other words, because the witness we selected is not the +first file created by @command{foo}, @command{make} will start a shell +to do nothing each time it is run. A simple riposte is to fix the timestamps when this happens. @@ -12723,13 +13030,10 @@ data.c: data.foo data.bar foo data.foo data.bar data.h data.w data.x: data.c - @@if test -f $@@; then \ - touch $@@; \ - else \ + @@test ! -f $@@ || touch $@@ ## Recover from the removal of $@@ - rm -f data.c; \ - $(MAKE) $(AM_MAKEFLAGS) data.c; \ - fi + @@test -f $@@ || rm -f data.c + @@test -f $@@ || $(MAKE) $(AM_MAKEFLAGS) data.c @end example Another solution is to use a different and dedicated file as witness, @@ -12743,10 +13047,8 @@ @@mv -f data.tmp $@@ data.c data.h data.w data.x: data.stamp ## Recover from the removal of $@@ - @@if test -f $@@; then :; else \ - rm -f data.stamp; \ - $(MAKE) $(AM_MAKEFLAGS) data.stamp; \ - fi + @@test -f $@@ || rm -f data.stamp + @@test -f $@@ || $(MAKE) $(AM_MAKEFLAGS) data.stamp @end example @file{data.tmp} is created before @command{foo} is run, so it has a @@ -12905,17 +13207,16 @@ My package needs to populate the installation directory of another package at install-time. I can easily compute that installation directory in @file{configure}, but if I install files therein, -@samp{make distcheck} fails. How else should I do? +@samp{make distcheck} fails. How else should I do it? @end display These two setups share their symptoms: @samp{make distcheck} fails -because they are installing files to hard-coded paths. In the later -case the path is not really hard-coded in the package, but we can -consider it to be hard-coded in the system (or in whichever tool that -supplies the path). As long as the path does not use any of the -standard directory variables (@samp{$(prefix)}, @samp{$(bindir)}, -@samp{$(datadir)}, etc.), the effect will be the same: -user-installations are impossible. +because they are installing files to hard-coded paths. In the latter +case the path is not hard-coded in the package, but we can consider it +to be hard-coded in the system (or in whichever tool that supplies the +path). As long as the path does not use any of the standard directory +variables (@samp{$(prefix)}, @samp{$(bindir)}, @samp{$(datadir)}, +etc.), the effect will be the same: user-installations are impossible. As a (non-root) user who wants to install a package, you usually have no right to install anything in @file{/usr} or @file{/usr/local}. So you @@ -12937,7 +13238,7 @@ @end example @noindent -by default @code{sysconfdir} will be @samp{$(prefix)/etc}, because +By default @code{sysconfdir} will be @samp{$(prefix)/etc}, because this is what the GNU Standards require. When such a package is installed on an FHS compliant system, the installer will have to set @samp{--sysconfdir=/etc}. As the maintainer of the package you @@ -12957,12 +13258,12 @@ @end example If you indeed use this absolute path to install your shared library, -non-root users will not be able to install the package, hence +non-root users will not be able to install the package; hence distcheck fails. Let's do better. The @samp{sysconfig.get_python_lib()} function -actually accepts a third argument that will replace Python's -installation prefix. +accepts a third argument that will replace Python's installation +prefix. @example % @kbd{python -c 'from distutils import sysconfig; @@ -12977,10 +13278,10 @@ as Python (you get the behavior of the previous attempt) @item -non-root users can install your package too, they will have the +non-root users can install your package too; they will have the extension module in a place that is not searched by Python but they can work around this using environment variables (and if you installed -scripts that use this shared library, it's easy to tell Python were to +scripts that use this shared library, it's easy to tell Python where to look in the beginning of your script, so the script works in both cases). @end itemize @@ -12989,7 +13290,7 @@ @samp{$(pythondir)} and @samp{$(pyexecdir)} (@pxref{Python}). Of course not all tools are as advanced as Python regarding that -substitution of @var{prefix}. So another strategy is to figure the +substitution of @var{prefix}. So another strategy is to figure out the part of the installation directory that must be preserved. For instance, here is how @code{AM_PATH_LISPDIR} (@pxref{Emacs Lisp}) computes @samp{$(lispdir)}: @@ -13009,14 +13310,14 @@ conftest.out` @end example -I.e., it just picks the first directory that looks like +That is, it just picks the first directory that looks like @file{*/lib/*emacs/site-lisp} or @file{*/share/*emacs/site-lisp} in the search path of emacs, and then substitutes @samp{$@{libdir@}} or @samp{$@{datadir@}} appropriately. The emacs case looks complicated because it processes a list and -expects two possible layouts, otherwise it's easy, and the benefits for -non-root users are really worth the extra @command{sed} invocation. +expects two possible layouts; otherwise it's easy, and the benefits +for non-root users are worth the extra @command{sed} invocation. @node Debugging Make Rules @@ -13036,34 +13337,38 @@ If less verbose output has been enabled in the package with the use of silent rules (@pxref{Automake Silent Rules}), you can use @code{make V=1} to see the commands being executed. + @item @code{make -n} can help show what would be done without actually doing -it. Note however, that this will @emph{still execute} commands prefixed -with @samp{+}, and, when using GNU @command{make}, commands that contain +it. However, this @emph{still executes} commands prefixed with +@samp{+}, and, when using GNU @command{make}, commands that contain the strings @samp{$(MAKE)} or @samp{$@{MAKE@}} (@pxref{Instead of -Execution,,, make, The GNU Make Manual}). -Typically, this is helpful to show what recursive rules would do, but it -means that, in your own rules, you should not mix such recursion with -actions that change any files.@footnote{Automake's @samp{dist} and -@samp{distcheck} rules had a bug in this regard in that they created -directories even with @option{-n}, but this has been fixed in Automake -1.11.} Furthermore, note that GNU @command{make} will update -prerequisites for the @file{Makefile} file itself even with @option{-n} -(@pxref{Remaking Makefiles,,, make, The GNU Make Manual}). +Execution,,, make, The GNU Make Manual}). Typically, this is helpful +to show what recursive rules would do, but it means that, in your own +rules, you should not mix such recursion with actions that change any +files.@footnote{Automake's @samp{dist} and @samp{distcheck} rules had +a bug in this regard in that they created directories even with +@option{-n}, but this has been fixed in Automake 1.11.} Furthermore, +note that GNU @command{make} will update prerequisites for the +@file{Makefile} file itself even with @option{-n} (@pxref{Remaking +Makefiles,,, make, The GNU Make Manual}). + @item @code{make SHELL="/bin/bash -vx"} can help debug complex rules. @xref{The Make Macro SHELL,,, autoconf, The Autoconf Manual}, for some portability quirks associated with this construct. + @item @code{echo 'print: ; @@echo "$(VAR)"' | make -f Makefile -f - print} can be handy to examine the expanded value of variables. You may need to use a target other than @samp{print} if that is already used or a file with that name exists. + @item @url{http://bashdb.sourceforge.net/@/remake/} provides a modified GNU @command{make} command called @command{remake} that copes with -complex GNU @command{make}-specific Makefiles and allows to trace -execution, examine variables, and call rules interactively, much like +complex GNU @command{make}-specific Makefiles and allows tracing +execution, examining variables, and calling rules interactively, much like a debugger. @end itemize @@ -13071,40 +13376,37 @@ @node Reporting Bugs @section Reporting Bugs -Most nontrivial software has bugs. Automake is no exception. Although -we cannot promise we can or will fix a bug, and we might not even agree -that it is a bug, we want to hear about problems you encounter. Often we -agree they are bugs and want to fix them. +@cindex Bugs, reporting +@cindex Reporting bugs -To make it possible for us to fix a bug, please report it. In order to -do so effectively, it helps to know when and how to do it. +Most nontrivial software has bugs. Automake is no exception. We +cannot promise we can or will fix a bug, and we might not even agree +that it is a bug, but we want to hear about problems you +encounter. Often we agree they are bugs and want to fix them. -Before reporting a bug, it is a good idea to see if it is already known. +So, to make it possible for us to fix a bug, please report it. +If you can, though, it is helpful if you check if it is already known. You can look at the @uref{https://debbugs.gnu.org/, GNU Bug Tracker} and the @uref{https://lists.gnu.org/@/archive/@/html/@/bug-automake/, -bug-automake mailing list archives} for previous bug reports. We -previously used a -@uref{http://sourceware.org/@/cgi-bin/@/gnatsweb.pl?database=automake, -Gnats database} for bug tracking, so some bugs might have been reported -there already. Please do not use it for new bug reports, however. - -If the bug is not already known, it should be reported. It is very -important to report bugs in a way that is useful and efficient. For -this, please familiarize yourself with -@uref{http://www.chiark.greenend.org.uk/@/~sgtatham/@/bugs.html, How to -Report Bugs Effectively} and +bug-automake mailing list archives} for previous bug reports. (We +previously used a Gnats database for bug tracking, but it is no longer +online.) + +If the bug is not already known, it should be reported. To report +bugs in a way that is useful and efficient, please read +@uref{https://www.chiark.greenend.org.uk/@/~sgtatham/@/bugs.html, How +to Report Bugs Effectively} and @uref{http://catb.org/@/~esr/@/faqs/@/smart-questions.html, How to Ask -Questions the Smart Way}. This helps you and developers to save time -which can then be spent on fixing more bugs and implementing more -features. +Questions the Smart Way}. Good bug reports save time for everyone. For a bug report, a feature request or other suggestions, please send email to @email{@value{PACKAGE_BUGREPORT}}. This will then open a new bug in the @uref{https://debbugs.gnu.org/@/automake, bug tracker}. Be -sure to include the versions of Autoconf and Automake that you use. -Ideally, post a minimal @file{Makefile.am} and @file{configure.ac} that -reproduces the problem you encounter. If you have encountered test -suite failures, please attach the @file{test-suite.log} file. +sure to include the versions of Autoconf and Automake that you use and +the kind of system you're on. Ideally, post a minimal +@file{Makefile.am} and @file{configure.ac} that reproduces the problem +you encounter. If you have encountered test suite failures, please +attach the @file{test-suite.log} file. @c ========================================================== Appendices @@ -13225,4 +13527,4 @@ @c LocalWords: LTALLOCA MALLOC malloc memcmp strdup alloca libcompat xyz DFOO @c LocalWords: unprefixed buildable preprocessed DBAZ DDATADIR WARNINGCFLAGS @c LocalWords: LIBFOOCFLAGS LIBFOOLDFLAGS ftable testSubDir obj LIBTOOLFLAGS -@c LocalWords: barexec Pinard's automatize initialize lzip xz cscope +@c LocalWords: barexec Pinard's automatize initialize lzip xz zstd cscope diff -Nru automake-1.16-1.16.1/doc/fdl.texi automake-1.16-1.16.5/doc/fdl.texi --- automake-1.16-1.16.1/doc/fdl.texi 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/doc/fdl.texi 2021-07-12 02:41:13.000000000 +0000 @@ -5,8 +5,8 @@ @c hence no sectioning command or @node. @display -Copyright @copyright{} 2000-2018 Free Software Foundation, Inc. -@uref{http://fsf.org/} +Copyright @copyright{} 2000--2021 Free Software Foundation, Inc. +@uref{https://fsf.org/} Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -92,16 +92,16 @@ of text. A copy that is not ``Transparent'' is called ``Opaque''. Examples of suitable formats for Transparent copies include plain -@sc{ascii} without markup, Texinfo input format, La@TeX{} input -format, @acronym{SGML} or @acronym{XML} using a publicly available -@acronym{DTD}, and standard-conforming simple @acronym{HTML}, -PostScript or @acronym{PDF} designed for human modification. Examples -of transparent image formats include @acronym{PNG}, @acronym{XCF} and -@acronym{JPG}. Opaque formats include proprietary formats that can be -read and edited only by proprietary word processors, @acronym{SGML} or -@acronym{XML} for which the @acronym{DTD} and/or processing tools are -not generally available, and the machine-generated @acronym{HTML}, -PostScript or @acronym{PDF} produced by some word processors for +ASCII without markup, Texinfo input format, La@TeX{} input +format, SGML or XML using a publicly available +DTD, and standard-conforming simple HTML, +PostScript or PDF designed for human modification. Examples +of transparent image formats include PNG, XCF and +JPG@. Opaque formats include proprietary formats that can be +read and edited only by proprietary word processors, SGML or +XML for which the DTD and/or processing tools are +not generally available, and the machine-generated HTML, +PostScript or PDF produced by some word processors for output purposes only. The ``Title Page'' means, for a printed book, the title page itself, @@ -151,7 +151,7 @@ If you publish printed copies (or copies in media that commonly have printed covers) of the Document, numbering more than 100, and the Document's license notice requires Cover Texts, you must enclose the -copies in covers that carry, clearly and legibly, all of these Cover +copies in covers that carry, clearly and legibly, all these Cover Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on the back cover. Both covers must also clearly and legibly identify you as the publisher of these copies. The front cover must present @@ -414,7 +414,7 @@ of the GNU Free Documentation License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. See -@uref{http://www.gnu.org/copyleft/}. +@uref{https://www.gnu.org/copyleft/}. Each version of the License is given a distinguishing version number. If the Document specifies that a particular numbered version of this @@ -481,7 +481,7 @@ @end smallexample If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, -replace the ``with@dots{}Texts.'' line with this: +replace the ``with@dots{}Texts.''@: line with this: @smallexample @group @@ -503,4 +503,3 @@ @c Local Variables: @c ispell-local-pdict: "ispell-dict" @c End: - diff -Nru automake-1.16-1.16.1/doc/help2man automake-1.16-1.16.5/doc/help2man --- automake-1.16-1.16.1/doc/help2man 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/doc/help2man 2021-09-20 00:53:14.000000000 +0000 @@ -1,7 +1,9 @@ #!/usr/bin/perl -w # Generate a short man page from --help and --version output. -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, +# 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2020, 2021 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 @@ -27,7 +29,7 @@ use POSIX qw(strftime setlocale LC_ALL); my $this_program = 'help2man'; -my $this_version = '1.47.4'; +my $this_version = '1.48.4'; sub _ { $_[0] } sub configure_locale @@ -51,8 +53,9 @@ my $version_info = enc_user sprintf _(<<'EOT'), $this_program, $this_version; GNU %s %s -Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010, -2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc. +Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, +2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2020, 2021 Free Software +Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -247,7 +250,7 @@ $version_text ||= get_option_value $ARGV[0], $version_option; # By default the generated manual pages will include the current date. This may -# however be overriden by setting the environment variable $SOURCE_DATE_EPOCH +# however be overridden by setting the environment variable $SOURCE_DATE_EPOCH # to an integer value of the seconds since the UNIX epoch. This is primarily # intended to support reproducible builds (wiki.debian.org/ReproducibleBuilds) # and will additionally ensure that the output date string is UTC. @@ -255,7 +258,7 @@ if (exists $ENV{SOURCE_DATE_EPOCH} and $ENV{SOURCE_DATE_EPOCH} =~ /^(\d+)$/) { $epoch_secs = $1; - $ENV{TZ} = 'UTC'; + $ENV{TZ} = 'UTC0'; } # Translators: the following message is a strftime(3) format string, which in @@ -282,21 +285,23 @@ # # # {GNU,Free} -# ({GNU,Free} ) -# - {GNU,Free} +# ({GNU,Free,} ) +# - {GNU,Free,} +# - {GNU,Free,} - # # and separated from any copyright/author details by a blank line. ($_, $version_text) = ((split /\n+/, $version_text, 2), ''); -if (/^(\S+) +\(((?:GNU|Free) +[^)]+)\) +(.*)/ or - /^(\S+) +- *((?:GNU|Free) +\S+) +(.*)/) +if (/^(\S+) +\(((?:(?:GNU|Free) +)?[^)]+)\) +(\S.*)$/ or + /^(\S+) +- +((?:(?:GNU|Free) +)?\S.*) +- +(\S.*)$/ or + /^(\S+) +- +((?:(?:GNU|Free) +)?\S+) +(\S.*)$/) { $program = program_basename $1; $package = $2; $version = $3; } -elsif (/^((?:GNU|Free) +)?(\S+) +(.*)/) +elsif (/^((?:GNU|Free) +)?(\S+) +(\S.*)$/) { $program = program_basename $2; $package = $1 ? "$1$program" : $program; @@ -336,7 +341,7 @@ my $PROGRAM = uc $program; # Set default page head/footers -$source ||= "$program $version"; +$source ||= "$package $version"; unless ($manual) { for ($section) diff -Nru automake-1.16-1.16.1/doc/local.mk automake-1.16-1.16.5/doc/local.mk --- automake-1.16-1.16.1/doc/local.mk 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/doc/local.mk 2021-10-04 02:51:12.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- makefile-automake -*- -## Copyright (C) 1995-2018 Free Software Foundation, Inc. +## Copyright (C) 1995-2021 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 @@ -50,6 +50,41 @@ %D%/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm $(update_mans) automake-$(APIVERSION) +## This target is not invoked as a dependency of anything. It exists +## merely to make checking the links in automake.texi (that is, +## automake.html) more convenient. We use a slightly-enhanced version of +## W3C checklink to do this. We intentionally do not have automake.html +## as a dependency, as it seems more convenient to have its regeneration +## under manual control. See https://debbugs.gnu.org/10371. +## +checklinkx = $(top_srcdir)/contrib/checklinkx +# that 4-second sleep seems to be what gnu.org likes. +chlx_args = -v --sleep 8 #--exclude-url-file=/tmp/xf +# Explanation of excludes: +# - w3.org dtds, they are fine (and slow). +# - mailto urls, they are always forbidden. +# - vala, redirects to a Gnome subpage and returns 403 to us. +# - cfortran, forbidden by site's robots.txt. +# - search.cpan.org, gets +# - debbugs.gnu.org/automake, forbidden by robots.txt. +# - autoconf.html, forbidden by robots.txt (since served from savannah). +# - https://fsf.org redirects to https://www.fsf.org and nothing to do +# (it's in the FDL). --suppress-redirect options do not suppress the msg. +# +chlx_excludes = \ + -X 'http.*w3\.org/.*dtd' \ + -X 'mailto:.*' \ + -X 'https://www\.vala-project\.org/' \ + -X 'https://www-zeus\.desy\.de/~burow/cfortran/' \ + -X 'http://xsearch\.cpan\.org/~mschwern/Test-Simple/lib/Test/More\.pm' \ + -X 'https://debbugs\.gnu\.org/automake' \ + -X 'https://www\.gnu\.org/software/autoconf/manual/autoconf\.html' \ + -X 'https://fsf\.org/' +chlx_file = $(top_srcdir)/doc/automake.html +.PHONY: checklinkx +checklinkx: + $(checklinkx) $(chlx_args) $(chlx_excludes) $(chlx_file) + ## ---------------------------- ## ## Example package "amhello". ## ## ---------------------------- ## @@ -91,7 +126,7 @@ $(srcdir)/%D%/amhello-1.0.tar.gz: $(amhello_sources) $(srcdir)/configure.ac $(AM_V_GEN)tmp=amhello-output.tmp \ && $(am__cd) $(srcdir)/%D%/amhello \ - && : Make our aclocal and automake avaiable before system ones. \ + && : Make our aclocal and automake available before system ones. \ && $(setup_autotools_paths) \ && ( \ { $(AM_V_P) || exec 5>&2 >$$tmp 2>&1; } \ diff -Nru automake-1.16-1.16.1/doc/stamp-vti automake-1.16-1.16.5/doc/stamp-vti --- automake-1.16-1.16.1/doc/stamp-vti 2018-03-11 21:21:14.000000000 +0000 +++ automake-1.16-1.16.5/doc/stamp-vti 2021-10-04 03:17:35.000000000 +0000 @@ -1,4 +1,4 @@ -@set UPDATED 26 February 2018 -@set UPDATED-MONTH February 2018 -@set EDITION 1.16.1 -@set VERSION 1.16.1 +@set UPDATED 1 October 2021 +@set UPDATED-MONTH October 2021 +@set EDITION 1.16.5 +@set VERSION 1.16.5 diff -Nru automake-1.16-1.16.1/doc/version.texi automake-1.16-1.16.5/doc/version.texi --- automake-1.16-1.16.1/doc/version.texi 2018-03-11 21:21:14.000000000 +0000 +++ automake-1.16-1.16.5/doc/version.texi 2021-10-04 02:46:50.000000000 +0000 @@ -1,4 +1,4 @@ -@set UPDATED 26 February 2018 -@set UPDATED-MONTH February 2018 -@set EDITION 1.16.1 -@set VERSION 1.16.1 +@set UPDATED 1 October 2021 +@set UPDATED-MONTH October 2021 +@set EDITION 1.16.5 +@set VERSION 1.16.5 diff -Nru automake-1.16-1.16.1/gen-testsuite-part automake-1.16-1.16.5/gen-testsuite-part --- automake-1.16-1.16.1/gen-testsuite-part 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/gen-testsuite-part 2021-07-12 02:41:13.000000000 +0000 @@ -3,7 +3,7 @@ # of the Automake testsuite. Also, automatically generate some more # tests from them (for particular cases/setups only). -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/GNUmakefile automake-1.16-1.16.5/GNUmakefile --- automake-1.16-1.16.1/GNUmakefile 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/GNUmakefile 2021-07-19 00:59:02.000000000 +0000 @@ -1,6 +1,6 @@ # Maintainer makefile for Automake. Requires GNU make. -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/HACKING automake-1.16-1.16.5/HACKING --- automake-1.16-1.16.1/HACKING 2018-02-27 22:59:31.000000000 +0000 +++ automake-1.16-1.16.5/HACKING 2021-09-20 00:53:14.000000000 +0000 @@ -1,41 +1,46 @@ ============================================================================ = This file -* This file attempts to describe the rules to use when hacking - automake. +* This file attempts to describe the conventions to use when hacking automake. + +* After git checkout from Savannah, can do initial build with, e.g.: + $ ./bootstrap && ./configure --prefix=/tmp/amdev && make ============================================================================ = Administrivia * The correct response to most actual bugs is to write a new test case which demonstrates the bug. Then fix the bug, re-run the test suite, - and check everything in. + and check everything in. Run the test suite in parallel. * If you incorporate a change from somebody on the net: - - First, if it is a large change, you must make sure they have + - First, if it is not a tiny change, you must make sure they have signed the appropriate paperwork. - - Second, be sure to add their name and email address to THANKS. + - Second, add their name and email address to THANKS. -* If a change fixes a test, mention the test in the commit message. - If a change fixes a bug registered in the Automake debbugs tracker, - mention the bug number in the commit message. +* If a change fixes or adds a test, mention the test in the commit + message. If a change fixes a bug registered in the Automake debbugs + tracker, mention the bug number in the commit message, using + the short url form, like https://bugs.gnu.org/1234. See section below + about commit messages. -* If somebody reports a new bug, mention his name in the commit message - that fixes or exposes the bug, and put him into THANKS. +* If somebody reports a new bug, mention their name in the commit message + that fixes or exposes the bug, and add a line for them in THANKS. * When documenting a non-trivial idiom or example in the manual, be sure to add a test case for it, and to reference such test case from a proper Texinfo comment. -* Some files in the automake package are not owned by automake; these - files are listed in the $(FETCHFILES) variable in Makefile.am. They - should never be edited here. Almost all of them can be updated from - respective upstreams with "make fetch" (this should be done especially - before releases). The only exception is the 'lib/COPYING' (from FSF), - which should be updated by hand whenever the GPL gets updated (which - shouldn't happen that often anyway :-) +* Some files in the automake package are not owned by automake (many by + gnulib, https://gnu.org/s/gnulib); these files are listed in the + $(FETCHFILES) variable in Makefile.am. They should never be edited + here. All but one of them can be updated from respective upstreams + with "make fetch" (this should be done especially before releases). + The only exception is 'lib/COPYING' (from FSF), which should be + updated by hand whenever the GPL gets updated (which shouldn't happen + that often anyway :-) -* Changes other than *trivial* bug fixes must be mentioned in NEWS. +* All changes that are not trivial bug fixes must be mentioned in NEWS. * Changes which are potentially controversial, require a non-trivial plan, or must be implemented gradually with a roadmap spanning several @@ -47,10 +52,26 @@ Automake debbugs tracker, to keep the idea more visible, and have the discussions surrounding it easily archived in a central place. +=========================================================================== += Setting the development environment + +* In development, ./GNUmakefile is used, not (the generated) ./Makefile. + Run make V=1 to see the commands that are run. + +* The required and optional dependencies used by Automake and its test suite + can be automatically fetched using the GNU Guix package manager with the + following command: + + $ guix environment automake --ad-hoc \ + gettext help2man texinfo libtool flex bison dejagnu zip icedtea \ + python gcc-toolchain gfortran pkg-config vala + + For other environments, you'll need to install the equivalent. + ============================================================================ = Naming -* We've adopted the convention that internal AC_SUBSTs and make variables +* Automake's convention is that internal AC_SUBSTs and make variables should be named with a leading 'am__', and internally generated targets should be named with a leading 'am--'. This convention, although in place from at least February 2001, isn't yet universally used. @@ -61,14 +82,20 @@ variable begins with the underscore character. Yay for them. I changed the target naming convention just to be safe. +* If you'd like to read some general background on automake and the + other GNU autotools, you might try this not-too-long web page (not + affiliated with GNU): + https://www.linux.com/news/best-practices-autotools/ + ============================================================================ = Editing '.am' files -* Always use $(...) and not ${...} +* For variables, always use $(...) and not ${...}. * Prefer ':' over 'true', mostly for consistency with existing code. -* Use '##' comments liberally. Comment anything even remotely unusual. +* Use '##' comments liberally. Comment anything even remotely unusual, + and even usual things, to help future readers of the code understand. * Never use basename or dirname. Instead, use sed. @@ -139,23 +166,13 @@ * Major releases can introduce backward-incompatibilities (albeit such incompatibilities should be announced well in advance, and a smooth - transition plan prepared for them), and try more risking and daring - refactorings and code cleanups. + transition plan prepared for them), and try more risky and daring + refactorings and code cleanups. Still, backward compatibilities are + extremely undesirable and should be avoided at all costs. * For more information, refer to the extensive discussion associated with automake bug#13578. -=========================================================================== -= Setting the development environment - -* The required and optional dependencies used by Automake and its test suite - can be automatically fetched using the GNU Guix package manager with the - following command: - - $ guix environment automake --ad-hoc \ - gettext help2man texinfo libtool flex bison dejagnu zip icedtea \ - python gcc-toolchain gfortran pkg-config vala - ============================================================================ = Working with git @@ -165,7 +182,9 @@ be the same as you would get if you install this version of automake and use it to generate those files. Be sure to have the latest stable version of Autoconf installed and available early - in your PATH. + in your PATH. To get a faithful and correct rebuild, run: + ./bootstrap && ./config.status --recheck && make clean all + (per https://bugs.gnu.org/11347) * The Automake git tree currently carries three basic branches: 'master', 'next' and 'maint'. @@ -213,6 +232,20 @@ it in the 'experimental/*' namespace; for example, a rewindable branch dealing with Vala support could be named like "experimental/vala-work". +* If you need to trivially fix a change after a commit, e.g., a typo in + the NEWS entry, edit the file and then: + git commit --amend --no-edit NEWS + git commit --amend --date="$(date -R)" # update date of commit + +* If you want to just completely lose your local changes: + git fetch && git reset --hard origin && git checkout && git submodule update + (the submodule stuff is for gnulib). + +* The preferred way to create a patch to mail around: + git format-patch --stdout -1 >/tmp/some-patch.diff + which can then be applied with: + git am mboxfile + ============================================================================ = Writing a good commit message @@ -226,7 +259,7 @@ Here goes a more detailed explanation of why the commit is needed, and a general overview of what it does, and how. This section - should almost always be provided, possibly only with the expection + should almost always be provided, possibly only with the exception of obvious fixes or very trivial changes. And if the detailed explanation is quite long or detailed, you can @@ -252,19 +285,21 @@ * some/file (func1): Improved frobnication. (func2): Adjusted accordingly. * another/file (foo, bar): Likewise. - * tests/foo.tap: New test. - * tests/Makefile.am (TESTS): Add it. + * t/foo.sh: New test. + * t/list-of-tests.mk (handwritten_TESTS): Add it. + * doc/automake.texi (Some Node): Document it. + * NEWS: mention it. * If your commit fixes an automake bug registered in the tracker (say numbered 1234), you should put the following line after the summary line: - This change fixes automake bug#1234. + Fixes automake bug https://bugs.gnu.org/1234. * If your commit is just related to the given bug report, but does not fix it, you might want to add a line like this instead: - This change is related to automake bug#1234. + Related to automake bug https://bugs.gnu.org/1234. * When referring to older commits, use 'git describe' output as pointer. But also try to identify the given commit by date and/or summary line @@ -272,7 +307,7 @@ Since yesterday's commit, v1.11-2019-g4d2bf42, ... - ... removed in commit 'v1.11-1674-g02e9072' of 01-01-2012, + ... removed in commit 'v1.11-1674-g02e9072' of 2012-01-01, "dist: ditch support for lzma"... * If the commit is a tiny change that is exempt from copyright paperwork, the @@ -281,9 +316,13 @@ Copyright-paperwork-exempt: yes +* Generally write the commit message in present tense. + ============================================================================ = Test suite +* See file 't/README' for more information. + * Use "make check" and "make maintainer-check" liberally. * Export the 'keep_testdirs' environment variable to "yes" to keep @@ -292,7 +331,94 @@ * Use perl coverage information to ensure your new code is thoroughly tested by your new tests. -* See file 't/README' for more information. +* To run the tests, you should install expect, shar, language compilers, + gettext macros. Anything you don't install won't be tested. The test + suite will report on tests skipped due to software not available. + +* You can run a single test, with, e.g., + + make check TESTS='t/aclocal-acdir.sh' + + where t/aclocal-acdir.sh can be any t/*.sh test, including a new one + you are writing. You may want to add --no-print-dir to silence GNU + make about the many cd commands, and/or env VERBOSE=1 to get more + information about what make is running. + +* Then check t/test-suite.log for the overall results. The directory + t/TESTNAME.dir is where the work will be left, if the test fails. + During development of a new test, you want to end it with "exit 33" + (or whatever) to make it fail even when it would succeed, so you can + inspect the test directory to be sure things worked as expected. + + You can also set keep_testdirs=yes on the command line to keep the + *.dir results. + +* Run the test suite in parallel (e.g., "make -j12 check"), both so it + doesn't take forever and because that is what most users will do. You + can also parallelize the makes that run inside each test with, e.g.: + + make check AM_TESTSUITE_MAKE="make -j$(( 1*$(nproc) + 1 ))" + + If you like, try different levels of parallelization to see what + runs the fastest on your machine. + +* Run "make maintainer-check" before commit. Watch out for trailing spaces. + +* It is good to run also run "make -j12 distcheck" before pushing a + commit since that exercises yet more testing, after "make -j12 check" + succeeds. + +* Use make V=1 to un-silence (some) of what make does. + +* To set up a new test, first write the test file in t/good-name.sh. + Choose a name that fits with existing ones, as best you can devise. + + - You'll likely want to copy material from an existing test, which is + fine and good; depending on how much is copied, it may be useful to + mention the other test(s) you used. + + - Nevertheless, start the copyright year list in the new file fresh, + with the current year. + + - You can run the new test on its own with + make check TESTS='t/good-name.sh' + + - At some point before releasing, add the test to the appropriate + variable in t/list-of-tests.mk, most likely the (alphabetical) + handwritten_TESTS. + +============================================================================ += Bug tracker + +* Automake uses the debbugs instance at https://bugs.gnu.org. Email + from the tracker is sent to bug-automake@gnu.org, and vice versa. + (https://gnu.org/s/automake for all the mailing lists; you should subscribe.) + +* To see all open bugs (and recently closed ones): + https://debbugs.gnu.org/cgi/pkgreport.cgi?pkg=automake + +* For a full search form, initialized to show bugs tagged confirmed: + https://debbugs.gnu.org/cgi/pkgreport.cgi?package=automake;include=tags%3Aconfirmed + +* We use the "confirmed" tag to mean bugs that have been reviewed, are + evidently valid, but no one is currently working or plans to work on + them. Thus they are good candidates for new volunteers to get involved. + +* To download the so-called maintainer mbox for a bug, say 12345: + https://debbugs.gnu.org/cgi/bugreport.cgi?bug=12345;mbox=yes;mboxmaint=yes + Only the maintainer mbox consistently has the bug# prefix on Subject: + lines, so it is generally the most usable. + +* To close a bug, you can mail (or bcc) to 12345-done@debbugs.gnu.org. + It's best to do this with a note saying that the bug is being closed + because the fix was pushed, or whatever the reason. + +* To add tags "help" and "confirmed" to bug 12345, mail to + control@debbugs.gnu.org with a one-line body: + tags 12345 + help confirmed + +* In general, all bug operations are done by mail. Reference information: + https://debbugs.gnu.org/server-control.html # dev info ============================================================================ = Release procedure @@ -305,7 +431,7 @@ running "make fetch". In case any file in the automake repository has been updated, commit and re-run the testsuite. -* Ensure that the copyright notices of the distributed files is up to +* Ensure that the copyright notices of the distributed files are up to date. The maintainer-only target "update-copyright" can help with this. @@ -391,7 +517,7 @@ ----- -Copyright (C) 2003-2018 Free Software Foundation, Inc. +Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/INSTALL automake-1.16-1.16.5/INSTALL --- automake-1.16-1.16.1/INSTALL 2018-02-27 22:59:31.000000000 +0000 +++ automake-1.16-1.16.5/INSTALL 2021-07-10 19:43:25.000000000 +0000 @@ -1,8 +1,8 @@ Installation Instructions ************************* - Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software -Foundation, Inc. + Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free +Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -225,7 +225,7 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX 'make' updates targets which have the same time stamps as their + HP-UX 'make' updates targets which have the same timestamps as their prerequisites, which makes it generally unusable when shipped generated files such as 'configure' are involved. Use GNU 'make' instead. diff -Nru automake-1.16-1.16.1/lib/am/check2.am automake-1.16-1.16.5/lib/am/check2.am --- automake-1.16-1.16.1/lib/am/check2.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/check2.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2008-2018 Free Software Foundation, Inc. +## Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/check.am automake-1.16-1.16.5/lib/am/check.am --- automake-1.16-1.16.1/lib/am/check.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/check.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2001-2018 Free Software Foundation, Inc. +## Copyright (C) 2001-2021 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 @@ -243,6 +243,9 @@ am--force-recheck: @: +## Exists only to be overridden. See bug#11745. +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' + $(TEST_SUITE_LOG): $(TEST_LOGS) @$(am__set_TESTS_bases); \ ## Helper shell function, tells whether a path refers to an existing, @@ -375,7 +378,7 @@ ## Multi line coloring is problematic with "less -R", so we really need ## to color each line individually. echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ ## This is expected to go to the console, so it might have to be colorized. create_testsuite_report --maybe-color; \ diff -Nru automake-1.16-1.16.1/lib/am/clean.am automake-1.16-1.16.5/lib/am/clean.am --- automake-1.16-1.16.1/lib/am/clean.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/clean.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/clean-hdr.am automake-1.16-1.16.5/lib/am/clean-hdr.am --- automake-1.16-1.16.1/lib/am/clean-hdr.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/clean-hdr.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/compile.am automake-1.16-1.16.5/lib/am/compile.am --- automake-1.16-1.16.1/lib/am/compile.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/compile.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/configure.am automake-1.16-1.16.5/lib/am/configure.am --- automake-1.16-1.16.1/lib/am/configure.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/configure.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2001-2018 Free Software Foundation, Inc. +## Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/data.am automake-1.16-1.16.5/lib/am/data.am --- automake-1.16-1.16.1/lib/am/data.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/data.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/dejagnu.am automake-1.16-1.16.5/lib/am/dejagnu.am --- automake-1.16-1.16.1/lib/am/dejagnu.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/dejagnu.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 @@ -54,7 +54,7 @@ @echo '# Do not edit here. If you wish to override these values' >>site.tmp @echo '# edit the last section' >>site.tmp @echo 'set srcdir "$(srcdir)"' >>site.tmp - @echo "set objdir `pwd`" >>site.tmp + @echo "set objdir \"`pwd`\"" >>site.tmp ## Quote the *_alias variables because they might be empty. ?BUILD? @echo 'set build_alias "$(build_alias)"' >>site.tmp ?BUILD? @echo 'set build_triplet $(build_triplet)' >>site.tmp diff -Nru automake-1.16-1.16.1/lib/am/depend2.am automake-1.16-1.16.5/lib/am/depend2.am --- automake-1.16-1.16.1/lib/am/depend2.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/depend2.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/depend.am automake-1.16-1.16.5/lib/am/depend.am --- automake-1.16-1.16.1/lib/am/depend.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/depend.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/distdir.am automake-1.16-1.16.5/lib/am/distdir.am --- automake-1.16-1.16.1/lib/am/distdir.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/distdir.am 2021-07-12 02:19:30.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2001-2018 Free Software Foundation, Inc. +## Copyright (C) 2001-2021 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 @@ -75,8 +75,13 @@ AM_RECURSIVE_TARGETS += distdir distdir-am endif %?SUBDIRS% +if %?DIST_BUILT_SOURCES% +distdir: + $(MAKE) $(AM_MAKEFLAGS) distdir-am +else !%?DIST_BUILT_SOURCES% distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am +endif !%?DIST_BUILT_SOURCES% distdir-am: $(DISTFILES) ## @@ -350,6 +355,12 @@ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +?ZSTD?DIST_ARCHIVES += $(distdir).tar.zst +.PHONY: dist-zstd +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + ?COMPRESS?DIST_ARCHIVES += $(distdir).tar.Z .PHONY: dist-tarZ dist-tarZ: distdir @@ -381,6 +392,7 @@ ?BZIP2?DIST_TARGETS += dist-bzip2 ?GZIP?DIST_TARGETS += dist-gzip ?ZIP?DIST_TARGETS += dist-zip +?ZSTD?DIST_TARGETS += dist-zstd ?COMPRESS?DIST_TARGETS += dist-tarZ endif %?TOPDIR_P% @@ -418,6 +430,9 @@ AM_RECURSIVE_TARGETS += distcheck endif %?SUBDIRS% +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi + # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another # tarfile. @@ -438,6 +453,8 @@ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac ## Make the new source tree read-only. Distributions ought to work in ## this case. However, make the top-level directory writable so we @@ -481,7 +498,7 @@ ## (in corner-case usages); see automake bug#14991. --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ diff -Nru automake-1.16-1.16.1/lib/am/footer.am automake-1.16-1.16.5/lib/am/footer.am --- automake-1.16-1.16.1/lib/am/footer.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/footer.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/header.am automake-1.16-1.16.5/lib/am/header.am --- automake-1.16-1.16.1/lib/am/header.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/header.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/header-vars.am automake-1.16-1.16.5/lib/am/header-vars.am --- automake-1.16-1.16.1/lib/am/header-vars.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/header-vars.am 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 @@ -31,7 +31,7 @@ ## Why the this needs to be so convoluted? ## ## (1) We can't unconditionally use make functions or special variables -## starting with a dot, as those cause non-GNU implmentations to +## starting with a dot, as those cause non-GNU implementations to ## crash hard. ## ## (2) We can't use $(MAKE_VERSION) here, as it is also defined in some diff -Nru automake-1.16-1.16.1/lib/am/install.am automake-1.16-1.16.5/lib/am/install.am --- automake-1.16-1.16.1/lib/am/install.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/install.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2001-2018 Free Software Foundation, Inc. +## Copyright (C) 2001-2021 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 @@ -52,18 +52,19 @@ RECURSIVE_TARGETS += install-data-recursive install-exec-recursive \ install-recursive uninstall-recursive install:%maybe_BUILT_SOURCES% install-recursive -install-exec: install-exec-recursive +install-exec:%maybe_BUILT_SOURCES% install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive else !%?SUBDIRS% install:%maybe_BUILT_SOURCES% install-am -install-exec: install-exec-am +install-exec:%maybe_BUILT_SOURCES% install-exec-am install-data: install-data-am uninstall: uninstall-am endif !%?SUBDIRS% if %?maybe_BUILT_SOURCES% .MAKE: install +.MAKE: install-exec endif %?maybe_BUILT_SOURCES% .MAKE .PHONY: install-am diff -Nru automake-1.16-1.16.1/lib/am/inst-vars.am automake-1.16-1.16.5/lib/am/inst-vars.am --- automake-1.16-1.16.1/lib/am/inst-vars.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/inst-vars.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2004-2018 Free Software Foundation, Inc. +## Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/java.am automake-1.16-1.16.5/lib/am/java.am --- automake-1.16-1.16.1/lib/am/java.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/java.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1998-2018 Free Software Foundation, Inc. +## Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/lang-compile.am automake-1.16-1.16.5/lib/am/lang-compile.am --- automake-1.16-1.16.1/lib/am/lang-compile.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/lang-compile.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2001-2018 Free Software Foundation, Inc. +## Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/lex.am automake-1.16-1.16.5/lib/am/lex.am --- automake-1.16-1.16.1/lib/am/lex.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/lex.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2001-2018 Free Software Foundation, Inc. +## Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/library.am automake-1.16-1.16.5/lib/am/library.am --- automake-1.16-1.16.1/lib/am/library.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/library.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/libs.am automake-1.16-1.16.5/lib/am/libs.am --- automake-1.16-1.16.1/lib/am/libs.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/libs.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/libtool.am automake-1.16-1.16.5/lib/am/libtool.am --- automake-1.16-1.16.1/lib/am/libtool.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/libtool.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/lisp.am automake-1.16-1.16.5/lib/am/lisp.am --- automake-1.16-1.16.1/lib/am/lisp.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/lisp.am 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1996-2018 Free Software Foundation, Inc. +## Copyright (C) 1996-2021 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 @@ -28,7 +28,7 @@ ## We prefer files from the build directory to those from the source ## directory, in true VPATH spirit. ## The destination file is normally determined by appending "c" to the -## input (which would erronously put it in $(srcdir) in VPATH builds), +## input (which would erroneously put it in $(srcdir) in VPATH builds), ## so we override that, too. if test '$(EMACS)' != no; then \ am__dir=. am__subdir_includes=''; \ @@ -41,10 +41,29 @@ $(EMACS) --batch \ $(AM_ELCFLAGS) $(ELCFLAGS) \ $$am__subdir_includes -L $(builddir) -L $(srcdir) \ - --eval '(setq byte-compile-dest-file-function (lambda (_) "$@"))' \ + --eval '$(am__emacs_byte_compile_setup)' \ -f batch-byte-compile '$<'; \ else :; fi +if %?FIRST% +## In Automake 1.16, byte compilation was changed to use +## byte-compile-dest-file-function, but that doesn't exist in Emacs +## versions earlier than 25, which are still widespread (likely +## permanently). There's no harm in supporting the older versions, which +## require defining the byte-compile-file defun, so do so. +## Otherwise, various of our lisp-related tests fail with the older +## Emacsen, since they would try to byte-compile into a read-only srcdir. +## +## This is used, single-quoted, in the shell sequence above. +## So use (quote) instead of another single quote in the Lisp. +## +am__emacs_byte_compile_setup = \ + (if (boundp (quote byte-compile-dest-file-function)) \ + (setq byte-compile-dest-file-function (lambda (_) "$@")) \ + (defun byte-compile-dest-file (_) "$@") \ + ) +## Just to be clear: that "$@" above is an Elisp string of the make target. +endif %?FIRST% ## ------------ ## ## Installing. ## diff -Nru automake-1.16-1.16.1/lib/am/local.mk automake-1.16-1.16.5/lib/am/local.mk --- automake-1.16-1.16.1/lib/am/local.mk 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/local.mk 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- makefile-automake -*- -## Copyright (C) 1995-2018 Free Software Foundation, Inc. +## Copyright (C) 1995-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/ltlib.am automake-1.16-1.16.5/lib/am/ltlib.am --- automake-1.16-1.16.1/lib/am/ltlib.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/ltlib.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/ltlibrary.am automake-1.16-1.16.5/lib/am/ltlibrary.am --- automake-1.16-1.16.1/lib/am/ltlibrary.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/ltlibrary.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/mans.am automake-1.16-1.16.5/lib/am/mans.am --- automake-1.16-1.16.1/lib/am/mans.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/mans.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1998-2018 Free Software Foundation, Inc. +## Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/mans-vars.am automake-1.16-1.16.5/lib/am/mans-vars.am --- automake-1.16-1.16.1/lib/am/mans-vars.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/mans-vars.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/program.am automake-1.16-1.16.5/lib/am/program.am --- automake-1.16-1.16.1/lib/am/program.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/program.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/progs.am automake-1.16-1.16.5/lib/am/progs.am --- automake-1.16-1.16.1/lib/am/progs.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/progs.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/python.am automake-1.16-1.16.5/lib/am/python.am --- automake-1.16-1.16.1/lib/am/python.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/python.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1999-2018 Free Software Foundation, Inc. +## Copyright (C) 1999-2021 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 @@ -97,7 +97,7 @@ if %?INSTALL% ?FIRST?am__pep3147_tweak = \ -?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|&.*.pyc\n&.*.pyo|' +?FIRST? sed -e 's|\.py$$||' -e 's|[^/]*$$|__pycache__/&.*.pyc __pycache__/&.*.pyo|' .PHONY uninstall-am: uninstall-%DIR%PYTHON uninstall-%DIR%PYTHON: @@ -116,7 +116,7 @@ done; \ ## This is somewhat tricky, because for newer pythons we have to take PEP-3147 ## into account. Avoid exceeding the command-line length limit. - dir='$(DESTDIR)$(%NDIR%dir)/__pycache__'; \ + dir='$(DESTDIR)$(%NDIR%dir)'; \ echo "$$py_files" | $(am__pep3147_tweak) | $(am__base_list) | \ while read files; do \ $(am__uninstall_files_from_dir) || st=$$?; \ diff -Nru automake-1.16-1.16.1/lib/am/remake-hdr.am automake-1.16-1.16.5/lib/am/remake-hdr.am --- automake-1.16-1.16.1/lib/am/remake-hdr.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/remake-hdr.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/scripts.am automake-1.16-1.16.5/lib/am/scripts.am --- automake-1.16-1.16.1/lib/am/scripts.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/scripts.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/subdirs.am automake-1.16-1.16.5/lib/am/subdirs.am --- automake-1.16-1.16.1/lib/am/subdirs.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/subdirs.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/tags.am automake-1.16-1.16.5/lib/am/tags.am --- automake-1.16-1.16.1/lib/am/tags.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/tags.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 @@ -45,7 +45,6 @@ ## TAGS. ## ## ------ ## -ETAGS = etags .PHONY: TAGS tags if %?SUBDIRS% AM_RECURSIVE_TARGETS += TAGS @@ -101,7 +100,6 @@ ## vi-style tags. ## ## --------------- ## -CTAGS = ctags .PHONY: CTAGS ctags if %?SUBDIRS% AM_RECURSIVE_TARGETS += CTAGS @@ -136,7 +134,6 @@ ## ------- ## if %?TOPDIR_P% -CSCOPE = cscope .PHONY: cscope clean-cscope AM_RECURSIVE_TARGETS += cscope cscope: cscope.files diff -Nru automake-1.16-1.16.1/lib/am/texibuild.am automake-1.16-1.16.5/lib/am/texibuild.am --- automake-1.16-1.16.1/lib/am/texibuild.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/texibuild.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/texinfos.am automake-1.16-1.16.5/lib/am/texinfos.am --- automake-1.16-1.16.1/lib/am/texinfos.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/texinfos.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/texi-vers.am automake-1.16-1.16.5/lib/am/texi-vers.am --- automake-1.16-1.16.1/lib/am/texi-vers.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/texi-vers.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994-2018 Free Software Foundation, Inc. +## Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/vala.am automake-1.16-1.16.5/lib/am/vala.am --- automake-1.16-1.16.1/lib/am/vala.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/vala.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 2008-2018 Free Software Foundation, Inc. +## Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/lib/am/yacc.am automake-1.16-1.16.5/lib/am/yacc.am --- automake-1.16-1.16.1/lib/am/yacc.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/am/yacc.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1998-2018 Free Software Foundation, Inc. +## Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/lib/ar-lib automake-1.16-1.16.5/lib/ar-lib --- automake-1.16-1.16.1/lib/ar-lib 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/ar-lib 2021-07-12 02:41:13.000000000 +0000 @@ -2,9 +2,9 @@ # Wrapper for Microsoft lib.exe me=ar-lib -scriptversion=2012-03-01.08; # UTC +scriptversion=2019-07-04.01; # UTC -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 Free Software Foundation, Inc. # Written by Peter Rosin . # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -65,7 +65,7 @@ mingw) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin) + cygwin | msys) file=`cygpath -m "$file" || echo "$file"` ;; wine) @@ -224,10 +224,11 @@ esac done else - $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member - do - $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? - done + $AR -NOLOGO -LIST "$archive" | tr -d '\r' | sed -e 's/\\/\\\\/g' \ + | while read member + do + $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? + done fi elif test -n "$quick$replace"; then diff -Nru automake-1.16-1.16.1/lib/Automake/ChannelDefs.pm automake-1.16-1.16.5/lib/Automake/ChannelDefs.pm --- automake-1.16-1.16.1/lib/Automake/ChannelDefs.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/ChannelDefs.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 @@ -15,17 +15,6 @@ package Automake::ChannelDefs; -use Automake::Config; -BEGIN -{ - if ($perl_threads) - { - require threads; - import threads; - } -} -use Automake::Channels; - =head1 NAME Automake::ChannelDefs - channel definitions for Automake and helper functions @@ -34,7 +23,7 @@ use Automake::ChannelDefs; - Automake::ChannelDefs::usage (); + print Automake::ChannelDefs::usage (), "\n"; prog_error ($MESSAGE, [%OPTIONS]); error ($WHERE, $MESSAGE, [%OPTIONS]); error ($MESSAGE); @@ -43,12 +32,12 @@ verb ($MESSAGE, [%OPTIONS]); switch_warning ($CATEGORY); parse_WARNINGS (); - parse_warnings ($OPTION, $ARGUMENT); + parse_warnings ($OPTION, @ARGUMENT); Automake::ChannelDefs::set_strictness ($STRICTNESS_NAME); =head1 DESCRIPTION -This packages defines channels that can be used in Automake to +This package defines channels that can be used in Automake to output diagnostics and other messages (via C). It also defines some helper function to enable or disable these channels, and some shorthand function to output on specific channels. @@ -57,13 +46,25 @@ use 5.006; use strict; +use warnings FATAL => 'all'; + use Exporter; -use vars qw (@ISA @EXPORT); +use Automake::Channels; +use Automake::Config; +BEGIN +{ + if ($perl_threads) + { + require threads; + import threads; + } +} -@ISA = qw (Exporter); -@EXPORT = qw (&prog_error &error &fatal &verb - &switch_warning &parse_WARNINGS &parse_warnings); +our @ISA = qw (Exporter); +our @EXPORT = qw (&prog_error &error &fatal &verb + &switch_warning &parse_WARNINGS &parse_warnings + &merge_WARNINGS); =head2 CHANNELS @@ -97,13 +98,17 @@ Internal errors. Use C<&prog_error> to send messages over this channel. +=item C + +Constructs compromising the cross-compilation of the package. + =item C Warnings related to GNU Coding Standards. =item C -Warnings about obsolete features (silent by default). +Warnings about obsolete features. =item C @@ -114,6 +119,14 @@ Warnings about non-portable constructs. +=item C + +Warnings about recursive variable expansions (C<$(foo$(x))>). +These are not universally supported, but are more portable than +the other non-portable constructs diagnosed by C<-Wportability>. +These warnings are turned on by C<-Wportability> but can then be +turned off separately by C<-Wno-portability-recursive>. + =item C Extra warnings about non-portable constructs covering obscure tools. @@ -154,11 +167,12 @@ footer => "\nPlease contact <$PACKAGE_BUGREPORT>.", uniq_part => UP_NONE, ordered => 0; -register_channel 'extra-portability', type => 'warning', silent => 1; +register_channel 'cross', type => 'warning', silent => 1; register_channel 'gnu', type => 'warning'; register_channel 'obsolete', type => 'warning'; register_channel 'override', type => 'warning', silent => 1; register_channel 'portability', type => 'warning', silent => 1; +register_channel 'extra-portability', type => 'warning', silent => 1; register_channel 'portability-recursive', type => 'warning', silent => 1; register_channel 'syntax', type => 'warning'; register_channel 'unsupported', type => 'warning'; @@ -177,26 +191,26 @@ =item C -Display warning categories. +Return the warning category descriptions. =cut sub usage () { - print < @@ -257,7 +271,7 @@ =item C If C<$CATEGORY> is C, turn on channel C. -If it's C, turn C off. +If it is C, turn C off. Else handle C and C for completeness. =cut @@ -338,35 +352,124 @@ =cut +# Used to communicate from parse_WARNINGS to parse_warnings. +our $_werror = 0; + sub parse_WARNINGS () { if (exists $ENV{'WARNINGS'}) { # Ignore unknown categories. This is required because WARNINGS # should be honored by many tools. - switch_warning $_ foreach (split (',', $ENV{'WARNINGS'})); + # For the same reason, do not turn on -Werror at this point, just + # record that we saw it; parse_warnings will turn on -Werror after + # the command line has been processed. + foreach (split (',', $ENV{'WARNINGS'})) + { + if (/^(no-)?error$/) + { + $_werror = !defined $1; + } + else + { + switch_warning $_; + } + } } } -=item C +=item C Parse the argument of C<--warning=CATEGORY> or C<-WCATEGORY>. +C<@CATEGORIES> is the accumulated set of warnings categories. +Use like this: -C<$OPTIONS> is C<"--warning"> or C<"-W">, C<$ARGUMENT> is C. + Automake::GetOpt::parse_options ( + # ... + 'W|warnings=s' => \@warnings, + ) + # possibly call set_strictness here + parse_warnings @warnings; -This is meant to be used as an argument to C. +=cut + +sub parse_warnings (@) +{ + foreach my $cat (map { split ',' } @_) + { + if ($cat =~ /^(no-)?error$/) + { + $_werror = !defined $1; + } + elsif (switch_warning $cat) + { + msg 'unsupported', "unknown warning category '$cat'"; + } + } + + switch_warning ($_werror ? 'error' : 'no-error'); +} + +=item C + +Merge the warnings categories in the environment variable C +with the warnings categories in C<@CATEGORIES>, and return a new +value for C. Values in C<@CATEGORIES> take precedence. +Use like this: + + local $ENV{WARNINGS} = merge_WARNINGS @additional_warnings; =cut -sub parse_warnings ($$) +sub merge_WARNINGS (@) { - my ($opt, $categories) = @_; + my $werror = ''; + my $all_or_none = ''; + my %warnings; + + my @categories = split /,/, $ENV{WARNINGS} || ''; + push @categories, @_; + + foreach (@categories) + { + if (/^(?:no-)?error$/) + { + $werror = $_; + } + elsif (/^(?:all|none)$/) + { + $all_or_none = $_; + } + else + { + # The character class in the second match group is ASCII \S minus + # comma. We are generous with this because category values may come + # from WARNINGS and we don't want to assume what other programs' + # syntaxes for warnings categories are. + /^(no-|)([\w\[\]\/\\!"#$%&'()*+-.:;<=>?@^`{|}~]+)$/ + or die "Invalid warnings category: $_"; + $warnings{$2} = $1; + } + } - foreach my $cat (split (',', $categories)) + my @final_warnings; + if ($all_or_none) { - msg 'unsupported', "unknown warning category '$cat'" - if switch_warning $cat; + push @final_warnings, $all_or_none; } + else + { + foreach (sort keys %warnings) + { + push @final_warnings, $warnings{$_} . $_; + } + } + if ($werror) + { + push @final_warnings, $werror; + } + + return join (',', @final_warnings); } =item C @@ -425,3 +528,20 @@ =cut 1; + +### Setup "GNU" style for perl-mode and cperl-mode. +## Local Variables: +## perl-indent-level: 2 +## perl-continued-statement-offset: 2 +## perl-continued-brace-offset: 0 +## perl-brace-offset: 0 +## perl-brace-imaginary-offset: 0 +## perl-label-offset: -2 +## cperl-indent-level: 2 +## cperl-brace-offset: 0 +## cperl-continued-brace-offset: 0 +## cperl-label-offset: -2 +## cperl-extra-newline-before-brace: t +## cperl-merge-trailing-else: nil +## cperl-continued-statement-offset: 2 +## End: diff -Nru automake-1.16-1.16.1/lib/Automake/Channels.pm automake-1.16-1.16.5/lib/Automake/Channels.pm --- automake-1.16-1.16.1/lib/Automake/Channels.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/Channels.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 @@ -68,24 +68,25 @@ use 5.006; use strict; -use Exporter; +use warnings FATAL => 'all'; + use Carp; +use Exporter; use File::Basename; -use vars qw (@ISA @EXPORT %channels $me); +our @ISA = qw (Exporter); +our @EXPORT = qw ($exit_code $warnings_are_errors + &reset_local_duplicates &reset_global_duplicates + ®ister_channel &msg &exists_channel &channel_type + &setup_channel &setup_channel_type + &dup_channel_setup &drop_channel_setup + &buffer_messages &flush_messages + &setup_channel_queue &pop_channel_queue + US_GLOBAL US_LOCAL + UP_NONE UP_TEXT UP_LOC_TEXT); -@ISA = qw (Exporter); -@EXPORT = qw ($exit_code $warnings_are_errors - &reset_local_duplicates &reset_global_duplicates - ®ister_channel &msg &exists_channel &channel_type - &setup_channel &setup_channel_type - &dup_channel_setup &drop_channel_setup - &buffer_messages &flush_messages - &setup_channel_queue &pop_channel_queue - US_GLOBAL US_LOCAL - UP_NONE UP_TEXT UP_LOC_TEXT); - -$me = basename $0; +our %channels; +our $me = basename $0; =head2 Global Variables @@ -98,8 +99,7 @@ =cut -use vars qw ($exit_code); -$exit_code = 0; +our $exit_code = 0; =item C<$warnings_are_errors> @@ -108,8 +108,7 @@ =cut -use vars qw ($warnings_are_errors); -$warnings_are_errors = 0; +our $warnings_are_errors = 0; =back @@ -259,11 +258,8 @@ =cut -use vars qw (%_default_options %_global_duplicate_messages - %_local_duplicate_messages); - # Default options for a channel. -%_default_options = +our %_default_options = ( type => 'warning', exit_code => 1, @@ -283,8 +279,8 @@ # Filled with output messages as keys, to detect duplicates. # The value associated with each key is the number of occurrences # filtered out. -%_local_duplicate_messages = (); -%_global_duplicate_messages = (); +our %_local_duplicate_messages = (); +our %_global_duplicate_messages = (); sub _reset_duplicates (\%) { @@ -403,8 +399,7 @@ } # Store partial messages here. (See the 'partial' option.) -use vars qw ($partial); -$partial = ''; +our $partial = ''; # _format_message ($LOCATION, $MESSAGE, %OPTIONS) # ----------------------------------------------- @@ -619,11 +614,9 @@ =cut -use vars qw (@backlog %buffering); - # See buffer_messages() and flush_messages() below. -%buffering = (); # The map of channel types to buffer. -@backlog = (); # The buffer of messages. +our %buffering = (); # The map of channel types to buffer. +our @backlog = (); # The buffer of messages. sub msg ($$;$%) { @@ -715,9 +708,8 @@ =cut -use vars qw (@_saved_channels @_saved_werrors); -@_saved_channels = (); -@_saved_werrors = (); +our @_saved_channels = (); +our @_saved_werrors = (); sub dup_channel_setup () { diff -Nru automake-1.16-1.16.1/lib/Automake/Condition.pm automake-1.16-1.16.5/lib/Automake/Condition.pm --- automake-1.16-1.16.1/lib/Automake/Condition.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/Condition.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 @@ -17,12 +17,13 @@ use 5.006; use strict; +use warnings FATAL => 'all'; + use Carp; +use Exporter; -require Exporter; -use vars '@ISA', '@EXPORT_OK'; -@ISA = qw/Exporter/; -@EXPORT_OK = qw/TRUE FALSE reduce_and reduce_or/; +our @ISA = qw (Exporter); +our @EXPORT_OK = qw (TRUE FALSE reduce_and reduce_or); =head1 NAME @@ -167,7 +168,7 @@ # Keys in this hash are conditional strings. Values are the # associated object conditions. This is used by 'new' to reuse # Condition objects with identical conditionals. -use vars '%_condition_singletons'; +our %_condition_singletons; # Do NOT reset this hash here. It's already empty by default, # and any setting would otherwise occur AFTER the 'TRUE' and 'FALSE' # constants definitions. diff -Nru automake-1.16-1.16.1/lib/Automake/Config.in automake-1.16-1.16.5/lib/Automake/Config.in --- automake-1.16-1.16.1/lib/Automake/Config.in 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/Config.in 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ # -*- Perl -*- -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 Free Software Foundation, Inc. # @configure_input@ # This program is free software; you can redistribute it and/or modify @@ -16,10 +16,12 @@ # along with this program. If not, see . package Automake::Config; -use strict; use 5.006; -require Exporter; +use strict; +use warnings FATAL => 'all'; + +use Exporter; our @ISA = qw (Exporter); our @EXPORT = qw ($APIVERSION $PACKAGE $PACKAGE_BUGREPORT $VERSION diff -Nru automake-1.16-1.16.1/lib/Automake/Configure_ac.pm automake-1.16-1.16.5/lib/Automake/Configure_ac.pm --- automake-1.16-1.16.1/lib/Automake/Configure_ac.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/Configure_ac.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 @@ -22,14 +22,15 @@ use 5.006; use strict; +use warnings FATAL => 'all'; + use Exporter; -use Automake::Channels; -use Automake::ChannelDefs; -use vars qw (@ISA @EXPORT); +use Automake::ChannelDefs; +use Automake::Channels; -@ISA = qw (Exporter); -@EXPORT = qw (&find_configure_ac &require_configure_ac); +our @ISA = qw (Exporter); +our @EXPORT = qw (&find_configure_ac &require_configure_ac); =head1 NAME diff -Nru automake-1.16-1.16.1/lib/Automake/DisjConditions.pm automake-1.16-1.16.5/lib/Automake/DisjConditions.pm --- automake-1.16-1.16.1/lib/Automake/DisjConditions.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/DisjConditions.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 @@ -17,8 +17,10 @@ use 5.006; use strict; +use warnings FATAL => 'all'; + use Carp; -use Automake::Condition qw/TRUE FALSE/; +use Automake::Condition qw (TRUE FALSE); =head1 NAME @@ -139,7 +141,7 @@ # Keys in this hash are DisjConditions strings. Values are the # associated object DisjConditions. This is used by 'new' to reuse # DisjConditions objects with identical conditions. -use vars '%_disjcondition_singletons'; +our %_disjcondition_singletons; sub new ($;@) { diff -Nru automake-1.16-1.16.1/lib/Automake/FileUtils.pm automake-1.16-1.16.5/lib/Automake/FileUtils.pm --- automake-1.16-1.16.1/lib/Automake/FileUtils.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/FileUtils.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 @@ -36,21 +36,24 @@ use 5.006; use strict; +use warnings FATAL => 'all'; + use Exporter; use File::stat; use IO::File; + use Automake::Channels; use Automake::ChannelDefs; -use vars qw (@ISA @EXPORT); +our @ISA = qw (Exporter); +our @EXPORT = qw (&contents + &find_file &mtime + &update_file + &xsystem &xsystem_hint &xqx + &dir_has_case_matching_file &reset_dir_cache + &set_dir_cache_file); -@ISA = qw (Exporter); -@EXPORT = qw (&contents - &find_file &mtime - &update_file &up_to_date_p - &xsystem &xsystem_hint &xqx - &dir_has_case_matching_file &reset_dir_cache - &set_dir_cache_file); +=over 4 =item C @@ -179,34 +182,6 @@ } -=item C - -Is C<$file> more recent than C<@dep>? - -=cut - -# $BOOLEAN -# &up_to_date_p ($FILE, @DEP) -# --------------------------- -sub up_to_date_p ($@) -{ - my ($file, @dep) = @_; - my $mtime = mtime ($file); - - foreach my $dep (@dep) - { - if ($mtime < mtime ($dep)) - { - verb "up_to_date ($file): outdated: $dep"; - return 0; - } - } - - verb "up_to_date ($file): up to date"; - return 1; -} - - =item C Display an error message for C<$command>, based on the content of @@ -356,7 +331,7 @@ =cut -use vars '%_directory_cache'; +our %_directory_cache; sub dir_has_case_matching_file ($$) { # Note that print File::Spec->case_tolerant returns 0 even on MacOS @@ -405,4 +380,8 @@ if exists $_directory_cache{$dirname}; } +=back + +=cut + 1; # for require diff -Nru automake-1.16-1.16.1/lib/Automake/General.pm automake-1.16-1.16.5/lib/Automake/General.pm --- automake-1.16-1.16.1/lib/Automake/General.pm 2018-03-08 20:27:05.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/General.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 @@ -17,19 +17,18 @@ use 5.006; use strict; +use warnings FATAL => 'all'; + use Exporter; use File::Basename; -use vars qw (@ISA @EXPORT); - -@ISA = qw (Exporter); -@EXPORT = qw (&uniq &none $me); +our @ISA = qw (Exporter); +our @EXPORT = qw (&uniq &none $me); # Variable we share with the main package. Be sure to have a single # copy of them: using 'my' together with multiple inclusion of this # package would introduce several copies. -use vars qw ($me); -$me = basename ($0); +our $me = basename ($0); # END # --- diff -Nru automake-1.16-1.16.1/lib/Automake/Getopt.pm automake-1.16-1.16.5/lib/Automake/Getopt.pm --- automake-1.16-1.16.1/lib/Automake/Getopt.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/Getopt.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 @@ -33,14 +33,15 @@ use 5.006; use strict; use warnings FATAL => 'all'; + +use Carp qw (confess croak); use Exporter (); use Getopt::Long (); -use Automake::ChannelDefs qw/fatal/; -use Carp qw/croak confess/; -use vars qw (@ISA @EXPORT); -@ISA = qw (Exporter); -@EXPORT= qw/getopt/; +use Automake::ChannelDefs qw (fatal); + +our @ISA = qw (Exporter); +our @EXPORT = qw (getopt); =item C diff -Nru automake-1.16-1.16.1/lib/Automake/ItemDef.pm automake-1.16-1.16.5/lib/Automake/ItemDef.pm --- automake-1.16-1.16.1/lib/Automake/ItemDef.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/ItemDef.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 @@ -17,6 +17,8 @@ use 5.006; use strict; +use warnings FATAL => 'all'; + use Carp; =head1 NAME diff -Nru automake-1.16-1.16.1/lib/Automake/Item.pm automake-1.16-1.16.5/lib/Automake/Item.pm --- automake-1.16-1.16.1/lib/Automake/Item.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/Item.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 @@ -17,7 +17,10 @@ use 5.006; use strict; +use warnings FATAL => 'all'; + use Carp; + use Automake::ChannelDefs; use Automake::DisjConditions; diff -Nru automake-1.16-1.16.1/lib/Automake/Language.pm automake-1.16-1.16.5/lib/Automake/Language.pm --- automake-1.16-1.16.1/lib/Automake/Language.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/Language.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 @@ -17,8 +17,10 @@ use 5.006; use strict; +use warnings FATAL => 'all'; use Class::Struct (); + Class::Struct::struct ( # Short name of the language (c, f77...). 'name' => "\$", diff -Nru automake-1.16-1.16.1/lib/Automake/local.mk automake-1.16-1.16.5/lib/Automake/local.mk --- automake-1.16-1.16.1/lib/Automake/local.mk 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/local.mk 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- makefile-automake -*- -## Copyright (C) 1995-2018 Free Software Foundation, Inc. +## Copyright (C) 1995-2021 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 diff -Nru automake-1.16-1.16.1/lib/Automake/Location.pm automake-1.16-1.16.5/lib/Automake/Location.pm --- automake-1.16-1.16.1/lib/Automake/Location.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/Location.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 @@ -16,6 +16,8 @@ package Automake::Location; use 5.006; +use strict; +use warnings FATAL => 'all'; =head1 NAME diff -Nru automake-1.16-1.16.1/lib/Automake/Options.pm automake-1.16-1.16.5/lib/Automake/Options.pm --- automake-1.16-1.16.1/lib/Automake/Options.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/Options.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 @@ -17,21 +17,22 @@ use 5.006; use strict; +use warnings FATAL => 'all'; + use Exporter; + use Automake::Config; use Automake::ChannelDefs; use Automake::Channels; use Automake::Version; -use vars qw (@ISA @EXPORT); - -@ISA = qw (Exporter); -@EXPORT = qw (option global_option - set_option set_global_option - unset_option unset_global_option - process_option_list process_global_option_list - set_strictness $strictness $strictness_name - &FOREIGN &GNU &GNITS); +our @ISA = qw (Exporter); +our @EXPORT = qw (option global_option + set_option set_global_option + unset_option unset_global_option + process_option_list process_global_option_list + set_strictness $strictness $strictness_name + &FOREIGN &GNU &GNITS); =head1 NAME @@ -72,14 +73,14 @@ =cut # Values are the Automake::Location of the definition. -use vars '%_options'; # From AUTOMAKE_OPTIONS -use vars '%_global_options'; # From AM_INIT_AUTOMAKE or the command line. +our %_options; # From AUTOMAKE_OPTIONS +our %_global_options; # From AM_INIT_AUTOMAKE or the command line. # Whether process_option_list has already been called for the current # Makefile.am. -use vars '$_options_processed'; +our $_options_processed; # Whether process_global_option_list has already been called. -use vars '$_global_options_processed'; +our $_global_options_processed; =head2 Constants @@ -119,10 +120,10 @@ =cut # Strictness levels. -use vars qw ($strictness $strictness_name); +our ($strictness, $strictness_name); # Strictness level as set on command line. -use vars qw ($_default_strictness $_default_strictness_name); +our ($_default_strictness, $_default_strictness_name); =head2 Functions @@ -277,10 +278,12 @@ dist-lzip dist-xz dist-zip + dist-zstd info-in-builddir no-define no-dependencies no-dist + no-dist-built-sources no-dist-gzip no-exeext no-installinfo diff -Nru automake-1.16-1.16.1/lib/Automake/RuleDef.pm automake-1.16-1.16.5/lib/Automake/RuleDef.pm --- automake-1.16-1.16.1/lib/Automake/RuleDef.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/RuleDef.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 @@ -17,14 +17,16 @@ use 5.006; use strict; +use warnings FATAL => 'all'; + use Carp; +use Exporter; + use Automake::ChannelDefs; use Automake::ItemDef; -require Exporter; -use vars '@ISA', '@EXPORT'; -@ISA = qw/Automake::ItemDef Exporter/; -@EXPORT = qw (&RULE_AUTOMAKE &RULE_USER); +our @ISA = qw (Automake::ItemDef Exporter); +our @EXPORT = qw (&RULE_AUTOMAKE &RULE_USER); =head1 NAME diff -Nru automake-1.16-1.16.1/lib/Automake/Rule.pm automake-1.16-1.16.5/lib/Automake/Rule.pm --- automake-1.16-1.16.1/lib/Automake/Rule.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/Rule.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 @@ -17,7 +17,10 @@ use 5.006; use strict; +use warnings FATAL => 'all'; + use Carp; +use Exporter; use Automake::Item; use Automake::RuleDef; @@ -26,15 +29,14 @@ use Automake::Options; use Automake::Condition qw (TRUE FALSE); use Automake::DisjConditions; -require Exporter; -use vars '@ISA', '@EXPORT', '@EXPORT_OK'; -@ISA = qw/Automake::Item Exporter/; -@EXPORT = qw (reset register_suffix_rule next_in_suffix_chain - suffixes rules $KNOWN_EXTENSIONS_PATTERN - depend %dependencies %actions register_action - accept_extensions - reject_rule msg_rule msg_cond_rule err_rule err_cond_rule - rule rrule ruledef rruledef); + +our @ISA = qw (Automake::Item Exporter); +our @EXPORT = qw (reset register_suffix_rule next_in_suffix_chain + suffixes rules $KNOWN_EXTENSIONS_PATTERN + depend %dependencies %actions register_action + accept_extensions + reject_rule msg_rule msg_cond_rule err_rule err_cond_rule + rule rrule ruledef rruledef); =head1 NAME @@ -120,7 +122,7 @@ =cut -use vars '%dependencies'; +our %dependencies; =item <%actions> @@ -129,7 +131,7 @@ =cut -use vars '%actions'; +our %actions; =item C<$KNOWN_EXTENSIONS_PATTERN> @@ -142,8 +144,7 @@ =cut -use vars qw ($KNOWN_EXTENSIONS_PATTERN); -$KNOWN_EXTENSIONS_PATTERN = ""; +our $KNOWN_EXTENSIONS_PATTERN = ""; =back diff -Nru automake-1.16-1.16.1/lib/Automake/VarDef.pm automake-1.16-1.16.5/lib/Automake/VarDef.pm --- automake-1.16-1.16.1/lib/Automake/VarDef.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/VarDef.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 @@ -17,15 +17,17 @@ use 5.006; use strict; +use warnings FATAL => 'all'; + use Carp; +use Exporter; + use Automake::ChannelDefs; use Automake::ItemDef; -require Exporter; -use vars '@ISA', '@EXPORT'; -@ISA = qw/Automake::ItemDef Exporter/; -@EXPORT = qw (&VAR_AUTOMAKE &VAR_CONFIGURE &VAR_MAKEFILE - &VAR_ASIS &VAR_PRETTY &VAR_SILENT &VAR_SORTED); +our @ISA = qw (Automake::ItemDef Exporter); +our @EXPORT = qw (&VAR_AUTOMAKE &VAR_CONFIGURE &VAR_MAKEFILE + &VAR_ASIS &VAR_PRETTY &VAR_SILENT &VAR_SORTED); =head1 NAME diff -Nru automake-1.16-1.16.1/lib/Automake/Variable.pm automake-1.16-1.16.5/lib/Automake/Variable.pm --- automake-1.16-1.16.1/lib/Automake/Variable.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/Variable.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 @@ -17,7 +17,10 @@ use 5.006; use strict; +use warnings FATAL => 'all'; + use Carp; +use Exporter; use Automake::Channels; use Automake::ChannelDefs; @@ -29,20 +32,18 @@ use Automake::General 'uniq'; use Automake::Wrap 'makefile_wrap'; -require Exporter; -use vars '@ISA', '@EXPORT', '@EXPORT_OK'; -@ISA = qw/Automake::Item Exporter/; -@EXPORT = qw (err_var msg_var msg_cond_var reject_var - var rvar vardef rvardef - variables - scan_variable_expansions check_variable_expansions - variable_delete - variables_dump - set_seen - require_variables - variable_value - output_variables - transform_variable_recursively); +our @ISA = qw (Automake::Item Exporter); +our @EXPORT = qw (err_var msg_var msg_cond_var reject_var + var rvar vardef rvardef + variables + scan_variable_expansions check_variable_expansions + variable_delete + variables_dump + set_seen + require_variables + variable_value + output_variables + transform_variable_recursively); =head1 NAME @@ -198,7 +199,8 @@ # Variables that can be overridden without complaint from -Woverride my %_silent_variable_override = - (AM_MAKEINFOHTMLFLAGS => 1, + (AM_DISTCHECK_DVI_TARGET => 1, + AM_MAKEINFOHTMLFLAGS => 1, AR => 1, ARFLAGS => 1, DEJATOOL => 1, @@ -298,7 +300,7 @@ =cut -use vars '%_hooks'; +our %_hooks; sub hook ($$) { my ($var, $fun) = @_; @@ -313,7 +315,7 @@ =cut -use vars '%_variable_dict', '%_primary_dict'; +our (%_variable_dict, %_primary_dict); sub variables (;$) { my ($suffix) = @_; diff -Nru automake-1.16-1.16.1/lib/Automake/Version.pm automake-1.16-1.16.5/lib/Automake/Version.pm --- automake-1.16-1.16.1/lib/Automake/Version.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/Version.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 @@ -17,6 +17,8 @@ use 5.006; use strict; +use warnings FATAL => 'all'; + use Automake::ChannelDefs; =head1 NAME diff -Nru automake-1.16-1.16.1/lib/Automake/Wrap.pm automake-1.16-1.16.5/lib/Automake/Wrap.pm --- automake-1.16-1.16.1/lib/Automake/Wrap.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/Wrap.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 @@ -17,11 +17,12 @@ use 5.006; use strict; +use warnings FATAL => 'all'; -require Exporter; -use vars '@ISA', '@EXPORT_OK'; -@ISA = qw/Exporter/; -@EXPORT_OK = qw/wrap makefile_wrap/; +use Exporter; + +our @ISA = qw (Exporter); +our @EXPORT_OK = qw (wrap makefile_wrap); =head1 NAME diff -Nru automake-1.16-1.16.1/lib/Automake/XFile.pm automake-1.16-1.16.5/lib/Automake/XFile.pm --- automake-1.16-1.16.1/lib/Automake/XFile.pm 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/Automake/XFile.pm 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 @@ -71,23 +71,19 @@ use 5.006; use strict; -use vars qw($VERSION @EXPORT @EXPORT_OK $AUTOLOAD @ISA); -use Carp; +use warnings FATAL => 'all'; + use Errno; +use Exporter; use IO::File; -use File::Basename; + use Automake::ChannelDefs; -use Automake::Channels qw(msg); +use Automake::Channels qw (msg); use Automake::FileUtils; -require Exporter; -require DynaLoader; - -@ISA = qw(IO::File Exporter DynaLoader); - -$VERSION = "1.2"; - -@EXPORT = @IO::File::EXPORT; +our @ISA = qw(Exporter IO::File); +our @EXPORT = @IO::File::EXPORT; +our $VERSION = "1.2"; eval { # Make all Fcntl O_XXX and LOCK_XXX constants available for importing @@ -232,7 +228,8 @@ # Unless explicitly configured otherwise, Perl implements its 'flock' with the # first of flock(2), fcntl(2), or lockf(3) that works. These can fail on - # NFS-backed files, with ENOLCK (GNU/Linux) or EOPNOTSUPP (FreeBSD); we + # NFS-backed files, with ENOLCK (GNU/Linux) or EOPNOTSUPP (FreeBSD) or + # EINVAL (OpenIndiana, as per POSIX 1003.1-2017 fcntl spec); we # usually ignore these errors. If $ENV{MAKEFLAGS} suggests that a parallel # invocation of 'make' has invoked the tool we serve, report all locking # failures and abort. @@ -251,7 +248,7 @@ msg ($make_j ? 'fatal' : 'unsupported', "cannot lock $file with mode $mode: $!" . ($make_j ? $note : "")) - if $make_j || !($!{ENOLCK} || $!{EOPNOTSUPP}); + if $make_j || !($!{EINVAL} || $!{ENOLCK} || $!{EOPNOTSUPP}); } } diff -Nru automake-1.16-1.16.1/lib/compile automake-1.16-1.16.5/lib/compile --- automake-1.16-1.16.1/lib/compile 2018-03-08 20:15:51.000000000 +0000 +++ automake-1.16-1.16.5/lib/compile 2021-07-12 02:41:13.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -Nru automake-1.16-1.16.1/lib/config.guess automake-1.16-1.16.5/lib/config.guess --- automake-1.16-1.16.1/lib/config.guess 2018-03-11 21:19:05.000000000 +0000 +++ automake-1.16-1.16.5/lib/config.guess 2021-07-07 05:39:57.000000000 +0000 @@ -1,8 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2018 Free Software Foundation, Inc. +# Copyright 1992-2021 Free Software Foundation, Inc. -timestamp='2018-03-08' +# shellcheck disable=SC2006,SC2268 # see below for rationale + +timestamp='2021-06-03' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -27,11 +29,19 @@ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess # # Please send patches to . +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + + me=`echo "$0" | sed -e 's,.*/,,'` usage="\ @@ -50,7 +60,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2018 Free Software Foundation, Inc. +Copyright 1992-2021 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -84,7 +94,8 @@ exit 1 fi -trap 'exit 1' 1 2 15 +# Just in case it came from the environment. +GUESS= # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires @@ -96,73 +107,90 @@ # Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > "$dummy.c" ; - for c in cc gcc c89 c99 ; do - if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +tmp= +# shellcheck disable=SC2172 +trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 + +set_cc_for_build() { + # prevent multiple calls if $tmp is already set + test "$tmp" && return 0 + : "${TMPDIR=/tmp}" + # shellcheck disable=SC2039,SC3028 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } + dummy=$tmp/dummy + case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in + ,,) echo "int x;" > "$dummy.c" + for driver in cc gcc c89 c99 ; do + if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD=$driver + break + fi + done + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; + esac +} # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then +if test -f /.attbin/uname ; then PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "$UNAME_SYSTEM" in +case $UNAME_SYSTEM in Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu + LIBC=unknown - eval "$set_cc_for_build" + set_cc_for_build cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc - #else + #elif defined(__GLIBC__) LIBC=gnu + #else + #include + /* First heuristic to detect musl libc. */ + #ifdef __DEFINED_va_list + LIBC=musl + #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "$cc_set_libc" - # If ldd exists, use it to detect musl libc. - if command -v ldd >/dev/null && \ - ldd --version 2>&1 | grep -q ^musl - then - LIBC=musl + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in +case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -174,12 +202,12 @@ # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - "/sbin/$sysctl" 2>/dev/null || \ - "/usr/sbin/$sysctl" 2>/dev/null || \ + /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ echo unknown)` - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; @@ -188,18 +216,18 @@ earmv*) arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` - machine="${arch}${endian}"-unknown + machine=${arch}${endian}-unknown ;; - *) machine="$UNAME_MACHINE_ARCH"-unknown ;; + *) machine=$UNAME_MACHINE_ARCH-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval "$set_cc_for_build" + set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -215,7 +243,7 @@ ;; esac # Determine ABI tags. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` @@ -226,7 +254,7 @@ # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "$UNAME_VERSION" in + case $UNAME_VERSION in Debian*) release='-gnu' ;; @@ -237,45 +265,57 @@ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "$machine-${os}${release}${abi}" - exit ;; + GUESS=$machine-${os}${release}${abi-} + ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE + ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE + ;; + *:SecBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` + GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE + ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE + ;; *:MidnightBSD:*:*) - echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE + ;; *:ekkoBSD:*:*) - echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE + ;; *:SolidBSD:*:*) - echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE + ;; + *:OS108:*:*) + GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE + ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE + ;; *:MirBSD:*:*) - echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE + ;; *:Sortix:*:*) - echo "$UNAME_MACHINE"-unknown-sortix - exit ;; + GUESS=$UNAME_MACHINE-unknown-sortix + ;; + *:Twizzler:*:*) + GUESS=$UNAME_MACHINE-unknown-twizzler + ;; *:Redox:*:*) - echo "$UNAME_MACHINE"-unknown-redox - exit ;; + GUESS=$UNAME_MACHINE-unknown-redox + ;; mips:OSF1:*.*) - echo mips-dec-osf1 - exit ;; + GUESS=mips-dec-osf1 + ;; alpha:OSF1:*:*) + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + trap '' 0 case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -289,7 +329,7 @@ # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in + case $ALPHA_CPU_TYPE in "EV4 (21064)") UNAME_MACHINE=alpha ;; "EV4.5 (21064)") @@ -326,75 +366,76 @@ # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; + OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + GUESS=$UNAME_MACHINE-dec-osf$OSF_REL + ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; + GUESS=m68k-unknown-sysv4 + ;; *:[Aa]miga[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-amigaos - exit ;; + GUESS=$UNAME_MACHINE-unknown-amigaos + ;; *:[Mm]orph[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-morphos - exit ;; + GUESS=$UNAME_MACHINE-unknown-morphos + ;; *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; + GUESS=i370-ibm-openedition + ;; *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; + GUESS=s390-ibm-zvmoe + ;; *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; + GUESS=powerpc-ibm-os400 + ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix"$UNAME_RELEASE" - exit ;; + GUESS=arm-acorn-riscix$UNAME_RELEASE + ;; arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + GUESS=arm-unknown-riscos + ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; + GUESS=hppa1.1-hitachi-hiuxmpp + ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; + case `(/bin/universe) 2>/dev/null` in + att) GUESS=pyramid-pyramid-sysv3 ;; + *) GUESS=pyramid-pyramid-bsd ;; + esac + ;; NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; + GUESS=pyramid-pyramid-svr4 + ;; DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; + GUESS=sparc-icl-nx6 + ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; + sparc) GUESS=sparc-icl-nx7 ;; + esac + ;; s390x:SunOS:*:*) - echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL + ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-hal-solaris2$SUN_REL + ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris2$SUN_REL + ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux"$UNAME_RELEASE" - exit ;; + GUESS=i386-pc-auroraux$UNAME_RELEASE + ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval "$set_cc_for_build" + set_cc_for_build SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null @@ -402,41 +443,44 @@ SUN_ARCH=x86_64 fi fi - echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$SUN_ARCH-pc-solaris2$SUN_REL + ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris3$SUN_REL + ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in + case `/usr/bin/arch -k` in Series*|S4*) UNAME_RELEASE=`uname -v` ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` + GUESS=sparc-sun-sunos$SUN_REL + ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos"$UNAME_RELEASE" - exit ;; + GUESS=m68k-sun-sunos$UNAME_RELEASE + ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in + case `/bin/arch` in sun3) - echo m68k-sun-sunos"$UNAME_RELEASE" + GUESS=m68k-sun-sunos$UNAME_RELEASE ;; sun4) - echo sparc-sun-sunos"$UNAME_RELEASE" + GUESS=sparc-sun-sunos$UNAME_RELEASE ;; esac - exit ;; + ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos"$UNAME_RELEASE" - exit ;; + GUESS=sparc-auspex-sunos$UNAME_RELEASE + ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -446,43 +490,43 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-milan-mint$UNAME_RELEASE + ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-hades-mint$UNAME_RELEASE + ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-unknown-mint$UNAME_RELEASE + ;; m68k:machten:*:*) - echo m68k-apple-machten"$UNAME_RELEASE" - exit ;; + GUESS=m68k-apple-machten$UNAME_RELEASE + ;; powerpc:machten:*:*) - echo powerpc-apple-machten"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-apple-machten$UNAME_RELEASE + ;; RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; + GUESS=mips-dec-mach_bsd4.3 + ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix"$UNAME_RELEASE" - exit ;; + GUESS=mips-dec-ultrix$UNAME_RELEASE + ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix"$UNAME_RELEASE" - exit ;; + GUESS=vax-dec-ultrix$UNAME_RELEASE + ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix"$UNAME_RELEASE" - exit ;; + GUESS=clipper-intergraph-clix$UNAME_RELEASE + ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ @@ -508,78 +552,79 @@ dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos"$UNAME_RELEASE" - exit ;; + GUESS=mips-mips-riscos$UNAME_RELEASE + ;; Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; + GUESS=powerpc-motorola-powermax + ;; Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; + GUESS=powerpc-harris-powerunix + ;; m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; + GUESS=m88k-harris-cxux7 + ;; m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; + GUESS=m88k-motorola-sysv4 + ;; m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then - if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ - [ "$TARGET_BINARY_INTERFACE"x = x ] + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x then - echo m88k-dg-dgux"$UNAME_RELEASE" + GUESS=m88k-dg-dgux$UNAME_RELEASE else - echo m88k-dg-dguxbcs"$UNAME_RELEASE" + GUESS=m88k-dg-dguxbcs$UNAME_RELEASE fi else - echo i586-dg-dgux"$UNAME_RELEASE" + GUESS=i586-dg-dgux$UNAME_RELEASE fi - exit ;; + ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; + GUESS=m88k-dolphin-sysv3 + ;; M88*:*:R3*:*) # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; + GUESS=m88k-tektronix-sysv3 + ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; + GUESS=m68k-tektronix-bsd + ;; *:IRIX*:*:*) - echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" - exit ;; + IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'` + GUESS=mips-sgi-irix$IRIX_REL + ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id + ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; + GUESS=i386-ibm-aix + ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then + if test -x /usr/bin/oslevel ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" - exit ;; + GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV + ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #include @@ -593,16 +638,16 @@ EOF if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then - echo "$SYSTEM_NAME" + GUESS=$SYSTEM_NAME else - echo rs6000-ibm-aix3.2.5 + GUESS=rs6000-ibm-aix3.2.5 fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 + GUESS=rs6000-ibm-aix3.2.4 else - echo rs6000-ibm-aix3.2 + GUESS=rs6000-ibm-aix3.2 fi - exit ;; + ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then @@ -610,57 +655,57 @@ else IBM_ARCH=powerpc fi - if [ -x /usr/bin/lslpp ] ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + if test -x /usr/bin/lslpp ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo "$IBM_ARCH"-ibm-aix"$IBM_REV" - exit ;; + GUESS=$IBM_ARCH-ibm-aix$IBM_REV + ;; *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; + GUESS=rs6000-ibm-aix + ;; ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) - echo romp-ibm-bsd4.4 - exit ;; + GUESS=romp-ibm-bsd4.4 + ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to + ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; + GUESS=rs6000-bull-bosx + ;; DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; + GUESS=m68k-bull-sysv3 + ;; 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; + GUESS=m68k-hp-bsd + ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; + GUESS=m68k-hp-bsd4.4 + ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - case "$UNAME_MACHINE" in + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + case $UNAME_MACHINE in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then + if test -x /usr/bin/getconf; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "$sc_cpu_version" in + case $sc_cpu_version in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "$sc_kernel_bits" in + case $sc_kernel_bits in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "$HP_ARCH" = "" ]; then - eval "$set_cc_for_build" + if test "$HP_ARCH" = ""; then + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE @@ -698,9 +743,9 @@ test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ "$HP_ARCH" = hppa2.0w ] + if test "$HP_ARCH" = hppa2.0w then - eval "$set_cc_for_build" + set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -719,14 +764,14 @@ HP_ARCH=hppa64 fi fi - echo "$HP_ARCH"-hp-hpux"$HPUX_REV" - exit ;; + GUESS=$HP_ARCH-hp-hpux$HPUX_REV + ;; ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux"$HPUX_REV" - exit ;; + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + GUESS=ia64-hp-hpux$HPUX_REV + ;; 3050*:HI-UX:*:*) - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #include int @@ -754,36 +799,36 @@ EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; + GUESS=unknown-hitachi-hiuxwe2 + ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) - echo hppa1.1-hp-bsd - exit ;; + GUESS=hppa1.1-hp-bsd + ;; 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; + GUESS=hppa1.0-hp-bsd + ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; + GUESS=hppa1.0-hp-mpeix + ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) - echo hppa1.1-hp-osf - exit ;; + GUESS=hppa1.1-hp-osf + ;; hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; + GUESS=hppa1.0-hp-osf + ;; i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo "$UNAME_MACHINE"-unknown-osf1mk + if test -x /usr/sbin/sysversion ; then + GUESS=$UNAME_MACHINE-unknown-osf1mk else - echo "$UNAME_MACHINE"-unknown-osf1 + GUESS=$UNAME_MACHINE-unknown-osf1 fi - exit ;; + ;; parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; + GUESS=hppa1.1-hp-lites + ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; + GUESS=c1-convex-bsd + ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd @@ -791,17 +836,18 @@ fi exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; + GUESS=c34-convex-bsd + ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; + GUESS=c38-convex-bsd + ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; + GUESS=c4-convex-bsd + ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=ymp-cray-unicos$CRAY_REL + ;; CRAY*[A-Z]90:*:*:*) echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ @@ -809,103 +855,126 @@ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=t90-cray-unicos$CRAY_REL + ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=alphaev5-cray-unicosmk$CRAY_REL + ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=sv1-cray-unicos$CRAY_REL + ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=craynv-cray-unicosmp$CRAY_REL + ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE + ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=sparc-unknown-bsdi$UNAME_RELEASE + ;; *:BSD/OS:*:*) - echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE + ;; + arm:FreeBSD:*:*) + UNAME_PROCESSOR=`uname -p` + set_cc_for_build + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi + else + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf + fi + ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case "$UNAME_PROCESSOR" in + case $UNAME_PROCESSOR in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL + ;; i*:CYGWIN*:*) - echo "$UNAME_MACHINE"-pc-cygwin - exit ;; + GUESS=$UNAME_MACHINE-pc-cygwin + ;; *:MINGW64*:*) - echo "$UNAME_MACHINE"-pc-mingw64 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw64 + ;; *:MINGW*:*) - echo "$UNAME_MACHINE"-pc-mingw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw32 + ;; *:MSYS*:*) - echo "$UNAME_MACHINE"-pc-msys - exit ;; + GUESS=$UNAME_MACHINE-pc-msys + ;; i*:PW*:*) - echo "$UNAME_MACHINE"-pc-pw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-pw32 + ;; *:Interix*:*) - case "$UNAME_MACHINE" in + case $UNAME_MACHINE in x86) - echo i586-pc-interix"$UNAME_RELEASE" - exit ;; + GUESS=i586-pc-interix$UNAME_RELEASE + ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix"$UNAME_RELEASE" - exit ;; + GUESS=x86_64-unknown-interix$UNAME_RELEASE + ;; IA64) - echo ia64-unknown-interix"$UNAME_RELEASE" - exit ;; + GUESS=ia64-unknown-interix$UNAME_RELEASE + ;; esac ;; i*:UWIN*:*) - echo "$UNAME_MACHINE"-pc-uwin - exit ;; + GUESS=$UNAME_MACHINE-pc-uwin + ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; + GUESS=x86_64-pc-cygwin + ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=powerpcle-unknown-solaris2$SUN_REL + ;; *:GNU:*:*) # the GNU system - echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" - exit ;; + GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` + GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL + ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" - exit ;; - i*86:Minix:*:*) - echo "$UNAME_MACHINE"-pc-minix - exit ;; + GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC + ;; + *:Minix:*:*) + GUESS=$UNAME_MACHINE-unknown-minix + ;; aarch64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -916,183 +985,225 @@ esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; arm*:Linux:*:*) - eval "$set_cc_for_build" + set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi else - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf fi fi - exit ;; + ;; avr32*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; cris:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; crisv32:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; e2k:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; frv:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; hexagon:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-pc-linux-$LIBC + ;; ia64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; k1om:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m32r*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m68*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; mips:Linux:*:* | mips64:Linux:*:*) - eval "$set_cc_for_build" + set_cc_for_build + IS_GLIBC=0 + test x"${LIBC}" = xgnu && IS_GLIBC=1 sed 's/^ //' << EOF > "$dummy.c" #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el + #undef mips + #undef mipsel + #undef mips64 + #undef mips64el + #if ${IS_GLIBC} && defined(_ABI64) + LIBCABI=gnuabi64 + #else + #if ${IS_GLIBC} && defined(_ABIN32) + LIBCABI=gnuabin32 + #else + LIBCABI=${LIBC} + #endif + #endif + + #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa64r6 + #else + #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa32r6 + #else + #if defined(__mips64) + CPU=mips64 + #else + CPU=mips + #endif + #endif + #endif + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el + MIPS_ENDIAN=el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} + MIPS_ENDIAN= #else - CPU= + MIPS_ENDIAN= #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" - test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } + cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'` + eval "$cc_set_vars" + test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-"$LIBC" - exit ;; + GUESS=or1k-unknown-linux-$LIBC + ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; padre:Linux:*:*) - echo sparc-unknown-linux-"$LIBC" - exit ;; + GUESS=sparc-unknown-linux-$LIBC + ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-"$LIBC" - exit ;; + GUESS=hppa64-unknown-linux-$LIBC + ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; - PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; - *) echo hppa-unknown-linux-"$LIBC" ;; + PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; + PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; + *) GUESS=hppa-unknown-linux-$LIBC ;; esac - exit ;; + ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc64-unknown-linux-$LIBC + ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc-unknown-linux-$LIBC + ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc64le-unknown-linux-$LIBC + ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-"$LIBC" - exit ;; - riscv32:Linux:*:* | riscv64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpcle-unknown-linux-$LIBC + ;; + riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; s390:Linux:*:* | s390x:Linux:*:*) - echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-ibm-linux-$LIBC + ;; sh64*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sh*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; tile*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; vax:Linux:*:*) - echo "$UNAME_MACHINE"-dec-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-dec-linux-$LIBC + ;; x86_64:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" - exit ;; + set_cc_for_build + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_X32 >/dev/null + then + LIBCABI=${LIBC}x32 + fi + fi + GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI + ;; xtensa*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; + GUESS=i386-sequent-sysv4 + ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" - exit ;; + GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION + ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo "$UNAME_MACHINE"-pc-os2-emx - exit ;; + GUESS=$UNAME_MACHINE-pc-os2-emx + ;; i*86:XTS-300:*:STOP) - echo "$UNAME_MACHINE"-unknown-stop - exit ;; + GUESS=$UNAME_MACHINE-unknown-stop + ;; i*86:atheos:*:*) - echo "$UNAME_MACHINE"-unknown-atheos - exit ;; + GUESS=$UNAME_MACHINE-unknown-atheos + ;; i*86:syllable:*:*) - echo "$UNAME_MACHINE"-pc-syllable - exit ;; + GUESS=$UNAME_MACHINE-pc-syllable + ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=i386-unknown-lynxos$UNAME_RELEASE + ;; i*86:*DOS:*:*) - echo "$UNAME_MACHINE"-pc-msdosdjgpp - exit ;; + GUESS=$UNAME_MACHINE-pc-msdosdjgpp + ;; i*86:*:4.*:*) UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" + GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL else - echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" + GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL fi - exit ;; + ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in @@ -1100,12 +1211,12 @@ *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" - exit ;; + GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1115,11 +1226,11 @@ && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" + GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL else - echo "$UNAME_MACHINE"-pc-sysv32 + GUESS=$UNAME_MACHINE-pc-sysv32 fi - exit ;; + ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -1127,31 +1238,31 @@ # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; + GUESS=i586-pc-msdosdjgpp + ;; Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; + GUESS=i386-pc-mach3 + ;; paragon:*:*:*) - echo i860-intel-osf1 - exit ;; + GUESS=i860-intel-osf1 + ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 + GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 + GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 fi - exit ;; + ;; mini*:CTIX:SYS*5:*) # "miniframe" - echo m68010-convergent-sysv - exit ;; + GUESS=m68010-convergent-sysv + ;; mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; + GUESS=m68k-convergent-sysv + ;; M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; + GUESS=m68k-diab-dnix + ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) @@ -1176,249 +1287,401 @@ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=m68k-unknown-lynxos$UNAME_RELEASE + ;; mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; + GUESS=m68k-atari-sysv4 + ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=sparc-unknown-lynxos$UNAME_RELEASE + ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=rs6000-unknown-lynxos$UNAME_RELEASE + ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-unknown-lynxos$UNAME_RELEASE + ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv"$UNAME_RELEASE" - exit ;; + GUESS=mips-dde-sysv$UNAME_RELEASE + ;; RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo "$UNAME_MACHINE"-sni-sysv4 + GUESS=$UNAME_MACHINE-sni-sysv4 else - echo ns32k-sni-sysv + GUESS=ns32k-sni-sysv fi - exit ;; + ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says - echo i586-unisys-sysv4 - exit ;; + GUESS=i586-unisys-sysv4 + ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; + GUESS=hppa1.1-stratus-sysv4 + ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; + GUESS=i860-stratus-sysv4 + ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo "$UNAME_MACHINE"-stratus-vos - exit ;; + GUESS=$UNAME_MACHINE-stratus-vos + ;; *:VOS:*:*) # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; + GUESS=hppa1.1-stratus-vos + ;; mc68*:A/UX:*:*) - echo m68k-apple-aux"$UNAME_RELEASE" - exit ;; + GUESS=m68k-apple-aux$UNAME_RELEASE + ;; news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; + GUESS=mips-sony-newsos6 + ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv"$UNAME_RELEASE" + if test -d /usr/nec; then + GUESS=mips-nec-sysv$UNAME_RELEASE else - echo mips-unknown-sysv"$UNAME_RELEASE" + GUESS=mips-unknown-sysv$UNAME_RELEASE fi - exit ;; + ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; + GUESS=powerpc-be-beos + ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; + GUESS=powerpc-apple-beos + ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; + GUESS=i586-pc-beos + ;; BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; + GUESS=i586-pc-haiku + ;; x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; + GUESS=x86_64-unknown-haiku + ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx4-nec-superux$UNAME_RELEASE + ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx5-nec-superux$UNAME_RELEASE + ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx6-nec-superux$UNAME_RELEASE + ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx7-nec-superux$UNAME_RELEASE + ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx8-nec-superux$UNAME_RELEASE + ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx8r-nec-superux$UNAME_RELEASE + ;; SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sxace-nec-superux$UNAME_RELEASE + ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-apple-rhapsody$UNAME_RELEASE + ;; *:Rhapsody:*:*) - echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE + ;; + arm64:Darwin:*:*) + GUESS=aarch64-apple-darwin$UNAME_RELEASE + ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval "$set_cc_for_build" - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc - fi - if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null - then - UNAME_PROCESSOR=powerpc - fi + UNAME_PROCESSOR=`uname -p` + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + if command -v xcode-select > /dev/null 2> /dev/null && \ + ! xcode-select --print-path > /dev/null 2> /dev/null ; then + # Avoid executing cc if there is no toolchain installed as + # cc will be a stub that puts up a graphical alert + # prompting the user to install developer tools. + CC_FOR_BUILD=no_compiler_found + else + set_cc_for_build + fi + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc fi elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 + # uname -m returns i386 or x86_64 + UNAME_PROCESSOR=$UNAME_MACHINE fi - echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE + ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE + ;; *:QNX:*:4*) - echo i386-pc-qnx - exit ;; + GUESS=i386-pc-qnx + ;; NEO-*:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=neo-tandem-nsk$UNAME_RELEASE + ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nse-tandem-nsk$UNAME_RELEASE + ;; NSR-*:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsr-tandem-nsk$UNAME_RELEASE + ;; NSV-*:NONSTOP_KERNEL:*:*) - echo nsv-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsv-tandem-nsk$UNAME_RELEASE + ;; NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsx-tandem-nsk$UNAME_RELEASE + ;; *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; + GUESS=mips-compaq-nonstopux + ;; BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; + GUESS=bs2000-siemens-sysv + ;; DS/*:UNIX_System_V:*:*) - echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE + ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = 386; then + if test "${cputype-}" = 386; then UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" + elif test "x${cputype-}" != x; then + UNAME_MACHINE=$cputype fi - echo "$UNAME_MACHINE"-unknown-plan9 - exit ;; + GUESS=$UNAME_MACHINE-unknown-plan9 + ;; *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; + GUESS=pdp10-unknown-tops10 + ;; *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; + GUESS=pdp10-unknown-tenex + ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; + GUESS=pdp10-dec-tops20 + ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; + GUESS=pdp10-xkl-tops20 + ;; *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; + GUESS=pdp10-unknown-tops20 + ;; *:ITS:*:*) - echo pdp10-unknown-its - exit ;; + GUESS=pdp10-unknown-its + ;; SEI:*:*:SEIUX) - echo mips-sei-seiux"$UNAME_RELEASE" - exit ;; + GUESS=mips-sei-seiux$UNAME_RELEASE + ;; *:DragonFly:*:*) - echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; + DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL + ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "$UNAME_MACHINE" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; + case $UNAME_MACHINE in + A*) GUESS=alpha-dec-vms ;; + I*) GUESS=ia64-dec-vms ;; + V*) GUESS=vax-dec-vms ;; esac ;; *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; + GUESS=i386-pc-xenix + ;; i*86:skyos:*:*) - echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" - exit ;; + SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'` + GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL + ;; i*86:rdos:*:*) - echo "$UNAME_MACHINE"-pc-rdos - exit ;; - i*86:AROS:*:*) - echo "$UNAME_MACHINE"-pc-aros - exit ;; + GUESS=$UNAME_MACHINE-pc-rdos + ;; + *:AROS:*:*) + GUESS=$UNAME_MACHINE-unknown-aros + ;; x86_64:VMkernel:*:*) - echo "$UNAME_MACHINE"-unknown-esx - exit ;; + GUESS=$UNAME_MACHINE-unknown-esx + ;; amd64:Isilon\ OneFS:*:*) - echo x86_64-unknown-onefs - exit ;; + GUESS=x86_64-unknown-onefs + ;; + *:Unleashed:*:*) + GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE + ;; esac +# Do we have a guess based on uname results? +if test "x$GUESS" != x; then + echo "$GUESS" + exit +fi + +# No uname command or uname output not recognized. +set_cc_for_build +cat > "$dummy.c" < +#include +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#include +#if defined(_SIZE_T_) || defined(SIGLOST) +#include +#endif +#endif +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); +#endif + +#if defined (vax) +#if !defined (ultrix) +#include +#if defined (BSD) +#if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +#else +#if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#endif +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#else +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname un; + uname (&un); + printf ("vax-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("vax-dec-ultrix\n"); exit (0); +#endif +#endif +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname *un; + uname (&un); + printf ("mips-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("mips-dec-ultrix\n"); exit (0); +#endif +#endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. +test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } + echo "$0: unable to guess system type" >&2 -case "$UNAME_MACHINE:$UNAME_SYSTEM" in +case $UNAME_MACHINE:$UNAME_SYSTEM in mips:Linux | mips64:Linux) # If we got here on MIPS GNU/Linux, output extra information. cat >&2 <&2 <&2 exit 1 ;; *local*) @@ -110,1223 +119,1181 @@ exit 1;; esac -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | cloudabi*-eabi* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo "$1" | sed 's/-[^-]*$//'` - if [ "$basic_machine" != "$1" ] - then os=`echo "$1" | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; - -bluegene*) - os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*178) - os=-lynxos178 - ;; - -lynx*5) - os=-lynxos5 +# Split fields of configuration type +# shellcheck disable=SC2162 +saved_IFS=$IFS +IFS="-" read field1 field2 field3 field4 <&2 + exit 1 ;; - -lynx*) - os=-lynxos + *-*-*-*) + basic_machine=$field1-$field2 + basic_os=$field3-$field4 ;; - -ptx*) - basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` + *-*-*) + # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two + # parts + maybe_os=$field2-$field3 + case $maybe_os in + nto-qnx* | linux-* | uclinux-uclibc* \ + | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ + | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ + | storm-chaos* | os2-emx* | rtmk-nova*) + basic_machine=$field1 + basic_os=$maybe_os + ;; + android-linux) + basic_machine=$field1-unknown + basic_os=linux-android + ;; + *) + basic_machine=$field1-$field2 + basic_os=$field3 + ;; + esac ;; - -psos*) - os=-psos + *-*) + # A lone config we happen to match not fitting any pattern + case $field1-$field2 in + decstation-3100) + basic_machine=mips-dec + basic_os= + ;; + *-*) + # Second component is usually, but not always the OS + case $field2 in + # Prevent following clause from handling this valid os + sun*os*) + basic_machine=$field1 + basic_os=$field2 + ;; + zephyr*) + basic_machine=$field1-unknown + basic_os=$field2 + ;; + # Manufacturers + dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ + | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ + | unicom* | ibm* | next | hp | isi* | apollo | altos* \ + | convergent* | ncr* | news | 32* | 3600* | 3100* \ + | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ + | ultra | tti* | harris | dolphin | highlevel | gould \ + | cbm | ns | masscomp | apple | axis | knuth | cray \ + | microblaze* | sim | cisco \ + | oki | wec | wrs | winbond) + basic_machine=$field1-$field2 + basic_os= + ;; + *) + basic_machine=$field1 + basic_os=$field2 + ;; + esac + ;; + esac ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint + *) + # Convert single-component short-hands not valid as part of + # multi-component configurations. + case $field1 in + 386bsd) + basic_machine=i386-pc + basic_os=bsd + ;; + a29khif) + basic_machine=a29k-amd + basic_os=udi + ;; + adobe68k) + basic_machine=m68010-adobe + basic_os=scout + ;; + alliant) + basic_machine=fx80-alliant + basic_os= + ;; + altos | altos3068) + basic_machine=m68k-altos + basic_os= + ;; + am29k) + basic_machine=a29k-none + basic_os=bsd + ;; + amdahl) + basic_machine=580-amdahl + basic_os=sysv + ;; + amiga) + basic_machine=m68k-unknown + basic_os= + ;; + amigaos | amigados) + basic_machine=m68k-unknown + basic_os=amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + basic_os=sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + basic_os=sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + basic_os=bsd + ;; + aros) + basic_machine=i386-pc + basic_os=aros + ;; + aux) + basic_machine=m68k-apple + basic_os=aux + ;; + balance) + basic_machine=ns32k-sequent + basic_os=dynix + ;; + blackfin) + basic_machine=bfin-unknown + basic_os=linux + ;; + cegcc) + basic_machine=arm-unknown + basic_os=cegcc + ;; + convex-c1) + basic_machine=c1-convex + basic_os=bsd + ;; + convex-c2) + basic_machine=c2-convex + basic_os=bsd + ;; + convex-c32) + basic_machine=c32-convex + basic_os=bsd + ;; + convex-c34) + basic_machine=c34-convex + basic_os=bsd + ;; + convex-c38) + basic_machine=c38-convex + basic_os=bsd + ;; + cray) + basic_machine=j90-cray + basic_os=unicos + ;; + crds | unos) + basic_machine=m68k-crds + basic_os= + ;; + da30) + basic_machine=m68k-da30 + basic_os= + ;; + decstation | pmax | pmin | dec3100 | decstatn) + basic_machine=mips-dec + basic_os= + ;; + delta88) + basic_machine=m88k-motorola + basic_os=sysv3 + ;; + dicos) + basic_machine=i686-pc + basic_os=dicos + ;; + djgpp) + basic_machine=i586-pc + basic_os=msdosdjgpp + ;; + ebmon29k) + basic_machine=a29k-amd + basic_os=ebmon + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + basic_os=ose + ;; + gmicro) + basic_machine=tron-gmicro + basic_os=sysv + ;; + go32) + basic_machine=i386-pc + basic_os=go32 + ;; + h8300hms) + basic_machine=h8300-hitachi + basic_os=hms + ;; + h8300xray) + basic_machine=h8300-hitachi + basic_os=xray + ;; + h8500hms) + basic_machine=h8500-hitachi + basic_os=hms + ;; + harris) + basic_machine=m88k-harris + basic_os=sysv3 + ;; + hp300 | hp300hpux) + basic_machine=m68k-hp + basic_os=hpux + ;; + hp300bsd) + basic_machine=m68k-hp + basic_os=bsd + ;; + hppaosf) + basic_machine=hppa1.1-hp + basic_os=osf + ;; + hppro) + basic_machine=hppa1.1-hp + basic_os=proelf + ;; + i386mach) + basic_machine=i386-mach + basic_os=mach + ;; + isi68 | isi) + basic_machine=m68k-isi + basic_os=sysv + ;; + m68knommu) + basic_machine=m68k-unknown + basic_os=linux + ;; + magnum | m3230) + basic_machine=mips-mips + basic_os=sysv + ;; + merlin) + basic_machine=ns32k-utek + basic_os=sysv + ;; + mingw64) + basic_machine=x86_64-pc + basic_os=mingw64 + ;; + mingw32) + basic_machine=i686-pc + basic_os=mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + basic_os=mingw32ce + ;; + monitor) + basic_machine=m68k-rom68k + basic_os=coff + ;; + morphos) + basic_machine=powerpc-unknown + basic_os=morphos + ;; + moxiebox) + basic_machine=moxie-unknown + basic_os=moxiebox + ;; + msdos) + basic_machine=i386-pc + basic_os=msdos + ;; + msys) + basic_machine=i686-pc + basic_os=msys + ;; + mvs) + basic_machine=i370-ibm + basic_os=mvs + ;; + nacl) + basic_machine=le32-unknown + basic_os=nacl + ;; + ncr3000) + basic_machine=i486-ncr + basic_os=sysv4 + ;; + netbsd386) + basic_machine=i386-pc + basic_os=netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + basic_os=linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + basic_os=newsos + ;; + news1000) + basic_machine=m68030-sony + basic_os=newsos + ;; + necv70) + basic_machine=v70-nec + basic_os=sysv + ;; + nh3000) + basic_machine=m68k-harris + basic_os=cxux + ;; + nh[45]000) + basic_machine=m88k-harris + basic_os=cxux + ;; + nindy960) + basic_machine=i960-intel + basic_os=nindy + ;; + mon960) + basic_machine=i960-intel + basic_os=mon960 + ;; + nonstopux) + basic_machine=mips-compaq + basic_os=nonstopux + ;; + os400) + basic_machine=powerpc-ibm + basic_os=os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + basic_os=ose + ;; + os68k) + basic_machine=m68k-none + basic_os=os68k + ;; + paragon) + basic_machine=i860-intel + basic_os=osf + ;; + parisc) + basic_machine=hppa-unknown + basic_os=linux + ;; + psp) + basic_machine=mipsallegrexel-sony + basic_os=psp + ;; + pw32) + basic_machine=i586-unknown + basic_os=pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + basic_os=rdos + ;; + rdos32) + basic_machine=i386-pc + basic_os=rdos + ;; + rom68k) + basic_machine=m68k-rom68k + basic_os=coff + ;; + sa29200) + basic_machine=a29k-amd + basic_os=udi + ;; + sei) + basic_machine=mips-sei + basic_os=seiux + ;; + sequent) + basic_machine=i386-sequent + basic_os= + ;; + sps7) + basic_machine=m68k-bull + basic_os=sysv2 + ;; + st2000) + basic_machine=m68k-tandem + basic_os= + ;; + stratus) + basic_machine=i860-stratus + basic_os=sysv4 + ;; + sun2) + basic_machine=m68000-sun + basic_os= + ;; + sun2os3) + basic_machine=m68000-sun + basic_os=sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + basic_os=sunos4 + ;; + sun3) + basic_machine=m68k-sun + basic_os= + ;; + sun3os3) + basic_machine=m68k-sun + basic_os=sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + basic_os=sunos4 + ;; + sun4) + basic_machine=sparc-sun + basic_os= + ;; + sun4os3) + basic_machine=sparc-sun + basic_os=sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + basic_os=sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + basic_os=solaris2 + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + basic_os= + ;; + sv1) + basic_machine=sv1-cray + basic_os=unicos + ;; + symmetry) + basic_machine=i386-sequent + basic_os=dynix + ;; + t3e) + basic_machine=alphaev5-cray + basic_os=unicos + ;; + t90) + basic_machine=t90-cray + basic_os=unicos + ;; + toad1) + basic_machine=pdp10-xkl + basic_os=tops20 + ;; + tpf) + basic_machine=s390x-ibm + basic_os=tpf + ;; + udi29k) + basic_machine=a29k-amd + basic_os=udi + ;; + ultra3) + basic_machine=a29k-nyu + basic_os=sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + basic_os=none + ;; + vaxv) + basic_machine=vax-dec + basic_os=sysv + ;; + vms) + basic_machine=vax-dec + basic_os=vms + ;; + vsta) + basic_machine=i386-pc + basic_os=vsta + ;; + vxworks960) + basic_machine=i960-wrs + basic_os=vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + basic_os=vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + basic_os=vxworks + ;; + xbox) + basic_machine=i686-pc + basic_os=mingw32 + ;; + ymp) + basic_machine=ymp-cray + basic_os=unicos + ;; + *) + basic_machine=$1 + basic_os= + ;; + esac ;; esac -# Decode aliases for certain CPU-COMPANY combinations. +# Decode 1-component or ad-hoc basic machines case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | ba \ - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | e2k | epiphany \ - | fido | fr30 | frv | ft32 \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia16 | ia64 \ - | ip2k | iq2000 \ - | k1om \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ - | pdp10 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pru \ - | pyramid \ - | riscv32 | riscv64 \ - | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | visium \ - | wasm32 \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - leon|leon[3-9]) - basic_machine=sparc-$basic_machine - ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none + # Here we handle the default manufacturer of certain CPU types. It is in + # some cases the only manufacturer, in others, it is the most popular. + w89k) + cpu=hppa1.1 + vendor=winbond ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) + op50n) + cpu=hppa1.1 + vendor=oki ;; - ms1) - basic_machine=mt-unknown + op60c) + cpu=hppa1.1 + vendor=oki ;; - - strongarm | thumb | xscale) - basic_machine=arm-unknown + ibm*) + cpu=i370 + vendor=ibm ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none + orion105) + cpu=clipper + vendor=highlevel ;; - xscaleeb) - basic_machine=armeb-unknown + mac | mpw | mac-mpw) + cpu=m68k + vendor=apple ;; - - xscaleel) - basic_machine=armel-unknown + pmac | pmac-mpw) + cpu=powerpc + vendor=apple ;; - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | ba-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | e2k-* | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ - | ip2k-* | iq2000-* \ - | k1om-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | or1k*-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pru-* \ - | pyramid-* \ - | riscv32-* | riscv64-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | visium-* \ - | wasm32-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-pc - os=-bsd - ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att + cpu=m68000 + vendor=att ;; 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - asmjs) - basic_machine=asmjs-unknown - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + cpu=we32k + vendor=att ;; bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec + cpu=powerpc + vendor=ibm + basic_os=cnk ;; decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 + cpu=pdp10 + vendor=dec + basic_os=tops10 ;; decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 + cpu=pdp10 + vendor=dec + basic_os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx + cpu=m68k + vendor=motorola ;; dpx2*) - basic_machine=m68k-bull - os=-sysv3 - ;; - e500v[12]) - basic_machine=powerpc-unknown - os=$os"spe" - ;; - e500v[12]-*) - basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=$os"spe" - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd + cpu=m68k + vendor=bull + basic_os=sysv3 ;; encore | umax | mmax) - basic_machine=ns32k-encore + cpu=ns32k + vendor=encore ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose + elxsi) + cpu=elxsi + vendor=elxsi + basic_os=${basic_os:-bsd} ;; fx2800) - basic_machine=i860-alliant + cpu=i860 + vendor=alliant ;; genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 + cpu=ns32k + vendor=ns ;; h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp + cpu=m68000 + vendor=hp ;; hp9k3[2-9][0-9]) - basic_machine=m68k-hp + cpu=m68k + vendor=hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm + cpu=hppa1.0 + vendor=hp ;; i*86v32) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv32 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv32 ;; i*86v4*) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv4 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv4 ;; i*86v) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv ;; i*86sol2) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - vsta) - basic_machine=i386-unknown - os=-vsta + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=solaris2 + ;; + j90 | j90-cray) + cpu=j90 + vendor=cray + basic_os=${basic_os:-unicos} ;; iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) + cpu=mips + vendor=sgi + case $basic_os in + irix*) ;; *) - os=-irix4 + basic_os=irix4 ;; esac ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - leon-*|leon[3-9]-*) - basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox - ;; - msdos) - basic_machine=i386-pc - os=-msdos + cpu=m68000 + vendor=convergent ;; - ms1-*) - basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i686-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) + cpu=m68k + vendor=atari + basic_os=mint ;; news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv + cpu=mips + vendor=sony + basic_os=newsos ;; next | m*-next) - basic_machine=m68k-next - case $os in - -nextstep* ) + cpu=m68k + vendor=next + case $basic_os in + openstep*) + ;; + nextstep*) ;; - -ns2*) - os=-nextstep2 + ns2*) + basic_os=nextstep2 ;; *) - os=-nextstep3 + basic_os=nextstep3 ;; esac ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - nsv-tandem) - basic_machine=nsv-tandem - ;; - nsx-tandem) - basic_machine=nsx-tandem + cpu=np1 + vendor=gould ;; op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k + cpu=hppa1.1 + vendor=oki + basic_os=proelf ;; pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 ;; pbd) - basic_machine=sparc-tti + cpu=sparc + vendor=tti ;; pbb) - basic_machine=m68k-tti + cpu=m68k + vendor=tti ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 + pc532) + cpu=ns32k + vendor=pc532 ;; - pc98) - basic_machine=i386-pc + pn) + cpu=pn + vendor=gould ;; - pc98-*) - basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` + power) + cpu=power + vendor=ibm ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc + ps2) + cpu=i386 + vendor=ibm ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc + rm[46]00) + cpu=mips + vendor=siemens ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc + rtpc | rtpc-*) + cpu=romp + vendor=ibm ;; - pentium4) - basic_machine=i786-pc + sde) + cpu=mipsisa32 + vendor=sde + basic_os=${basic_os:-elf} ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` + simso-wrs) + cpu=sparclite + vendor=wrs + basic_os=vxworks ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` + tower | tower-32) + cpu=m68k + vendor=ncr ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` + vpp*|vx|vx-*) + cpu=f301 + vendor=fujitsu ;; - pentium4-*) - basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` + w65) + cpu=w65 + vendor=wdc ;; - pn) - basic_machine=pn-gould + w89k-*) + cpu=hppa1.1 + vendor=winbond + basic_os=proelf ;; - power) basic_machine=power-ibm + none) + cpu=none + vendor=none ;; - ppc | ppcbe) basic_machine=powerpc-unknown + leon|leon[3-9]) + cpu=sparc + vendor=$basic_machine ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` + leon-*|leon[3-9]-*) + cpu=sparc + vendor=`echo "$basic_machine" | sed 's/-.*//'` ;; - ppcle | powerpclittle) - basic_machine=powerpcle-unknown + + *-*) + # shellcheck disable=SC2162 + saved_IFS=$IFS + IFS="-" read cpu vendor <&2 - exit 1 + # Recognize the canonical CPU types that are allowed with any + # company name. + case $cpu in + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | abacus \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ + | alphapca5[67] | alpha64pca5[67] \ + | am33_2.0 \ + | amdgcn \ + | arc | arceb | arc32 | arc64 \ + | arm | arm[lb]e | arme[lb] | armv* \ + | avr | avr32 \ + | asmjs \ + | ba \ + | be32 | be64 \ + | bfin | bpf | bs2000 \ + | c[123]* | c30 | [cjt]90 | c4x \ + | c8051 | clipper | craynv | csky | cydra \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | elxsi | epiphany \ + | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ + | h8300 | h8500 \ + | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i*86 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | loongarch32 | loongarch64 | loongarchx32 \ + | m32c | m32r | m32rle \ + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64eb | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r3 | mipsisa32r3el \ + | mipsisa32r5 | mipsisa32r5el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r3 | mipsisa64r3el \ + | mipsisa64r5 | mipsisa64r5el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mmix \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nfp \ + | nios | nios2 | nios2eb | nios2el \ + | none | np1 | ns16k | ns32k | nvptx \ + | open8 \ + | or1k* \ + | or32 \ + | orion \ + | picochip \ + | pdp10 | pdp11 | pj | pjl | pn | power \ + | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ + | pru \ + | pyramid \ + | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ + | rl78 | romp | rs6000 | rx \ + | s390 | s390x \ + | score \ + | sh | shl \ + | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ + | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ + | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ + | spu \ + | tahoe \ + | thumbv7* \ + | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ + | tron \ + | ubicom32 \ + | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ + | vax \ + | visium \ + | w65 \ + | wasm32 | wasm64 \ + | we32k \ + | x86 | x86_64 | xc16x | xgate | xps100 \ + | xstormy16 | xtensa* \ + | ymp \ + | z8k | z80) + ;; + + *) + echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 + exit 1 + ;; + esac ;; esac # Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` +case $vendor in + digital*) + vendor=dec ;; - *-commodore*) - basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` + commodore*) + vendor=cbm ;; *) ;; @@ -1334,203 +1301,215 @@ # Decode manufacturer-specific aliases for certain operating systems. -if [ x"$os" != x"" ] +if test x$basic_os != x then + +# First recognize some ad-hoc caes, or perhaps split kernel-os, or else just +# set os. +case $basic_os in + gnu/linux*) + kernel=linux + os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'` + ;; + os2-emx) + kernel=os2 + os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'` + ;; + nto-qnx*) + kernel=nto + os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'` + ;; + *-*) + # shellcheck disable=SC2162 + saved_IFS=$IFS + IFS="-" read kernel os <&2 - exit 1 + # No normalization, but not necessarily accepted, that comes below. ;; esac + else # Here we handle the default operating systems that come with various machines. @@ -1543,254 +1522,358 @@ # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -case $basic_machine in +kernel= +case $cpu-$vendor in score-*) - os=-elf + os=elf ;; spu-*) - os=-elf + os=elf ;; *-acorn) - os=-riscix1.2 + os=riscix1.2 ;; arm*-rebel) - os=-linux + kernel=linux + os=gnu ;; arm*-semi) - os=-aout + os=aout ;; c4x-* | tic4x-*) - os=-coff + os=coff ;; c8051-*) - os=-elf + os=elf + ;; + clipper-intergraph) + os=clix ;; hexagon-*) - os=-elf + os=elf ;; tic54x-*) - os=-coff + os=coff ;; tic55x-*) - os=-coff + os=coff ;; tic6x-*) - os=-coff + os=coff ;; # This must come before the *-dec entry. pdp10-*) - os=-tops20 + os=tops20 ;; pdp11-*) - os=-none + os=none ;; *-dec | vax-*) - os=-ultrix4.2 + os=ultrix4.2 ;; m68*-apollo) - os=-domain + os=domain ;; i386-sun) - os=-sunos4.0.2 + os=sunos4.0.2 ;; m68000-sun) - os=-sunos3 + os=sunos3 ;; m68*-cisco) - os=-aout + os=aout ;; mep-*) - os=-elf + os=elf ;; mips*-cisco) - os=-elf + os=elf ;; mips*-*) - os=-elf + os=elf ;; or32-*) - os=-coff + os=coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 + os=sysv3 ;; sparc-* | *-sun) - os=-sunos4.1.1 + os=sunos4.1.1 ;; pru-*) - os=-elf + os=elf ;; *-be) - os=-beos + os=beos ;; *-ibm) - os=-aix + os=aix ;; *-knuth) - os=-mmixware + os=mmixware ;; *-wec) - os=-proelf + os=proelf ;; *-winbond) - os=-proelf + os=proelf ;; *-oki) - os=-proelf + os=proelf ;; *-hp) - os=-hpux + os=hpux ;; *-hitachi) - os=-hiux + os=hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv + os=sysv ;; *-cbm) - os=-amigaos + os=amigaos ;; *-dg) - os=-dgux + os=dgux ;; *-dolphin) - os=-sysv3 + os=sysv3 ;; m68k-ccur) - os=-rtu + os=rtu ;; m88k-omron*) - os=-luna + os=luna ;; *-next) - os=-nextstep + os=nextstep ;; *-sequent) - os=-ptx + os=ptx ;; *-crds) - os=-unos + os=unos ;; *-ns) - os=-genix + os=genix ;; i370-*) - os=-mvs + os=mvs ;; *-gould) - os=-sysv + os=sysv ;; *-highlevel) - os=-bsd + os=bsd ;; *-encore) - os=-bsd + os=bsd ;; *-sgi) - os=-irix + os=irix ;; *-siemens) - os=-sysv4 + os=sysv4 ;; *-masscomp) - os=-rtu + os=rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=-uxpv + os=uxpv ;; *-rom68k) - os=-coff + os=coff ;; *-*bug) - os=-coff + os=coff ;; *-apple) - os=-macos + os=macos ;; *-atari*) - os=-mint + os=mint + ;; + *-wrs) + os=vxworks ;; *) - os=-none + os=none ;; esac + fi +# Now, validate our (potentially fixed-up) OS. +case $os in + # Sometimes we do "kernel-libc", so those need to count as OSes. + musl* | newlib* | relibc* | uclibc*) + ;; + # Likewise for "kernel-abi" + eabi* | gnueabi*) + ;; + # VxWorks passes extra cpu info in the 4th filed. + simlinux | simwindows | spe) + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ + | hiux* | abug | nacl* | netware* | windows* \ + | os9* | macos* | osx* | ios* \ + | mpw* | magic* | mmixware* | mon960* | lnews* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | mirbsd* | netbsd* | dicos* | openedition* | ose* \ + | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \ + | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* | serenity* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | mint* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ + | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*) + ;; + # This one is extra strict with allowed versions + sco3.2v2 | sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + none) + ;; + *) + echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os in + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ + | linux-musl* | linux-relibc* | linux-uclibc* ) + ;; + uclinux-uclibc* ) + ;; + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) + # These are just libc implementations, not actual OSes, and thus + # require a kernel. + echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + kfreebsd*-gnu* | kopensolaris*-gnu*) + ;; + vxworks-simlinux | vxworks-simwindows | vxworks-spe) + ;; + nto-qnx*) + ;; + os2-emx) + ;; + *-eabi* | *-gnueabi*) + ;; + -*) + # Blank kernel with real OS is always fine. + ;; + *-*) + echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + exit 1 + ;; +esac + # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) +case $vendor in + unknown) + case $cpu-$os in + *-riscix*) vendor=acorn ;; - -sunos*) + *-sunos*) vendor=sun ;; - -cnk*|-aix*) + *-cnk* | *-aix*) vendor=ibm ;; - -beos*) + *-beos*) vendor=be ;; - -hpux*) + *-hpux*) vendor=hp ;; - -mpeix*) + *-mpeix*) vendor=hp ;; - -hiux*) + *-hiux*) vendor=hitachi ;; - -unos*) + *-unos*) vendor=crds ;; - -dgux*) + *-dgux*) vendor=dg ;; - -luna*) + *-luna*) vendor=omron ;; - -genix*) + *-genix*) vendor=ns ;; - -mvs* | -opened*) + *-clix*) + vendor=intergraph + ;; + *-mvs* | *-opened*) + vendor=ibm + ;; + *-os400*) vendor=ibm ;; - -os400*) + s390-* | s390x-*) vendor=ibm ;; - -ptx*) + *-ptx*) vendor=sequent ;; - -tpf*) + *-tpf*) vendor=ibm ;; - -vxsim* | -vxworks* | -windiss*) + *-vxsim* | *-vxworks* | *-windiss*) vendor=wrs ;; - -aux*) + *-aux*) vendor=apple ;; - -hms*) + *-hms*) vendor=hitachi ;; - -mpw* | -macos*) + *-mpw* | *-macos*) vendor=apple ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) vendor=atari ;; - -vos*) + *-vos*) vendor=stratus ;; esac - basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo "$basic_machine$os" +echo "$cpu-$vendor-${kernel:+$kernel-}$os" exit # Local variables: diff -Nru automake-1.16-1.16.1/lib/COPYING automake-1.16-1.16.5/lib/COPYING --- automake-1.16-1.16.1/lib/COPYING 2018-02-26 17:20:26.000000000 +0000 +++ automake-1.16-1.16.5/lib/COPYING 2020-02-26 04:25:53.000000000 +0000 @@ -1,7 +1,7 @@ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - Copyright (C) 2007 Free Software Foundation, Inc. + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -645,7 +645,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. @@ -664,11 +664,11 @@ You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see -. +. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -. +. diff -Nru automake-1.16-1.16.1/lib/depcomp automake-1.16-1.16.5/lib/depcomp --- automake-1.16-1.16.1/lib/depcomp 2018-03-08 20:15:51.000000000 +0000 +++ automake-1.16-1.16.5/lib/depcomp 2021-07-12 02:41:13.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/lib/gendocs.sh automake-1.16-1.16.5/lib/gendocs.sh --- automake-1.16-1.16.1/lib/gendocs.sh 2018-03-11 21:19:05.000000000 +0000 +++ automake-1.16-1.16.5/lib/gendocs.sh 2021-07-26 05:00:01.000000000 +0000 @@ -2,9 +2,9 @@ # gendocs.sh -- generate a GNU manual in many formats. This script is # mentioned in maintain.texi. See the help message below for usage details. -scriptversion=2018-03-06.19 +scriptversion=2021-07-19.18 -# Copyright 2003-2018 Free Software Foundation, Inc. +# Copyright 2003-2021 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 @@ -58,7 +58,8 @@ commonarg= # passed to all makeinfo/texi2html invcations. dirargs= # passed to all tools (-I dir). dirs= # -I directories. -htmlarg="--css-ref=/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual" +htmlarg="--css-ref=https://www.gnu.org/software/gnulib/manual.css -c TOP_NODE_UP_URL=/manual" +default_htmlarg=true infoarg=--no-split generate_ascii=true generate_html=true @@ -72,7 +73,7 @@ version="gendocs.sh $scriptversion -Copyright 2018 Free Software Foundation, Inc. +Copyright 2021 Free Software Foundation, Inc. There is NO warranty. You may redistribute this software under the terms of the GNU General Public License. For more information about these matters, see the files named COPYING." @@ -163,7 +164,7 @@ --common) shift; commonarg=$1;; --docbook) docbook=yes;; --email) shift; EMAIL=$1;; - --html) shift; htmlarg=$1;; + --html) shift; default_htmlarg=false; htmlarg=$1;; --info) shift; infoarg=$1;; --no-ascii) generate_ascii=false;; --no-html) generate_ascii=false;; @@ -199,6 +200,11 @@ # For most of the following, the base name is just $PACKAGE base=$PACKAGE +if $default_htmlarg && test -n "$use_texi2html"; then + # The legacy texi2html doesn't support TOP_NODE_UP_URL + htmlarg="--css-ref=https://www.gnu.org/software/gnulib/manual.css" +fi + if test -n "$srcfile"; then # but here, we use the basename of $srcfile base=`basename "$srcfile"` diff -Nru automake-1.16-1.16.1/lib/gendocs_template automake-1.16-1.16.5/lib/gendocs_template --- automake-1.16-1.16.1/lib/gendocs_template 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/gendocs_template 2021-07-07 05:39:57.000000000 +0000 @@ -1,5 +1,15 @@ - + + + + %%TITLE%% - GNU Project - Free Software Foundation

%%TITLE%%

@@ -77,7 +87,7 @@ to <%%EMAIL%%>.

-

Copyright © 2018 Free Software Foundation, Inc.

+

Copyright © 2020 Free Software Foundation, Inc.

This page is licensed under a Creative diff -Nru automake-1.16-1.16.1/lib/gitlog-to-changelog automake-1.16-1.16.5/lib/gitlog-to-changelog --- automake-1.16-1.16.1/lib/gitlog-to-changelog 2018-03-11 21:19:05.000000000 +0000 +++ automake-1.16-1.16.5/lib/gitlog-to-changelog 2021-07-07 05:39:57.000000000 +0000 @@ -1,31 +1,46 @@ -eval '(exit $?0)' && eval 'exec perl -wS "$0" "$@"' - & eval 'exec perl -wS "$0" $argv:q' - if 0; -# Convert git log output to ChangeLog format. - -my $VERSION = '2018-03-07 03:47'; # UTC -# The definition above must lie within the first 8 lines in order -# for the Emacs time-stamp write hook (at end) to update it. -# If you change this file with Emacs, please let the write hook -# do its job. Otherwise, update this string manually. +#!/bin/sh +#! -*-perl-*- -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Convert git log output to ChangeLog format. +# Copyright (C) 2008-2021 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 # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. - +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. - +# # You should have received a copy of the GNU General Public License # along with this program. If not, see . - +# # Written by Jim Meyering +# This is a prologue that allows to run a perl script as an executable +# on systems that are compliant to a POSIX version before POSIX:2017. +# On such systems, the usual invocation of an executable through execlp() +# or execvp() fails with ENOEXEC if it is a script that does not start +# with a #! line. The script interpreter mentioned in the #! line has +# to be /bin/sh, because on GuixSD systems that is the only program that +# has a fixed file name. The second line is essential for perl and is +# also useful for editing this file in Emacs. The next two lines below +# are valid code in both sh and perl. When executed by sh, they re-execute +# the script through the perl program found in $PATH. The '-x' option +# is essential as well; without it, perl would re-execute the script +# through /bin/sh. When executed by perl, the next two lines are a no-op. +eval 'exec perl -wSx "$0" "$@"' + if 0; + +my $VERSION = '2021-02-24 23:42'; # UTC +# The definition above must lie within the first 8 lines in order +# for the Emacs time-stamp write hook (at end) to update it. +# If you change this file with Emacs, please let the write hook +# do its job. Otherwise, update this string manually. + use strict; use warnings; use Getopt::Long; @@ -174,7 +189,7 @@ if (!$in_code) { - $line =~ /^([0-9a-fA-F]{40})$/ + $line =~ /^([[:xdigit:]]{40})$/ or (warn "$ME: $f:$.: invalid line; expected an SHA1\n"), $fail = 1, next; $sha = lc $1; @@ -288,7 +303,7 @@ my ($sha, $rest) = split ':', $log, 2; defined $sha or die "$ME:$.: malformed log entry\n"; - $sha =~ /^[0-9a-fA-F]{40}$/ + $sha =~ /^[[:xdigit:]]{40}$/ or die "$ME:$.: invalid SHA1: $sha\n"; my $skipflag = 0; @@ -376,7 +391,7 @@ @skipshas = (); next; } - if ($found && $_ =~ /^([0-9a-fA-F]{7,}) [^ ]/) + if ($found && $_ =~ /^([[:xdigit:]]{7,}) [^ ]/) { push ( @skipshas, $1 ); } @@ -440,7 +455,8 @@ # If there were any lines if (@line == 0) { - warn "$ME: warning: empty commit message:\n $date_line\n"; + warn "$ME: warning: empty commit message:\n" + . " commit $sha\n $date_line\n"; } else { @@ -492,6 +508,7 @@ # mode: perl # indent-tabs-mode: nil # eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-line-limit: 50 # time-stamp-start: "my $VERSION = '" # time-stamp-format: "%:y-%02m-%02d %02H:%02M" # time-stamp-time-zone: "UTC0" diff -Nru automake-1.16-1.16.1/lib/gnupload automake-1.16-1.16.5/lib/gnupload --- automake-1.16-1.16.1/lib/gnupload 2018-03-11 21:19:05.000000000 +0000 +++ automake-1.16-1.16.5/lib/gnupload 2021-07-07 05:39:57.000000000 +0000 @@ -1,9 +1,9 @@ #!/bin/sh # Sign files and upload them. -scriptversion=2018-03-07.03; # UTC +scriptversion=2021-04-11.09; # UTC -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 @@ -24,7 +24,30 @@ set -e -GPG='gpg --batch --no-tty' +GPG=gpg +# Choose the proper version of gpg, so as to avoid a +# "gpg-agent is not available in this session" error +# when gpg-agent is version 2 but gpg is still version 1. +# FIXME-2020: remove, once all major distros ship gpg version 2 as /usr/bin/gpg +gpg_agent_version=`(gpg-agent --version) 2>/dev/null | sed -e '2,$d' -e 's/^[^0-9]*//'` +case "$gpg_agent_version" in + 2.*) + gpg_version=`(gpg --version) 2>/dev/null | sed -e '2,$d' -e 's/^[^0-9]*//'` + case "$gpg_version" in + 1.*) + if (type gpg2) >/dev/null 2>/dev/null; then + # gpg2 is present. + GPG=gpg2 + else + # gpg2 is missing. Ubuntu users should install the package 'gnupg2'. + echo "WARNING: Using 'gpg', which is too old. You should install 'gpg2'." 1>&2 + fi + ;; + esac + ;; +esac + +GPG="${GPG} --batch --no-tty" conffile=.gnuploadrc to= dry_run=false @@ -54,10 +77,10 @@ --user NAME sign with key NAME --replace allow replacements of existing files --symlink-regex[=EXPR] use sed script EXPR to compute symbolic link names - --dry-run do nothing, show what would have been done + -n, --dry-run do nothing, show what would have been done (including the constructed directive file) --version output version information and exit - --help print this help text and exit + -h, --help print this help text and exit If --symlink-regex is given without EXPR, then the link target name is created by replacing the version information with '-latest', e.g.: @@ -93,12 +116,22 @@ --symlink-regex \\ foobar-1.0.tar.gz foobar-1.0.tar.xz -4. Upload foobar-0.9.90.tar.gz to two sites: +4. Create a symbolic link foobar-latest.tar.gz -> foobar-1.0.tar.gz + and likewise for the corresponding .sig file: + gnupload --to ftp.gnu.org:foobar \\ + --symlink foobar-1.0.tar.gz foobar-latest.tar.gz \\ + foobar-1.0.tar.gz.sig foobar-latest.tar.gz.sig + or (equivalent): + gnupload --to ftp.gnu.org:foobar \\ + --symlink foobar-1.0.tar.gz foobar-latest.tar.gz \\ + --symlink foobar-1.0.tar.gz.sig foobar-latest.tar.gz.sig + +5. Upload foobar-0.9.90.tar.gz to two sites: gnupload --to alpha.gnu.org:foobar \\ --to sources.redhat.com:~ftp/pub/foobar \\ foobar-0.9.90.tar.gz -5. Delete oopsbar-0.9.91.tar.gz and upload foobar-0.9.91.tar.gz +6. Delete oopsbar-0.9.91.tar.gz and upload foobar-0.9.91.tar.gz (the -- terminates the list of files to delete): gnupload --to alpha.gnu.org:foobar \\ --to sources.redhat.com:~ftp/pub/foobar \\ @@ -112,6 +145,12 @@ Send patches and bug reports to ." +copyright_year=`echo "$scriptversion" | sed -e 's/[^0-9].*//'` +copyright="Copyright (C) ${copyright_year} Free Software Foundation, Inc. +License GPLv2+: GNU GPL version 2 or later . +This is free software: you are free to change and redistribute it. +There is NO WARRANTY, to the extent permitted by law." + # Read local configuration file if test -r "$conffile"; then echo "$0: Reading configuration file $conffile" @@ -125,7 +164,7 @@ -*) collect_var= case $1 in - --help) + -h | --help) echo "$usage" exit $? ;; @@ -171,12 +210,13 @@ --symlink) collect_var=symlink_files ;; - --dry-run|-n) + -n | --dry-run) dry_run=: ;; --version) echo "gnupload $scriptversion" - exit $? + echo "$copyright" + exit 0 ;; --) shift diff -Nru automake-1.16-1.16.1/lib/INSTALL automake-1.16-1.16.5/lib/INSTALL --- automake-1.16-1.16.1/lib/INSTALL 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/INSTALL 2021-07-07 05:39:57.000000000 +0000 @@ -1,8 +1,8 @@ Installation Instructions ************************* - Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software -Foundation, Inc. + Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free +Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -225,7 +225,7 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX 'make' updates targets which have the same time stamps as their + HP-UX 'make' updates targets which have the same timestamps as their prerequisites, which makes it generally unusable when shipped generated files such as 'configure' are involved. Use GNU 'make' instead. diff -Nru automake-1.16-1.16.1/lib/install-sh automake-1.16-1.16.5/lib/install-sh --- automake-1.16-1.16.1/lib/install-sh 2018-03-11 21:18:51.000000000 +0000 +++ automake-1.16-1.16.5/lib/install-sh 2020-11-14 03:47:59.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -69,6 +69,11 @@ # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -99,18 +104,28 @@ --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake@gnu.org. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,8 +152,13 @@ -o) chowncmd="$chownprog $2" shift;; + -p) cpprog="$cpprog -p";; + -s) stripcmd=$stripprog;; + -S) backupsuffix="$2" + shift;; + -t) is_target_a_directory=always dst_arg=$2 @@ -255,6 +275,10 @@ dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -301,22 +325,6 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - # With -d, create the new directory with the user-specified mode. # Otherwise, rely on $mkdir_umask. if test -n "$dir_arg"; then @@ -326,52 +334,49 @@ fi posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. - if (umask $mkdir_umask && - $mkdirprog $mkdir_mode "$tmpdir" && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities 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. - test_tmpdir="$tmpdir/a" - ls_ld_tmpdir=`ls -ld "$test_tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null - fi - trap '' 0;; - esac;; + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities 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. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null + fi + trap '' 0;; esac if @@ -382,7 +387,7 @@ then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. @@ -411,7 +416,7 @@ prefixes= else if $posix_mkdir; then - (umask=$mkdir_umask && + (umask $mkdir_umask && $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break # Don't fail if two instances are running concurrently. test -d "$prefix" || exit 1 @@ -451,7 +456,18 @@ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -477,6 +493,13 @@ then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -491,9 +514,9 @@ # file should still install successfully. { test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || + $doit $rmcmd "$dst" 2>/dev/null || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } } || { echo "$0: cannot unlink or rename $dst" >&2 (exit 1); exit 1 diff -Nru automake-1.16-1.16.1/lib/local.mk automake-1.16-1.16.5/lib/local.mk --- automake-1.16-1.16.1/lib/local.mk 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/lib/local.mk 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- makefile-automake -*- -## Copyright (C) 1995-2018 Free Software Foundation, Inc. +## Copyright (C) 1995-2021 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 diff -Nru automake-1.16-1.16.1/lib/mdate-sh automake-1.16-1.16.5/lib/mdate-sh --- automake-1.16-1.16.1/lib/mdate-sh 2018-03-08 20:15:51.000000000 +0000 +++ automake-1.16-1.16.5/lib/mdate-sh 2021-07-12 02:41:13.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1995-2018 Free Software Foundation, Inc. +# Copyright (C) 1995-2021 Free Software Foundation, Inc. # written by Ulrich Drepper , June 1995 # # This program is free software; you can redistribute it and/or modify diff -Nru automake-1.16-1.16.1/lib/missing automake-1.16-1.16.5/lib/missing --- automake-1.16-1.16.1/lib/missing 2018-03-08 20:15:51.000000000 +0000 +++ automake-1.16-1.16.5/lib/missing 2021-07-12 02:41:13.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff -Nru automake-1.16-1.16.1/lib/mkinstalldirs automake-1.16-1.16.5/lib/mkinstalldirs --- automake-1.16-1.16.1/lib/mkinstalldirs 2018-03-08 20:15:51.000000000 +0000 +++ automake-1.16-1.16.5/lib/mkinstalldirs 2020-08-23 10:37:39.000000000 +0000 @@ -1,7 +1,7 @@ #! /bin/sh # mkinstalldirs --- make directory hierarchy -scriptversion=2018-03-07.03; # UTC +scriptversion=2020-07-26.22; # UTC # Original author: Noah Friedman # Created: 1993-05-16 @@ -92,6 +92,8 @@ *) if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && test ! -d ./--version; then + echo "umask 22" + umask 22 echo "mkdir -m $dirmode -p -- $*" exec mkdir -m "$dirmode" -p -- "$@" else @@ -104,6 +106,9 @@ ;; esac +echo "umask 22" +umask 22 + for file do case $file in @@ -132,21 +137,16 @@ if test ! -d "$pathcomp"; then errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi fi fi pathcomp=$pathcomp/ done + + if test ! -z "$dirmode"; then + echo "chmod $dirmode $file" + chmod "$dirmode" "$file" || errstatus=$? + fi done exit $errstatus diff -Nru automake-1.16-1.16.1/lib/py-compile automake-1.16-1.16.5/lib/py-compile --- automake-1.16-1.16.1/lib/py-compile 2018-03-08 20:15:51.000000000 +0000 +++ automake-1.16-1.16.5/lib/py-compile 2021-07-28 05:45:18.000000000 +0000 @@ -1,9 +1,9 @@ #!/bin/sh # py-compile - Compile a Python program -scriptversion=2018-03-07.03; # UTC +scriptversion=2021-02-27.01; # UTC -# Copyright (C) 2000-2018 Free Software Foundation, Inc. +# Copyright (C) 2000-2021 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 @@ -27,7 +27,7 @@ # bugs to or send patches to # . -if [ -z "$PYTHON" ]; then +if test -z "$PYTHON"; then PYTHON=python fi @@ -96,27 +96,46 @@ files=$* if test -z "$files"; then - usage_error "no files given" + usage_error "no files given" fi # if basedir was given, then it should be prepended to filenames before # byte compilation. -if [ -z "$basedir" ]; then - pathtrans="path = file" +if test -z "$basedir"; then + pathtrans="path = file" else - pathtrans="path = os.path.join('$basedir', file)" + pathtrans="path = os.path.join('$basedir', file)" fi # if destdir was given, then it needs to be prepended to the filename to # byte compile but not go into the compiled file. -if [ -z "$destdir" ]; then - filetrans="filepath = path" +if test -z "$destdir"; then + filetrans="filepath = path" else - filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)" + filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)" +fi + +python_major=`$PYTHON -V 2>&1 | sed -e 's/.* //;s/\..*$//;1q'` +if test -z "$python_major"; then + echo "$me: could not determine $PYTHON major version, guessing 3" >&2 + python_major=3 +fi + +# The old way to import libraries was deprecated. +if test "$python_major" -le 2; then + import_lib=imp + import_test="hasattr(imp, 'get_tag')" + import_call=imp.cache_from_source + import_arg2=', False' # needed in one call and not the other +else + import_lib=importlib + import_test="hasattr(sys.implementation, 'cache_tag')" + import_call=importlib.util.cache_from_source + import_arg2= fi $PYTHON -c " -import sys, os, py_compile, imp +import sys, os, py_compile, $import_lib files = '''$files''' @@ -129,15 +148,15 @@ continue sys.stdout.write(file) sys.stdout.flush() - if hasattr(imp, 'get_tag'): - py_compile.compile(filepath, imp.cache_from_source(filepath), path) + if $import_test: + py_compile.compile(filepath, $import_call(filepath), path) else: py_compile.compile(filepath, filepath + 'c', path) sys.stdout.write('\n')" || exit $? # this will fail for python < 1.5, but that doesn't matter ... $PYTHON -O -c " -import sys, os, py_compile, imp +import sys, os, py_compile, $import_lib # pypy does not use .pyo optimization if hasattr(sys, 'pypy_translation_info'): @@ -153,11 +172,11 @@ continue sys.stdout.write(file) sys.stdout.flush() - if hasattr(imp, 'get_tag'): - py_compile.compile(filepath, imp.cache_from_source(filepath, False), path) + if $import_test: + py_compile.compile(filepath, $import_call(filepath$import_arg2), path) else: py_compile.compile(filepath, filepath + 'o', path) -sys.stdout.write('\n')" 2>/dev/null || : +sys.stdout.write('\n')" 2>/dev/null || exit $? # Local Variables: # mode: shell-script diff -Nru automake-1.16-1.16.1/lib/tap-driver.sh automake-1.16-1.16.5/lib/tap-driver.sh --- automake-1.16-1.16.1/lib/tap-driver.sh 2018-03-08 20:15:51.000000000 +0000 +++ automake-1.16-1.16.5/lib/tap-driver.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -369,7 +369,7 @@ sub("^(not )?ok[ \t]*", "", line) # If the result has an explicit number, get it and strip it; otherwise, - # automatically assing the next progresive number to it. + # automatically assign the next test number to it. if (line ~ /^[0-9]+$/ || line ~ /^[0-9]+[^a-zA-Z0-9_]/) { match(line, "^[0-9]+") diff -Nru automake-1.16-1.16.1/lib/test-driver automake-1.16-1.16.5/lib/test-driver --- automake-1.16-1.16.1/lib/test-driver 2018-03-08 20:15:51.000000000 +0000 +++ automake-1.16-1.16.5/lib/test-driver 2021-07-12 02:41:13.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -42,11 +42,13 @@ { cat <$log_file 2>&1 +# Test script is run here. We create the file first, then append to it, +# to ameliorate tests themselves also writing to the log file. Our tests +# don't, but others can (automake bug#35762). +: >"$log_file" +"$@" >>"$log_file" 2>&1 estatus=$? if test $enable_hard_errors = no && test $estatus -eq 99; then @@ -126,7 +131,7 @@ # know whether the test passed or failed simply by looking at the '.log' # file, without the need of also peaking into the corresponding '.trs' # file (automake bug#11814). -echo "$res $test_name (exit status: $estatus)" >>$log_file +echo "$res $test_name (exit status: $estatus)" >>"$log_file" # Report outcome to console. echo "${col}${res}${std}: $test_name" diff -Nru automake-1.16-1.16.1/lib/texinfo.tex automake-1.16-1.16.5/lib/texinfo.tex --- automake-1.16-1.16.1/lib/texinfo.tex 2018-03-11 21:19:05.000000000 +0000 +++ automake-1.16-1.16.5/lib/texinfo.tex 2021-07-07 05:39:57.000000000 +0000 @@ -1,14 +1,11 @@ % texinfo.tex -- TeX macros to handle Texinfo files. -% +% % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2018-02-12.17} +\def\texinfoversion{2021-04-25.21} % -% Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, -% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, -% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 -% Free Software Foundation, Inc. +% Copyright 1985, 1986, 1988, 1990-2021 Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or % modify it under the terms of the GNU General Public License as @@ -36,7 +33,7 @@ % The texinfo.tex in any given distribution could well be out % of date, so if that's what you're using, please check. % -% Send bug reports to bug-texinfo@gnu.org. Please include including a +% Send bug reports to bug-texinfo@gnu.org. Please include a % complete document in each bug report with which we can reproduce the % problem. Patches are, of course, greatly appreciated. % @@ -182,7 +179,7 @@ % Hyphenation fixes. \hyphenation{ Flor-i-da Ghost-script Ghost-view Mac-OS Post-Script - auto-ma-ti-cal-ly ap-pen-dix bit-map bit-maps + ap-pen-dix bit-map bit-maps data-base data-bases eshell fall-ing half-way long-est man-u-script man-u-scripts mini-buf-fer mini-buf-fers over-view par-a-digm par-a-digms rath-er rec-tan-gu-lar ro-bot-ics se-vere-ly set-up spa-ces @@ -221,7 +218,7 @@ % @errormsg{MSG}. Do the index-like expansions on MSG, but if things % aren't perfect, it's not the end of the world, being an error message, % after all. -% +% \def\errormsg{\begingroup \indexnofonts \doerrormsg} \def\doerrormsg#1{\errmessage{#1}} @@ -244,17 +241,7 @@ % \def\finalout{\overfullrule=0pt } -% Do @cropmarks to get crop marks. -% -\newif\ifcropmarks -\let\cropmarks = \cropmarkstrue -% -% Dimensions to add cropmarks at corners. -% Added by P. A. MacKay, 12 Nov. 1986 -% \newdimen\outerhsize \newdimen\outervsize % set by the paper size routines -\newdimen\cornerlong \cornerlong=1pc -\newdimen\cornerthick \cornerthick=.3pt \newdimen\topandbottommargin \topandbottommargin=.75in % Output a mark which sets \thischapter, \thissection and \thiscolor. @@ -270,8 +257,8 @@ % \domark is called twice inside \chapmacro, to add one % mark before the section break, and one after. -% In the second call \prevchapterdefs is the same as \lastchapterdefs, -% and \prevsectiondefs is the same as \lastsectiondefs. +% In the second call \prevchapterdefs is the same as \currentchapterdefs, +% and \prevsectiondefs is the same as \currentsectiondefs. % Then if the page is not broken at the mark, some of the previous % section appears on the page, and we can get the name of this section % from \firstmark for @everyheadingmarks top. @@ -279,11 +266,11 @@ % % See page 260 of The TeXbook. \def\domark{% - \toks0=\expandafter{\lastchapterdefs}% - \toks2=\expandafter{\lastsectiondefs}% + \toks0=\expandafter{\currentchapterdefs}% + \toks2=\expandafter{\currentsectiondefs}% \toks4=\expandafter{\prevchapterdefs}% \toks6=\expandafter{\prevsectiondefs}% - \toks8=\expandafter{\lastcolordefs}% + \toks8=\expandafter{\currentcolordefs}% \mark{% \the\toks0 \the\toks2 % 0: marks for @everyheadingmarks top \noexpand\or \the\toks4 \the\toks6 % 1: for @everyheadingmarks bottom @@ -300,19 +287,19 @@ % @setcolor (or @url, or @link, etc.) between @contents and the very % first @chapter. \def\gettopheadingmarks{% - \ifcase0\topmark\fi + \ifcase0\the\savedtopmark\fi \ifx\thischapter\empty \ifcase0\firstmark\fi \fi } \def\getbottomheadingmarks{\ifcase1\botmark\fi} -\def\getcolormarks{\ifcase2\topmark\fi} +\def\getcolormarks{\ifcase2\the\savedtopmark\fi} % Avoid "undefined control sequence" errors. -\def\lastchapterdefs{} -\def\lastsectiondefs{} -\def\lastsection{} +\def\currentchapterdefs{} +\def\currentsectiondefs{} +\def\currentsection{} \def\prevchapterdefs{} \def\prevsectiondefs{} -\def\lastcolordefs{} +\def\currentcolordefs{} % Margin to add to right of even pages, to left of odd pages. \newdimen\bindingoffset @@ -322,51 +309,61 @@ % Main output routine. % \chardef\PAGE = 255 -\output = {\onepageout{\pagecontents\PAGE}} +\newtoks\defaultoutput +\defaultoutput = {\savetopmark\onepageout{\pagecontents\PAGE}} +\output=\expandafter{\the\defaultoutput} \newbox\headlinebox \newbox\footlinebox +% When outputting the double column layout for indices, an output routine +% is run several times, which hides the original value of \topmark. This +% can lead to a page heading being output and duplicating the chapter heading +% of the index. Hence, save the contents of \topmark at the beginning of +% the output routine. The saved contents are valid until we actually +% \shipout a page. +% +% (We used to run a short output routine to actually set \topmark and +% \firstmark to the right values, but if this was called with an empty page +% containing whatsits for writing index entries, the whatsits would be thrown +% away and the index auxiliary file would remain empty.) +% +\newtoks\savedtopmark +\newif\iftopmarksaved +\topmarksavedtrue +\def\savetopmark{% + \iftopmarksaved\else + \global\savedtopmark=\expandafter{\topmark}% + \global\topmarksavedtrue + \fi +} + % \onepageout takes a vbox as an argument. -% \shipout a vbox for a single page, adding an optional header, footer, -% cropmarks, and footnote. This also causes index entries for this page -% to be written to the auxiliary files. +% \shipout a vbox for a single page, adding an optional header, footer +% and footnote. This also causes index entries for this page to be written +% to the auxiliary files. % \def\onepageout#1{% - \ifcropmarks \hoffset=0pt \else \hoffset=\normaloffset \fi + \hoffset=\normaloffset % \ifodd\pageno \advance\hoffset by \bindingoffset \else \advance\hoffset by -\bindingoffset\fi % - % Common context changes for both heading and footing. - % Do this outside of the \shipout so @code etc. will be expanded in - % the headline as they should be, not taken literally (outputting ''code). - \def\commmonheadfootline{\let\hsize=\txipagewidth \texinfochars} + \checkchapterpage % % Retrieve the information for the headings from the marks in the page, % and call Plain TeX's \makeheadline and \makefootline, which use the % values in \headline and \footline. % - % This is used to check if we are on the first page of a chapter. - \ifcase1\topmark\fi - \let\prevchaptername\thischaptername - \ifcase0\firstmark\fi - \let\curchaptername\thischaptername + % Common context changes for both heading and footing. + % Do this outside of the \shipout so @code etc. will be expanded in + % the headline as they should be, not taken literally (outputting ''code). + \def\commonheadfootline{\let\hsize=\txipagewidth \texinfochars} % \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi + \global\setbox\headlinebox = \vbox{\commonheadfootline \makeheadline}% \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi - % - \ifx\curchaptername\prevchaptername - \let\thischapterheading\thischapter - \else - % \thischapterheading is the same as \thischapter except it is blank - % for the first page of a chapter. This is to prevent the chapter name - % being shown twice. - \def\thischapterheading{}% - \fi - % - \global\setbox\headlinebox = \vbox{\commmonheadfootline \makeheadline}% - \global\setbox\footlinebox = \vbox{\commmonheadfootline \makefootline}% + \global\setbox\footlinebox = \vbox{\commonheadfootline \makefootline}% % {% % Set context for writing to auxiliary files like index files. @@ -374,37 +371,12 @@ % take effect in \write's, yet the group defined by the \vbox ends % before the \shipout runs. % - \indexdummies % don't expand commands in the output. - \normalturnoffactive % \ in index entries must not stay \, e.g., if - % the page break happens to be in the middle of an example. - % We don't want .vr (or whatever) entries like this: - % \entry{{\indexbackslash }acronym}{32}{\code {\acronym}} - % "\acronym" won't work when it's read back in; - % it needs to be - % {\code {{\backslashcurfont }acronym} + \atdummies % don't expand commands in the output. + \turnoffactive \shipout\vbox{% % Do this early so pdf references go to the beginning of the page. \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi % - \ifcropmarks \vbox to \outervsize\bgroup - \hsize = \outerhsize - \vskip-\topandbottommargin - \vtop to0pt{% - \line{\ewtop\hfil\ewtop}% - \nointerlineskip - \line{% - \vbox{\moveleft\cornerthick\nstop}% - \hfill - \vbox{\moveright\cornerthick\nstop}% - }% - \vss}% - \vskip\topandbottommargin - \line\bgroup - \hfil % center the page within the outer (page) hsize. - \ifodd\pageno\hskip\bindingoffset\fi - \vbox\bgroup - \fi - % \unvbox\headlinebox \pagebody{#1}% \ifdim\ht\footlinebox > 0pt @@ -415,24 +387,9 @@ \unvbox\footlinebox \fi % - \ifcropmarks - \egroup % end of \vbox\bgroup - \hfil\egroup % end of (centering) \line\bgroup - \vskip\topandbottommargin plus1fill minus1fill - \boxmaxdepth = \cornerthick - \vbox to0pt{\vss - \line{% - \vbox{\moveleft\cornerthick\nsbot}% - \hfill - \vbox{\moveright\cornerthick\nsbot}% - }% - \nointerlineskip - \line{\ewbot\hfil\ewbot}% - }% - \egroup % \vbox from first cropmarks clause - \fi - }% end of \shipout\vbox - }% end of group with \indexdummies + }% + }% + \global\topmarksavedfalse \advancepageno \ifnum\outputpenalty>-20000 \else\dosupereject\fi } @@ -451,17 +408,22 @@ \ifr@ggedbottom \kern-\dimen@ \vfil \fi} } -% Here are the rules for the cropmarks. Note that they are -% offset so that the space between them is truly \outerhsize or \outervsize -% (P. A. MacKay, 12 November, 1986) -% -\def\ewtop{\vrule height\cornerthick depth0pt width\cornerlong} -\def\nstop{\vbox - {\hrule height\cornerthick depth\cornerlong width\cornerthick}} -\def\ewbot{\vrule height0pt depth\cornerthick width\cornerlong} -\def\nsbot{\vbox - {\hrule height\cornerlong depth\cornerthick width\cornerthick}} - +% Check if we are on the first page of a chapter. Used for printing headings. +\newif\ifchapterpage +\def\checkchapterpage{% + % Get the chapter that was current at the end of the last page + \ifcase1\the\savedtopmark\fi + \let\prevchaptername\thischaptername + % + \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi + \let\curchaptername\thischaptername + % + \ifx\curchaptername\prevchaptername + \chapterpagefalse + \else + \chapterpagetrue + \fi +} % Argument parsing @@ -487,11 +449,10 @@ }% } -% First remove any @comment, then any @c comment. Also remove a @texinfoc -% comment (see \scanmacro for details). Pass the result on to \argcheckspaces. +% First remove any @comment, then any @c comment. Pass the result on to +% \argcheckspaces. \def\argremovecomment#1\comment#2\ArgTerm{\argremovec #1\c\ArgTerm} -\def\argremovec#1\c#2\ArgTerm{\argremovetexinfoc #1\texinfoc\ArgTerm} -\def\argremovetexinfoc#1\texinfoc#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm} +\def\argremovec#1\c#2\ArgTerm{\argcheckspaces#1\^^M\ArgTerm} % Each occurrence of `\^^M' or `\^^M' is replaced by a single space. % @@ -611,9 +572,8 @@ \fi } -% @end foo executes the definition of \Efoo. -% But first, it executes a specialized version of \checkenv -% + +% @end foo calls \checkenv and executes the definition of \Efoo. \parseargdef\end{% \if 1\csname iscond.#1\endcsname \else @@ -1042,6 +1002,14 @@ \global\everypar = {}% } +% leave vertical mode without cancelling any first paragraph indent +\gdef\imageindent{% + \toks0=\everypar + \everypar={}% + \ptexnoindent + \global\everypar=\toks0 +} + % @refill is a no-op. \let\refill=\relax @@ -1050,7 +1018,7 @@ \let\setfilename=\comment % @bye. -\outer\def\bye{\pagealignmacro\tracingstats=1\ptexend} +\outer\def\bye{\chappager\pagelabels\tracingstats=1\ptexend} \message{pdf,} @@ -1092,7 +1060,7 @@ tex.sprint( string.format(string.char(0x5c) .. string.char(0x25) .. '03o' .. string.char(0x5c) .. string.char(0x25) .. '03o', - (c / 256), (c % 256))) + math.floor(c / 256), math.floor(c % 256))) else c = c - 0x10000 local c_hi = c / 1024 + 0xd800 @@ -1102,8 +1070,8 @@ string.char(0x5c) .. string.char(0x25) .. '03o' .. string.char(0x5c) .. string.char(0x25) .. '03o' .. string.char(0x5c) .. string.char(0x25) .. '03o', - (c_hi / 256), (c_hi % 256), - (c_lo / 256), (c_lo % 256))) + math.floor(c_hi / 256), math.floor(c_hi % 256), + math.floor(c_lo / 256), math.floor(c_lo % 256))) end end end @@ -1116,15 +1084,19 @@ function PDFescstr(str) for c in string.bytes(str) do if c <= 0x20 or c >= 0x80 or c == 0x28 or c == 0x29 or c == 0x5c then - tex.sprint( + tex.sprint(-2, string.format(string.char(0x5c) .. string.char(0x25) .. '03o', c)) else - tex.sprint(string.char(c)) + tex.sprint(-2, string.char(c)) end end end } + % The -2 in the arguments here gives all the input to TeX catcode 12 + % (other) or 10 (space), preventing undefined control sequence errors. See + % https://lists.gnu.org/archive/html/bug-texinfo/2019-08/msg00031.html + % \endgroup \def\pdfescapestring#1{\directlua{PDFescstr('\luaescapestring{#1}')}} \ifnum\luatexversion>84 @@ -1163,11 +1135,60 @@ \fi \fi +\newif\ifpdforxetex +\pdforxetexfalse +\ifpdf + \pdforxetextrue +\fi +\ifx\XeTeXrevision\thisisundefined\else + \pdforxetextrue +\fi + + +% Output page labels information. +% See PDF reference v.1.7 p.594, section 8.3.1. +\ifpdf +\def\pagelabels{% + \def\title{0 << /P (T-) /S /D >>}% + \edef\roman{\the\romancount << /S /r >>}% + \edef\arabic{\the\arabiccount << /S /D >>}% + % + % Page label ranges must be increasing. Remove any duplicates. + % (There is a slight chance of this being wrong if e.g. there is + % a @contents but no @titlepage, etc.) + % + \ifnum\romancount=0 \def\roman{}\fi + \ifnum\arabiccount=0 \def\title{}% + \else + \ifnum\romancount=\arabiccount \def\roman{}\fi + \fi + % + \ifnum\romancount<\arabiccount + \pdfcatalog{/PageLabels << /Nums [\title \roman \arabic ] >> }\relax + \else + \pdfcatalog{/PageLabels << /Nums [\title \arabic \roman ] >> }\relax + \fi +} +\else + \let\pagelabels\relax +\fi + +\newcount\pagecount \pagecount=0 +\newcount\romancount \romancount=0 +\newcount\arabiccount \arabiccount=0 +\ifpdf + \let\ptxadvancepageno\advancepageno + \def\advancepageno{% + \ptxadvancepageno\global\advance\pagecount by 1 + } +\fi + + % PDF uses PostScript string constants for the names of xref targets, % for display in the outlines, and in other places. Thus, we have to % double any backslashes. Otherwise, a name like "\node" will be % interpreted as a newline (\n), followed by o, d, e. Not good. -% +% % See http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html and % related messages. The final outcome is that it is up to the TeX user % to double the backslashes and otherwise make the string valid, so @@ -1219,7 +1240,7 @@ % Set color, and create a mark which defines \thiscolor accordingly, % so that \makeheadline knows which color to restore. \def\setcolor#1{% - \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}% + \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}% \domark \pdfsetcolor{#1}% } @@ -1227,7 +1248,7 @@ \def\maincolor{\rgbBlack} \pdfsetcolor{\maincolor} \edef\thiscolor{\maincolor} - \def\lastcolordefs{} + \def\currentcolordefs{} % \def\makefootline{% \baselineskip24pt @@ -1453,7 +1474,13 @@ % subentries, which we calculated on our first read of the .toc above. % % We use the node names as the destinations. + % + % Currently we prefix the section name with the section number + % for chapter and appendix headings only in order to avoid too much + % horizontal space being required in the PDF viewer. \def\numchapentry##1##2##3##4{% + \dopdfoutline{##2 ##1}{count-\expnumber{chap##2}}{##3}{##4}}% + \def\unnchapentry##1##2##3##4{% \dopdfoutline{##1}{count-\expnumber{chap##2}}{##3}{##4}}% \def\numsecentry##1##2##3##4{% \dopdfoutline{##1}{count-\expnumber{sec##2}}{##3}{##4}}% @@ -1472,7 +1499,7 @@ % their "best" equivalent, based on the @documentencoding. Too % much work for too little return. Just use the ASCII equivalents % we use for the index sort strings. - % + % \indexnofonts \setupdatafile % We can have normal brace characters in the PDF outlines, unlike @@ -1528,6 +1555,9 @@ \startlink attr{/Border [0 0 0]}% user{/Subtype /Link /A << /S /URI /URI (#1) >>}% \endgroup} + % \pdfgettoks - Surround page numbers in #1 with @pdflink. #1 may + % be a simple number, or a list of numbers in the case of an index + % entry. \def\pdfgettoks#1.{\setbox\boxA=\hbox{\toksA={#1.}\toksB={}\maketoks}} \def\addtokens#1#2{\edef\addtoks{\noexpand#1={\the#1#2}}\addtoks} \def\adn#1{\addtokens{\toksC}{#1}\global\countA=1\let\next=\maketoks} @@ -1602,7 +1632,7 @@ % Set color, and create a mark which defines \thiscolor accordingly, % so that \makeheadline knows which color to restore. \def\setcolor#1{% - \xdef\lastcolordefs{\gdef\noexpand\thiscolor{#1}}% + \xdef\currentcolordefs{\gdef\noexpand\thiscolor{#1}}% \domark \pdfsetcolor{#1}% } @@ -1610,7 +1640,7 @@ \def\maincolor{\rgbBlack} \pdfsetcolor{\maincolor} \edef\thiscolor{\maincolor} - \def\lastcolordefs{} + \def\currentcolordefs{} % \def\makefootline{% \baselineskip24pt @@ -1692,9 +1722,13 @@ % Therefore, we read toc only once. % % We use node names as destinations. + % + % Currently we prefix the section name with the section number + % for chapter and appendix headings only in order to avoid too much + % horizontal space being required in the PDF viewer. \def\partentry##1##2##3##4{}% ignore parts in the outlines \def\numchapentry##1##2##3##4{% - \dopdfoutline{##1}{1}{##3}{##4}}% + \dopdfoutline{##2 ##1}{1}{##3}{##4}}% \def\numsecentry##1##2##3##4{% \dopdfoutline{##1}{2}{##3}{##4}}% \def\numsubsecentry##1##2##3##4{% @@ -1706,7 +1740,8 @@ \let\appsecentry\numsecentry% \let\appsubsecentry\numsubsecentry% \let\appsubsubsecentry\numsubsubsecentry% - \let\unnchapentry\numchapentry% + \def\unnchapentry##1##2##3##4{% + \dopdfoutline{##1}{1}{##3}{##4}}% \let\unnsecentry\numsecentry% \let\unnsubsecentry\numsubsecentry% \let\unnsubsubsecentry\numsubsubsecentry% @@ -1835,19 +1870,23 @@ \closein 1 \endgroup % - \def\xetexpdfext{pdf}% - \ifx\xeteximgext\xetexpdfext - \XeTeXpdffile "#1".\xeteximgext "" - \else - \def\xetexpdfext{PDF}% + % Putting an \hbox around the image can prevent an over-long line + % after the image. + \hbox\bgroup + \def\xetexpdfext{pdf}% \ifx\xeteximgext\xetexpdfext \XeTeXpdffile "#1".\xeteximgext "" \else - \XeTeXpicfile "#1".\xeteximgext "" + \def\xetexpdfext{PDF}% + \ifx\xeteximgext\xetexpdfext + \XeTeXpdffile "#1".\xeteximgext "" + \else + \XeTeXpicfile "#1".\xeteximgext "" + \fi \fi - \fi - \ifdim \wd0 >0pt width \xeteximagewidth \fi - \ifdim \wd2 >0pt height \xeteximageheight \fi \relax + \ifdim \wd0 >0pt width \xeteximagewidth \fi + \ifdim \wd2 >0pt height \xeteximageheight \fi \relax + \egroup } \fi @@ -2202,7 +2241,7 @@ % A few fonts for @defun names and args. \setfont\defbf\bfshape{10}{\magstep1}{OT1} \setfont\deftt\ttshape{10}{\magstep1}{OT1TT} -\setfont\defsl\slshape{10}{\magstep1}{OT1TT} +\setfont\defsl\slshape{10}{\magstep1}{OT1} \setfont\defttsl\ttslshape{10}{\magstep1}{OT1TT} \def\df{\let\ttfont=\deftt \let\bffont = \defbf \let\ttslfont=\defttsl \let\slfont=\defsl \bf} @@ -2350,7 +2389,7 @@ % A few fonts for @defun names and args. \setfont\defbf\bfshape{10}{\magstephalf}{OT1} \setfont\deftt\ttshape{10}{\magstephalf}{OT1TT} -\setfont\defsl\slshape{10}{\magstephalf}{OT1TT} +\setfont\defsl\slshape{10}{\magstephalf}{OT1} \setfont\defttsl\ttslshape{10}{\magstephalf}{OT1TT} \def\df{\let\ttfont=\deftt \let\bffont = \defbf \let\slfont=\defsl \let\ttslfont=\defttsl \bf} @@ -2519,7 +2558,7 @@ \def\it{\fam=\itfam \setfontstyle{it}} \def\sl{\fam=\slfam \setfontstyle{sl}} \def\bf{\fam=\bffam \setfontstyle{bf}}\def\bfstylename{bf} -\def\tt{\fam=\ttfam \setfontstyle{tt}} +\def\tt{\fam=\ttfam \setfontstyle{tt}}\def\ttstylename{tt} % Texinfo sort of supports the sans serif font style, which plain TeX does not. % So we set up a \sf. @@ -2645,8 +2684,6 @@ \definetextfontsizexi -\message{markup,} - % Check if we are currently using a typewriter font. Since all the % Computer Modern typewriter fonts have zero interword stretch (and % shrink), and it is reasonable to expect all typewriter fonts to have @@ -2654,68 +2691,14 @@ % \def\ifmonospace{\ifdim\fontdimen3\font=0pt } -% Markup style infrastructure. \defmarkupstylesetup\INITMACRO will -% define and register \INITMACRO to be called on markup style changes. -% \INITMACRO can check \currentmarkupstyle for the innermost -% style. - -\let\currentmarkupstyle\empty - -\def\setupmarkupstyle#1{% - \def\currentmarkupstyle{#1}% - \markupstylesetup -} - -\let\markupstylesetup\empty - -\def\defmarkupstylesetup#1{% - \expandafter\def\expandafter\markupstylesetup - \expandafter{\markupstylesetup #1}% - \def#1% -} - -% Markup style setup for left and right quotes. -\defmarkupstylesetup\markupsetuplq{% - \expandafter\let\expandafter \temp - \csname markupsetuplq\currentmarkupstyle\endcsname - \ifx\temp\relax \markupsetuplqdefault \else \temp \fi -} - -\defmarkupstylesetup\markupsetuprq{% - \expandafter\let\expandafter \temp - \csname markupsetuprq\currentmarkupstyle\endcsname - \ifx\temp\relax \markupsetuprqdefault \else \temp \fi -} - { \catcode`\'=\active \catcode`\`=\active -\gdef\markupsetuplqdefault{\let`\lq} -\gdef\markupsetuprqdefault{\let'\rq} - -\gdef\markupsetcodequoteleft{\let`\codequoteleft} -\gdef\markupsetcodequoteright{\let'\codequoteright} +\gdef\setcodequotes{\let`\codequoteleft \let'\codequoteright} +\gdef\setregularquotes{\let`\lq \let'\rq} } -\let\markupsetuplqcode \markupsetcodequoteleft -\let\markupsetuprqcode \markupsetcodequoteright -% -\let\markupsetuplqexample \markupsetcodequoteleft -\let\markupsetuprqexample \markupsetcodequoteright -% -\let\markupsetuplqkbd \markupsetcodequoteleft -\let\markupsetuprqkbd \markupsetcodequoteright -% -\let\markupsetuplqsamp \markupsetcodequoteleft -\let\markupsetuprqsamp \markupsetcodequoteright -% -\let\markupsetuplqverb \markupsetcodequoteleft -\let\markupsetuprqverb \markupsetcodequoteright -% -\let\markupsetuplqverbatim \markupsetcodequoteleft -\let\markupsetuprqverbatim \markupsetcodequoteright - % Allow an option to not use regular directed right quote/apostrophe % (char 0x27), but instead the undirected quote from cmtt (char 0x0d). % The undirected quote is ugly, so don't make it the default, but it @@ -2753,7 +2736,7 @@ } % Commands to set the quote options. -% +% \parseargdef\codequoteundirected{% \def\temp{#1}% \ifx\temp\onword @@ -2794,7 +2777,7 @@ % If we are in a monospaced environment, however, 1) always use \ttsl, % and 2) do not add an italic correction. \def\dosmartslant#1#2{% - \ifusingtt + \ifusingtt {{\ttsl #2}\let\next=\relax}% {\def\next{{#1#2}\futurelet\next\smartitaliccorrection}}% \next @@ -2873,12 +2856,12 @@ % @t, explicit typewriter. \def\t#1{% - {\tt \rawbackslash \plainfrenchspacing #1}% + {\tt \plainfrenchspacing #1}% \null } % @samp. -\def\samp#1{{\setupmarkupstyle{samp}\lq\tclose{#1}\rq\null}} +\def\samp#1{{\setcodequotes\lq\tclose{#1}\rq\null}} % @indicateurl is \samp, that is, with quotes. \let\indicateurl=\samp @@ -2900,7 +2883,6 @@ % Turn off hyphenation. \nohyphenation % - \rawbackslash \plainfrenchspacing #1% }% @@ -2922,8 +2904,7 @@ \global\let'=\rq \global\let`=\lq % default definitions % \global\def\code{\begingroup - \setupmarkupstyle{code}% - % The following should really be moved into \setupmarkupstyle handlers. + \setcodequotes \catcode\dashChar=\active \catcode\underChar=\active \ifallowcodebreaks \let-\codedash @@ -2942,14 +2923,14 @@ \gdef\codedash{\futurelet\next\codedashfinish} \gdef\codedashfinish{% \normaldash % always output the dash character itself. - % + % % Now, output a discretionary to allow a line break, unless % (a) the next character is a -, or % (b) the preceding character is a -. % E.g., given --posix, we do not want to allow a break after either -. % Given --foo-bar, we do want to allow a break between the - and the b. \ifx\next\codedash \else - \ifx\codedashprev\codedash + \ifx\codedashprev\codedash \else \discretionary{}{}{}\fi \fi % we need the space after the = for the case when \next itself is a @@ -3011,10 +2992,18 @@ % arg (if given), and not the url (which is then just the link target). \newif\ifurefurlonlylink +% The default \pretolerance setting stops the penalty inserted in +% \urefallowbreak being a discouragement to line breaking. Set it to +% a negative value for this paragraph only. Hopefully this does not +% conflict with redefinitions of \par done elsewhere. +\def\nopretolerance{% +\pretolerance=-1 +\def\par{\endgraf\pretolerance=100 \let\par\endgraf}% +} + % The main macro is \urefbreak, which allows breaking at expected -% places within the url. (There used to be another version, which -% didn't support automatic breaking.) -\def\urefbreak{\begingroup \urefcatcodes \dourefbreak} +% places within the url. +\def\urefbreak{\nopretolerance \begingroup \urefcatcodes \dourefbreak} \let\uref=\urefbreak % \def\dourefbreak#1{\urefbreakfinish #1,,,\finish} @@ -3031,7 +3020,7 @@ % For pdfTeX and LuaTeX \ifurefurlonlylink % PDF plus option to not display url, show just arg - \unhbox0 + \unhbox0 \else % PDF, normally display both arg and url for consistency, % visibility, if the pdf is eventually used to print, etc. @@ -3044,7 +3033,7 @@ % For XeTeX \ifurefurlonlylink % PDF plus option to not display url, show just arg - \unhbox0 + \unhbox0 \else % PDF, normally display both arg and url for consistency, % visibility, if the pdf is eventually used to print, etc. @@ -3069,7 +3058,7 @@ \urefcatcodes % \global\def\urefcode{\begingroup - \setupmarkupstyle{code}% + \setcodequotes \urefcatcodes \let&\urefcodeamp \let.\urefcodedot @@ -3087,41 +3076,33 @@ \global\def/{\normalslash} } -% we put a little stretch before and after the breakable chars, to help -% line breaking of long url's. The unequal skips make look better in -% cmtt at least, especially for dots. -\def\urefprestretchamount{.13em} -\def\urefpoststretchamount{.1em} -\def\urefprestretch{\urefprebreak \hskip0pt plus\urefprestretchamount\relax} -\def\urefpoststretch{\urefpostbreak \hskip0pt plus\urefprestretchamount\relax} -% -\def\urefcodeamp{\urefprestretch \&\urefpoststretch} -\def\urefcodedot{\urefprestretch .\urefpoststretch} -\def\urefcodehash{\urefprestretch \#\urefpoststretch} -\def\urefcodequest{\urefprestretch ?\urefpoststretch} +\def\urefcodeamp{\urefprebreak \&\urefpostbreak} +\def\urefcodedot{\urefprebreak .\urefpostbreak} +\def\urefcodehash{\urefprebreak \#\urefpostbreak} +\def\urefcodequest{\urefprebreak ?\urefpostbreak} \def\urefcodeslash{\futurelet\next\urefcodeslashfinish} { \catcode`\/=\active \global\def\urefcodeslashfinish{% - \urefprestretch \slashChar + \urefprebreak \slashChar % Allow line break only after the final / in a sequence of % slashes, to avoid line break between the slashes in http://. - \ifx\next/\else \urefpoststretch \fi + \ifx\next/\else \urefpostbreak \fi } } -% One more complication: by default we'll break after the special -% characters, but some people like to break before the special chars, so -% allow that. Also allow no breaking at all, for manual control. -% +% By default we'll break after the special characters, but some people like to +% break before the special chars, so allow that. Also allow no breaking at +% all, for manual control. +% \parseargdef\urefbreakstyle{% \def\txiarg{#1}% \ifx\txiarg\wordnone \def\urefprebreak{\nobreak}\def\urefpostbreak{\nobreak} \else\ifx\txiarg\wordbefore - \def\urefprebreak{\allowbreak}\def\urefpostbreak{\nobreak} + \def\urefprebreak{\urefallowbreak}\def\urefpostbreak{\nobreak} \else\ifx\txiarg\wordafter - \def\urefprebreak{\nobreak}\def\urefpostbreak{\allowbreak} + \def\urefprebreak{\nobreak}\def\urefpostbreak{\urefallowbreak} \else \errhelp = \EMsimple \errmessage{Unknown @urefbreakstyle setting `\txiarg'}% @@ -3131,6 +3112,19 @@ \def\wordbefore{before} \def\wordnone{none} +% Allow a ragged right output to aid breaking long URL's. There can +% be a break at the \allowbreak with no extra glue (if the existing stretch in +% the line is sufficient), a break at the \penalty with extra glue added +% at the end of the line, or no break at all here. +% Changing the value of the penalty and/or the amount of stretch affects how +% preferable one choice is over the other. +\def\urefallowbreak{% + \penalty0\relax + \hskip 0pt plus 2 em\relax + \penalty1000\relax + \hskip 0pt plus -2 em\relax +} + \urefbreakstyle after % @url synonym for @uref, since that's how everyone uses it. @@ -3141,7 +3135,7 @@ % So now @email is just like @uref, unless we are pdf. % %\def\email#1{\angleleft{\tt #1}\angleright} -\ifpdf +\ifpdforxetex \def\email#1{\doemail#1,,\finish} \def\doemail#1,#2,#3\finish{\begingroup \unsepspaces @@ -3151,18 +3145,7 @@ \endlink \endgroup} \else - \ifx\XeTeXrevision\thisisundefined - \let\email=\uref - \else - \def\email#1{\doemail#1,,\finish} - \def\doemail#1,#2,#3\finish{\begingroup - \unsepspaces - \pdfurl{mailto:#1}% - \setbox0 = \hbox{\ignorespaces #2}% - \ifdim\wd0>0pt\unhbox0\else\code{#1}\fi - \endlink - \endgroup} - \fi + \let\email=\uref \fi % @kbdinputstyle -- arg is `distinct' (@kbd uses slanted tty font always), @@ -3196,8 +3179,8 @@ \def\kbdsub#1#2#3\par{% \def\one{#1}\def\three{#3}\def\threex{??}% \ifx\one\xkey\ifx\threex\three \key{#2}% - \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi - \else{\tclose{\kbdfont\setupmarkupstyle{kbd}\look}}\fi + \else{\tclose{\kbdfont\setcodequotes\look}}\fi + \else{\tclose{\kbdfont\setcodequotes\look}}\fi } % definition of @key that produces a lozenge. Doesn't adjust to text size. @@ -3214,7 +3197,7 @@ % monospace, don't change it; that way, we respect @kbdinputstyle. But % if it isn't monospace, then use \tt. % -\def\key#1{{\setupmarkupstyle{key}% +\def\key#1{{\setregularquotes \nohyphenation \ifmonospace\else\tt\fi #1}\null} @@ -3335,10 +3318,33 @@ \def\sup{\ifmmode \expandafter\ptexsp \else \expandafter\finishsup\fi} \def\finishsup#1{$\ptexsp{\hbox{\switchtolllsize #1}}$}% +% provide this command from LaTeX as it is very common +\def\frac#1#2{{{#1}\over{#2}}} + +% @displaymath. +% \globaldefs is needed to recognize the end lines in \tex and +% \end tex. Set \thisenv as @end displaymath is seen before @end tex. +{\obeylines +\globaldefs=1 +\envdef\displaymath{% +\tex% +\def\thisenv{\displaymath}% +\begingroup\let\end\displaymathend% +$$% +} + +\def\displaymathend{$$\endgroup\end}% + +\def\Edisplaymath{% +\def\thisenv{\tex}% +\end tex +}} + + % @inlinefmt{FMTNAME,PROCESSED-TEXT} and @inlineraw{FMTNAME,RAW-TEXT}. % Ignore unless FMTNAME == tex; then it is like @iftex and @tex, % except specified as a normal braced arg, so no newlines to worry about. -% +% \def\outfmtnametex{tex} % \long\def\inlinefmt#1{\doinlinefmt #1,\finish} @@ -3346,7 +3352,7 @@ \def\inlinefmtname{#1}% \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi } -% +% % @inlinefmtifelse{FMTNAME,THEN-TEXT,ELSE-TEXT} expands THEN-TEXT if % FMTNAME is tex, else ELSE-TEXT. \long\def\inlinefmtifelse#1{\doinlinefmtifelse #1,,,\finish} @@ -3362,7 +3368,7 @@ % *right* brace they would have to use a command anyway, so they may as % well use a command to get a left brace too. We could re-use the % delimiter character idea from \verb, but it seems like overkill. -% +% \long\def\inlineraw{\tex \doinlineraw} \long\def\doinlineraw#1{\doinlinerawtwo #1,\finish} \def\doinlinerawtwo#1,#2,\finish{% @@ -3539,7 +3545,7 @@ % @pounds{} is a sterling sign, which Knuth put in the CM italic font. % -\def\pounds{{\it\$}} +\def\pounds{\ifmonospace{\ecfont\char"BF}\else{\it\$}\fi} % @euro{} comes from a separate font, depending on the current style. % We use the free feym* fonts from the eurosym package by Henrik @@ -3639,7 +3645,7 @@ % for non-CM glyphs. That is ec* for regular text and tc* for the text % companion symbols (LaTeX TS1 encoding). Both are part of the ec % package and follow the same conventions. -% +% \def\ecfont{\etcfont{e}} \def\tcfont{\etcfont{t}} % @@ -3688,11 +3694,19 @@ \fi % Quotes. -\chardef\quotedblleft="5C -\chardef\quotedblright=`\" \chardef\quoteleft=`\` \chardef\quoteright=`\' +% only change font for tt for correct kerning and to avoid using +% \ecfont unless necessary. +\def\quotedblleft{% + \ifmonospace{\ecfont\char"10}\else{\char"5C}\fi +} + +\def\quotedblright{% + \ifmonospace{\ecfont\char"11}\else{\char`\"}\fi +} + \message{page headings,} @@ -3711,7 +3725,7 @@ after the title page.}}% \def\setshortcontentsaftertitlepage{% \errmessage{@setshortcontentsaftertitlepage has been removed as a Texinfo - command; move your @shortcontents and @contents commands if you + command; move your @shortcontents and @contents commands if you want the contents after the title page.}}% \parseargdef\shorttitlepage{% @@ -3766,7 +3780,7 @@ % don't worry much about spacing, ragged right. This should be used % inside a \vbox, and fonts need to be set appropriately first. \par should % be specified before the end of the \vbox, since a vbox is a group. -% +% \def\raggedtitlesettings{% \rm \hyphenpenalty=10000 @@ -3814,12 +3828,19 @@ \newtoks\evenheadline % headline on even pages \newtoks\oddheadline % headline on odd pages +\newtoks\evenchapheadline% headline on even pages with a new chapter +\newtoks\oddchapheadline % headline on odd pages with a new chapter \newtoks\evenfootline % footline on even pages \newtoks\oddfootline % footline on odd pages % Now make \makeheadline and \makefootline in Plain TeX use those variables -\headline={{\textfonts\rm \ifodd\pageno \the\oddheadline - \else \the\evenheadline \fi}} +\headline={{\textfonts\rm + \ifchapterpage + \ifodd\pageno\the\oddchapheadline\else\the\evenchapheadline\fi + \else + \ifodd\pageno\the\oddheadline\else\the\evenheadline\fi + \fi}} + \footline={{\textfonts\rm \ifodd\pageno \the\oddfootline \else \the\evenfootline \fi}\HEADINGShook} \let\HEADINGShook=\relax @@ -3835,12 +3856,14 @@ \def\evenheading{\parsearg\evenheadingxxx} \def\evenheadingxxx #1{\evenheadingyyy #1\|\|\|\|\finish} \def\evenheadingyyy #1\|#2\|#3\|#4\finish{% -\global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} + \global\evenheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}} + \global\evenchapheadline=\evenheadline} \def\oddheading{\parsearg\oddheadingxxx} \def\oddheadingxxx #1{\oddheadingyyy #1\|\|\|\|\finish} \def\oddheadingyyy #1\|#2\|#3\|#4\finish{% -\global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}} + \global\oddheadline={\rlap{\centerline{#2}}\line{#1\hfil#3}}% + \global\oddchapheadline=\oddheadline} \parseargdef\everyheading{\oddheadingxxx{#1}\evenheadingxxx{#1}}% @@ -3907,37 +3930,34 @@ \parseargdef\headings{\csname HEADINGS#1\endcsname} \def\headingsoff{% non-global headings elimination - \evenheadline={\hfil}\evenfootline={\hfil}% - \oddheadline={\hfil}\oddfootline={\hfil}% + \evenheadline={\hfil}\evenfootline={\hfil}\evenchapheadline={\hfil}% + \oddheadline={\hfil}\oddfootline={\hfil}\oddchapheadline={\hfil}% } \def\HEADINGSoff{{\globaldefs=1 \headingsoff}} % global setting \HEADINGSoff % it's the default % When we turn headings on, set the page number to 1. +\def\pageone{ + \global\pageno=1 + \global\arabiccount = \pagecount +} + % For double-sided printing, put current file name in lower left corner, % chapter name on inside top of right hand pages, document % title on inside top of left hand pages, and page numbers on outside top % edge of all pages. \def\HEADINGSdouble{% -\global\pageno=1 -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\folio\hfil\thistitle}} -\global\oddheadline={\line{\thischapterheading\hfil\folio}} -\global\let\contentsalignmacro = \chapoddpage +\pageone +\HEADINGSdoublex } \let\contentsalignmacro = \chappager % For single-sided printing, chapter title goes across top left of page, % page number on top right. \def\HEADINGSsingle{% -\global\pageno=1 -\global\evenfootline={\hfil} -\global\oddfootline={\hfil} -\global\evenheadline={\line{\thischapterheading\hfil\folio}} -\global\oddheadline={\line{\thischapterheading\hfil\folio}} -\global\let\contentsalignmacro = \chappager +\pageone +\HEADINGSsinglex } \def\HEADINGSon{\HEADINGSdouble} @@ -3947,7 +3967,9 @@ \global\evenfootline={\hfil} \global\oddfootline={\hfil} \global\evenheadline={\line{\folio\hfil\thistitle}} -\global\oddheadline={\line{\thischapterheading\hfil\folio}} +\global\oddheadline={\line{\thischapter\hfil\folio}} +\global\evenchapheadline={\line{\folio\hfil}} +\global\oddchapheadline={\line{\hfil\folio}} \global\let\contentsalignmacro = \chapoddpage } @@ -3955,8 +3977,22 @@ \def\HEADINGSsinglex{% \global\evenfootline={\hfil} \global\oddfootline={\hfil} -\global\evenheadline={\line{\thischapterheading\hfil\folio}} -\global\oddheadline={\line{\thischapterheading\hfil\folio}} +\global\evenheadline={\line{\thischapter\hfil\folio}} +\global\oddheadline={\line{\thischapter\hfil\folio}} +\global\evenchapheadline={\line{\hfil\folio}} +\global\oddchapheadline={\line{\hfil\folio}} +\global\let\contentsalignmacro = \chappager +} + +% for @setchapternewpage off +\def\HEADINGSsinglechapoff{% +\pageone +\global\evenfootline={\hfil} +\global\oddfootline={\hfil} +\global\evenheadline={\line{\thischapter\hfil\folio}} +\global\oddheadline={\line{\thischapter\hfil\folio}} +\global\evenchapheadline=\evenheadline +\global\oddchapheadline=\oddheadline \global\let\contentsalignmacro = \chappager } @@ -4265,82 +4301,8 @@ \doitemize{#1.}\flushcr } -% @alphaenumerate and @capsenumerate are abbreviations for giving an arg -% to @enumerate. -% -\def\alphaenumerate{\enumerate{a}} -\def\capsenumerate{\enumerate{A}} -\def\Ealphaenumerate{\Eenumerate} -\def\Ecapsenumerate{\Eenumerate} - % @multitable macros -% Amy Hendrickson, 8/18/94, 3/6/96 -% -% @multitable ... @end multitable will make as many columns as desired. -% Contents of each column will wrap at width given in preamble. Width -% can be specified either with sample text given in a template line, -% or in percent of \hsize, the current width of text on page. - -% Table can continue over pages but will only break between lines. - -% To make preamble: -% -% Either define widths of columns in terms of percent of \hsize: -% @multitable @columnfractions .25 .3 .45 -% @item ... -% -% Numbers following @columnfractions are the percent of the total -% current hsize to be used for each column. You may use as many -% columns as desired. - - -% Or use a template: -% @multitable {Column 1 template} {Column 2 template} {Column 3 template} -% @item ... -% using the widest term desired in each column. - -% Each new table line starts with @item, each subsequent new column -% starts with @tab. Empty columns may be produced by supplying @tab's -% with nothing between them for as many times as empty columns are needed, -% ie, @tab@tab@tab will produce two empty columns. - -% @item, @tab do not need to be on their own lines, but it will not hurt -% if they are. - -% Sample multitable: - -% @multitable {Column 1 template} {Column 2 template} {Column 3 template} -% @item first col stuff @tab second col stuff @tab third col -% @item -% first col stuff -% @tab -% second col stuff -% @tab -% third col -% @item first col stuff @tab second col stuff -% @tab Many paragraphs of text may be used in any column. -% -% They will wrap at the width determined by the template. -% @item@tab@tab This will be in third column. -% @end multitable - -% Default dimensions may be reset by user. -% @multitableparskip is vertical space between paragraphs in table. -% @multitableparindent is paragraph indent in table. -% @multitablecolmargin is horizontal space to be left between columns. -% @multitablelinespace is space to leave between table items, baseline -% to baseline. -% 0pt means it depends on current normal line spacing. -% -\newskip\multitableparskip -\newskip\multitableparindent -\newdimen\multitablecolspace -\newskip\multitablelinespace -\multitableparskip=0pt -\multitableparindent=6pt -\multitablecolspace=12pt -\multitablelinespace=0pt % Macros used to set up halign preamble: % @@ -4388,8 +4350,6 @@ \go } -% multitable-only commands. -% % @headitem starts a heading row, which we typeset in bold. Assignments % have to be global since we are inside the implicit group of an % alignment entry. \everycr below resets \everytab so we don't have to @@ -4406,14 +4366,8 @@ % default for tables with no headings. \let\headitemcrhook=\relax % -% A \tab used to include \hskip1sp. But then the space in a template -% line is not enough. That is bad. So let's go back to just `&' until -% we again encounter the problem the 1sp was intended to solve. -% --karl, nathan@acm.org, 20apr99. \def\tab{\checkenv\multitable &\the\everytab}% -% @multitable ... @end multitable definitions: -% \newtoks\everytab % insert after every tab. % \envdef\multitable{% @@ -4428,9 +4382,8 @@ % \tolerance=9500 \hbadness=9500 - \setmultitablespacing - \parskip=\multitableparskip - \parindent=\multitableparindent + \parskip=0pt + \parindent=6pt \overfullrule=0pt \global\colcount=0 % @@ -4460,47 +4413,24 @@ % continue for many paragraphs if desired. \halign\bgroup &% \global\advance\colcount by 1 - \multistrut + \strut \vtop{% - % Use the current \colcount to find the correct column width: + \advance\hsize by -1\leftskip + % Find the correct column width \hsize=\expandafter\csname col\the\colcount\endcsname % - % In order to keep entries from bumping into each other - % we will add a \leftskip of \multitablecolspace to all columns after - % the first one. - % - % If a template has been used, we will add \multitablecolspace - % to the width of each template entry. - % - % If the user has set preamble in terms of percent of \hsize we will - % use that dimension as the width of the column, and the \leftskip - % will keep entries from bumping into each other. Table will start at - % left margin and final column will justify at right margin. - % - % Make sure we don't inherit \rightskip from the outer environment. \rightskip=0pt \ifnum\colcount=1 - % The first column will be indented with the surrounding text. - \advance\hsize by\leftskip + \advance\hsize by\leftskip % Add indent of surrounding text \else - \ifsetpercent \else - % If user has not set preamble in terms of percent of \hsize - % we will advance \hsize by \multitablecolspace. - \advance\hsize by \multitablecolspace - \fi - % In either case we will make \leftskip=\multitablecolspace: - \leftskip=\multitablecolspace + % In order to keep entries from bumping into each other. + \leftskip=12pt + \ifsetpercent \else + % If a template has been used + \advance\hsize by \leftskip + \fi \fi - % Ignoring space at the beginning and end avoids an occasional spurious - % blank line, when TeX decides to break the line at the space before the - % box from the multistrut, so the strut ends up on a line by itself. - % For example: - % @multitable @columnfractions .11 .89 - % @item @code{#} - % @tab Legal holiday which is valid in major parts of the whole country. - % Is automatically provided with highlighting sequences respectively - % marking characters. - \noindent\ignorespaces##\unskip\multistrut + \noindent\ignorespaces##\unskip\strut }\cr } \def\Emultitable{% @@ -4509,31 +4439,6 @@ \global\setpercentfalse } -\def\setmultitablespacing{% - \def\multistrut{\strut}% just use the standard line spacing - % - % Compute \multitablelinespace (if not defined by user) for use in - % \multitableparskip calculation. We used define \multistrut based on - % this, but (ironically) that caused the spacing to be off. - % See bug-texinfo report from Werner Lemberg, 31 Oct 2004 12:52:20 +0100. -\ifdim\multitablelinespace=0pt -\setbox0=\vbox{X}\global\multitablelinespace=\the\baselineskip -\global\advance\multitablelinespace by-\ht0 -\fi -% Test to see if parskip is larger than space between lines of -% table. If not, do nothing. -% If so, set to same dimension as multitablelinespace. -\ifdim\multitableparskip>\multitablelinespace -\global\multitableparskip=\multitablelinespace -\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller - % than skip between lines in the table. -\fi% -\ifdim\multitableparskip=0pt -\global\multitableparskip=\multitablelinespace -\global\advance\multitableparskip-7pt % to keep parskip somewhat smaller - % than skip between lines in the table. -\fi} - \message{conditionals,} @@ -4696,19 +4601,6 @@ } } -% We have this subroutine so that we can handle at least some @value's -% properly in indexes (we call \makevalueexpandable in \indexdummies). -% The command has to be fully expandable (if the variable is set), since -% the result winds up in the index file. This means that if the -% variable's value contains other Texinfo commands, it's almost certain -% it will fail (although perhaps we could fix that with sufficient work -% to do a one-level expansion on the result, instead of complete). -% -% Unfortunately, this has the consequence that when _ is in the *value* -% of an @set, it does not print properly in the roman fonts (get the cmr -% dot accent at position 126 instead). No fix comes to mind, and it's -% been this way since 2003 or earlier, so just ignore it. -% \def\expandablevalue#1{% \expandafter\ifx\csname SET#1\endcsname\relax {[No value for ``#1'']}% @@ -4721,13 +4613,13 @@ % Like \expandablevalue, but completely expandable (the \message in the % definition above operates at the execution level of TeX). Used when % writing to auxiliary files, due to the expansion that \write does. -% If flag is undefined, pass through an unexpanded @value command: maybe it +% If flag is undefined, pass through an unexpanded @value command: maybe it % will be set by the time it is read back in. % % NB flag names containing - or _ may not work here. \def\dummyvalue#1{% \expandafter\ifx\csname SET#1\endcsname\relax - \noexpand\value{#1}% + \string\value{#1}% \else \csname SET#1\endcsname \fi @@ -4737,7 +4629,7 @@ % if possible, otherwise sort late. \def\indexnofontsvalue#1{% \expandafter\ifx\csname SET#1\endcsname\relax - ZZZZZZZ + ZZZZZZZ% \else \csname SET#1\endcsname \fi @@ -4745,7 +4637,7 @@ % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined % with @set. -% +% % To get the special treatment we need for `@end ifset,' we call % \makecond and then redefine. % @@ -4778,7 +4670,7 @@ % without the @) is in fact defined. We can only feasibly check at the % TeX level, so something like `mathcode' is going to considered % defined even though it is not a Texinfo command. -% +% \makecond{ifcommanddefined} \def\ifcommanddefined{\parsearg{\doifcmddefined{\let\next=\ifcmddefinedfail}}} % @@ -4884,32 +4776,18 @@ % like the previous two, but they put @code around the argument. \def\docodeindex#1{\edef\indexname{#1}\parsearg\docodeindexxxx} -\def\docodeindexxxx #1{\doind{\indexname}{\code{#1}}} +\def\docodeindexxxx #1{\docind{\indexname}{#1}} - -% Used when writing an index entry out to an index file to prevent -% expansion of Texinfo commands that can appear in an index entry. -% -\def\indexdummies{% - \escapechar = `\\ % use backslash in output files. - \definedummyletter\@% - \definedummyletter\ % - % - % For texindex which always views { and } as separators. - \def\{{\lbracechar{}}% - \def\}{\rbracechar{}}% - % - % Do the redefinitions. - \definedummies -} -% Used for the aux and toc files, where @ is the escape character. +% Used for the aux, toc and index files to prevent expansion of Texinfo +% commands. % \def\atdummies{% \definedummyletter\@% \definedummyletter\ % \definedummyletter\{% \definedummyletter\}% + \definedummyletter\&% % % Do the redefinitions. \definedummies @@ -4933,8 +4811,7 @@ \def\definedummyletter#1{\def#1{\string#1}}% \let\definedummyaccent\definedummyletter -% Called from \indexdummies and \atdummies, to effectively prevent -% the expansion of commands. +% Called from \atdummies to prevent the expansion of commands. % \def\definedummies{% % @@ -4981,8 +4858,10 @@ \definedummyword\TeX % % Assorted special characters. + \definedummyword\ampchar \definedummyword\atchar \definedummyword\arrow + \definedummyword\backslashchar \definedummyword\bullet \definedummyword\comma \definedummyword\copyright @@ -5019,6 +4898,8 @@ \definedummyword\sup \definedummyword\textdegree % + \definedummyword\subentry + % % We want to disable all macros so that they are not expanded by \write. \macrolist \let\value\dummyvalue @@ -5099,11 +4980,10 @@ \commondummyword\xref } -% For testing: output @{ and @} in index sort strings as \{ and \}. -\newif\ifusebracesinindexes - \let\indexlbrace\relax \let\indexrbrace\relax +\let\indexatchar\relax +\let\indexbackslash\relax {\catcode`\@=0 \catcode`\\=13 @@ -5137,10 +5017,8 @@ } \gdef\indexnonalnumreappear{% - \useindexbackslash \let-\normaldash \let<\normalless - \def\@{@}% } } @@ -5195,43 +5073,44 @@ \def\ss{ss}% \def\th{th}% % - \def\LaTeX{LaTeX}% - \def\TeX{TeX}% + \let\do\indexnofontsdef + % + \do\LaTeX{LaTeX}% + \do\TeX{TeX}% % - % Assorted special characters. \defglyph gives the control sequence a - % definition that removes the {} that follows its use. - \defglyph\atchar{@}% - \defglyph\arrow{->}% - \defglyph\bullet{bullet}% - \defglyph\comma{,}% - \defglyph\copyright{copyright}% - \defglyph\dots{...}% - \defglyph\enddots{...}% - \defglyph\equiv{==}% - \defglyph\error{error}% - \defglyph\euro{euro}% - \defglyph\expansion{==>}% - \defglyph\geq{>=}% - \defglyph\guillemetleft{<<}% - \defglyph\guillemetright{>>}% - \defglyph\guilsinglleft{<}% - \defglyph\guilsinglright{>}% - \defglyph\leq{<=}% - \defglyph\lbracechar{\{}% - \defglyph\minus{-}% - \defglyph\point{.}% - \defglyph\pounds{pounds}% - \defglyph\print{-|}% - \defglyph\quotedblbase{"}% - \defglyph\quotedblleft{"}% - \defglyph\quotedblright{"}% - \defglyph\quoteleft{`}% - \defglyph\quoteright{'}% - \defglyph\quotesinglbase{,}% - \defglyph\rbracechar{\}}% - \defglyph\registeredsymbol{R}% - \defglyph\result{=>}% - \defglyph\textdegree{o}% + % Assorted special characters. + \do\atchar{@}% + \do\arrow{->}% + \do\bullet{bullet}% + \do\comma{,}% + \do\copyright{copyright}% + \do\dots{...}% + \do\enddots{...}% + \do\equiv{==}% + \do\error{error}% + \do\euro{euro}% + \do\expansion{==>}% + \do\geq{>=}% + \do\guillemetleft{<<}% + \do\guillemetright{>>}% + \do\guilsinglleft{<}% + \do\guilsinglright{>}% + \do\leq{<=}% + \do\lbracechar{\{}% + \do\minus{-}% + \do\point{.}% + \do\pounds{pounds}% + \do\print{-|}% + \do\quotedblbase{"}% + \do\quotedblleft{"}% + \do\quotedblright{"}% + \do\quoteleft{`}% + \do\quoteright{'}% + \do\quotesinglbase{,}% + \do\rbracechar{\}}% + \do\registeredsymbol{R}% + \do\result{=>}% + \do\textdegree{o}% % % We need to get rid of all macros, leaving only the arguments (if present). % Of course this is not nearly correct, but it is the best we can do for now. @@ -5246,41 +5125,38 @@ \macrolist \let\value\indexnofontsvalue } -\def\defglyph#1#2{\def#1##1{#2}} % see above - +% Give the control sequence a definition that removes the {} that follows +% its use, e.g. @AA{} -> AA +\def\indexnofontsdef#1#2{\def#1##1{#2}}% -\let\SETmarginindex=\relax % put index entries in margin (undocumented)? -% Most index entries go through here, but \dosubind is the general case. -% #1 is the index name, #2 is the entry text. -\def\doind#1#2{\dosubind{#1}{#2}{}} -% There is also \dosubind {index}{topic}{subtopic} -% which makes an entry in a two-level index such as the operation index. -% TODO: Two-level index? Operation index? - -% Workhorse for all indexes. -% #1 is name of index, #2 is stuff to put there, #3 is subentry -- -% empty if called from \doind, as we usually are (the main exception -% is with most defuns, which call us directly). -% -\def\dosubind#1#2#3{% +% #1 is the index name, #2 is the entry text. +\def\doind#1#2{% \iflinks {% + % \requireopenindexfile{#1}% - % Store the main index entry text (including the third arg). - \toks0 = {#2}% - % If third arg is present, precede it with a space. - \def\thirdarg{#3}% - \ifx\thirdarg\empty \else - \toks0 = \expandafter{\the\toks0 \space #3}% - \fi + \edef\writeto{\csname#1indfile\endcsname}% + % + \def\indextext{#2}% + \safewhatsit\doindwrite + }% + \fi +} + +% Same as \doind, but for code indices +\def\docind#1#2{% + \iflinks + {% % + \requireopenindexfile{#1}% \edef\writeto{\csname#1indfile\endcsname}% % - \safewhatsit\dosubindwrite + \def\indextext{#2}% + \safewhatsit\docindwrite }% \fi } @@ -5295,28 +5171,14 @@ \ifx\suffix\indexisfl\def\suffix{f1}\fi % Open the file \immediate\openout\csname#1indfile\endcsname \jobname.\suffix - % Using \immediate above here prevents an object entering into the current + % Using \immediate above here prevents an object entering into the current % box, which could confound checks such as those in \safewhatsit for % preceding skips. \typeout{Writing index file \jobname.\suffix}% \fi} \def\indexisfl{fl} -% Output \ as {\indexbackslash}, because \ is an escape character in -% the index files. -\let\indexbackslash=\relax -{\catcode`\@=0 \catcode`\\=\active - @gdef@useindexbackslash{@def\{{@indexbackslash}}} -} - -% Definition for writing index entry text. -\def\sortas#1{\ignorespaces}% - -% Definition for writing index entry sort key. Should occur at the at -% the beginning of the index entry, like -% @cindex @sortas{september} \september -% The \ignorespaces takes care of following space, but there's no way -% to remove space before it. +% Definition for writing index entry sort key. { \catcode`\-=13 \gdef\indexwritesortas{% @@ -5327,51 +5189,158 @@ \xdef\indexsortkey{#1}\endgroup} } +\def\indexwriteseealso#1{ + \gdef\pagenumbertext{\string\seealso{#1}}% +} +\def\indexwriteseeentry#1{ + \gdef\pagenumbertext{\string\seeentry{#1}}% +} + +% The default definitions +\def\sortas#1{}% +\def\seealso#1{\i{\putwordSeeAlso}\ #1}% for sorted index file only +\def\putwordSeeAlso{See also} +\def\seeentry#1{\i{\putwordSee}\ #1}% for sorted index file only + -% Write the entry in \toks0 to the index file. +% Given index entry text like "aaa @subentry bbb @sortas{ZZZ}": +% * Set \bracedtext to "{aaa}{bbb}" +% * Set \fullindexsortkey to "aaa @subentry ZZZ" +% * If @seealso occurs, set \pagenumbertext % -\def\dosubindwrite{% - % Put the index entry in the margin if desired. - \ifx\SETmarginindex\relax\else - \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \the\toks0}}% +\def\splitindexentry#1{% + \gdef\fullindexsortkey{}% + \xdef\bracedtext{}% + \def\sep{}% + \def\seealso##1{}% + \def\seeentry##1{}% + \expandafter\doindexsegment#1\subentry\finish\subentry +} + +% append the results from the next segment +\def\doindexsegment#1\subentry{% + \def\segment{#1}% + \ifx\segment\isfinish + \else + % + % Fully expand the segment, throwing away any @sortas directives, and + % trim spaces. + \edef\trimmed{\segment}% + \edef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}% + \ifincodeindex + \edef\trimmed{\noexpand\code{\trimmed}}% + \fi + % + \xdef\bracedtext{\bracedtext{\trimmed}}% + % + % Get the string to sort by. Process the segment with all + % font commands turned off. + \bgroup + \let\sortas\indexwritesortas + \let\seealso\indexwriteseealso + \let\seeentry\indexwriteseeentry + \indexnofonts + % The braces around the commands are recognized by texindex. + \def\lbracechar{{\string\indexlbrace}}% + \def\rbracechar{{\string\indexrbrace}}% + \let\{=\lbracechar + \let\}=\rbracechar + \def\@{{\string\indexatchar}}% + \def\atchar##1{\@}% + \def\backslashchar{{\string\indexbackslash}}% + \uccode`\~=`\\ \uppercase{\let~\backslashchar}% + % + \let\indexsortkey\empty + \global\let\pagenumbertext\empty + % Execute the segment and throw away the typeset output. This executes + % any @sortas or @seealso commands in this segment. + \setbox\dummybox = \hbox{\segment}% + \ifx\indexsortkey\empty{% + \indexnonalnumdisappear + \xdef\trimmed{\segment}% + \xdef\trimmed{\expandafter\eatspaces\expandafter{\trimmed}}% + \xdef\indexsortkey{\trimmed}% + \ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi + }\fi + % + % Append to \fullindexsortkey. + \edef\tmp{\gdef\noexpand\fullindexsortkey{% + \fullindexsortkey\sep\indexsortkey}}% + \tmp + \egroup + \def\sep{\subentry}% + % + \expandafter\doindexsegment \fi +} +\def\isfinish{\finish}% +\newbox\dummybox % used above + +\let\subentry\relax + +% Use \ instead of @ in index files. To support old texi2dvi and texindex. +% This works without changing the escape character used in the toc or aux +% files because the index entries are fully expanded here, and \string uses +% the current value of \escapechar. +\def\escapeisbackslash{\escapechar=`\\} + +% Use \ in index files by default. texi2dvi didn't support @ as the escape +% character (as it checked for "\entry" in the files, and not "@entry"). When +% the new version of texi2dvi has had a chance to become more prevalent, then +% the escape character can change back to @ again. This should be an easy +% change to make now because both @ and \ are only used as escape characters in +% index files, never standing for themselves. +% +\set txiindexescapeisbackslash + +% Write the entry in \indextext to the index file. +% + +\newif\ifincodeindex +\def\doindwrite{\incodeindexfalse\doindwritex} +\def\docindwrite{\incodeindextrue\doindwritex} + +\def\doindwritex{% + \maybemarginindex % - % Remember, we are within a group. - \indexdummies % Must do this here, since \bf, etc expand at this stage - \useindexbackslash % \indexbackslash isn't defined now so it will be output - % as is; and it will print as backslash. - % The braces around \indexbrace are recognized by texindex. - % - % Get the string to sort by, by processing the index entry with all - % font commands turned off. - {\indexnofonts - \def\lbracechar{{\indexlbrace}}% - \def\rbracechar{{\indexrbrace}}% - \let\{=\lbracechar - \let\}=\rbracechar - \indexnonalnumdisappear - \xdef\indexsortkey{}% - \let\sortas=\indexwritesortas - \edef\temp{\the\toks0}% - \setbox\dummybox = \hbox{\temp}% Make sure to execute any \sortas - \ifx\indexsortkey\empty - \xdef\indexsortkey{\temp}% - \ifx\indexsortkey\empty\xdef\indexsortkey{ }\fi - \fi - }% + \atdummies + % + \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax\else + \escapeisbackslash + \fi + % + % For texindex which always views { and } as separators. + \def\{{\lbracechar{}}% + \def\}{\rbracechar{}}% + \uccode`\~=`\\ \uppercase{\def~{\backslashchar{}}}% + % + % Split the entry into primary entry and any subentries, and get the index + % sort key. + \splitindexentry\indextext % % Set up the complete index entry, with both the sort key and % the original text, including any font commands. We write % three arguments to \entry to the .?? file (four in the % subentry case), texindex reduces to two when writing the .??s % sorted result. + % \edef\temp{% \write\writeto{% - \string\entry{\indexsortkey}{\noexpand\folio}{\the\toks0}}% + \string\entry{\fullindexsortkey}% + {\ifx\pagenumbertext\empty\noexpand\folio\else\pagenumbertext\fi}% + \bracedtext}% }% \temp } -\newbox\dummybox % used above + +% Put the index entry in the margin if desired (undocumented). +\def\maybemarginindex{% + \ifx\SETmarginindex\relax\else + \insert\margin{\hbox{\vrule height8pt depth3pt width0pt \relax\indextext}}% + \fi +} +\let\SETmarginindex=\relax + % Take care of unwanted page breaks/skips around a whatsit: % @@ -5459,9 +5428,14 @@ % \entry {topic}{pagelist} % for a topic that is used without subtopics % \primary {topic} +% \entry {topic}{} % for the beginning of a topic that is used with subtopics % \secondary {subtopic}{pagelist} % for each subtopic. +% \secondary {subtopic}{} +% for a subtopic with sub-subtopics +% \tertiary {subtopic}{subsubtopic}{pagelist} +% for each sub-subtopic. % Define the user-accessible indexing commands % @findex, @vindex, @kindex, @cindex. @@ -5473,11 +5447,6 @@ \def\tindex {\tpindex} \def\pindex {\pgindex} -\def\cindexsub {\begingroup\obeylines\cindexsub} -{\obeylines % -\gdef\cindexsub "#1" #2^^M{\endgroup % -\dosubind{cp}{#2}{#1}}} - % Define the macros used in formatting output of the sorted index material. % @printindex causes a particular index (the ??s file) to get printed. @@ -5491,14 +5460,10 @@ \plainfrenchspacing \everypar = {}% don't want the \kern\-parindent from indentation suppression. % - % See if the index file exists and is nonempty. - % Change catcode of @ here so that if the index file contains - % \initial {@} - % as its first line, TeX doesn't complain about mismatched braces - % (because it thinks @} is a control sequence). - \catcode`\@ = 12 % See comment in \requireopenindexfile. \def\indexname{#1}\ifx\indexname\indexisfl\def\indexname{f1}\fi + % + % See if the index file exists and is nonempty. \openin 1 \jobname.\indexname s \ifeof 1 % \enddoublecolumns gets confused if there is no text in the index, @@ -5508,8 +5473,6 @@ \putwordIndexNonexistent \typeout{No file \jobname.\indexname s.}% \else - \catcode`\\ = 0 - % % If the index file exists but is empty, then \openin leaves \ifeof % false. We have to make TeX try to read something from the file, so % it can discover if there is anything in it. @@ -5517,47 +5480,55 @@ \ifeof 1 \putwordIndexIsEmpty \else - % Index files are almost Texinfo source, but we use \ as the escape - % character. It would be better to use @, but that's too big a change - % to make right now. - \def\indexbackslash{\ttbackslash}% - \let\indexlbrace\{ % Likewise, set these sequences for braces - \let\indexrbrace\} % used in the sort key. - \begindoublecolumns - \let\dotheinsertentrybox\dotheinsertentryboxwithpenalty - % - % Read input from the index file line by line. - \loopdo - \ifeof1 \else - \read 1 to \nextline - \fi - % - \indexinputprocessing - \thisline - % - \ifeof1\else - \let\thisline\nextline - \repeat - %% - \enddoublecolumns + \expandafter\printindexzz\thisline\relax\relax\finish% \fi \fi \closein 1 \endgroup} -\def\loopdo#1\repeat{\def\body{#1}\loopdoxxx} -\def\loopdoxxx{\let\next=\relax\body\let\next=\loopdoxxx\fi\next} -\def\indexinputprocessing{% - \ifeof1 - \let\firsttoken\relax +% If the index file starts with a backslash, forgo reading the index +% file altogether. If somebody upgrades texinfo.tex they may still have +% old index files using \ as the escape character. Reading this would +% at best lead to typesetting garbage, at worst a TeX syntax error. +\def\printindexzz#1#2\finish{% + \expandafter\ifx\csname SETtxiindexescapeisbackslash\endcsname\relax + \uccode`\~=`\\ \uppercase{\if\noexpand~}\noexpand#1 + \expandafter\ifx\csname SETtxiskipindexfileswithbackslash\endcsname\relax +\errmessage{% +ERROR: A sorted index file in an obsolete format was skipped. +To fix this problem, please upgrade your version of 'texi2dvi' +or 'texi2pdf' to that at . +If you are using an old version of 'texindex' (part of the Texinfo +distribution), you may also need to upgrade to a newer version (at least 6.0). +You may be able to typeset the index if you run +'texindex \jobname.\indexname' yourself. +You could also try setting the 'txiindexescapeisbackslash' flag by +running a command like +'texi2dvi -t "@set txiindexescapeisbackslash" \jobname.texi'. If you do +this, Texinfo will try to use index files in the old format. +If you continue to have problems, deleting the index files and starting again +might help (with 'rm \jobname.?? \jobname.??s')% +}% + \else + (Skipped sorted index file in obsolete format) + \fi + \else + \begindoublecolumns + \input \jobname.\indexname s + \enddoublecolumns + \fi \else - \edef\act{\gdef\noexpand\firsttoken{\getfirsttoken\nextline}}% - \act + \begindoublecolumns + \catcode`\\=0\relax + % + % Make @ an escape character to give macros a chance to work. This + % should work because we (hopefully) don't otherwise use @ in index files. + %\catcode`\@=12\relax + \catcode`\@=0\relax + \input \jobname.\indexname s + \enddoublecolumns \fi } -\def\getfirsttoken#1{\expandafter\getfirsttokenx#1\endfirsttoken} -\long\def\getfirsttokenx#1#2\endfirsttoken{\noexpand#1} - % These macros are used by the sorted index file itself. % Change them to control the appearance of the index. @@ -5566,12 +5537,19 @@ \catcode`\|=13 \catcode`\<=13 \catcode`\>=13 \catcode`\+=13 \catcode`\"=13 \catcode`\$=3 \gdef\initialglyphs{% + % special control sequences used in the index sort key + \let\indexlbrace\{% + \let\indexrbrace\}% + \let\indexatchar\@% + \def\indexbackslash{\math{\backslash}}% + % % Some changes for non-alphabetic characters. Using the glyphs from the % math fonts looks more consistent than the typewriter font used elsewhere % for these characters. - \def\indexbackslash{\math{\backslash}}% - \let\\=\indexbackslash + \uccode`\~=`\\ \uppercase{\def~{\math{\backslash}}} % + % In case @\ is used for backslash + \uppercase{\let\\=~} % Can't get bold backslash so don't use bold forward slash \catcode`\/=13 \def/{{\secrmnotbold \normalslash}}% @@ -5601,7 +5579,7 @@ % bottom of a column to reduce an increase in inter-line spacing. \nobreak \vskip 0pt plus 5\baselineskip - \penalty -300 + \penalty -300 \vskip 0pt plus -5\baselineskip % % Typeset the initial. Making this add up to a whole number of @@ -5631,12 +5609,6 @@ \def\entry{% \begingroup % - % For pdfTeX and XeTeX. - % The redefinition of \domark stops marks being added in \pdflink to - % preserve coloured links across page boundaries. Otherwise the marks - % would get in the way of \lastbox in \insertentrybox. - \let\domark\relax - % % Start a new paragraph if necessary, so our assignments below can't % affect previous text. \par @@ -5669,35 +5641,31 @@ \gdef\finishentry#1{% \egroup % end box A \dimen@ = \wd\boxA % Length of text of entry - \global\setbox\boxA=\hbox\bgroup\unhbox\boxA - % #1 is the page number. - % - % Get the width of the page numbers, and only use - % leaders if they are present. - \global\setbox\boxB = \hbox{#1}% - \ifdim\wd\boxB = 0pt - \null\nobreak\hfill\ % - \else - % - \null\nobreak\indexdotfill % Have leaders before the page number. + \global\setbox\boxA=\hbox\bgroup + \unhbox\boxA + % #1 is the page number. % - \ifpdf - \pdfgettoks#1.% - \hskip\skip\thinshrinkable\the\toksA + % Get the width of the page numbers, and only use + % leaders if they are present. + \global\setbox\boxB = \hbox{#1}% + \ifdim\wd\boxB = 0pt + \null\nobreak\hfill\ % \else - \ifx\XeTeXrevision\thisisundefined - \hskip\skip\thinshrinkable #1% - \else + % + \null\nobreak\indexdotfill % Have leaders before the page number. + % + \ifpdforxetex \pdfgettoks#1.% \hskip\skip\thinshrinkable\the\toksA + \else + \hskip\skip\thinshrinkable #1% \fi \fi - \fi \egroup % end \boxA \ifdim\wd\boxB = 0pt - \global\setbox\entrybox=\vbox{\unhbox\boxA}% - \else - \global\setbox\entrybox=\vbox\bgroup + \noindent\unhbox\boxA\par + \nobreak + \else\bgroup % We want the text of the entries to be aligned to the left, and the % page numbers to be aligned to the right. % @@ -5727,7 +5695,7 @@ \advance\dimen@ii by 1\dimen@i \ifdim\wd\boxA > \dimen@ii % If the entry doesn't fit in one line \ifdim\dimen@ > 0.8\dimen@ii % due to long index text - % Try to split the text roughly evenly. \dimen@ will be the length of + % Try to split the text roughly evenly. \dimen@ will be the length of % the first line. \dimen@ = 0.7\dimen@ \dimen@ii = \hsize @@ -5763,55 +5731,11 @@ \egroup % The \vbox \fi \endgroup - \dotheinsertentrybox }} \newskip\thinshrinkable \skip\thinshrinkable=.15em minus .15em -\newbox\entrybox -\def\insertentrybox{% - \ourunvbox\entrybox -} - -% default definition -\let\dotheinsertentrybox\insertentrybox - -% Use \lastbox to take apart vbox box by box, and add each sub-box -% to the current vertical list. -\def\ourunvbox#1{% -\bgroup % for local binding of \delayedbox - % Remove the last box from box #1 - \global\setbox#1=\vbox{% - \unvbox#1% - \unskip % remove any glue - \unpenalty - \global\setbox\interbox=\lastbox - }% - \setbox\delayedbox=\box\interbox - \ifdim\ht#1=0pt\else - \ourunvbox#1 % Repeat on what's left of the box - \nobreak - \fi - \box\delayedbox -\egroup -} -\newbox\delayedbox -\newbox\interbox - -% Used from \printindex. \firsttoken should be the first token -% after the \entry. If it's not another \entry, we are at the last -% line of a group of index entries, so insert a penalty to discourage -% widowed index entries. -\def\dotheinsertentryboxwithpenalty{% - \ifx\firsttoken\isentry - \else - \penalty 9000 - \fi - \insertentrybox -} -\def\isentry{\entry}% - % Like plain.tex's \dotfill, except uses up at least 1 em. % The filll stretch here overpowers both the fil and fill stretch to push % the page number to the right. @@ -5821,24 +5745,15 @@ \def\primary #1{\line{#1\hfil}} -\newskip\secondaryindent \secondaryindent=0.5cm -\def\secondary#1#2{{% - \parfillskip=0in - \parskip=0in - \hangindent=1in - \hangafter=1 - \noindent\hskip\secondaryindent\hbox{#1}\indexdotfill - \ifpdf - \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph. - \else - \ifx\XeTeXrevision\thisisundefined - #2 - \else - \pdfgettoks#2.\ \the\toksA % The page number ends the paragraph. - \fi - \fi - \par -}} +\def\secondary{\indententry{0.5cm}} +\def\tertiary{\indententry{1cm}} + +\def\indententry#1#2#3{% + \bgroup + \leftskip=#1 + \entry{#2}{#3}% + \egroup +} % Define two-column mode, which we use to typeset indexes. % Adapted from the TeXbook, page 416, which is to say, @@ -5848,60 +5763,21 @@ \newbox\partialpage \newdimen\doublecolumnhsize -% Use inside an output routine to save \topmark and \firstmark -\def\savemarks{% - \global\savedtopmark=\expandafter{\topmark }% - \global\savedfirstmark=\expandafter{\firstmark }% -} -\newtoks\savedtopmark -\newtoks\savedfirstmark - -% Set \topmark and \firstmark for next time \output runs. -% Can't be run from withinside \output (because any material -% added while an output routine is active, including -% penalties, is saved for after it finishes). The page so far -% should be empty, otherwise what's on it will be thrown away. -\def\restoremarks{% - \mark{\the\savedtopmark}% - \bgroup\output = {% - \setbox\dummybox=\box\PAGE - }abc\eject\egroup - % "abc" because output routine doesn't fire for a completely empty page. - \mark{\the\savedfirstmark}% -} - \def\begindoublecolumns{\begingroup % ended by \enddoublecolumns % If not much space left on page, start a new page. \ifdim\pagetotal>0.8\vsize\vfill\eject\fi % % Grab any single-column material above us. \output = {% - % - % Here is a possibility not foreseen in manmac: if we accumulate a - % whole lot of material, we might end up calling this \output - % routine twice in a row (see the doublecol-lose test, which is - % essentially a couple of indexes with @setchapternewpage off). In - % that case we just ship out what is in \partialpage with the normal - % output routine. Generally, \partialpage will be empty when this - % runs and this will be a no-op. See the indexspread.tex test case. - \ifvoid\partialpage \else - \onepageout{\pagecontents\partialpage}% - \fi + \savetopmark % \global\setbox\partialpage = \vbox{% % Unvbox the main output page. \unvbox\PAGE \kern-\topskip \kern\baselineskip }% - \savemarks }% \eject % run that output routine to set \partialpage - \restoremarks - % - % We recover the two marks that the last output routine saved in order - % to propagate the information in marks added around a chapter heading, - % which could be otherwise be lost by the time the final page is output. - % % % Use the double-column output routine for subsequent pages. \output = {\doublecolumnout}% @@ -5927,7 +5803,9 @@ \divide\doublecolumnhsize by 2 \hsize = \doublecolumnhsize % - % Double the \vsize as well. + % Get the available space for the double columns -- the normal + % (undoubled) page height minus any material left over from the + % previous page. \advance\vsize by -\ht\partialpage \vsize = 2\vsize % @@ -5940,17 +5818,15 @@ % \def\doublecolumnout{% % + \savetopmark \splittopskip=\topskip \splitmaxdepth=\maxdepth - % Get the available space for the double columns -- the normal - % (undoubled) page height minus any material left over from the - % previous page. \dimen@ = \vsize \divide\dimen@ by 2 % % box0 will be the left-hand column, box2 the right. \setbox0=\vsplit\PAGE to\dimen@ \setbox2=\vsplit\PAGE to\dimen@ \global\advance\vsize by 2\ht\partialpage - \onepageout\pagesofar + \onepageout\pagesofar % empty except for the first time we are called \unvbox\PAGE \penalty\outputpenalty } @@ -5966,7 +5842,7 @@ } -% Finished with with double columns. +% Finished with double columns. \def\enddoublecolumns{% % The following penalty ensures that the page builder is exercised % _before_ we change the output routine. This is necessary in the @@ -5998,7 +5874,7 @@ % \output = {% % Split the last of the double-column material. - \savemarks + \savetopmark \balancecolumns }% \eject % call the \output just set @@ -6006,10 +5882,9 @@ % Having called \balancecolumns once, we do not % want to call it again. Therefore, reset \output to its normal % definition right away. - \global\output = {\onepageout{\pagecontents\PAGE}}% + \global\output=\expandafter{\the\defaultoutput} % \endgroup % started in \begindoublecolumns - \restoremarks % Leave the double-column material on the current page, no automatic % page break. \box\balancedcolumns @@ -6028,18 +5903,19 @@ \newbox\balancedcolumns \setbox\balancedcolumns=\vbox{shouldnt see this}% % -% Only called for the last of the double column material. \doublecolumnout +% Only called for the last of the double column material. \doublecolumnout % does the others. \def\balancecolumns{% \setbox0 = \vbox{\unvbox\PAGE}% like \box255 but more efficient, see p.120. \dimen@ = \ht0 - \advance\dimen@ by \topskip - \advance\dimen@ by-\baselineskip - \ifdim\dimen@<5\baselineskip + \ifdim\dimen@<7\baselineskip % Don't split a short final column in two. \setbox2=\vbox{}% \global\setbox\balancedcolumns=\vbox{\pagesofar}% \else + % double the leading vertical space + \advance\dimen@ by \topskip + \advance\dimen@ by-\baselineskip \divide\dimen@ by 2 % target to split to \dimen@ii = \dimen@ \splittopskip = \topskip @@ -6055,7 +5931,7 @@ }% % Now the left column is in box 1, and the right column in box 3. % - % Check whether the left column has come out higher than the page itself. + % Check whether the left column has come out higher than the page itself. % (Note that we have doubled \vsize for the double columns, so % the actual height of the page is 0.5\vsize). \ifdim2\ht1>\vsize @@ -6174,11 +6050,9 @@ % @raisesections: treat @section as chapter, @subsection as section, etc. \def\raisesections{\global\advance\secbase by -1} -\let\up=\raisesections % original BFox name % @lowersections: treat @chapter as section, @section as subsection, etc. \def\lowersections{\global\advance\secbase by 1} -\let\down=\lowersections % original BFox name % we only have subsub. \chardef\maxseclevel = 3 @@ -6354,7 +6228,7 @@ \let\top\unnumbered % Sections. -% +% \outer\parseargdef\numberedsec{\numhead1{#1}} % normally calls seczzz \def\seczzz#1{% \global\subsecno=0 \global\subsubsecno=0 \global\advance\secno by 1 @@ -6377,7 +6251,7 @@ } % Subsections. -% +% % normally calls numberedsubseczzz: \outer\parseargdef\numberedsubsec{\numhead2{#1}} \def\numberedsubseczzz#1{% @@ -6402,7 +6276,7 @@ } % Subsubsections. -% +% % normally numberedsubsubseczzz: \outer\parseargdef\numberedsubsubsec{\numhead3{#1}} \def\numberedsubsubseczzz#1{% @@ -6492,18 +6366,16 @@ \def\CHAPPAGoff{% \global\let\contentsalignmacro = \chappager \global\let\pchapsepmacro=\chapbreak -\global\let\pagealignmacro=\chappager} +\global\def\HEADINGSon{\HEADINGSsinglechapoff}} \def\CHAPPAGon{% \global\let\contentsalignmacro = \chappager \global\let\pchapsepmacro=\chappager -\global\let\pagealignmacro=\chappager \global\def\HEADINGSon{\HEADINGSsingle}} \def\CHAPPAGodd{% \global\let\contentsalignmacro = \chapoddpage \global\let\pchapsepmacro=\chapoddpage -\global\let\pagealignmacro=\chapoddpage \global\def\HEADINGSon{\HEADINGSdouble}} \CHAPPAGon @@ -6523,27 +6395,22 @@ \expandafter\ifx\thisenv\titlepage\else \checkenv{}% chapters, etc., should not start inside an environment. \fi - % FIXME: \chapmacro is currently called from inside \titlepage when - % \setcontentsaftertitlepage to print the "Table of Contents" heading, but - % this should probably be done by \sectionheading with an option to print - % in chapter size. - % % Insert the first mark before the heading break (see notes for \domark). - \let\prevchapterdefs=\lastchapterdefs - \let\prevsectiondefs=\lastsectiondefs - \gdef\lastsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}% + \let\prevchapterdefs=\currentchapterdefs + \let\prevsectiondefs=\currentsectiondefs + \gdef\currentsectiondefs{\gdef\thissectionname{}\gdef\thissectionnum{}% \gdef\thissection{}}% % \def\temptype{#2}% \ifx\temptype\Ynothingkeyword - \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% + \gdef\currentchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% \gdef\thischapter{\thischaptername}}% \else\ifx\temptype\Yomitfromtockeyword - \gdef\lastchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% + \gdef\currentchapterdefs{\gdef\thischaptername{#1}\gdef\thischapternum{}% \gdef\thischapter{}}% \else\ifx\temptype\Yappendixkeyword \toks0={#1}% - \xdef\lastchapterdefs{% + \xdef\currentchapterdefs{% \gdef\noexpand\thischaptername{\the\toks0}% \gdef\noexpand\thischapternum{\appendixletter}% % \noexpand\putwordAppendix avoids expanding indigestible @@ -6554,7 +6421,7 @@ }% \else \toks0={#1}% - \xdef\lastchapterdefs{% + \xdef\currentchapterdefs{% \gdef\noexpand\thischaptername{\the\toks0}% \gdef\noexpand\thischapternum{\the\chapno}% % \noexpand\putwordChapter avoids expanding indigestible @@ -6574,18 +6441,18 @@ % % Now the second mark, after the heading break. No break points % between here and the heading. - \let\prevchapterdefs=\lastchapterdefs - \let\prevsectiondefs=\lastsectiondefs + \let\prevchapterdefs=\currentchapterdefs + \let\prevsectiondefs=\currentsectiondefs \domark % {% \chapfonts \rm \let\footnote=\errfootnoteheading % give better error message % - % Have to define \lastsection before calling \donoderef, because the + % Have to define \currentsection before calling \donoderef, because the % xref code eventually uses it. On the other hand, it has to be called % after \pchapsepmacro, or the headline will change too soon. - \gdef\lastsection{#1}% + \gdef\currentsection{#1}% % % Only insert the separating space if we have a chapter/appendix % number, and don't print the unnumbered ``number''. @@ -6674,10 +6541,10 @@ \csname #2fonts\endcsname \rm % % Insert first mark before the heading break (see notes for \domark). - \let\prevsectiondefs=\lastsectiondefs + \let\prevsectiondefs=\currentsectiondefs \ifx\temptype\Ynothingkeyword \ifx\sectionlevel\seckeyword - \gdef\lastsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}% + \gdef\currentsectiondefs{\gdef\thissectionname{#1}\gdef\thissectionnum{}% \gdef\thissection{\thissectionname}}% \fi \else\ifx\temptype\Yomitfromtockeyword @@ -6685,7 +6552,7 @@ \else\ifx\temptype\Yappendixkeyword \ifx\sectionlevel\seckeyword \toks0={#1}% - \xdef\lastsectiondefs{% + \xdef\currentsectiondefs{% \gdef\noexpand\thissectionname{\the\toks0}% \gdef\noexpand\thissectionnum{#4}% % \noexpand\putwordSection avoids expanding indigestible @@ -6698,7 +6565,7 @@ \else \ifx\sectionlevel\seckeyword \toks0={#1}% - \xdef\lastsectiondefs{% + \xdef\currentsectiondefs{% \gdef\noexpand\thissectionname{\the\toks0}% \gdef\noexpand\thissectionnum{#4}% % \noexpand\putwordSection avoids expanding indigestible @@ -6724,28 +6591,28 @@ % % Now the second mark, after the heading break. No break points % between here and the heading. - \global\let\prevsectiondefs=\lastsectiondefs + \global\let\prevsectiondefs=\currentsectiondefs \domark % % Only insert the space after the number if we have a section number. \ifx\temptype\Ynothingkeyword \setbox0 = \hbox{}% \def\toctype{unn}% - \gdef\lastsection{#1}% + \gdef\currentsection{#1}% \else\ifx\temptype\Yomitfromtockeyword % for @headings -- no section number, don't include in toc, - % and don't redefine \lastsection. + % and don't redefine \currentsection. \setbox0 = \hbox{}% \def\toctype{omit}% \let\sectionlevel=\empty \else\ifx\temptype\Yappendixkeyword \setbox0 = \hbox{#4\enspace}% \def\toctype{app}% - \gdef\lastsection{#1}% + \gdef\currentsection{#1}% \else \setbox0 = \hbox{#4\enspace}% \def\toctype{num}% - \gdef\lastsection{#1}% + \gdef\currentsection{#1}% \fi\fi\fi % % Write the toc entry (before \donoderef). See comments in \chapmacro. @@ -6835,13 +6702,8 @@ % 1 and 2 (the page numbers aren't printed), and so are the first % two pages of the document. Thus, we'd have two destinations named % `1', and two named `2'. - \ifpdf + \ifpdforxetex \global\pdfmakepagedesttrue - \else - \ifx\XeTeXrevision\thisisundefined - \else - \global\pdfmakepagedesttrue - \fi \fi } @@ -6878,9 +6740,7 @@ % \def\startcontents#1{% % If @setchapternewpage on, and @headings double, the contents should - % start on an odd page, unlike chapters. Thus, we maintain - % \contentsalignmacro in parallel with \pagealignmacro. - % From: Torbjorn Granlund + % start on an odd page, unlike chapters. \contentsalignmacro \immediate\closeout\tocfile % @@ -6895,6 +6755,9 @@ % % Roman numerals for page numbers. \ifnum \pageno>0 \global\pageno = \lastnegativepageno \fi + \def\thistitle{}% no title in double-sided headings + % Record where the Roman numerals started. + \ifnum\romancount=0 \global\romancount=\pagecount \fi } % redefined for the two-volume lispref. We always output on @@ -6917,8 +6780,7 @@ \fi \closein 1 \endgroup - \lastnegativepageno = \pageno - \global\pageno = \savepageno + \contentsendroman } % And just the chapters. @@ -6953,10 +6815,20 @@ \vfill \eject \contentsalignmacro % in case @setchapternewpage odd is in effect \endgroup + \contentsendroman +} +\let\shortcontents = \summarycontents + +% Get ready to use Arabic numerals again +\def\contentsendroman{% \lastnegativepageno = \pageno \global\pageno = \savepageno + % + % If \romancount > \arabiccount, the contents are at the end of the + % document. Otherwise, advance where the Arabic numerals start for + % the page numbers. + \ifnum\romancount>\arabiccount\else\global\arabiccount=\pagecount\fi } -\let\shortcontents = \summarycontents % Typeset the label for a chapter or appendix for the short contents. % The arg is, e.g., `A' for an appendix, or `3' for a chapter. @@ -7098,7 +6970,7 @@ % But \@ or @@ will get a plain @ character. \envdef\tex{% - \setupmarkupstyle{tex}% + \setregularquotes \catcode `\\=0 \catcode `\{=1 \catcode `\}=2 \catcode `\$=3 \catcode `\&=4 \catcode `\#=6 \catcode `\^=7 \catcode `\_=8 \catcode `\~=\active \let~=\tie @@ -7204,11 +7076,7 @@ % @cartouche ... @end cartouche: draw rectangle w/rounded corners around % environment contents. -\font\circle=lcircle10 -\newdimen\circthick -\newdimen\cartouter\newdimen\cartinner -\newskip\normbskip\newskip\normpskip\newskip\normlskip -\circthick=\fontdimen8\circle + % \def\ctl{{\circle\char'013\hskip -6pt}}% 6pt from pl file: 1/2charwidth \def\ctr{{\hskip 6pt\circle\char'010}} @@ -7223,7 +7091,18 @@ % \newskip\lskip\newskip\rskip +% only require the font if @cartouche is actually used +\def\cartouchefontdefs{% + \font\circle=lcircle10\relax + \circthick=\fontdimen8\circle +} +\newdimen\circthick +\newdimen\cartouter\newdimen\cartinner +\newskip\normbskip\newskip\normpskip\newskip\normlskip + + \envdef\cartouche{% + \cartouchefontdefs \ifhmode\par\fi % can't be in the midst of a paragraph. \startsavinginserts \lskip=\leftskip \rskip=\rightskip @@ -7317,7 +7196,7 @@ % If you want all examples etc. small: @set dispenvsize small. % If you want even small examples the full size: @set dispenvsize nosmall. % This affects the following displayed environments: -% @example, @display, @format, @lisp +% @example, @display, @format, @lisp, @verbatim % \def\smallword{small} \def\nosmallword{nosmall} @@ -7363,9 +7242,9 @@ % \maketwodispenvdef{lisp}{example}{% \nonfillstart - \tt\setupmarkupstyle{example}% + \tt\setcodequotes \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special. - \gobble % eat return + \parsearg\gobble } % @display/@smalldisplay: same as @lisp except keep current font. % @@ -7402,13 +7281,9 @@ % @raggedright does more-or-less normal line breaking but no right -% justification. From plain.tex. Don't stretch around special -% characters in urls in this environment, since the stretch at the right -% should be enough. +% justification. From plain.tex. \envdef\raggedright{% \rightskip0pt plus2.4em \spaceskip.3333em \xspaceskip.5em\relax - \def\urefprestretchamount{0pt}% - \def\urefpoststretchamount{0pt}% } \let\Eraggedright\par @@ -7467,7 +7342,7 @@ % @indentedblock is like @quotation, but indents only on the left and % has no optional argument. -% +% \makedispenvdef{indentedblock}{\indentedblockstart} % \def\indentedblockstart{% @@ -7527,7 +7402,7 @@ \def\setupverb{% \tt % easiest (and conventionally used) font for verbatim \def\par{\leavevmode\endgraf}% - \setupmarkupstyle{verb}% + \setcodequotes \tabeightspaces % Respect line breaks, % print special symbols as themselves, and @@ -7542,13 +7417,9 @@ \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount % % We typeset each line of the verbatim in an \hbox, so we can handle -% tabs. The \global is in case the verbatim line starts with an accent, -% or some other command that starts with a begin-group. Otherwise, the -% entire \verbbox would disappear at the corresponding end-group, before -% it is typeset. Meanwhile, we can't have nested verbatim commands -% (can we?), so the \global won't be overwriting itself. +% tabs. \newbox\verbbox -\def\starttabbox{\global\setbox\verbbox=\hbox\bgroup} +\def\starttabbox{\setbox\verbbox=\hbox\bgroup} % \begingroup \catcode`\^^I=\active @@ -7559,7 +7430,8 @@ \divide\dimen\verbbox by\tabw \multiply\dimen\verbbox by\tabw % compute previous multiple of \tabw \advance\dimen\verbbox by\tabw % advance to next multiple of \tabw - \wd\verbbox=\dimen\verbbox \box\verbbox \starttabbox + \wd\verbbox=\dimen\verbbox + \leavevmode\box\verbbox \starttabbox }% } \endgroup @@ -7569,17 +7441,14 @@ \let\nonarrowing = t% \nonfillstart \tt % easiest (and conventionally used) font for verbatim - % The \leavevmode here is for blank lines. Otherwise, we would - % never \starttabox and the \egroup would end verbatim mode. - \def\par{\leavevmode\egroup\box\verbbox\endgraf}% + \def\par{\egroup\leavevmode\box\verbbox\endgraf\starttabbox}% \tabexpand - \setupmarkupstyle{verbatim}% + \setcodequotes % Respect line breaks, % print special symbols as themselves, and % make each space count. % Must do in this order: \obeylines \uncatcodespecials \sepspaces - \everypar{\starttabbox}% } % Do the @verb magic: verbatim text is quoted by unique @@ -7614,13 +7483,16 @@ % ignore everything up to the first ^^M, that's the newline at the end % of the @verbatim input line itself. Otherwise we get an extra blank % line in the output. - \xdef\doverbatim#1^^M#2@end verbatim{#2\noexpand\end\gobble verbatim}% + \xdef\doverbatim#1^^M#2@end verbatim{% + \starttabbox#2\egroup\noexpand\end\gobble verbatim}% % We really want {...\end verbatim} in the body of the macro, but % without the active space; thus we have to use \xdef and \gobble. + % The \egroup ends the \verbbox started at the end of the last line in + % the block. \endgroup % \envdef\verbatim{% - \setupverbatim\doverbatim + \setnormaldispenv\setupverbatim\doverbatim } \let\Everbatim = \afterenvbreak @@ -7633,9 +7505,12 @@ {% \makevalueexpandable \setupverbatim - \indexnofonts % Allow `@@' and other weird things in file names. - \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}% - \input #1 + {% + \indexnofonts % Allow `@@' and other weird things in file names. + \wlog{texinfo.tex: doing @verbatiminclude of #1^^J}% + \edef\tmp{\noexpand\input #1 } + \expandafter + }\expandafter\starttabbox\tmp\egroup \afterenvbreak }% } @@ -7764,7 +7639,7 @@ % @deftypefnnewline on|off says whether the return type of typed functions % are printed on their own line. This affects @deftypefn, @deftypefun, % @deftypeop, and @deftypemethod. -% +% \parseargdef\deftypefnnewline{% \def\temp{#1}% \ifx\temp\onword @@ -7780,6 +7655,21 @@ \fi\fi } +% \dosubind {index}{topic}{subtopic} +% +% If SUBTOPIC is present, precede it with a space, and call \doind. +% (At some time during the 20th century, this made a two-level entry in an +% index such as the operation index. Nobody seemed to notice the change in +% behaviour though.) +\def\dosubind#1#2#3{% + \def\thirdarg{#3}% + \ifx\thirdarg\empty + \doind{#1}{#2}% + \else + \doind{#1}{#2\space#3}% + \fi +} + % Untyped functions: % @deffn category name args @@ -7794,7 +7684,6 @@ % \deffngeneral {subind}category name args % \def\deffngeneral#1#2 #3 #4\endheader{% - % Remember that \dosubind{fn}{foo}{} is equivalent to \doind{fn}{foo}. \dosubind{fn}{\code{#3}}{#1}% \defname{#2}{}{#3}\magicamp\defunargs{#4\unskip}% } @@ -7945,7 +7834,7 @@ \tclose{\temp}% typeset the return type \ifrettypeownline % put return type on its own line; prohibit line break following: - \hfil\vadjust{\nobreak}\break + \hfil\vadjust{\nobreak}\break \else \space % type on same line, so just followed by a space \fi @@ -7973,7 +7862,7 @@ % leave the code in, but it's strange for @var to lead to typewriter. % Nowadays we recommend @code, since the difference between a ttsl hyphen % and a tt hyphen is pretty tiny. @code also disables ?` !`. - \def\var##1{{\setupmarkupstyle{var}\ttslanted{##1}}}% + \def\var##1{{\setregularquotes\ttslanted{##1}}}% #1% \sl\hyphenchar\font=45 } @@ -8001,6 +7890,7 @@ \gdef\boldbrax{\let(=\opnr\let)=\clnr\let[=\lbrb\let]=\rbrb} \gdef\magicamp{\let&=\amprm} } +\let\ampchar\& \newcount\parencount @@ -8081,36 +7971,25 @@ } \fi -% alias because \c means cedilla in @tex or @math -\let\texinfoc=\c - -\newcount\savedcatcodeone -\newcount\savedcatcodetwo +\let\E=\expandafter % Used at the time of macro expansion. % Argument is macro body with arguments substituted \def\scanmacro#1{% \newlinechar`\^^M - \def\xeatspaces{\eatspaces}% - % - % Temporarily undo catcode changes of \printindex. Set catcode of @ to - % 0 so that @-commands in macro expansions aren't printed literally when - % formatting an index file, where \ is used as the escape character. - \savedcatcodeone=\catcode`\@ - \savedcatcodetwo=\catcode`\\ - \catcode`\@=0 - \catcode`\\=\active + % expand the expansion of \eatleadingcr twice to maybe remove a leading + % newline (and \else and \fi tokens), then call \eatspaces on the result. + \def\xeatspaces##1{% + \E\E\E\E\E\E\E\eatspaces\E\E\E\E\E\E\E{\eatleadingcr##1% + }}% + \def\xempty##1{}% % % Process the macro body under the current catcode regime. - \scantokens{#1@texinfoc}% + \scantokens{#1@comment}% % - \catcode`\@=\savedcatcodeone - \catcode`\\=\savedcatcodetwo - % - % The \texinfoc is to remove the \newlinechar added by \scantokens, and - % can be noticed by \parsearg. - % We avoid surrounding the call to \scantokens with \bgroup and \egroup - % to allow macros to open or close groups themselves. + % The \comment is to remove the \newlinechar added by \scantokens, and + % can be noticed by \parsearg. Note \c isn't used because this means cedilla + % in math mode. } % Used for copying and captions @@ -8156,6 +8035,11 @@ \unbrace{\gdef\trim@@@ #1 } #2@{#1} } +{\catcode`\^^M=\other% +\gdef\eatleadingcr#1{\if\noexpand#1\noexpand^^M\else\E#1\fi}}% +% Warning: this won't work for a delimited argument +% or for an empty argument + % Trim a single trailing ^^M off a string. {\catcode`\^^M=\other \catcode`\Q=3% \gdef\eatcr #1{\eatcra #1Q^^MQ}% @@ -8211,12 +8095,14 @@ \def\macroargctxt{% \scanctxt \catcode`\ =\active + \catcode`\@=\other \catcode`\^^M=\other \catcode`\\=\active } \def\macrolineargctxt{% used for whole-line arguments without braces \scanctxt + \catcode`\@=\other \catcode`\{=\other \catcode`\}=\other } @@ -8308,7 +8194,7 @@ % list to some hook where the argument is to be expanded. If there are % less than 10 arguments that hook is to be replaced by ##N where N % is the position in that list, that is to say the macro arguments are to be -% defined `a la TeX in the macro body. +% defined `a la TeX in the macro body. % % That gets used by \mbodybackslash (above). % @@ -8320,6 +8206,7 @@ \let\hash\relax % \hash is redefined to `#' later to get it into definitions \let\xeatspaces\relax + \let\xempty\relax \parsemargdefxxx#1,;,% \ifnum\paramno<10\relax\else \paramno0\relax @@ -8331,16 +8218,18 @@ \else \let\next=\parsemargdefxxx \advance\paramno by 1 \expandafter\edef\csname macarg.\eatspaces{#1}\endcsname - {\xeatspaces{\hash\the\paramno}}% + {\xeatspaces{\hash\the\paramno\noexpand\xempty{}}}% \edef\paramlist{\paramlist\hash\the\paramno,}% \fi\next} +% the \xempty{} is to give \eatleadingcr an argument in the case of an +% empty macro argument. % \parsemacbody, \parsermacbody % % Read recursive and nonrecursive macro bodies. (They're different since % rec and nonrec macros end differently.) -% -% We are in \macrobodyctxt, and the \xdef causes backslashshes in the macro +% +% We are in \macrobodyctxt, and the \xdef causes backslashshes in the macro % body to be transformed. % Set \macrobody to the body of the macro, and call \defmacro. % @@ -8374,7 +8263,7 @@ % twice the \macarg.BLAH macros does not cost too much processing power. \def\parsemmanyargdef@@#1,{% \if#1;\let\next=\relax - \else + \else \let\next=\parsemmanyargdef@@ \edef\tempb{\eatspaces{#1}}% \expandafter\def\expandafter\tempa @@ -8459,7 +8348,7 @@ % Replace arguments by their values in the macro body, and place the result % in macro \@tempa. -% +% \def\macvalstoargs@{% % To do this we use the property that token registers that are \the'ed % within an \edef expand only once. So we are going to place all argument @@ -8483,9 +8372,9 @@ \expandafter\def\expandafter\@tempa\expandafter{\@tempc}% } -% Define the named-macro outside of this group and then close this group. -% -\def\macargexpandinbody@{% +% Define the named-macro outside of this group and then close this group. +% +\def\macargexpandinbody@{% \expandafter \endgroup \macargdeflist@ @@ -8523,7 +8412,7 @@ } % Trailing missing arguments are set to empty. -% +% \def\setemptyargvalues@{% \ifx\paramlist\nilm@ \let\next\macargexpandinbody@ @@ -8600,7 +8489,7 @@ \else % at most 9 \ifnum\paramno<10\relax % @MACNAME sets the context for reading the macro argument - % @MACNAME@@ gets the argument, processes backslashes and appends a + % @MACNAME@@ gets the argument, processes backslashes and appends a % comma. % @MACNAME@@@ removes braces surrounding the argument list. % @MACNAME@@@@ scans the macro body with arguments substituted. @@ -8644,11 +8533,11 @@ % Call #1 with a list of tokens #2, with any doubled backslashes in #2 % compressed to one. % -% This implementation works by expansion, and not execution (so we cannot use -% \def or similar). This reduces the risk of this failing in contexts where -% complete expansion is done with no execution (for example, in writing out to +% This implementation works by expansion, and not execution (so we cannot use +% \def or similar). This reduces the risk of this failing in contexts where +% complete expansion is done with no execution (for example, in writing out to % an auxiliary file for an index entry). -% +% % State is kept in the input stream: the argument passed to % @look_ahead, @gobble_and_check_finish and @add_segment is % @@ -8670,11 +8559,11 @@ % #3 - NEXT_TOKEN % #4 used to look ahead % -% If the next token is not a backslash, process the rest of the argument; +% If the next token is not a backslash, process the rest of the argument; % otherwise, remove the next token. @gdef@look_ahead#1!#2#3#4{% @ifx#4\% - @expandafter@gobble_and_check_finish + @expandafter@gobble_and_check_finish @else @expandafter@add_segment @fi#1!{#2}#4#4% @@ -8698,9 +8587,9 @@ % #3 - NEXT_TOKEN % #4 is input stream until next backslash % -% Input stream is either at the start of the argument, or just after a -% backslash sequence, either a lone backslash, or a doubled backslash. -% NEXT_TOKEN contains the first token in the input stream: if it is \finish, +% Input stream is either at the start of the argument, or just after a +% backslash sequence, either a lone backslash, or a doubled backslash. +% NEXT_TOKEN contains the first token in the input stream: if it is \finish, % finish; otherwise, append to ARG_RESULT the segment of the argument up until % the next backslash. PENDING_BACKSLASH contains a backslash to represent % a backslash just before the start of the input stream that has not been @@ -8712,13 +8601,13 @@ % append the pending backslash to the result, followed by the next segment @expandafter@is_fi@look_ahead#1#2#4!{\}@fi % this @fi is discarded by @look_ahead. - % we can't get rid of it with \expandafter because we don't know how + % we can't get rid of it with \expandafter because we don't know how % long #4 is. } % #1 - THE_MACRO % #2 - ARG_RESULT -% #3 discards the res of the conditional in @add_segment, and @is_fi ends the +% #3 discards the res of the conditional in @add_segment, and @is_fi ends the % conditional. @gdef@call_the_macro#1#2!#3@fi{@is_fi #1{#2}} @@ -8730,7 +8619,7 @@ % for reading the argument (slightly different in the two cases). Then, % to read the argument, in the whole-line case, it then calls the regular % \parsearg MAC; in the lbrace case, it calls \passargtomacro MAC. -% +% \def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx} \def\braceorlinexxx{% \ifx\nchar\bgroup @@ -8780,9 +8669,29 @@ % also remove a trailing comma, in case of something like this: % @node Help-Cross, , , Cross-refs \def\donode#1 ,#2\finishnodeparse{\dodonode #1,\finishnodeparse} -\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}} +\def\dodonode#1,#2\finishnodeparse{\gdef\lastnode{#1}\omittopnode} + +% Used so that the @top node doesn't have to be wrapped in an @ifnottex +% conditional. +% \doignore goes to more effort to skip nested conditionals but we don't need +% that here. +\def\omittopnode{% + \ifx\lastnode\wordTop + \expandafter\ignorenode\fi +} +\def\wordTop{Top} + +% Until the next @node or @bye command, divert output to a box that is not +% output. +\def\ignorenode{\setbox\dummybox\vbox\bgroup\def\node{\egroup\node}% +\ignorenodebye +} + +{\let\bye\relax +\gdef\ignorenodebye{\let\bye\ignorenodebyedef} +\gdef\ignorenodebyedef{\egroup(`Top' node ignored)\bye}} +% The redefinition of \bye here is because it is declared \outer -\let\nwnode=\node \let\lastnode=\empty % Write a cross-reference definition for the current node. #1 is the @@ -8805,7 +8714,7 @@ % \setref{NAME}{SNT} defines a cross-reference point NAME (a node or an % anchor), which consists of three parts: -% 1) NAME-title - the current sectioning name taken from \lastsection, +% 1) NAME-title - the current sectioning name taken from \currentsection, % or the anchor name. % 2) NAME-snt - section number and type, passed as the SNT arg, or % empty for anchors. @@ -8827,7 +8736,7 @@ \write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef ##1}{##2}}% these are parameters of \writexrdef }% - \toks0 = \expandafter{\lastsection}% + \toks0 = \expandafter{\currentsection}% \immediate \writexrdef{title}{\the\toks0 }% \immediate \writexrdef{snt}{\csname #2\endcsname}% \Ynumbered etc. \safewhatsit{\writexrdef{pg}{\folio}}% will be written later, at \shipout @@ -8839,7 +8748,7 @@ % automatically in xrefs, if the third arg is not explicitly specified. % This was provided as a "secret" @set xref-automatic-section-title % variable, now it's official. -% +% \parseargdef\xrefautomaticsectiontitle{% \def\temp{#1}% \ifx\temp\onword @@ -8855,7 +8764,7 @@ \fi\fi } -% +% % @xref, @pxref, and @ref generate cross-references. For \xrefX, #1 is % the node name, #2 the name of the Info cross-reference, #3 the printed % node name, #4 the name of the Info file, #5 the name of the printed @@ -8902,7 +8811,7 @@ \else \ifhavexrefs % We (should) know the real title if we have the xref values. - \def\printedrefname{\refx{#1-title}{}}% + \def\printedrefname{\refx{#1-title}}% \else % Otherwise just copy the Info node name. \def\printedrefname{\ignorespaces #1}% @@ -8996,7 +8905,7 @@ % If the user specified the print name (third arg) to the ref, % print it instead of our usual "Figure 1.2". \ifdim\wd\printedrefnamebox = 0pt - \refx{#1-snt}{}% + \refx{#1-snt}% \else \printedrefname \fi @@ -9008,77 +8917,73 @@ \fi \else % node/anchor (non-float) references. - % + % % If we use \unhbox to print the node names, TeX does not insert % empty discretionaries after hyphens, which means that it will not % find a line break at a hyphen in a node names. Since some manuals % are best written with fairly long node names, containing hyphens, % this is a loss. Therefore, we give the text of the node name % again, so it is as if TeX is seeing it for the first time. - % + % \ifdim \wd\printedmanualbox > 0pt % Cross-manual reference with a printed manual name. - % + % \crossmanualxref{\cite{\printedmanual\unskip}}% % \else\ifdim \wd\infofilenamebox > 0pt % Cross-manual reference with only an info filename (arg 4), no % printed manual name (arg 5). This is essentially the same as % the case above; we output the filename, since we have nothing else. - % + % \crossmanualxref{\code{\infofilename\unskip}}% % \else % Reference within this manual. % - % _ (for example) has to be the character _ for the purposes of the - % control sequence corresponding to the node, but it has to expand - % into the usual \leavevmode...\vrule stuff for purposes of - % printing. So we \turnoffactive for the \refx-snt, back on for the - % printing, back off for the \refx-pg. - {\turnoffactive - % Only output a following space if the -snt ref is nonempty; for - % @unnumbered and @anchor, it won't be. - \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}% - \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi - }% + % Only output a following space if the -snt ref is nonempty, as the ref + % will be empty for @unnumbered and @anchor. + \setbox2 = \hbox{\ignorespaces \refx{#1-snt}}% + \ifdim \wd2 > 0pt \refx{#1-snt}\space\fi + % % output the `[mynode]' via the macro below so it can be overridden. \xrefprintnodename\printedrefname % - % But we always want a comma and a space: - ,\space - % - % output the `page 3'. - \turnoffactive \putwordpage\tie\refx{#1-pg}{}% - % Add a , if xref followed by a space - \if\space\noexpand\tokenafterxref ,% - \else\ifx\ \tokenafterxref ,% @TAB - \else\ifx\*\tokenafterxref ,% @* - \else\ifx\ \tokenafterxref ,% @SPACE - \else\ifx\ - \tokenafterxref ,% @NL - \else\ifx\tie\tokenafterxref ,% @tie - \fi\fi\fi\fi\fi\fi + \expandafter\ifx\csname SETtxiomitxrefpg\endcsname\relax + % But we always want a comma and a space: + ,\space + % + % output the `page 3'. + \turnoffactive \putwordpage\tie\refx{#1-pg}% + % Add a , if xref followed by a space + \if\space\noexpand\tokenafterxref ,% + \else\ifx\ \tokenafterxref ,% @TAB + \else\ifx\*\tokenafterxref ,% @* + \else\ifx\ \tokenafterxref ,% @SPACE + \else\ifx\ + \tokenafterxref ,% @NL + \else\ifx\tie\tokenafterxref ,% @tie + \fi\fi\fi\fi\fi\fi + \fi \fi\fi \fi \endlink \endgroup} % Output a cross-manual xref to #1. Used just above (twice). -% +% % Only include the text "Section ``foo'' in" if the foo is neither % missing or Top. Thus, @xref{,,,foo,The Foo Manual} outputs simply % "see The Foo Manual", the idea being to refer to the whole manual. -% +% % But, this being TeX, we can't easily compare our node name against the % string "Top" while ignoring the possible spaces before and after in % the input. By adding the arbitrary 7sp below, we make it much less % likely that a real node name would have the same width as "Top" (e.g., % in a monospaced font). Hopefully it will never happen in practice. -% +% % For the same basic reason, we retypeset the "Top" at every % reference, since the current font is indeterminate. -% +% \def\crossmanualxref#1{% \setbox\toprefbox = \hbox{Top\kern7sp}% \setbox2 = \hbox{\ignorespaces \printedrefname \unskip \kern7sp}% @@ -9125,13 +9030,12 @@ \fi\fi\fi } -% \refx{NAME}{SUFFIX} - reference a cross-reference string named NAME. SUFFIX -% is output afterwards if non-empty. -\def\refx#1#2{% +% \refx{NAME} - reference a cross-reference string named NAME. +\def\refx#1{% \requireauxfile {% \indexnofonts - \otherbackslash + \turnoffactive \def\value##1{##1}% \expandafter\global\expandafter\let\expandafter\thisrefX \csname XR#1\endcsname @@ -9154,12 +9058,11 @@ % It's defined, so just use it. \thisrefX \fi - #2% Output the suffix in any case. } -% This is the macro invoked by entries in the aux file. Define a control -% sequence for a cross-reference target (we prepend XR to the control sequence -% name to avoid collisions). The value is the page number. If this is a float +% This is the macro invoked by entries in the aux file. Define a control +% sequence for a cross-reference target (we prepend XR to the control sequence +% name to avoid collisions). The value is the page number. If this is a float % type, we have more work to do. % \def\xrdef#1#2{% @@ -9175,10 +9078,10 @@ \bgroup \expandafter\gdef\csname XR\safexrefname\endcsname{#2}% \egroup - % We put the \gdef inside a group to avoid the definitions building up on - % TeX's save stack, which can cause it to run out of space for aux files with + % We put the \gdef inside a group to avoid the definitions building up on + % TeX's save stack, which can cause it to run out of space for aux files with % thousands of lines. \gdef doesn't use the save stack, but \csname does - % when it defines an unknown control sequence as \relax. + % when it defines an unknown control sequence as \relax. % % Was that xref control sequence that we just defined for a float? \expandafter\iffloat\csname XR\safexrefname\endcsname @@ -9257,19 +9160,6 @@ \catcode`\^^]=\other \catcode`\^^^=\other \catcode`\^^_=\other - % It was suggested to set the catcode of ^ to 7, which would allow ^^e4 etc. - % in xref tags, i.e., node names. But since ^^e4 notation isn't - % supported in the main text, it doesn't seem desirable. Furthermore, - % that is not enough: for node names that actually contain a ^ - % character, we would end up writing a line like this: 'xrdef {'hat - % b-title}{'hat b} and \xrdef does a \csname...\endcsname on the first - % argument, and \hat is not an expandable control sequence. It could - % all be worked out, but why? Either we support ^^ or we don't. - % - % The other change necessary for this was to define \auxhat: - % \def\auxhat{\def^{'hat }}% extra space so ok if followed by letter - % and then to call \auxhat in \setq. - % \catcode`\^=\other % % Special characters. Should be turned off anyway, but... @@ -9277,24 +9167,17 @@ \catcode`\[=\other \catcode`\]=\other \catcode`\"=\other - \catcode`\_=\other - \catcode`\|=\other - \catcode`\<=\other - \catcode`\>=\other + \catcode`\_=\active + \catcode`\|=\active + \catcode`\<=\active + \catcode`\>=\active \catcode`\$=\other \catcode`\#=\other \catcode`\&=\other \catcode`\%=\other \catcode`+=\other % avoid \+ for paranoia even though we've turned it off % - % This is to support \ in node names and titles, since the \ - % characters end up in a \csname. It's easier than - % leaving it active and making its active definition an actual \ - % character. What I don't understand is why it works in the *value* - % of the xrdef. Seems like it should be a catcode12 \, and that - % should not typeset properly. But it works, so I'm moving on for - % now. --karl, 15jan04. - \catcode`\\=\other + \catcode`\\=\active % % @ is our escape character in .aux files, and we need braces. \catcode`\{=1 @@ -9508,7 +9391,7 @@ \def\imagexxx#1,#2,#3,#4,#5,#6\finish{\begingroup \catcode`\^^M = 5 % in case we're inside an example \normalturnoffactive % allow _ et al. in names - \def\xprocessmacroarg{\eatspaces}% in case we are being used via a macro + \makevalueexpandable % If the image is by itself, center it. \ifvmode \imagevmodetrue @@ -9534,7 +9417,7 @@ % On the other hand, if we are in the case of @center @image, we don't % want to start a paragraph, which will create a hsize-width box and % eradicate the centering. - \ifx\centersub\centerV\else \noindent \fi + \ifx\centersub\centerV \else \imageindent \fi % % Output the image. \ifpdf @@ -9557,7 +9440,7 @@ % \ifimagevmode \medskip % space after a standalone image - \fi + \fi \ifx\centersub\centerV \egroup \fi \endgroup} @@ -9625,13 +9508,13 @@ \global\advance\floatno by 1 % {% - % This magic value for \lastsection is output by \setref as the + % This magic value for \currentsection is output by \setref as the % XREFLABEL-title value. \xrefX uses it to distinguish float % labels (which have a completely different output format) from % node and anchor labels. And \xrdef uses it to construct the % lists of floats. % - \edef\lastsection{\floatmagic=\safefloattype}% + \edef\currentsection{\floatmagic=\safefloattype}% \setref{\floatlabel}{Yfloat}% }% \fi @@ -9754,7 +9637,7 @@ % #1 is the control sequence we are passed; we expand into a conditional % which is true if #1 represents a float ref. That is, the magic -% \lastsection value which we \setref above. +% \currentsection value which we \setref above. % \def\iffloat#1{\expandafter\doiffloat#1==\finish} % @@ -10388,7 +10271,7 @@ \uppercase{.} \endgroup \else - \errhelp = \EMsimple + \errhelp = \EMsimple \errmessage{Unicode character U+#1 not supported, sorry}% \fi \else @@ -10421,7 +10304,7 @@ \countUTFz = "#1\relax \begingroup \parseXMLCharref - + % Give \u8:... its definition. The sequence of seven \expandafter's % expands after the \gdef three times, e.g. % @@ -10433,7 +10316,7 @@ \expandafter\expandafter \expandafter\expandafter \expandafter\gdef \UTFviiiTmp{#2}% - % + % \expandafter\ifx\csname uni:#1\endcsname \relax \else \message{Internal error, already defined: #1}% \fi @@ -10472,7 +10355,7 @@ \divide\countUTFz by 64 \countUTFy = \countUTFz % Save to be the future value of \countUTFz. \multiply\countUTFz by 64 - + % \countUTFz is now \countUTFx with the last 5 bits cleared. Subtract % in order to get the last five bits. \advance\countUTFx by -\countUTFz @@ -10507,7 +10390,7 @@ % U+0080..U+00FF = https://en.wikipedia.org/wiki/Latin-1_Supplement_(Unicode_block) % U+0100..U+017F = https://en.wikipedia.org/wiki/Latin_Extended-A % U+0180..U+024F = https://en.wikipedia.org/wiki/Latin_Extended-B -% +% % Many of our renditions are less than wonderful, and all the missing % characters are available somewhere. Loading the necessary fonts % awaits user request. We can't truly support Unicode without @@ -10808,6 +10691,8 @@ \DeclareUnicodeCharacter{0233}{\=y}% \DeclareUnicodeCharacter{0237}{\dotless{j}}% % + \DeclareUnicodeCharacter{02BC}{'}% + % \DeclareUnicodeCharacter{02DB}{\ogonek{ }}% % % Greek letters upper case @@ -11242,21 +11127,14 @@ \relax } -% define all Unicode characters we know about, for the sake of @U. +% Define all Unicode characters we know about. This makes UTF-8 the default +% input encoding and allows @U to work. \iftxinativeunicodecapable \nativeunicodechardefsatu \else \utfeightchardefs \fi - -% Make non-ASCII characters printable again for compatibility with -% existing Texinfo documents that may use them, even without declaring a -% document encoding. -% -\setnonasciicharscatcode \other - - \message{formatting,} \newdimen\defaultparindent \defaultparindent = 15pt @@ -11449,6 +11327,18 @@ \globaldefs = 0 }} +\def\bsixpaper{{\globaldefs = 1 + \afourpaper + \internalpagesizes{140mm}{100mm}% + {-6.35mm}{-12.7mm}% + {\bindingoffset}{14pt}% + {176mm}{125mm}% + \let\SETdispenvsize=\smallword + \lispnarrowing = 0.2in + \globaldefs = 0 +}} + + % @pagesizes TEXTHEIGHT[,TEXTWIDTH] % Perhaps we should allow setting the margins, \topskip, \parskip, % and/or leading, also. Or perhaps we should compute them somehow. @@ -11462,12 +11352,12 @@ \setleading{\textleading}% % \dimen0 = #1\relax - \advance\dimen0 by \voffset - \advance\dimen0 by 1in % reference point for DVI is 1 inch from top of page + \advance\dimen0 by 2.5in % default 1in margin above heading line + % and 1.5in to include heading, footing and + % bottom margin % \dimen2 = \hsize - \advance\dimen2 by \normaloffset - \advance\dimen2 by 1in % reference point is 1 inch from left edge of page + \advance\dimen2 by 2in % default to 1 inch margin on each side % \internalpagesizes{#1}{\hsize}% {\voffset}{\normaloffset}% @@ -11552,9 +11442,9 @@ \def\texinfochars{% \let< = \activeless \let> = \activegtr - \let~ = \activetilde + \let~ = \activetilde \let^ = \activehat - \markupsetuplqdefault \markupsetuprqdefault + \setregularquotes \let\b = \strong \let\i = \smartitalic % in principle, all other definitions in \tex have to be undone too. @@ -11572,11 +11462,9 @@ % \backslashcurfont outputs one backslash character in current font, % as in \char`\\. \global\chardef\backslashcurfont=`\\ -\global\let\rawbackslashxx=\backslashcurfont % let existing .??s files work -% \realbackslash is an actual character `\' with catcode other, and -% \doublebackslash is two of them (for the pdf outlines). -{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}} +% \realbackslash is an actual character `\' with catcode other. +{\catcode`\\=\other @gdef@realbackslash{\}} % In Texinfo, backslash is an active character; it prints the backslash % in fixed width font. @@ -11594,10 +11482,8 @@ @def@ttbackslash{{@tt @ifmmode @mathchar29020 @else @backslashcurfont @fi}} @let@backslashchar = @ttbackslash % @backslashchar{} is for user documents. -% \rawbackslash defines an active \ to do \backslashcurfont. % \otherbackslash defines an active \ to be a literal `\' character with -% catcode other. We switch back and forth between these. -@gdef@rawbackslash{@let\=@backslashcurfont} +% catcode other. @gdef@otherbackslash{@let\=@realbackslash} % Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of @@ -11617,8 +11503,7 @@ @let|=@normalverticalbar @let~=@normaltilde @let\=@ttbackslash - @markupsetuplqdefault - @markupsetuprqdefault + @setregularquotes @unsepspaces } } @@ -11669,7 +11554,7 @@ @ifx\@eatinput @let\ = @ttbackslash @fi @catcode13=5 % regular end of line @enableemergencynewline - @let@c=@texinfoc + @let@c=@comment @let@parsearg@originalparsearg % Also turn back on active characters that might appear in the input % file name, in case not using a pre-dumped format. @@ -11711,11 +11596,10 @@ @c Do this last of all since we use ` in the previous @catcode assignments. @catcode`@'=@active @catcode`@`=@active -@markupsetuplqdefault -@markupsetuprqdefault +@setregularquotes @c Local variables: -@c eval: (add-hook 'write-file-hooks 'time-stamp) +@c eval: (add-hook 'before-save-hook 'time-stamp) @c page-delimiter: "^\\\\message\\|emacs-page" @c time-stamp-start: "def\\\\texinfoversion{" @c time-stamp-format: "%:y-%02m-%02d.%02H" @@ -11725,3 +11609,4 @@ @c vim:sw=2: @enablebackslashhack + diff -Nru automake-1.16-1.16.1/lib/update-copyright automake-1.16-1.16.5/lib/update-copyright --- automake-1.16-1.16.1/lib/update-copyright 2018-03-11 21:19:05.000000000 +0000 +++ automake-1.16-1.16.5/lib/update-copyright 2021-07-07 05:39:57.000000000 +0000 @@ -1,11 +1,9 @@ -eval '(exit $?0)' && eval 'exec perl -wS -0777 -pi "$0" "$@"' - & eval 'exec perl -wS -0777 -pi "$0" $argv:q' - if 0; -# Update an FSF copyright year list to include the current year. +#!/bin/sh +#! -*-perl-*- -my $VERSION = '2018-03-07.03:47'; # UTC +# Update an FSF copyright year list to include the current year. -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 @@ -19,9 +17,12 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . - +# # Written by Jim Meyering and Joel E. Denny +# This script updates an FSF copyright year list to include the current year. +# Usage: update-copyright [FILE...] +# # The arguments to this script should be names of files that contain # copyright statements to be updated. The copyright holder's name # defaults to "Free Software Foundation, Inc." but may be changed to @@ -97,7 +98,7 @@ # 6. Blank lines, even if preceded by the prefix, do not appear # within the FSF copyright statement. # 7. Each copyright year is 2 or 4 digits, and years are separated by -# commas or dashes. Whitespace may appear after commas. +# commas, "-", or "--". Whitespace may appear after commas. # # Environment variables: # @@ -121,6 +122,27 @@ # 5. Set UPDATE_COPYRIGHT_HOLDER if the copyright holder is other # than "Free Software Foundation, Inc.". +# This is a prologue that allows to run a perl script as an executable +# on systems that are compliant to a POSIX version before POSIX:2017. +# On such systems, the usual invocation of an executable through execlp() +# or execvp() fails with ENOEXEC if it is a script that does not start +# with a #! line. The script interpreter mentioned in the #! line has +# to be /bin/sh, because on GuixSD systems that is the only program that +# has a fixed file name. The second line is essential for perl and is +# also useful for editing this file in Emacs. The next two lines below +# are valid code in both sh and perl. When executed by sh, they re-execute +# the script through the perl program found in $PATH. The '-x' option +# is essential as well; without it, perl would re-execute the script +# through /bin/sh. When executed by perl, the next two lines are a no-op. +eval 'exec perl -wSx -0777 -pi "$0" "$@"' + if 0; + +my $VERSION = '2020-04-04.15:07'; # UTC +# The definition above must lie within the first 8 lines in order +# for the Emacs time-stamp write hook (at end) to update it. +# If you change this file with Emacs, please let the write hook +# do its job. Otherwise, update this string manually. + use strict; use warnings; @@ -170,7 +192,7 @@ $holder_re =~ s/\s/$ws_re/g; my $stmt_remainder_re = "(?:$ws_re$circle_c_re)?" - . "$ws_re(?:(?:\\d\\d)?\\d\\d(?:,$ws_re?|-))*" + . "$ws_re(?:(?:\\d\\d)?\\d\\d(?:,$ws_re?|--?))*" . "((?:\\d\\d)?\\d\\d)$ws_re$holder_re"; if (/\G$stmt_remainder_re/) { @@ -209,26 +231,28 @@ # Make the use of intervals consistent. if (!$ENV{UPDATE_COPYRIGHT_USE_INTERVALS}) { - $stmt =~ s/(\d{4})-(\d{4})/join(', ', $1..$2)/eg; + $stmt =~ s/(\d{4})--?(\d{4})/join(', ', $1..$2)/eg; } else { + my $ndash = $ARGV =~ /\.tex(i(nfo)?)?$/ ? "--" : "-"; + $stmt =~ s/ (\d{4}) (?: - (,\ |-) + (,\ |--?) ((??{ - if ($2 eq '-') { '\d{4}'; } + if ($2 ne ', ') { '\d{4}'; } elsif (!$3) { $1 + 1; } else { $3 + 1; } })) )+ - /$1-$3/gx; + /$1$ndash$3/gx; # When it's 2, emit a single range encompassing all year numbers. $ENV{UPDATE_COPYRIGHT_USE_INTERVALS} == 2 - and $stmt =~ s/\b(\d{4})\b.*\b(\d{4})\b/$1-$2/; + and $stmt =~ s/\b(\d{4})\b.*\b(\d{4})\b/$1$ndash$2/; } # Format within margin. @@ -270,6 +294,7 @@ # mode: perl # indent-tabs-mode: nil # eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-line-limit: 200 # time-stamp-start: "my $VERSION = '" # time-stamp-format: "%:y-%02m-%02d.%02H:%02M" # time-stamp-time-zone: "UTC0" diff -Nru automake-1.16-1.16.1/lib/ylwrap automake-1.16-1.16.5/lib/ylwrap --- automake-1.16-1.16.1/lib/ylwrap 2018-03-08 20:15:51.000000000 +0000 +++ automake-1.16-1.16.5/lib/ylwrap 2021-07-12 02:41:13.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # Written by Tom Tromey . # diff -Nru automake-1.16-1.16.1/m4/amversion.in automake-1.16-1.16.5/m4/amversion.in --- automake-1.16-1.16.1/m4/amversion.in 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/amversion.in 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ ## -*- Autoconf -*- ## @configure_input@ -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/amversion.m4 automake-1.16-1.16.5/m4/amversion.m4 --- automake-1.16-1.16.1/m4/amversion.m4 2018-03-11 21:21:06.000000000 +0000 +++ automake-1.16-1.16.5/m4/amversion.m4 2021-10-04 03:06:47.000000000 +0000 @@ -1,6 +1,6 @@ ## -*- Autoconf -*- ## Generated from amversion.in; do not edit by hand. -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,7 @@ [am__api_version='1.16' 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.1], [], +m4_if([$1], [1.16.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -31,7 +31,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.1])dnl +[AM_AUTOMAKE_VERSION([1.16.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff -Nru automake-1.16-1.16.1/m4/ar-lib.m4 automake-1.16-1.16.5/m4/ar-lib.m4 --- automake-1.16-1.16.1/m4/ar-lib.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/ar-lib.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/as.m4 automake-1.16-1.16.5/m4/as.m4 --- automake-1.16-1.16.1/m4/as.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/as.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ # Figure out how to run the assembler. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/auxdir.m4 automake-1.16-1.16.5/m4/auxdir.m4 --- automake-1.16-1.16.1/m4/auxdir.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/auxdir.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/cond-if.m4 automake-1.16-1.16.5/m4/cond-if.m4 --- automake-1.16-1.16.1/m4/cond-if.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/cond-if.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ # AM_COND_IF -*- Autoconf -*- -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/cond.m4 automake-1.16-1.16.5/m4/cond.m4 --- automake-1.16-1.16.1/m4/cond.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/cond.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/depend.m4 automake-1.16-1.16.5/m4/depend.m4 --- automake-1.16-1.16.1/m4/depend.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/depend.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/depout.m4 automake-1.16-1.16.5/m4/depout.m4 --- automake-1.16-1.16.1/m4/depout.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/depout.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -39,7 +39,9 @@ done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi diff -Nru automake-1.16-1.16.1/m4/dmalloc.m4 automake-1.16-1.16.5/m4/dmalloc.m4 --- automake-1.16-1.16.1/m4/dmalloc.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/dmalloc.m4 2021-07-12 02:41:13.000000000 +0000 @@ -3,7 +3,7 @@ ## From Franc,ois Pinard ## ## ----------------------------------- ## -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/extra-recurs.m4 automake-1.16-1.16.5/m4/extra-recurs.m4 --- automake-1.16-1.16.1/m4/extra-recurs.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/extra-recurs.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ # AM_EXTRA_RECURSIVE_TARGETS -*- Autoconf -*- -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/gcj.m4 automake-1.16-1.16.5/m4/gcj.m4 --- automake-1.16-1.16.1/m4/gcj.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/gcj.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,7 +1,7 @@ # Check for Java compiler. -*- Autoconf -*- # For now we only handle the GNU compiler. -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/init.m4 automake-1.16-1.16.5/m4/init.m4 --- automake-1.16-1.16.1/m4/init.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/init.m4 2021-09-20 00:53:14.000000000 +0000 @@ -1,6 +1,6 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -28,6 +28,10 @@ # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl +m4_ifdef([_$0_ALREADY_INIT], + [m4_fatal([$0 expanded multiple times +]m4_defn([_$0_ALREADY_INIT]))], + [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -64,7 +68,7 @@ [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. m4_if( - m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]), [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl @@ -116,6 +120,20 @@ [m4_define([AC_PROG_OBJCXX], m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) +# Variables for tags utilities; see am/tags.am +if test -z "$CTAGS"; then + CTAGS=ctags +fi +AC_SUBST([CTAGS]) +if test -z "$ETAGS"; then + ETAGS=etags +fi +AC_SUBST([ETAGS]) +if test -z "$CSCOPE"; then + CSCOPE=cscope +fi +AC_SUBST([CSCOPE]) + 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 diff -Nru automake-1.16-1.16.1/m4/install-sh.m4 automake-1.16-1.16.5/m4/install-sh.m4 --- automake-1.16-1.16.1/m4/install-sh.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/install-sh.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/internal/ac-config-macro-dirs.m4 automake-1.16-1.16.5/m4/internal/ac-config-macro-dirs.m4 --- automake-1.16-1.16.1/m4/internal/ac-config-macro-dirs.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/internal/ac-config-macro-dirs.m4 2021-07-12 02:41:13.000000000 +0000 @@ -4,7 +4,7 @@ # FIXME: keep in sync with the contents of the variable # '$ac_config_macro_dirs_fallback' in aclocal.in. -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/lead-dot.m4 automake-1.16-1.16.5/m4/lead-dot.m4 --- automake-1.16-1.16.1/m4/lead-dot.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/lead-dot.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/lex.m4 automake-1.16-1.16.5/m4/lex.m4 --- automake-1.16-1.16.1/m4/lex.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/lex.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ ## Replacement for AC_PROG_LEX. -*- Autoconf -*- ## by Alexandre Oliva -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/lispdir.m4 automake-1.16-1.16.5/m4/lispdir.m4 --- automake-1.16-1.16.1/m4/lispdir.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/lispdir.m4 2021-07-12 02:41:13.000000000 +0000 @@ -3,7 +3,7 @@ ## From Ulrich Drepper ## Almost entirely rewritten by Alexandre Oliva ## ------------------------ -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/local.mk automake-1.16-1.16.5/m4/local.mk --- automake-1.16-1.16.1/m4/local.mk 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/local.mk 2021-07-19 00:59:02.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- makefile-automake -*- -## Copyright (C) 1995-2018 Free Software Foundation, Inc. +## Copyright (C) 1995-2021 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 diff -Nru automake-1.16-1.16.1/m4/maintainer.m4 automake-1.16-1.16.5/m4/maintainer.m4 --- automake-1.16-1.16.1/m4/maintainer.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/maintainer.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,7 +1,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/make.m4 automake-1.16-1.16.5/m4/make.m4 --- automake-1.16-1.16.1/m4/make.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/make.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/missing.m4 automake-1.16-1.16.5/m4/missing.m4 --- automake-1.16-1.16.1/m4/missing.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/missing.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -21,12 +21,7 @@ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac + MISSING="\${SHELL} '$am_aux_dir/missing'" fi # Use eval to expand $SHELL if eval "$MISSING --is-lightweight"; then diff -Nru automake-1.16-1.16.1/m4/mkdirp.m4 automake-1.16-1.16.5/m4/mkdirp.m4 --- automake-1.16-1.16.1/m4/mkdirp.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/mkdirp.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/obsolete.m4 automake-1.16-1.16.5/m4/obsolete.m4 --- automake-1.16-1.16.1/m4/obsolete.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/obsolete.m4 2021-07-12 02:41:13.000000000 +0000 @@ -2,7 +2,7 @@ # Obsolete and "removed" macros, that must however still report explicit # error messages when used, to smooth transition. # -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/options.m4 automake-1.16-1.16.5/m4/options.m4 --- automake-1.16-1.16.1/m4/options.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/options.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/prog-cc-c-o.m4 automake-1.16-1.16.5/m4/prog-cc-c-o.m4 --- automake-1.16-1.16.1/m4/prog-cc-c-o.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/prog-cc-c-o.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/python.m4 automake-1.16-1.16.5/m4/python.m4 --- automake-1.16-1.16.1/m4/python.m4 2018-03-08 20:26:56.000000000 +0000 +++ automake-1.16-1.16.5/m4/python.m4 2021-10-04 02:51:12.000000000 +0000 @@ -1,9 +1,9 @@ ## ------------------------ -*- Autoconf -*- ## Python file handling ## From Andrew Dalke -## Updated by James Henstridge +## Updated by James Henstridge and other contributors. ## ------------------------ -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -82,34 +82,141 @@ ]) if test "$PYTHON" = :; then - dnl Run any user-specified action, or abort. + dnl Run any user-specified action, or abort. m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])]) else - dnl Query Python for its version number. Getting [:3] seems to be - dnl the best way to do this; it's what "site.py" does in the standard - dnl library. - + dnl Query Python for its version number. Although site.py simply uses + dnl sys.version[:3], printing that failed with Python 3.10, since the + dnl trailing zero was eliminated. So now we output just the major + dnl and minor version numbers, as numbers. Apparently the tertiary + dnl version is not of interest. + dnl AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], - [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) + [am_cv_python_version=`$PYTHON -c "import sys; print ('%u.%u' % sys.version_info[[:2]])"`]) AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) - dnl Use the values of $prefix and $exec_prefix for the corresponding - dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX. These are made - dnl distinct variables so they can be overridden if need be. However, - dnl general consensus is that you shouldn't need this ability. - - AC_SUBST([PYTHON_PREFIX], ['${prefix}']) - AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}']) - - dnl At times (like when building shared libraries) you may want + dnl At times, e.g., when building shared libraries, you may want dnl to know which OS platform Python thinks this is. - + dnl AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) - # Just factor out some code duplication. + dnl emacs-page + dnl If --with-python-sys-prefix is given, use the values of sys.prefix + dnl and sys.exec_prefix for the corresponding values of PYTHON_PREFIX + dnl and PYTHON_EXEC_PREFIX. Otherwise, use the GNU ${prefix} and + dnl ${exec_prefix} variables. + dnl + dnl The two are made distinct variables so they can be overridden if + dnl need be, although general consensus is that you shouldn't need + dnl this separation. + dnl + dnl Also allow directly setting the prefixes via configure options, + dnl overriding any default. + dnl + if test "x$prefix" = xNONE; then + am__usable_prefix=$ac_default_prefix + else + am__usable_prefix=$prefix + fi + + # Allow user to request using sys.* values from Python, + # instead of the GNU $prefix values. + AC_ARG_WITH([python-sys-prefix], + [AS_HELP_STRING([--with-python-sys-prefix], + [use Python's sys.prefix and sys.exec_prefix values])], + [am_use_python_sys=:], + [am_use_python_sys=false]) + + # Allow user to override whatever the default Python prefix is. + AC_ARG_WITH([python_prefix], + [AS_HELP_STRING([--with-python_prefix], + [override the default PYTHON_PREFIX])], + [am_python_prefix_subst=$withval + am_cv_python_prefix=$withval + AC_MSG_CHECKING([for explicit $am_display_PYTHON prefix]) + AC_MSG_RESULT([$am_cv_python_prefix])], + [ + if $am_use_python_sys; then + # using python sys.prefix value, not GNU + AC_CACHE_CHECK([for python default $am_display_PYTHON prefix], + [am_cv_python_prefix], + [am_cv_python_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"`]) + + dnl If sys.prefix is a subdir of $prefix, replace the literal value of + dnl $prefix with a variable reference so it can be overridden. + case $am_cv_python_prefix in + $am__usable_prefix*) + am__strip_prefix=`echo "$am__usable_prefix" | sed 's|.|.|g'` + am_python_prefix_subst=`echo "$am_cv_python_prefix" | sed "s,^$am__strip_prefix,\\${prefix},"` + ;; + *) + am_python_prefix_subst=$am_cv_python_prefix + ;; + esac + else # using GNU prefix value, not python sys.prefix + am_python_prefix_subst='${prefix}' + am_python_prefix=$am_python_prefix_subst + AC_MSG_CHECKING([for GNU default $am_display_PYTHON prefix]) + AC_MSG_RESULT([$am_python_prefix]) + fi]) + # Substituting python_prefix_subst value. + AC_SUBST([PYTHON_PREFIX], [$am_python_prefix_subst]) + + # emacs-page Now do it all over again for Python exec_prefix, but with yet + # another conditional: fall back to regular prefix if that was specified. + AC_ARG_WITH([python_exec_prefix], + [AS_HELP_STRING([--with-python_exec_prefix], + [override the default PYTHON_EXEC_PREFIX])], + [am_python_exec_prefix_subst=$withval + am_cv_python_exec_prefix=$withval + AC_MSG_CHECKING([for explicit $am_display_PYTHON exec_prefix]) + AC_MSG_RESULT([$am_cv_python_exec_prefix])], + [ + # no explicit --with-python_exec_prefix, but if + # --with-python_prefix was given, use its value for python_exec_prefix too. + AS_IF([test -n "$with_python_prefix"], + [am_python_exec_prefix_subst=$with_python_prefix + am_cv_python_exec_prefix=$with_python_prefix + AC_MSG_CHECKING([for python_prefix-given $am_display_PYTHON exec_prefix]) + AC_MSG_RESULT([$am_cv_python_exec_prefix])], + [ + # Set am__usable_exec_prefix whether using GNU or Python values, + # since we use that variable for pyexecdir. + if test "x$exec_prefix" = xNONE; then + am__usable_exec_prefix=$am__usable_prefix + else + am__usable_exec_prefix=$exec_prefix + fi + # + if $am_use_python_sys; then # using python sys.exec_prefix, not GNU + AC_CACHE_CHECK([for python default $am_display_PYTHON exec_prefix], + [am_cv_python_exec_prefix], + [am_cv_python_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"`]) + dnl If sys.exec_prefix is a subdir of $exec_prefix, replace the + dnl literal value of $exec_prefix with a variable reference so it can + dnl be overridden. + case $am_cv_python_exec_prefix in + $am__usable_exec_prefix*) + am__strip_prefix=`echo "$am__usable_exec_prefix" | sed 's|.|.|g'` + am_python_exec_prefix_subst=`echo "$am_cv_python_exec_prefix" | sed "s,^$am__strip_prefix,\\${exec_prefix},"` + ;; + *) + am_python_exec_prefix_subst=$am_cv_python_exec_prefix + ;; + esac + else # using GNU $exec_prefix, not python sys.exec_prefix + am_python_exec_prefix_subst='${exec_prefix}' + am_python_exec_prefix=$am_python_exec_prefix_subst + AC_MSG_CHECKING([for GNU default $am_display_PYTHON exec_prefix]) + AC_MSG_RESULT([$am_python_exec_prefix]) + fi])]) + # Substituting python_exec_prefix_subst. + AC_SUBST([PYTHON_EXEC_PREFIX], [$am_python_exec_prefix_subst]) + + # Factor out some code duplication into this shell variable. am_python_setup_sysconfig="\ import sys # Prefer sysconfig over distutils.sysconfig, for better compatibility @@ -129,96 +236,95 @@ except ImportError: pass" - dnl Set up 4 directories: + dnl emacs-page Set up 4 directories: - dnl pythondir -- where to install python scripts. This is the - dnl site-packages directory, not the python standard library - dnl directory like in previous automake betas. This behavior - dnl is more consistent with lispdir.m4 for example. + dnl 1. pythondir: where to install python scripts. This is the + dnl site-packages directory, not the python standard library + dnl directory like in previous automake betas. This behavior + dnl is more consistent with lispdir.m4 for example. dnl Query distutils for this directory. - AC_CACHE_CHECK([for $am_display_PYTHON script directory], - [am_cv_python_pythondir], - [if test "x$prefix" = xNONE - then - am_py_prefix=$ac_default_prefix - else - am_py_prefix=$prefix - fi - am_cv_python_pythondir=`$PYTHON -c " + dnl + AC_CACHE_CHECK([for $am_display_PYTHON script directory (pythondir)], + [am_cv_python_pythondir], + [if test "x$am_cv_python_prefix" = x; then + am_py_prefix=$am__usable_prefix + else + am_py_prefix=$am_cv_python_prefix + fi + am_cv_python_pythondir=`$PYTHON -c " $am_python_setup_sysconfig if can_use_sysconfig: - sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) + sitedir = sysconfig.get_path('purelib', vars={'base':'$am_py_prefix'}) else: - from distutils import sysconfig - sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(0, 0, prefix='$am_py_prefix') sys.stdout.write(sitedir)"` - case $am_cv_python_pythondir in - $am_py_prefix*) - am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` - am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` - ;; - *) - case $am_py_prefix in - /usr|/System*) ;; - *) - am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages - ;; - esac - ;; + # + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,\\${PYTHON_PREFIX},"` + ;; + *) + case $am_py_prefix in + /usr|/System*) ;; + *) am_cv_python_pythondir="\${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/site-packages" + ;; esac - ]) + ;; + esac + ]) AC_SUBST([pythondir], [$am_cv_python_pythondir]) - dnl pkgpythondir -- $PACKAGE directory under pythondir. Was - dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is - dnl more consistent with the rest of automake. - + dnl 2. pkgpythondir: $PACKAGE directory under pythondir. Was + dnl PYTHON_SITE_PACKAGE in previous betas, but this naming is + dnl more consistent with the rest of automake. + dnl AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE]) - dnl pyexecdir -- directory for installing python extension modules - dnl (shared libraries) + dnl 3. pyexecdir: directory for installing python extension modules + dnl (shared libraries). dnl Query distutils for this directory. - AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], - [am_cv_python_pyexecdir], - [if test "x$exec_prefix" = xNONE - then - am_py_exec_prefix=$am_py_prefix - else - am_py_exec_prefix=$exec_prefix - fi - am_cv_python_pyexecdir=`$PYTHON -c " + dnl + AC_CACHE_CHECK([for $am_display_PYTHON extension module directory (pyexecdir)], + [am_cv_python_pyexecdir], + [if test "x$am_cv_python_exec_prefix" = x; then + am_py_exec_prefix=$am__usable_exec_prefix + else + am_py_exec_prefix=$am_cv_python_exec_prefix + fi + am_cv_python_pyexecdir=`$PYTHON -c " $am_python_setup_sysconfig if can_use_sysconfig: - sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_prefix'}) + sitedir = sysconfig.get_path('platlib', vars={'platbase':'$am_py_exec_prefix'}) else: - from distutils import sysconfig - sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_prefix') + from distutils import sysconfig + sitedir = sysconfig.get_python_lib(1, 0, prefix='$am_py_exec_prefix') sys.stdout.write(sitedir)"` - case $am_cv_python_pyexecdir in - $am_py_exec_prefix*) - am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` - am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` - ;; - *) - case $am_py_exec_prefix in - /usr|/System*) ;; - *) - am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages - ;; - esac - ;; + # + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,\\${PYTHON_EXEC_PREFIX},"` + ;; + *) + case $am_py_exec_prefix in + /usr|/System*) ;; + *) am_cv_python_pyexecdir="\${PYTHON_EXEC_PREFIX}/lib/python$PYTHON_VERSION/site-packages" + ;; esac - ]) + ;; + esac + ]) AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) - dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) - + dnl 4. pkgpyexecdir: $(pyexecdir)/$(PACKAGE) + dnl AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE]) dnl Run any user-specified action. $2 fi - ]) diff -Nru automake-1.16-1.16.1/m4/runlog.m4 automake-1.16-1.16.5/m4/runlog.m4 --- automake-1.16-1.16.1/m4/runlog.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/runlog.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/sanity.m4 automake-1.16-1.16.5/m4/sanity.m4 --- automake-1.16-1.16.1/m4/sanity.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/sanity.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/silent.m4 automake-1.16-1.16.5/m4/silent.m4 --- automake-1.16-1.16.1/m4/silent.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/silent.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/strip.m4 automake-1.16-1.16.5/m4/strip.m4 --- automake-1.16-1.16.1/m4/strip.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/strip.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/substnot.m4 automake-1.16-1.16.5/m4/substnot.m4 --- automake-1.16-1.16.1/m4/substnot.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/substnot.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- Autoconf -*- -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/tar.m4 automake-1.16-1.16.5/m4/tar.m4 --- automake-1.16-1.16.1/m4/tar.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/tar.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/upc.m4 automake-1.16-1.16.5/m4/upc.m4 --- automake-1.16-1.16.1/m4/upc.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/upc.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ # Find a compiler for Unified Parallel C. -*- Autoconf -*- -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru automake-1.16-1.16.1/m4/vala.m4 automake-1.16-1.16.5/m4/vala.m4 --- automake-1.16-1.16.1/m4/vala.m4 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/m4/vala.m4 2021-07-12 02:41:13.000000000 +0000 @@ -1,28 +1,30 @@ # Autoconf support for the Vala compiler -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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. -# Check whether the Vala compiler exists in $PATH. If it is found, the -# variable VALAC is set pointing to its absolute path. Otherwise, it is -# simply set to 'valac'. -# Optionally a minimum release number of the compiler can be requested. -# If the ACTION-IF-FOUND parameter is given, it will be run if a proper -# Vala compiler is found. -# Similarly, if the ACTION-IF-FOUND is given, it will be run if no proper -# Vala compiler is found. It defaults to simply print a warning about the -# situation, but otherwise proceeding with the configuration. +# Search for a Vala compiler in PATH. If it is found, the variable VALAC is +# set to point to it. Otherwise, it is simply set to 'valac'. This macro +# takes three optional arguments. The first argument, if present, is the +# minimum version of the Vala API required to compile this package. For Vala +# releases, this is the same as the major and minor release number; e.g., when +# `valac --version' reports 0.48.7, `valac --api-version' reports 0.48. If a +# compiler is found and satisfies MINIMUM-VERSION, then ACTION-IF-FOUND is run +# (this defaults to do nothing). Otherwise, ACTION-IF-NOT-FOUND is run. If +# ACTION-IF-NOT-FOUND is not specified, the default value is to print a +# warning in case no compiler is found, or if a too-old version of the +# compiler is found. # # AM_PROG_VALAC([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) # -------------------------------------------------------------------------- AC_DEFUN([AM_PROG_VALAC], [AC_PATH_PROG([VALAC], [valac], [valac]) AS_IF([test "$VALAC" != valac && test -n "$1"], - [AC_MSG_CHECKING([whether $VALAC is at least version $1]) - am__vala_version=`$VALAC --version | sed 's/Vala *//'` + [AC_MSG_CHECKING([whether $VALAC supports at least API version $1]) + am__vala_version=`$VALAC --api-version` AS_VERSION_COMPARE([$1], ["$am__vala_version"], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([yes])], @@ -30,8 +32,8 @@ VALAC=valac])]) if test "$VALAC" = valac; then m4_default([$3], - [AC_MSG_WARN([no proper vala compiler found]) - AC_MSG_WARN([you will not be able to compile vala source files])]) + [AC_MSG_WARN([Vala compiler not found or too old]) + AC_MSG_WARN([you will not be able to compile Vala source files])]) else m4_default([$2], [:]) fi]) diff -Nru automake-1.16-1.16.1/maintainer/am-ft automake-1.16-1.16.5/maintainer/am-ft --- automake-1.16-1.16.1/maintainer/am-ft 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/maintainer/am-ft 2021-07-12 02:41:13.000000000 +0000 @@ -2,7 +2,7 @@ # Remote testing of Automake tarballs made easy. # This script requires Bash 4.x or later. -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/maintainer/am-xft automake-1.16-1.16.5/maintainer/am-xft --- automake-1.16-1.16.1/maintainer/am-xft 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/maintainer/am-xft 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/maintainer/maint.mk automake-1.16-1.16.5/maintainer/maint.mk --- automake-1.16-1.16.1/maintainer/maint.mk 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/maintainer/maint.mk 2021-07-19 00:59:02.000000000 +0000 @@ -1,6 +1,6 @@ # Maintainer makefile rules for Automake. # -# Copyright (C) 1995-2018 Free Software Foundation, Inc. +# Copyright (C) 1995-2021 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 diff -Nru automake-1.16-1.16.1/maintainer/rename-tests automake-1.16-1.16.5/maintainer/rename-tests --- automake-1.16-1.16.1/maintainer/rename-tests 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/maintainer/rename-tests 2021-07-12 02:41:13.000000000 +0000 @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Convenience script to rename test cases in Automake. -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/maintainer/syntax-checks.mk automake-1.16-1.16.5/maintainer/syntax-checks.mk --- automake-1.16-1.16.1/maintainer/syntax-checks.mk 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/maintainer/syntax-checks.mk 2021-10-04 03:06:47.000000000 +0000 @@ -1,6 +1,6 @@ # Maintainer checks for Automake. Requires GNU make. -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 @@ -36,9 +36,10 @@ $(srcdir)/t/ax/test-lib.sh \ $(srcdir)/t/ax/test-defs.in +# Must prune test dirs since some are intentionally unreadable. ams := $(shell find $(srcdir) -name '*.dir' -prune -o -name '*.am' -print) -# Some simple checks, and then ordinary check. These are only really +# Some simple checks, and then ordinary checks. These are only really # guaranteed to work on my machine. syntax_check_rules = \ $(sc_tests_plain_check_rules) \ @@ -80,8 +81,8 @@ sc_at_in_texi $(syntax_check_rules): bin/automake bin/aclocal -maintainer-check: $(syntax_check_rules) -.PHONY: maintainer-check $(syntax_check_rules) +maintainer-check syntax-check: $(syntax_check_rules) +.PHONY: maintainer-check syntax-check $(syntax_check_rules) # Check that the list of tests given in the Makefile is equal to the # list of all test scripts in the Automake testsuite. @@ -95,7 +96,8 @@ sc_sanity_gnu_grep: $(AM_V_GEN)grep --version | grep 'GNU grep' >/dev/null 2>&1 \ && ab=$$(printf 'a\nb') \ - && test "$$(printf 'xa\nb\nc' | grep -Pzo 'a\nb')" = "$$ab" \ + && test "$$(printf 'xa\nb\nc' | grep -Pzo 'a\nb' | tr -d '\0')" \ + = "$$ab" \ || { \ echo "Syntax checks recipes require a modern GNU grep" >&2; \ exit 1; \ @@ -104,18 +106,18 @@ $(syntax_check_rules): sc_sanity_gnu_grep # Check that every subroutine in perl scripts has a corresponding -# prototype +# prototype. sc_perl_protos: $(AM_V_GEN)$(srcdir)/maintainer/check-perl-protos \ <$(srcdir)/bin/aclocal.in && \ $(srcdir)/maintainer/check-perl-protos <$(srcdir)/bin/automake.in # These check avoids accidental configure substitutions in the source. -# There are exactly 8 lines that should be modified from automake.in to -# automake, and 9 lines that should be modified from aclocal.in to +# There are exactly 7 lines that should be modified from automake.in to +# automake, and 8 lines that should be modified from aclocal.in to # aclocal. -automake_diff_no = 8 -aclocal_diff_no = 9 +automake_diff_no = 7 +aclocal_diff_no = 8 sc_diff_automake sc_diff_aclocal: in=$($*_in) sc_diff_automake sc_diff_aclocal: out=$($*_script) sc_diff_automake sc_diff_aclocal: sc_diff_% : @@ -228,7 +230,7 @@ ## Allow only few variables to be localized in automake and aclocal. sc_perl_local: - @if egrep -v '^[ \t]*local \$$[_~]( *=|;)' \ + @if grep -Ev '^[ \t]*local \$$[_~]( *=|;)' \ $(automake_in) $(aclocal_in) | \ grep '^[ \t]*local [^*]'; then \ echo "Please avoid 'local'." 1>&2; \ @@ -413,7 +415,7 @@ -e 's/ exp="[^"]*"/ /' \ -e 's/ exp=[^ ]/ /' \ $(filter-out %/am-test-lib.sh,$(xtests)) \ - | grep '\$$MAKE .*='; then \ + | grep -E '\$$MAKE .*\S+='; then \ echo 'Rewrite "$$MAKE foo=bar" as "run_make foo=bar" in the lines above,'; \ echo 'it is more portable.'; \ exit 1; \ @@ -488,9 +490,11 @@ fi # Ensure variables are listed before rules in Makefile.in files we generate. +# (Do not descend into test dirs that are unreadable.) sc_tests_makefile_variable_order: sc_ensure_testsuite_has_run @st=0; \ - for file in `find t -name Makefile.in -print`; do \ + for file in `find t ! -perm -o+r -prune -o -name Makefile.in -print`; \ + do \ latevars=`sed -n \ -e :x -e 's/#.*//' \ -e '/\\\\$$/{' -e N -e 'b x' -e '}' \ diff -Nru automake-1.16-1.16.1/Makefile.am automake-1.16-1.16.5/Makefile.am --- automake-1.16-1.16.1/Makefile.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/Makefile.am 2021-07-19 00:59:02.000000000 +0000 @@ -2,7 +2,7 @@ ## Makefile for Automake. -# Copyright (C) 1995-2018 Free Software Foundation, Inc. +# Copyright (C) 1995-2021 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 @@ -36,6 +36,7 @@ bootstrap \ GNUmakefile \ HACKING \ + NEWS-2.0 \ PLANS # We want a handful of substitutions to be fully-expanded by make; @@ -93,6 +94,7 @@ EXTRA_DIST += \ contrib/tap-driver.pl \ contrib/check-html.am \ + contrib/checklinkx \ contrib/multilib/README \ contrib/multilib/config-ml.in \ contrib/multilib/symlink-tree \ diff -Nru automake-1.16-1.16.1/Makefile.in automake-1.16-1.16.5/Makefile.in --- automake-1.16-1.16.1/Makefile.in 2018-03-11 21:21:08.000000000 +0000 +++ automake-1.16-1.16.5/Makefile.in 2021-10-04 03:07:25.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2021 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,7 @@ @SET_MAKE@ -# Copyright (C) 1995-2018 Free Software Foundation, Inc. +# Copyright (C) 1995-2021 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 @@ -106,15 +106,7 @@ host_triplet = @host@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/amversion.m4 \ - $(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/cond.m4 \ - $(top_srcdir)/m4/init.m4 $(top_srcdir)/m4/install-sh.m4 \ - $(top_srcdir)/m4/lead-dot.m4 $(top_srcdir)/m4/missing.m4 \ - $(top_srcdir)/m4/options.m4 $(top_srcdir)/m4/prog-cc-c-o.m4 \ - $(top_srcdir)/m4/runlog.m4 $(top_srcdir)/m4/sanity.m4 \ - $(top_srcdir)/m4/silent.m4 $(top_srcdir)/m4/strip.m4 \ - $(top_srcdir)/m4/substnot.m4 $(top_srcdir)/m4/tar.m4 \ - $(top_srcdir)/configure.ac +am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ @@ -254,9 +246,6 @@ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | $(am__uniquify_input)` -ETAGS = etags -CTAGS = ctags -CSCOPE = cscope AM_RECURSIVE_TARGETS = cscope check recheck am__tty_colors_dummy = \ mgn= red= grn= lgn= blu= brg= std=; \ @@ -413,6 +402,7 @@ bases='$(TEST_LOGS)'; \ bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \ bases=`echo $$bases` +AM_TESTSUITE_SUMMARY_HEADER = ' for $(PACKAGE_STRING)' RECHECK_LOGS = $(TEST_LOGS) TEST_SUITE_LOG = test-suite.log am__test_logs1 = $(TESTS:=.log) @@ -467,6 +457,8 @@ DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz GZIP_ENV = --best DIST_TARGETS = dist-xz dist-gzip +# Exists only to be overridden by the user if desired. +AM_DISTCHECK_DVI_TARGET = dvi distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -483,6 +475,8 @@ CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ +CSCOPE = @CSCOPE@ +CTAGS = @CTAGS@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -491,6 +485,7 @@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ F77 = @F77@ FC = @FC@ @@ -597,6 +592,7 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ required_autoconf_version = @required_autoconf_version@ +runstatedir = @runstatedir@ sbindir = @sbindir@ scriptdir = @scriptdir@ sharedstatedir = @sharedstatedir@ @@ -621,24 +617,25 @@ # Maintainer-specific files and scripts. # XXX: This script should be updated with 'fetch' target. -EXTRA_DIST = bootstrap GNUmakefile HACKING PLANS contrib/tap-driver.pl \ - contrib/check-html.am contrib/multilib/README \ - contrib/multilib/config-ml.in contrib/multilib/symlink-tree \ - contrib/multilib/multilib.am contrib/multilib/multi.m4 \ - contrib/README old/ChangeLog-tests old/ChangeLog.96 \ - old/ChangeLog.98 old/ChangeLog.00 old/ChangeLog.01 \ - old/ChangeLog.02 old/ChangeLog.03 old/ChangeLog.04 \ - old/ChangeLog.09 old/ChangeLog.11 old/TODO maintainer/am-ft \ - maintainer/am-xft maintainer/rename-tests maintainer/maint.mk \ - maintainer/syntax-checks.mk $(AUTOMAKESOURCES) doc/help2man \ - lib/Automake/Config.in m4/amversion.in t/README t/ax/is \ - t/ax/is_newest t/ax/deltree.pl $(handwritten_TESTS) \ - t/ax/tap-summary-aux.sh t/ax/testsuite-summary-checks.sh \ - t/ax/depcomp.sh t/ax/extract-testsuite-summary.pl \ - t/ax/tap-setup.sh t/ax/trivial-test-driver $(generated_TESTS) \ - gen-testsuite-part $(contrib_TESTS) t/ax/distcheck-hook-m4.am \ - t/ax/test-defs.in t/ax/shell-no-trail-bslash.in \ - t/ax/cc-no-c-o.in t/ax/runtest.in $(perf_TESTS) +EXTRA_DIST = bootstrap GNUmakefile HACKING NEWS-2.0 PLANS \ + contrib/tap-driver.pl contrib/check-html.am contrib/checklinkx \ + contrib/multilib/README contrib/multilib/config-ml.in \ + contrib/multilib/symlink-tree contrib/multilib/multilib.am \ + contrib/multilib/multi.m4 contrib/README old/ChangeLog-tests \ + old/ChangeLog.96 old/ChangeLog.98 old/ChangeLog.00 \ + old/ChangeLog.01 old/ChangeLog.02 old/ChangeLog.03 \ + old/ChangeLog.04 old/ChangeLog.09 old/ChangeLog.11 old/TODO \ + maintainer/am-ft maintainer/am-xft maintainer/rename-tests \ + maintainer/maint.mk maintainer/syntax-checks.mk \ + $(AUTOMAKESOURCES) doc/help2man lib/Automake/Config.in \ + m4/amversion.in t/README t/ax/is t/ax/is_newest \ + t/ax/deltree.pl $(handwritten_TESTS) t/ax/tap-summary-aux.sh \ + t/ax/testsuite-summary-checks.sh t/ax/depcomp.sh \ + t/ax/extract-testsuite-summary.pl t/ax/tap-setup.sh \ + t/ax/trivial-test-driver $(generated_TESTS) gen-testsuite-part \ + $(contrib_TESTS) t/ax/distcheck-hook-m4.am t/ax/test-defs.in \ + t/ax/shell-no-trail-bslash.in t/ax/cc-no-c-o.in \ + t/ax/runtest.in $(perf_TESTS) TAGS_FILES = $(AUTOMAKESOURCES) # Static dependencies valid for each test case (also further @@ -708,6 +705,31 @@ && $(MKDIR_P) doc \ && ./pre-inst-env $(PERL) $(srcdir)/doc/help2man --output=$@ +checklinkx = $(top_srcdir)/contrib/checklinkx +# that 4-second sleep seems to be what gnu.org likes. +chlx_args = -v --sleep 8 #--exclude-url-file=/tmp/xf +# Explanation of excludes: +# - w3.org dtds, they are fine (and slow). +# - mailto urls, they are always forbidden. +# - vala, redirects to a Gnome subpage and returns 403 to us. +# - cfortran, forbidden by site's robots.txt. +# - search.cpan.org, gets +# - debbugs.gnu.org/automake, forbidden by robots.txt. +# - autoconf.html, forbidden by robots.txt (since served from savannah). +# - https://fsf.org redirects to https://www.fsf.org and nothing to do +# (it's in the FDL). --suppress-redirect options do not suppress the msg. +# +chlx_excludes = \ + -X 'http.*w3\.org/.*dtd' \ + -X 'mailto:.*' \ + -X 'https://www\.vala-project\.org/' \ + -X 'https://www-zeus\.desy\.de/~burow/cfortran/' \ + -X 'http://xsearch\.cpan\.org/~mschwern/Test-Simple/lib/Test/More\.pm' \ + -X 'https://debbugs\.gnu\.org/automake' \ + -X 'https://www\.gnu\.org/software/autoconf/manual/autoconf\.html' \ + -X 'https://fsf\.org/' + +chlx_file = $(top_srcdir)/doc/automake.html amhello_sources = \ doc/amhello/configure.ac \ doc/amhello/Makefile.am \ @@ -890,6 +912,8 @@ # For sourcing of extra "shell libraries" by our test scripts. As per # POSIX, sourcing a file with '.' will cause it to be looked up in $PATH # in case it is given with a relative name containing no slashes. + +# Ensure that the installed Automake perl modules are found when running 'installcheck' target AM_TESTS_ENVIRONMENT = for v in required am_test_protocol \ am_serial_tests am_test_prefer_config_shell \ am_original_AUTOMAKE am_original_ACLOCAL am_test_lib_sourced \ @@ -898,7 +922,9 @@ $(srcdir) != .; then \ PATH='$(abs_srcdir)/t/ax$(PATH_SEPARATOR)'$$PATH; fi; \ PATH='$(abs_builddir)/t/ax$(PATH_SEPARATOR)'$$PATH; export \ - PATH; + PATH; if test "$${am_running_installcheck}" = yes; then \ + PERL5LIB="$(DESTDIR)$(pkgvdatadir)/$${PERL5LIB:+$(PATH_SEPARATOR)}$$PERL5LIB"; \ + fi; export PERL5LIB; # We want warning messages and explanations for skipped tests to go to # the console if possible, so set up 'stderr_fileno_' properly. AM_TESTS_FD_REDIRECT = 9>&2 @@ -916,7 +942,6 @@ XFAIL_TESTS = \ t/all.sh \ -t/auxdir-pr19311.sh \ t/cond17.sh \ t/gcj6.sh \ t/override-conditional-2.sh \ @@ -1090,6 +1115,7 @@ t/built-sources-cond.sh \ t/built-sources-fork-bomb.sh \ t/built-sources-install.sh \ +t/built-sources-install-exec.sh \ t/built-sources-subdir.sh \ t/built-sources.sh \ t/candist.sh \ @@ -1297,6 +1323,7 @@ t/dist-readonly.sh \ t/dist-repeated.sh \ t/dist-pr109765.sh \ +t/dist-no-built-sources.sh \ t/dist-vs-built-sources.sh \ t/distcleancheck.sh \ t/distcom2.sh \ @@ -1318,6 +1345,7 @@ t/distcheck-missing-m4.sh \ t/distcheck-outdated-m4.sh \ t/distcheck-no-prefix-or-srcdir-override.sh \ +t/distcheck-override-dvi.sh \ t/distcheck-override-infodir.sh \ t/distcheck-pr9579.sh \ t/distcheck-pr10470.sh \ @@ -1416,6 +1444,7 @@ t/add-missing-install-sh.sh \ t/install-sh-unittests.sh \ t/install-sh-option-C.sh \ +t/install-sh-option-S.sh \ t/instdat.sh \ t/instdat2.sh \ t/instdir.sh \ @@ -1703,6 +1732,7 @@ t/testsuite-summary-color.sh \ t/testsuite-summary-count.sh \ t/testsuite-summary-count-many.sh \ +t/testsuite-summary-header.sh \ t/testsuite-summary-reference-log.sh \ t/test-driver-acsubst.sh \ t/test-driver-cond.sh \ @@ -1717,6 +1747,7 @@ t/test-driver-trs-suffix-registered.sh \ t/test-driver-fail.sh \ t/test-driver-is-distributed.sh \ +t/test-extensions-empty.sh \ t/test-harness-vpath-rewrite.sh \ t/test-log.sh \ t/test-logs-repeated.sh \ @@ -1731,6 +1762,7 @@ t/test-trs-recover2.sh \ t/test-extensions.sh \ t/test-extensions-cond.sh \ +t/toplevelmd.sh \ t/parse.sh \ t/percent.sh \ t/percent2.sh \ @@ -1809,6 +1841,7 @@ t/python-missing.sh \ t/python-too-old.sh \ t/python-dist.sh \ +t/python-prefix.sh \ t/python-vars.sh \ t/python-virtualenv.sh \ t/python-pr10995.sh \ @@ -2075,6 +2108,7 @@ t/tags.sh \ t/tags2.sh \ t/tagsub.sh \ +t/tags-lisp-space.sh \ t/tags-pr12372.sh \ t/tar-ustar.sh \ t/tar-pax.sh \ @@ -2101,6 +2135,7 @@ t/txinfo-no-extra-dist.sh \ t/txinfo-no-installinfo.sh \ t/txinfo-no-repeated-targets.sh \ +t/txinfo-no-setfilename.sh \ t/txinfo-other-suffixes.sh \ t/txinfo-override-infodeps.sh \ t/txinfo-override-texinfo-tex.sh \ @@ -2133,6 +2168,8 @@ t/vala-grepping.sh \ t/vala-headers.sh \ t/vala-libs.sh \ +t/vala-libs-distcheck.sh \ +t/vala-libs-vpath.sh \ t/vala-mix.sh \ t/vala-mix2.sh \ t/vala-non-recursive-setup.sh \ @@ -2217,10 +2254,10 @@ t/color-tests2-w.sh t/compile-w.sh t/compile2-w.sh \ t/compile3-w.sh t/compile4-w.sh t/compile5-w.sh \ t/compile6-w.sh t/compile7-w.sh t/exeext4-w.sh \ - t/install-sh-option-C-w.sh t/install-sh-unittests-w.sh \ - t/maken3-w.sh t/mdate5-w.sh t/mdate6-w.sh \ - t/missing-version-mismatch-w.sh t/missing3-w.sh t/mkinst3-w.sh \ - t/posixsubst-tests-w.sh t/depcomp-lt-auto.tap \ + t/install-sh-option-C-w.sh t/install-sh-option-S-w.sh \ + t/install-sh-unittests-w.sh t/maken3-w.sh t/mdate5-w.sh \ + t/mdate6-w.sh t/missing-version-mismatch-w.sh t/missing3-w.sh \ + t/mkinst3-w.sh t/posixsubst-tests-w.sh t/depcomp-lt-auto.tap \ t/depcomp-lt-cpp.tap t/depcomp-lt-dashmstdout.tap \ t/depcomp-lt-disabled.tap t/depcomp-lt-gcc.tap \ t/depcomp-lt-makedepend.tap t/depcomp-lt-msvcmsys.tap \ @@ -2235,7 +2272,8 @@ check_testsuite_summary_TESTS = \ t/testsuite-summary-color.sh \ - t/testsuite-summary-count.sh + t/testsuite-summary-count.sh \ + t/testsuite-summary-header.sh depcomp_TESTS = \ t/depcomp-lt-auto.tap \ @@ -2256,7 +2294,8 @@ t/depcomp-msvisualcpp.tap extract_testsuite_summary_TESTS = \ - t/testsuite-summary-count-many.sh + t/testsuite-summary-count-many.sh \ + t/testsuite-summary-header.sh gettext_macros_TESTS = \ t/gettext-basics.sh \ @@ -2321,6 +2360,8 @@ t/suffix8.tap \ t/suffix10.tap \ t/vala-libs.sh \ + t/vala-libs-distcheck.sh \ + t/vala-libs-vpath.sh \ t/vartypo2.sh \ t/depcomp-lt-auto.tap \ t/depcomp-lt-cpp.tap \ @@ -2404,6 +2445,8 @@ pkgconfig_macros_TESTS = \ t/vala-headers.sh \ t/vala-libs.sh \ + t/vala-libs-distcheck.sh \ + t/vala-libs-vpath.sh \ t/vala-mix.sh \ t/vala-mix2.sh \ t/vala-non-recursive-setup.sh \ @@ -3114,7 +3157,7 @@ test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \ fi; \ echo "$${col}$$br$${std}"; \ - echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \ + echo "$${col}Testsuite summary"$(AM_TESTSUITE_SUMMARY_HEADER)"$${std}"; \ echo "$${col}$$br$${std}"; \ create_testsuite_report --maybe-color; \ echo "$$col$$br$$std"; \ @@ -3190,7 +3233,6 @@ @am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TAP_LOG_DRIVER_FLAGS) $(TAP_LOG_DRIVER_FLAGS) -- $(TAP_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) - distdir: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) distdir-am @@ -3256,6 +3298,10 @@ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -3298,6 +3344,8 @@ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -3313,7 +3361,7 @@ $(DISTCHECK_CONFIGURE_FLAGS) \ --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \ && $(MAKE) $(AM_MAKEFLAGS) check \ && $(MAKE) $(AM_MAKEFLAGS) install \ && $(MAKE) $(AM_MAKEFLAGS) installcheck \ @@ -3594,10 +3642,10 @@ check-am check-local clean clean-aminfo clean-cscope \ clean-generic clean-local cscope cscopelist-am ctags ctags-am \ dist dist-all dist-bzip2 dist-gzip dist-info dist-lzip \ - dist-shar dist-tarZ dist-xz dist-zip distcheck distclean \ - distclean-generic distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-binSCRIPTS install-data \ + dist-shar dist-tarZ dist-xz dist-zip dist-zstd distcheck \ + distclean distclean-generic distclean-tags distcleancheck \ + distdir distuninstallcheck dvi dvi-am html html-am info \ + info-am install install-am install-binSCRIPTS install-data \ install-data-am install-data-hook install-dist_amDATA \ install-dist_automake_acDATA \ install-dist_automake_internal_acDATA install-dist_docDATA \ @@ -3693,13 +3741,16 @@ $(update_mans) aclocal-$(APIVERSION) doc/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm $(update_mans) automake-$(APIVERSION) +.PHONY: checklinkx +checklinkx: + $(checklinkx) $(chlx_args) $(chlx_excludes) $(chlx_file) # We depend on configure.ac so that we regenerate the tarball # whenever the Automake version changes. $(srcdir)/doc/amhello-1.0.tar.gz: $(amhello_sources) $(srcdir)/configure.ac $(AM_V_GEN)tmp=amhello-output.tmp \ && $(am__cd) $(srcdir)/doc/amhello \ - && : Make our aclocal and automake avaiable before system ones. \ + && : Make our aclocal and automake available before system ones. \ && $(setup_autotools_paths) \ && ( \ { $(AM_V_P) || exec 5>&2 >$$tmp 2>&1; } \ @@ -3829,6 +3880,8 @@ t/exeext4-w.log: t/exeext4.log t/install-sh-option-C-w.log: t/install-sh-option-C.sh t/install-sh-option-C-w.log: t/install-sh-option-C.log +t/install-sh-option-S-w.log: t/install-sh-option-S.sh +t/install-sh-option-S-w.log: t/install-sh-option-S.log t/install-sh-unittests-w.log: t/install-sh-unittests.sh t/install-sh-unittests-w.log: t/install-sh-unittests.log t/maken3-w.log: t/maken3.sh @@ -3849,6 +3902,7 @@ t/tap-summary-color.log: t/ax/tap-summary-aux.sh t/testsuite-summary-color.log: t/ax/testsuite-summary-checks.sh t/testsuite-summary-count.log: t/ax/testsuite-summary-checks.sh +t/testsuite-summary-header.log: t/ax/testsuite-summary-checks.sh t/depcomp-lt-auto.log: t/ax/depcomp.sh t/depcomp-lt-cpp.log: t/ax/depcomp.sh t/depcomp-lt-dashmstdout.log: t/ax/depcomp.sh @@ -3866,6 +3920,7 @@ t/depcomp-msvcmsys.log: t/ax/depcomp.sh t/depcomp-msvisualcpp.log: t/ax/depcomp.sh t/testsuite-summary-count-many.log: t/ax/extract-testsuite-summary.pl +t/testsuite-summary-header.log: t/ax/extract-testsuite-summary.pl t/gettext-basics.log: t/gettext-macros.log t/gettext-config-rpath.log: t/gettext-macros.log t/gettext-external-pr338.log: t/gettext-macros.log @@ -3926,6 +3981,8 @@ t/suffix8.log: t/libtool-macros.log t/suffix10.log: t/libtool-macros.log t/vala-libs.log: t/libtool-macros.log +t/vala-libs-distcheck.log: t/libtool-macros.log +t/vala-libs-vpath.log: t/libtool-macros.log t/vartypo2.log: t/libtool-macros.log t/depcomp-lt-auto.log: t/libtool-macros.log t/depcomp-lt-cpp.log: t/libtool-macros.log @@ -4005,6 +4062,8 @@ t/tap-xfail-tests.log: t/ax/tap-setup.sh t/tap-common-setup.log t/vala-headers.log: t/pkg-config-macros.log t/vala-libs.log: t/pkg-config-macros.log +t/vala-libs-distcheck.log: t/pkg-config-macros.log +t/vala-libs-vpath.log: t/pkg-config-macros.log t/vala-mix.log: t/pkg-config-macros.log t/vala-mix2.log: t/pkg-config-macros.log t/vala-non-recursive-setup.log: t/pkg-config-macros.log @@ -4027,12 +4086,13 @@ $(AM_V_at)chmod a-w t/testsuite-part.tmp $(AM_V_at)mv -f t/testsuite-part.tmp $@ -# The dependecies declared here are not truly complete, but such +# The dependencies declared here are not truly complete, but such # completeness would cause more issues than it would solve. See -# automake bug#11347. +# automake bug#11347 and #44458. $(generated_TESTS): $(srcdir)/gen-testsuite-part $(srcdir)/t/testsuite-part.am: $(srcdir)/gen-testsuite-part $(srcdir)/t/testsuite-part.am: Makefile.am +$(srcdir)/t/testsuite-part.am: t/list-of-tests.mk # Few more static dependencies. t/distcheck-missing-m4.log: t/ax/distcheck-hook-m4.am @@ -4166,7 +4226,7 @@ if $$diff $(am__tmk) $(am__tfs) >$(am__tdf); then \ result=0; \ else \ - echo '$@: list of tests in Makefile an on filesystem differ' >&2; \ + echo '$@: list of tests in Makefile and on filesystem differ' >&2; \ echo "+ $$diff in-makefile on-filesystem" >&2; \ cat $(am__tdf) >&2; \ result=1; \ @@ -4179,10 +4239,13 @@ clean-maintcheck-testslist-tmp: rm -f $(am__tmk) $(am__tfs) $(am__tdf) -# Run the testsuite with the installed aclocal and automake. +# Run the testsuite with the installed aclocal and automake without using +# the 'pre-inst-env' wrapper script. installcheck-local: installcheck-testsuite installcheck-testsuite: $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \ + LOG_COMPILER=$(AM_TEST_RUNNER_SHELL) \ + PL_LOG_COMPILER=$(PERL) \ am_running_installcheck=yes # Performance tests. diff -Nru automake-1.16-1.16.1/NEWS automake-1.16-1.16.5/NEWS --- automake-1.16-1.16.1/NEWS 2018-03-11 21:20:03.000000000 +0000 +++ automake-1.16-1.16.5/NEWS 2021-10-04 03:06:47.000000000 +0000 @@ -1,64 +1,137 @@ -* WARNING: Future backward-incompatibilities! +For planned incompatibilities in a future Automake 2.0 release, +please see NEWS-2.0 and start following the advice there now. - - Makefile recipes generated by Automake 2.0 will expect to use an - 'rm' program that doesn't complain when called without any non-option - argument if the '-f' option is given (so that commands like "rm -f" - and "rm -rf" will act as a no-op, instead of raising usage errors). - This behavior of 'rm' is very widespread in the wild, and it will be - required in the next POSIX version: - - - - Accordingly, AM_INIT_AUTOMAKE now expands some shell code that checks - that the default 'rm' program in PATH satisfies this requirement, - aborting the configure process if this is not the case. For the - moment, it's still possible to force the configuration process to - succeed even with a broken 'rm', that that will no longer be the case - for Automake 2.0. - - - Automake 2.0 will require Autoconf 2.70 or later (which is still - unreleased at the moment of writing, but is planned to be released - before Automake 2.0 is). - - - Automake 2.0 will drop support for the long-deprecated 'configure.in' - name for the Autoconf input file. You are advised to start using the - recommended name 'configure.ac' instead, ASAP. - - - The ACLOCAL_AMFLAGS special make variable will be fully deprecated in - Automake 2.0: it will raise warnings in the "obsolete" category (but - still no hard error of course, for compatibilities with the many, many - packages that still relies on that variable). You are advised to - start relying on the new Automake support for AC_CONFIG_MACRO_DIRS - instead (which was introduced in Automake 1.13). - - - Automake 2.0 will remove support for automatic dependency tracking - with the SGI C/C++ compilers on IRIX. The SGI depmode has been - reported broken "in the wild" already, and we don't think investing - time in debugging and fixing is worthwhile, especially considering - that SGI has last updated those compilers in 2006, and retired - support for them in December 2013: - - - - Automake 2.0 will remove support for MS-DOS and Windows 95/98/ME - (support for them was offered by relying on the DJGPP project). - Note however that both Cygwin and MSYS/MinGW on modern Windows - versions will continue to be fully supported. - - - Automake-provided scripts and makefile recipes might (finally!) - start assuming a POSIX shell in Automake 2.0. There still is no - certainty about this though: we'd first like to wait and see - whether future Autoconf versions will be enhanced to guarantee - that such a shell is always found and provided by the checks in - ./configure. - - - Starting from Automake 2.0, third-party m4 files located in the - system-wide aclocal directory, as well as in any directory listed - in the ACLOCAL_PATH environment variable, will take precedence - over "built-in" Automake macros. For example (assuming Automake - is installed in the /usr/local hierarchy), a definition of the - AM_PROG_VALAC macro found in '/usr/local/share/aclocal/my-vala.m4' - should take precedence over the same-named automake-provided macro - (defined in '/usr/local/share/aclocal-2.0/vala.m4'). +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +New in 1.16.5: + +* Bugs fixed + + - PYTHON_PREFIX and PYTHON_EXEC_PREFIX are now set according to + Python's sys.* values only if the new configure option + --with-python-sys-prefix is specified. Otherwise, GNU default values + are used, as in the past. (The change in 1.16.3 was too incompatible.) + + - consistently depend on install-libLTLIBRARIES. + +* Distribution + + - use const for yyerror declaration in bison/yacc tests. + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +New in 1.16.4: + +* New features added + + - The PYTHON_PREFIX and PYTHON_EXEC_PREFIX variables are now set from + Python's sys.prefix and sys.exec_prefix; use the new configure options + --with-python_prefix and --with-python_exec_prefix to specify explicitly. + + - Common top-level files can be provided as .md; the non-md version is + used if both are present: + AUTHORS ChangeLog INSTALL NEWS README README-alpha THANKS + + - CTAGS, ETAGS, SCOPE variables can be set via configure. + + - Silent make output for custom link commands. + + - New option "no-dist-built-sources" skips generating $(BUILT_SOURCES) + before building the tarball as part of "make dist", that is, + omits the dependency of $(distdir): $(BUILT_SOURCES). + +* Bugs fixed + + - automake output more reproducible. + + - test-driver less likely to clash with tests writing to the same file. + + - DejaGnu tests always use the directory name, testsuite/, for + compatibility with the newer dejagnu-1.6.3 and with prior versions. + +* Distribution + + - config.sub and config.guess updates include restoration of `...` + for maximum portability. + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +New in 1.16.3: + +* New features added + + - In the testsuite summary, the "for $(PACKAGE_STRING)" suffix + can be overridden with the AM_TESTSUITE_SUMMARY_HEADER variable. + +* Bugs fixed + + - Python version number 3.10 no longer considered to be 3.1. + + - Broken links in manual fixed or removed, and new script + contrib/checklinkx (a small modification of W3C checklink) added, + with accompany target checklinkx to recheck urls. + + - install-exec target depends on $(BUILT_SOURCES). + + - valac argument matching more precise, to avoid garbage in DIST_COMMON. + + - Support for Vala in VPATH builds fixed so that both freshly-generated and + distributed C files work, and operation is more reliable with or without + an installed valac. + + - Dejagnu doesn't break on directories containing spaces. + +* Distribution + + - new variable AM_DISTCHECK_DVI_TARGET, to allow overriding the + "make dvi" that is done as part of distcheck. + +* Miscellaneous changes + + - install-sh tweaks: + . new option -p to preserve mtime, i.e., invoke cp -p. + . new option -S SUFFIX to attempt backup files using SUFFIX. + . no longer unconditionally uses -f when rm is overridden by RMPROG. + . does not chown existing directories. + + - Removed function up_to_date_p in lib/Automake/FileUtils.pm. + We believe this function is completely unused. + + - Support for in-tree Vala libraries improved. + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +New in 1.16.2: + +* New features added + + - add zstd support and the automake option, dist-zstd. + + - support for Python 3: py-compile now supports both Python 3 + and Python 2; tests do not require .pyo files, and uninstall + deletes __pycache__ correctly (automake bug #32088). + +* Miscellaneous changes + + - automake no longer requires a @setfilename in each .texi file + +* Bugs fixed + + - When cleaning the compiled python files, '\n' is not used anymore in the + substitution text of 'sed' transformations. This is done to preserve + compatibility with the 'sed' implementation provided by macOS which + considers '\n' as the 'n' character instead of a newline. + (automake bug#31222) + + - For make tags, lisp_LISP is followed by the necessary space when + used with CONFIG_HEADERS. + (automake bug#38139) + + - The automake test txinfo-vtexi4.sh no longer fails when localtime + and UTC cross a day boundary. + + - Emacsen older than version 25, which require use of + byte-compile-dest-file, are supported again. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -1333,6 +1406,7 @@ script. Similarly, the obsolescent variable '$(AMTAR)' (which you shouldn't be using BTW ;-) no longer invokes the 'missing' script to wrap tar, but simply invokes the 'tar' program itself. + The TAR environment variable overrides. - "make dist" can now create lzip-compressed tarballs. @@ -2751,7 +2825,7 @@ using a `dirlist' file within the aclocal directory. * automake --output-dir is deprecated. * The part of the distcheck target that checks whether uninstall actually - removes all installed files has been moved in a separate target, + removes all installed files has been moved to a separate target, distuninstallcheck, so it can be overridden easily. * Many bug fixes. @@ -2797,7 +2871,7 @@ * EXTRA_DIST can contain generated directories. * Support for dot-less extensions in suffix rules. * The part of the distcheck target that checks whether distclean actually - cleans all built files has been moved in a separate target, distcleancheck, + cleans all built files has been moved to a separate target, distcleancheck, so it can be overridden easily. * `make distcheck' will pass additional options defined in $(DISTCHECK_CONFIGURE_FLAGS) to configure. @@ -3028,7 +3102,7 @@ ----- -Copyright (C) 1995-2018 Free Software Foundation, Inc. +Copyright (C) 1995-2021 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 diff -Nru automake-1.16-1.16.1/NEWS-2.0 automake-1.16-1.16.5/NEWS-2.0 --- automake-1.16-1.16.1/NEWS-2.0 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/NEWS-2.0 2021-10-04 02:51:12.000000000 +0000 @@ -0,0 +1,97 @@ +This file (NEWS-2.0) lists several incompatibilities planned for a +future Automake 2.0 release. + +However, the (few) current Automake maintainers have insufficient interest +and energy to pursue the 2.0 release. We have not even reviewed all +existing bugs. New maintainers are needed! For more information about +helping with Automake development: +https://lists.gnu.org/archive/html/automake/2021-03/msg00018.html + +Therefore, there is no ETA for Automake 2.0, but it is not likely to be +any time soon. So moving these future issues to a separate file seemed +warranted. For more info, see the ./PLANS/ directory. + + +* WARNING: Future backward-incompatibilities! + + - Makefile recipes generated by Automake 2.0 will expect to use an + 'rm' program that doesn't complain when called without any non-option + argument if the '-f' option is given (so that commands like "rm -f" + and "rm -rf" will act as a no-op, instead of raising usage errors). + This behavior of 'rm' is very widespread in the wild, and it will be + required in the next POSIX version: + + + + Accordingly, AM_INIT_AUTOMAKE now expands some shell code that checks + that the default 'rm' program in PATH satisfies this requirement, + aborting the configure process if this is not the case. For the + moment, it's still possible to force the configuration process to + succeed even with a broken 'rm', but that will no longer be the case + for Automake 2.0. + + - Automake 2.0 will require Autoconf 2.71 or later. Exact + dependencies are unknowable at ths time. + + - Automake 2.0 will drop support for the long-deprecated 'configure.in' + name for the Autoconf input file. You are advised to start using the + recommended name 'configure.ac' instead, ASAP. + + - The ACLOCAL_AMFLAGS special make variable will be fully deprecated in + Automake 2.0: it will raise warnings in the "obsolete" category (but + still no hard error of course, for compatibilities with the many, many + packages that still relies on that variable). You are advised to + start relying on the new Automake support for AC_CONFIG_MACRO_DIRS + instead (which was introduced in Automake 1.13). + + - Automake 2.0 will remove support for automatic dependency tracking + with the SGI C/C++ compilers on IRIX. The SGI depmode has been + reported broken "in the wild" already, and we don't think investing + time in debugging and fixing is worthwhile, especially considering + that SGI has last updated those compilers in 2006, and retired + support for them in December 2013: + + + - Automake 2.0 will remove support for MS-DOS and Windows 95/98/ME + (support for them was offered by relying on the DJGPP project). + Note however that both Cygwin and MSYS/MinGW on modern Windows + versions will continue to be fully supported. + + - Automake-provided scripts and makefile recipes might (finally!) + start assuming a POSIX shell in Automake 2.0. There still is no + certainty about this though: we'd first like to wait and see + whether future Autoconf versions will be enhanced to guarantee + that such a shell is always found and provided by the checks in + ./configure. + + In 2020, config.guess was changed by its then-maintainer to require + $(...); the ensuing bug reports and maintenance hassle + (unfortunately the changes have not been reverted) are a convincing + argument that we should not require a POSIX shell until Solaris 10, + at least, is completely gone from the world. + + - Starting from Automake 2.0, third-party m4 files located in the + system-wide aclocal directory, as well as in any directory listed + in the ACLOCAL_PATH environment variable, will take precedence + over "built-in" Automake macros. For example (assuming Automake + is installed in the /usr/local hierarchy), a definition of the + AM_PROG_VALAC macro found in '/usr/local/share/aclocal/my-vala.m4' + should take precedence over the same-named automake-provided macro + (defined in '/usr/local/share/aclocal-2.0/vala.m4'). + +----- + +Copyright (C) 1995-2021 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 +the Free Software Foundation; either version 2, or (at your option) +any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . diff -Nru automake-1.16-1.16.1/old/ChangeLog.00 automake-1.16-1.16.5/old/ChangeLog.00 --- automake-1.16-1.16.1/old/ChangeLog.00 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/old/ChangeLog.00 2021-07-12 02:41:13.000000000 +0000 @@ -2205,7 +2205,7 @@ ----- -Copyright 1999-2018 Free Software Foundation, Inc. +Copyright 1999-2021 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff -Nru automake-1.16-1.16.1/old/ChangeLog.01 automake-1.16-1.16.5/old/ChangeLog.01 --- automake-1.16-1.16.1/old/ChangeLog.01 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/old/ChangeLog.01 2021-07-12 02:41:13.000000000 +0000 @@ -4931,7 +4931,7 @@ ----- -Copyright (C) 2001-2018 Free Software Foundation, Inc. +Copyright (C) 2001-2021 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff -Nru automake-1.16-1.16.1/old/ChangeLog.02 automake-1.16-1.16.5/old/ChangeLog.02 --- automake-1.16-1.16.1/old/ChangeLog.02 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/old/ChangeLog.02 2021-07-12 02:41:13.000000000 +0000 @@ -3219,7 +3219,7 @@ ----- -Copyright (C) 2002-2018 Free Software Foundation, Inc. +Copyright (C) 2002-2021 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff -Nru automake-1.16-1.16.1/old/ChangeLog.03 automake-1.16-1.16.5/old/ChangeLog.03 --- automake-1.16-1.16.1/old/ChangeLog.03 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/old/ChangeLog.03 2021-07-12 02:41:13.000000000 +0000 @@ -2965,7 +2965,7 @@ ----- -Copyright (C) 2003-2018 Free Software Foundation, Inc. +Copyright (C) 2003-2021 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff -Nru automake-1.16-1.16.1/old/ChangeLog.04 automake-1.16-1.16.5/old/ChangeLog.04 --- automake-1.16-1.16.1/old/ChangeLog.04 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/old/ChangeLog.04 2021-07-12 02:41:13.000000000 +0000 @@ -1613,7 +1613,7 @@ ----- -Copyright (C) 2004-2018 Free Software Foundation, Inc. +Copyright (C) 2004-2021 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff -Nru automake-1.16-1.16.1/old/ChangeLog.09 automake-1.16-1.16.5/old/ChangeLog.09 --- automake-1.16-1.16.1/old/ChangeLog.09 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/old/ChangeLog.09 2021-07-12 02:41:13.000000000 +0000 @@ -5757,7 +5757,7 @@ ----- -Copyright (C) 2005-2018 Free Software Foundation, Inc. +Copyright (C) 2005-2021 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff -Nru automake-1.16-1.16.1/old/ChangeLog.11 automake-1.16-1.16.5/old/ChangeLog.11 --- automake-1.16-1.16.1/old/ChangeLog.11 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/old/ChangeLog.11 2021-07-12 02:41:13.000000000 +0000 @@ -13097,7 +13097,7 @@ ----- -Copyright (C) 2010-2018 Free Software Foundation, Inc. +Copyright (C) 2010-2021 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff -Nru automake-1.16-1.16.1/old/ChangeLog.96 automake-1.16-1.16.5/old/ChangeLog.96 --- automake-1.16-1.16.1/old/ChangeLog.96 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/old/ChangeLog.96 2021-07-12 02:41:13.000000000 +0000 @@ -3679,7 +3679,7 @@ ----- -Copyright 1994-2018 Free Software Foundation, Inc. +Copyright 1994-2021 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff -Nru automake-1.16-1.16.1/old/ChangeLog.98 automake-1.16-1.16.5/old/ChangeLog.98 --- automake-1.16-1.16.1/old/ChangeLog.98 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/old/ChangeLog.98 2021-07-12 02:41:13.000000000 +0000 @@ -2185,7 +2185,7 @@ ----- -Copyright 1997-2018 Free Software Foundation, Inc. +Copyright 1997-2021 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff -Nru automake-1.16-1.16.1/old/ChangeLog-tests automake-1.16-1.16.5/old/ChangeLog-tests --- automake-1.16-1.16.1/old/ChangeLog-tests 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/old/ChangeLog-tests 2021-07-12 02:41:13.000000000 +0000 @@ -1442,7 +1442,7 @@ ----- -Copyright 2012-2018 Free Software Foundation, Inc. +Copyright 2012-2021 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. diff -Nru automake-1.16-1.16.1/old/TODO automake-1.16-1.16.5/old/TODO --- automake-1.16-1.16.1/old/TODO 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/old/TODO 2021-07-12 02:41:13.000000000 +0000 @@ -483,7 +483,7 @@ * copyright notice -Copyright 1994-2018 Free Software Foundation, Inc. +Copyright 1994-2021 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 diff -Nru automake-1.16-1.16.1/pre-inst-env.in automake-1.16-1.16.5/pre-inst-env.in --- automake-1.16-1.16.1/pre-inst-env.in 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/pre-inst-env.in 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright © 2017-2018 Free Software Foundation, Inc. +# Copyright © 2017-2021 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 diff -Nru automake-1.16-1.16.1/README automake-1.16-1.16.5/README --- automake-1.16-1.16.1/README 2018-02-27 22:59:31.000000000 +0000 +++ automake-1.16-1.16.5/README 2021-07-15 03:18:28.000000000 +0000 @@ -23,11 +23,11 @@ Automake has a test suite. Use "make check" to run it. For more information, see the file t/README. -Automake has a page on the web. See: +Automake's home page: https://www.gnu.org/software/automake/ -Automake also has three mailing lists: +Automake has three mailing lists: * automake@gnu.org For general discussions of Automake and its interactions with other @@ -40,19 +40,19 @@ Where to send patches, and discuss the automake development process and the design of new features. -To obtain more information about these list, or to subscribe to them, -refer to +To see the archives of these lists, or to (un)subscribe to them, +refer to . New releases are announced to autotools-announce@gnu.org. If you want to be informed, subscribe to that list by following the instructions at . For any copyright year range specified as YYYY-ZZZZ in this package, -that the range specifies every single year in that closed interval. +the range specifies every single year in that closed interval. ----- -Copyright (C) 1994-2012 Free Software Foundation, Inc. +Copyright (C) 1994-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-acdir.sh automake-1.16-1.16.5/t/aclocal-acdir.sh --- automake-1.16-1.16.1/t/aclocal-acdir.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-acdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-amflags.sh automake-1.16-1.16.5/t/aclocal-amflags.sh --- automake-1.16-1.16.1/t/aclocal-amflags.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-amflags.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-autoconf-version-check.sh automake-1.16-1.16.5/t/aclocal-autoconf-version-check.sh --- automake-1.16-1.16.1/t/aclocal-autoconf-version-check.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-autoconf-version-check.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-comments-respected.sh automake-1.16-1.16.5/t/aclocal-comments-respected.sh --- automake-1.16-1.16.1/t/aclocal-comments-respected.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-comments-respected.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-deleted-header-aclocal-amflags.sh automake-1.16-1.16.5/t/aclocal-deleted-header-aclocal-amflags.sh --- automake-1.16-1.16.1/t/aclocal-deleted-header-aclocal-amflags.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-deleted-header-aclocal-amflags.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2007-2018 Free Software Foundation, Inc. +# Copyright (C) 2007-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-deleted-header.sh automake-1.16-1.16.5/t/aclocal-deleted-header.sh --- automake-1.16-1.16.1/t/aclocal-deleted-header.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-deleted-header.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2007-2018 Free Software Foundation, Inc. +# Copyright (C) 2007-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-deps.sh automake-1.16-1.16.5/t/aclocal-deps.sh --- automake-1.16-1.16.1/t/aclocal-deps.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-deps.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-deps-subdir.sh automake-1.16-1.16.5/t/aclocal-deps-subdir.sh --- automake-1.16-1.16.1/t/aclocal-deps-subdir.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-deps-subdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-dirlist-abspath.sh automake-1.16-1.16.5/t/aclocal-dirlist-abspath.sh --- automake-1.16-1.16.1/t/aclocal-dirlist-abspath.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-dirlist-abspath.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-dirlist-globbing.sh automake-1.16-1.16.5/t/aclocal-dirlist-globbing.sh --- automake-1.16-1.16.1/t/aclocal-dirlist-globbing.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-dirlist-globbing.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-dirlist.sh automake-1.16-1.16.5/t/aclocal-dirlist.sh --- automake-1.16-1.16.1/t/aclocal-dirlist.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-dirlist.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-I-and-install.sh automake-1.16-1.16.5/t/aclocal-I-and-install.sh --- automake-1.16-1.16.1/t/aclocal-I-and-install.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-I-and-install.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-install-absdir.sh automake-1.16-1.16.5/t/aclocal-install-absdir.sh --- automake-1.16-1.16.1/t/aclocal-install-absdir.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-install-absdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-install-fail.sh automake-1.16-1.16.5/t/aclocal-install-fail.sh --- automake-1.16-1.16.1/t/aclocal-install-fail.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-install-fail.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-install-mkdir.sh automake-1.16-1.16.5/t/aclocal-install-mkdir.sh --- automake-1.16-1.16.1/t/aclocal-install-mkdir.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-install-mkdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-I-order-1.sh automake-1.16-1.16.5/t/aclocal-I-order-1.sh --- automake-1.16-1.16.1/t/aclocal-I-order-1.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-I-order-1.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-I-order-2.sh automake-1.16-1.16.5/t/aclocal-I-order-2.sh --- automake-1.16-1.16.1/t/aclocal-I-order-2.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-I-order-2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-I-order-3.sh automake-1.16-1.16.5/t/aclocal-I-order-3.sh --- automake-1.16-1.16.1/t/aclocal-I-order-3.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-I-order-3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh automake-1.16-1.16.5/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh --- automake-1.16-1.16.1/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-m4-include-are-scanned-aclocal-amflags.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-m4-include-are-scanned.sh automake-1.16-1.16.5/t/aclocal-m4-include-are-scanned.sh --- automake-1.16-1.16.1/t/aclocal-m4-include-are-scanned.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-m4-include-are-scanned.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-m4-sinclude.sh automake-1.16-1.16.5/t/aclocal-m4-sinclude.sh --- automake-1.16-1.16.1/t/aclocal-m4-sinclude.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-m4-sinclude.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-macrodirs.tap automake-1.16-1.16.5/t/aclocal-macrodirs.tap --- automake-1.16-1.16.1/t/aclocal-macrodirs.tap 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-macrodirs.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-macrodir.tap automake-1.16-1.16.5/t/aclocal-macrodir.tap --- automake-1.16-1.16.1/t/aclocal-macrodir.tap 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-macrodir.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-missing-macros.sh automake-1.16-1.16.5/t/aclocal-missing-macros.sh --- automake-1.16-1.16.1/t/aclocal-missing-macros.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-missing-macros.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-no-extra-scan.sh automake-1.16-1.16.5/t/aclocal-no-extra-scan.sh --- automake-1.16-1.16.1/t/aclocal-no-extra-scan.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-no-extra-scan.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-no-force.sh automake-1.16-1.16.5/t/aclocal-no-force.sh --- automake-1.16-1.16.1/t/aclocal-no-force.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-no-force.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-no-install-no-mkdir.sh automake-1.16-1.16.5/t/aclocal-no-install-no-mkdir.sh --- automake-1.16-1.16.1/t/aclocal-no-install-no-mkdir.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-no-install-no-mkdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-no-symlinked-overwrite.sh automake-1.16-1.16.5/t/aclocal-no-symlinked-overwrite.sh --- automake-1.16-1.16.1/t/aclocal-no-symlinked-overwrite.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-no-symlinked-overwrite.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-no-unused-required.sh automake-1.16-1.16.5/t/aclocal-no-unused-required.sh --- automake-1.16-1.16.1/t/aclocal-no-unused-required.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-no-unused-required.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-path-install-serial.sh automake-1.16-1.16.5/t/aclocal-path-install-serial.sh --- automake-1.16-1.16.1/t/aclocal-path-install-serial.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-path-install-serial.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-path-install.sh automake-1.16-1.16.5/t/aclocal-path-install.sh --- automake-1.16-1.16.1/t/aclocal-path-install.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-path-install.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-path-nonexistent.sh automake-1.16-1.16.5/t/aclocal-path-nonexistent.sh --- automake-1.16-1.16.1/t/aclocal-path-nonexistent.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-path-nonexistent.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-path-precedence.sh automake-1.16-1.16.5/t/aclocal-path-precedence.sh --- automake-1.16-1.16.1/t/aclocal-path-precedence.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-path-precedence.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-path.sh automake-1.16-1.16.5/t/aclocal-path.sh --- automake-1.16-1.16.1/t/aclocal-path.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-path.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-pr450.sh automake-1.16-1.16.5/t/aclocal-pr450.sh --- automake-1.16-1.16.1/t/aclocal-pr450.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-pr450.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-print-acdir.sh automake-1.16-1.16.5/t/aclocal-print-acdir.sh --- automake-1.16-1.16.1/t/aclocal-print-acdir.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-print-acdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-remake-misc.sh automake-1.16-1.16.5/t/aclocal-remake-misc.sh --- automake-1.16-1.16.1/t/aclocal-remake-misc.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-remake-misc.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-req.sh automake-1.16-1.16.5/t/aclocal-req.sh --- automake-1.16-1.16.1/t/aclocal-req.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-req.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-scan-configure-ac-pr319.sh automake-1.16-1.16.5/t/aclocal-scan-configure-ac-pr319.sh --- automake-1.16-1.16.1/t/aclocal-scan-configure-ac-pr319.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-scan-configure-ac-pr319.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-serial.sh automake-1.16-1.16.5/t/aclocal-serial.sh --- automake-1.16-1.16.1/t/aclocal-serial.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-serial.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal.sh automake-1.16-1.16.5/t/aclocal.sh --- automake-1.16-1.16.1/t/aclocal.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-underquoted-defun.sh automake-1.16-1.16.5/t/aclocal-underquoted-defun.sh --- automake-1.16-1.16.1/t/aclocal-underquoted-defun.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-underquoted-defun.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/aclocal-verbose-install.sh automake-1.16-1.16.5/t/aclocal-verbose-install.sh --- automake-1.16-1.16.1/t/aclocal-verbose-install.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aclocal-verbose-install.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/ac-output-old.tap automake-1.16-1.16.5/t/ac-output-old.tap --- automake-1.16-1.16.1/t/ac-output-old.tap 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/ac-output-old.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/acsilent.sh automake-1.16-1.16.5/t/acsilent.sh --- automake-1.16-1.16.1/t/acsilent.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/acsilent.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/acsubst2.sh automake-1.16-1.16.5/t/acsubst2.sh --- automake-1.16-1.16.1/t/acsubst2.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/acsubst2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/acsubst.sh automake-1.16-1.16.5/t/acsubst.sh --- automake-1.16-1.16.1/t/acsubst.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/acsubst.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/add-missing-install-sh.sh automake-1.16-1.16.5/t/add-missing-install-sh.sh --- automake-1.16-1.16.1/t/add-missing-install-sh.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/add-missing-install-sh.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/add-missing-multiple.sh automake-1.16-1.16.5/t/add-missing-multiple.sh --- automake-1.16-1.16.1/t/add-missing-multiple.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/add-missing-multiple.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/add-missing.tap automake-1.16-1.16.5/t/add-missing.tap --- automake-1.16-1.16.1/t/add-missing.tap 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/add-missing.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/all2.sh automake-1.16-1.16.5/t/all2.sh --- automake-1.16-1.16.1/t/all2.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/all2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/alloca2.sh automake-1.16-1.16.5/t/alloca2.sh --- automake-1.16-1.16.1/t/alloca2.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/alloca2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/alloca.sh automake-1.16-1.16.5/t/alloca.sh --- automake-1.16-1.16.1/t/alloca.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/alloca.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/all.sh automake-1.16-1.16.5/t/all.sh --- automake-1.16-1.16.1/t/all.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/all.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/alpha2.sh automake-1.16-1.16.5/t/alpha2.sh --- automake-1.16-1.16.1/t/alpha2.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/alpha2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/alpha.sh automake-1.16-1.16.5/t/alpha.sh --- automake-1.16-1.16.1/t/alpha.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/alpha.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/amassign.sh automake-1.16-1.16.5/t/amassign.sh --- automake-1.16-1.16.1/t/amassign.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/amassign.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/am-config-header.sh automake-1.16-1.16.5/t/am-config-header.sh --- automake-1.16-1.16.1/t/am-config-header.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/am-config-header.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/am-default-source-ext.sh automake-1.16-1.16.5/t/am-default-source-ext.sh --- automake-1.16-1.16.1/t/am-default-source-ext.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/am-default-source-ext.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/amhello-binpkg.sh automake-1.16-1.16.5/t/amhello-binpkg.sh --- automake-1.16-1.16.1/t/amhello-binpkg.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/amhello-binpkg.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/amhello-cflags.sh automake-1.16-1.16.5/t/amhello-cflags.sh --- automake-1.16-1.16.1/t/amhello-cflags.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/amhello-cflags.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/amhello-cross-compile.sh automake-1.16-1.16.5/t/amhello-cross-compile.sh --- automake-1.16-1.16.1/t/amhello-cross-compile.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/amhello-cross-compile.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/am-include-only-one-generated-fragment.sh automake-1.16-1.16.5/t/am-include-only-one-generated-fragment.sh --- automake-1.16-1.16.1/t/am-include-only-one-generated-fragment.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/am-include-only-one-generated-fragment.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2014-2018 Free Software Foundation, Inc. +# Copyright (C) 2014-2021 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 diff -Nru automake-1.16-1.16.1/t/aminit-moreargs-deprecation.sh automake-1.16-1.16.5/t/aminit-moreargs-deprecation.sh --- automake-1.16-1.16.1/t/aminit-moreargs-deprecation.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aminit-moreargs-deprecation.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 @@ -25,6 +25,7 @@ AC_INIT([Makefile.am]) AM_INIT_AUTOMAKE([twoargs], [1.0]) AC_CONFIG_FILES([Makefile]) +AC_OUTPUT END $ACLOCAL diff -Nru automake-1.16-1.16.1/t/aminit-trailing-dnl-comment-pr16841.sh automake-1.16-1.16.5/t/aminit-trailing-dnl-comment-pr16841.sh --- automake-1.16-1.16.1/t/aminit-trailing-dnl-comment-pr16841.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/aminit-trailing-dnl-comment-pr16841.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2014-2018 Free Software Foundation, Inc. +# Copyright (C) 2014-2021 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 diff -Nru automake-1.16-1.16.1/t/am-macro-not-found.sh automake-1.16-1.16.5/t/am-macro-not-found.sh --- automake-1.16-1.16.1/t/am-macro-not-found.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/am-macro-not-found.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 diff -Nru automake-1.16-1.16.1/t/am-missing-prog.sh automake-1.16-1.16.5/t/am-missing-prog.sh --- automake-1.16-1.16.1/t/am-missing-prog.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/am-missing-prog.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 @@ -86,9 +86,9 @@ $FGREP COMMAND Makefile.in Makefile # For debugging. -grep "^NO_SUCH_COMMAND = \${SHELL} .*/missing .*am-none-none" Makefile -grep "^MISMATCHED_COMMAND = \${SHELL} .*/missing .*am-exit-63" Makefile -grep "^COMMAND_FOUND = \${SHELL} .*/missing .*my-command" Makefile +grep "^NO_SUCH_COMMAND = \${SHELL} .*/missing.* .*am-none-none" Makefile +grep "^MISMATCHED_COMMAND = \${SHELL} .*/missing.* .*am-exit-63" Makefile +grep "^COMMAND_FOUND = \${SHELL} .*/missing.* .*my-command" Makefile grep '^OVERRIDDEN_COMMAND = am-overridden *$' Makefile $MAKE test1 test2 test3 test4 diff -Nru automake-1.16-1.16.1/t/amopt.sh automake-1.16-1.16.5/t/amopt.sh --- automake-1.16-1.16.1/t/amopt.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/amopt.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 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 diff -Nru automake-1.16-1.16.1/t/amopts-location.sh automake-1.16-1.16.5/t/amopts-location.sh --- automake-1.16-1.16.1/t/amopts-location.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/amopts-location.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/amopts-variable-expansion.sh automake-1.16-1.16.5/t/amopts-variable-expansion.sh --- automake-1.16-1.16.1/t/amopts-variable-expansion.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/amopts-variable-expansion.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/am-prog-cc-c-o.sh automake-1.16-1.16.5/t/am-prog-cc-c-o.sh --- automake-1.16-1.16.1/t/am-prog-cc-c-o.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/am-prog-cc-c-o.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/am-prog-cc-stdc.sh automake-1.16-1.16.5/t/am-prog-cc-stdc.sh --- automake-1.16-1.16.1/t/am-prog-cc-stdc.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/am-prog-cc-stdc.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/amsubst.sh automake-1.16-1.16.5/t/amsubst.sh --- automake-1.16-1.16.1/t/amsubst.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/amsubst.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 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 diff -Nru automake-1.16-1.16.1/t/am-tests-environment.sh automake-1.16-1.16.5/t/am-tests-environment.sh --- automake-1.16-1.16.1/t/am-tests-environment.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/am-tests-environment.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/ansi2knr-no-more.sh automake-1.16-1.16.5/t/ansi2knr-no-more.sh --- automake-1.16-1.16.1/t/ansi2knr-no-more.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/ansi2knr-no-more.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/ar2.sh automake-1.16-1.16.5/t/ar2.sh --- automake-1.16-1.16.1/t/ar2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ar2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/ar3.sh automake-1.16-1.16.5/t/ar3.sh --- automake-1.16-1.16.1/t/ar3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ar3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/ar4.sh automake-1.16-1.16.5/t/ar4.sh --- automake-1.16-1.16.1/t/ar4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ar4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -18,6 +18,7 @@ . test-init.sh +: > ar-lib cat >> configure.ac << 'END' AM_PROG_AR END diff -Nru automake-1.16-1.16.1/t/ar5.sh automake-1.16-1.16.5/t/ar5.sh --- automake-1.16-1.16.1/t/ar5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ar5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -18,6 +18,7 @@ . test-init.sh +: > ar-lib cat >> configure.ac << 'END' AM_PROG_AR([ echo spy > bad-archiver-interface-detected diff -Nru automake-1.16-1.16.1/t/ar-lib2.sh automake-1.16-1.16.5/t/ar-lib2.sh --- automake-1.16-1.16.1/t/ar-lib2.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/ar-lib2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/ar-lib3.sh automake-1.16-1.16.5/t/ar-lib3.sh --- automake-1.16-1.16.1/t/ar-lib3.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/ar-lib3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/ar-lib4.sh automake-1.16-1.16.5/t/ar-lib4.sh --- automake-1.16-1.16.1/t/ar-lib4.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/ar-lib4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/ar-lib5a.sh automake-1.16-1.16.5/t/ar-lib5a.sh --- automake-1.16-1.16.1/t/ar-lib5a.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/ar-lib5a.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/ar-lib5b.sh automake-1.16-1.16.5/t/ar-lib5b.sh --- automake-1.16-1.16.1/t/ar-lib5b.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/ar-lib5b.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/ar-lib6a.sh automake-1.16-1.16.5/t/ar-lib6a.sh --- automake-1.16-1.16.1/t/ar-lib6a.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/ar-lib6a.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/ar-lib6b.sh automake-1.16-1.16.5/t/ar-lib6b.sh --- automake-1.16-1.16.1/t/ar-lib6b.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/ar-lib6b.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/ar-lib7.sh automake-1.16-1.16.5/t/ar-lib7.sh --- automake-1.16-1.16.1/t/ar-lib7.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/ar-lib7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/ar-lib.sh automake-1.16-1.16.5/t/ar-lib.sh --- automake-1.16-1.16.1/t/ar-lib.sh 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/ar-lib.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/ar.sh automake-1.16-1.16.5/t/ar.sh --- automake-1.16-1.16.1/t/ar.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ar.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/asm2.sh automake-1.16-1.16.5/t/asm2.sh --- automake-1.16-1.16.1/t/asm2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/asm2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/asm3.sh automake-1.16-1.16.5/t/asm3.sh --- automake-1.16-1.16.1/t/asm3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/asm3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/asm.sh automake-1.16-1.16.5/t/asm.sh --- automake-1.16-1.16.1/t/asm.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/asm.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/autodist-acconfig-no-subdir.sh automake-1.16-1.16.5/t/autodist-acconfig-no-subdir.sh --- automake-1.16-1.16.1/t/autodist-acconfig-no-subdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/autodist-acconfig-no-subdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/autodist-acconfig.sh automake-1.16-1.16.5/t/autodist-acconfig.sh --- automake-1.16-1.16.1/t/autodist-acconfig.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/autodist-acconfig.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/autodist-aclocal-m4.sh automake-1.16-1.16.5/t/autodist-aclocal-m4.sh --- automake-1.16-1.16.1/t/autodist-aclocal-m4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/autodist-aclocal-m4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/autodist-config-headers.sh automake-1.16-1.16.5/t/autodist-config-headers.sh --- automake-1.16-1.16.1/t/autodist-config-headers.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/autodist-config-headers.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/autodist-configure-no-subdir.sh automake-1.16-1.16.5/t/autodist-configure-no-subdir.sh --- automake-1.16-1.16.1/t/autodist-configure-no-subdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/autodist-configure-no-subdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/autodist-no-duplicate.sh automake-1.16-1.16.5/t/autodist-no-duplicate.sh --- automake-1.16-1.16.1/t/autodist-no-duplicate.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/autodist-no-duplicate.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/autodist.sh automake-1.16-1.16.5/t/autodist.sh --- automake-1.16-1.16.1/t/autodist.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/autodist.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/autodist-stamp-vti.sh automake-1.16-1.16.5/t/autodist-stamp-vti.sh --- automake-1.16-1.16.1/t/autodist-stamp-vti.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/autodist-stamp-vti.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -32,6 +32,10 @@ ls -l $(distdir) echo ' ' $(DIST_COMMON) ' ' | grep '[ /]stamp-vti ' test -f $(distdir)/stamp-vti + +# The test can fail under a parallel make, so disable. +# No evident way to debug or reliably reproduce. +.NOTPARALLEL: END cat > foo.texi << 'END' diff -Nru automake-1.16-1.16.1/t/autodist-subdir.sh automake-1.16-1.16.5/t/autodist-subdir.sh --- automake-1.16-1.16.1/t/autodist-subdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/autodist-subdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/autohdr3.sh automake-1.16-1.16.5/t/autohdr3.sh --- automake-1.16-1.16.1/t/autohdr3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/autohdr3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/autohdr4.sh automake-1.16-1.16.5/t/autohdr4.sh --- automake-1.16-1.16.1/t/autohdr4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/autohdr4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/autohdrdry.sh automake-1.16-1.16.5/t/autohdrdry.sh --- automake-1.16-1.16.1/t/autohdrdry.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/autohdrdry.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/autohdr.sh automake-1.16-1.16.5/t/autohdr.sh --- automake-1.16-1.16.1/t/autohdr.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/autohdr.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/autohdr-subdir-pr12495.sh automake-1.16-1.16.5/t/autohdr-subdir-pr12495.sh --- automake-1.16-1.16.1/t/autohdr-subdir-pr12495.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/autohdr-subdir-pr12495.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/automake-cmdline.tap automake-1.16-1.16.5/t/automake-cmdline.tap --- automake-1.16-1.16.1/t/automake-cmdline.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/automake-cmdline.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/auxdir6.sh automake-1.16-1.16.5/t/auxdir6.sh --- automake-1.16-1.16.1/t/auxdir6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/auxdir6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/auxdir7.sh automake-1.16-1.16.5/t/auxdir7.sh --- automake-1.16-1.16.1/t/auxdir7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/auxdir7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/auxdir8.sh automake-1.16-1.16.5/t/auxdir8.sh --- automake-1.16-1.16.1/t/auxdir8.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/auxdir8.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/auxdir-autodetect.sh automake-1.16-1.16.5/t/auxdir-autodetect.sh --- automake-1.16-1.16.1/t/auxdir-autodetect.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/auxdir-autodetect.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/auxdir-cc-pr15981.sh automake-1.16-1.16.5/t/auxdir-cc-pr15981.sh --- automake-1.16-1.16.1/t/auxdir-cc-pr15981.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/auxdir-cc-pr15981.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2014-2018 Free Software Foundation, Inc. +# Copyright (C) 2014-2021 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 diff -Nru automake-1.16-1.16.1/t/auxdir-computed.tap automake-1.16-1.16.5/t/auxdir-computed.tap --- automake-1.16-1.16.1/t/auxdir-computed.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/auxdir-computed.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/auxdir-misplaced.sh automake-1.16-1.16.5/t/auxdir-misplaced.sh --- automake-1.16-1.16.1/t/auxdir-misplaced.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/auxdir-misplaced.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/auxdir-nonexistent.sh automake-1.16-1.16.5/t/auxdir-nonexistent.sh --- automake-1.16-1.16.1/t/auxdir-nonexistent.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/auxdir-nonexistent.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/auxdir-pr15981.sh automake-1.16-1.16.5/t/auxdir-pr15981.sh --- automake-1.16-1.16.1/t/auxdir-pr15981.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/auxdir-pr15981.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2014-2018 Free Software Foundation, Inc. +# Copyright (C) 2014-2021 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 @@ -24,7 +24,7 @@ AM_AUX_DIR_EXPAND printf '%s\n' "ac_aux_dir: '$ac_aux_dir'" printf '%s\n' "am_aux_dir: '$am_aux_dir'" -test "$ac_aux_dir" = . || AS_EXIT([1]) +test "${ac_aux_dir%/}" = . || AS_EXIT([1]) test "$am_aux_dir" = "`pwd`" || AS_EXIT([1]) AS_EXIT([0]) END diff -Nru automake-1.16-1.16.1/t/auxdir-pr19311.sh automake-1.16-1.16.5/t/auxdir-pr19311.sh --- automake-1.16-1.16.1/t/auxdir-pr19311.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/auxdir-pr19311.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2014-2018 Free Software Foundation, Inc. +# Copyright (C) 2014-2021 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 @@ -21,6 +21,14 @@ required=cc . test-init.sh +ver=$($AUTOCONF --version | sed -n '1s/.* //p') +case $ver in + 2.69[d-z]*) ;; + 2.[7-9][0-9]*) ;; + [3-9].*) ;; + *) skip_ 'this test passes with autoconf-2.69d and newer' +esac + cat > configure.ac <&2 + echo "$me (test-lib.sh:rm_rf_): ls -alR follows:" >&2 + ls -alR $_am_rmrf_v >&2 # should always be there + echo "$me (test-lib.sh:rm_rf_): " \ + "end ls of tree not removed ($_am_rmrf_v)." >&2 + _am_rmrf_status=2 + fi + done + return $_am_rmrf_status } commented_sed_unindent_prog=' diff -Nru automake-1.16-1.16.1/t/ax/testsuite-summary-checks.sh automake-1.16-1.16.5/t/ax/testsuite-summary-checks.sh --- automake-1.16-1.16.1/t/ax/testsuite-summary-checks.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ax/testsuite-summary-checks.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -15,7 +15,7 @@ # along with this program. If not, see . # Check the testsuite summary with the parallel test harness. This -# script is meant to be sourced by other test script, so that it can +# script is meant to be sourced by other test scripts, so that it can # be used to check different scenarios (colorized and non-colorized # testsuite output, packages with and without bug-report addresses, # testsuites in subdirectories, ...) diff -Nru automake-1.16-1.16.1/t/ax/trivial-test-driver automake-1.16-1.16.5/t/ax/trivial-test-driver --- automake-1.16-1.16.1/t/ax/trivial-test-driver 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ax/trivial-test-driver 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/backcompat2.sh automake-1.16-1.16.5/t/backcompat2.sh --- automake-1.16-1.16.1/t/backcompat2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/backcompat2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/backcompat3.sh automake-1.16-1.16.5/t/backcompat3.sh --- automake-1.16-1.16.1/t/backcompat3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/backcompat3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/backcompat6.sh automake-1.16-1.16.5/t/backcompat6.sh --- automake-1.16-1.16.1/t/backcompat6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/backcompat6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/backcompat-acout.sh automake-1.16-1.16.5/t/backcompat-acout.sh --- automake-1.16-1.16.1/t/backcompat-acout.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/backcompat-acout.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/backcompat.sh automake-1.16-1.16.5/t/backcompat.sh --- automake-1.16-1.16.1/t/backcompat.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/backcompat.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/backslash-before-trailing-whitespace.sh automake-1.16-1.16.5/t/backslash-before-trailing-whitespace.sh --- automake-1.16-1.16.1/t/backslash-before-trailing-whitespace.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/backslash-before-trailing-whitespace.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/backslash-issues.sh automake-1.16-1.16.5/t/backslash-issues.sh --- automake-1.16-1.16.1/t/backslash-issues.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/backslash-issues.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/badline.sh automake-1.16-1.16.5/t/badline.sh --- automake-1.16-1.16.1/t/badline.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/badline.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/badopt.sh automake-1.16-1.16.5/t/badopt.sh --- automake-1.16-1.16.1/t/badopt.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/badopt.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/badprog.sh automake-1.16-1.16.5/t/badprog.sh --- automake-1.16-1.16.1/t/badprog.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/badprog.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/built-sources-check.sh automake-1.16-1.16.5/t/built-sources-check.sh --- automake-1.16-1.16.1/t/built-sources-check.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/built-sources-check.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 @@ -44,7 +44,7 @@ check_SCRIPTS = echo.sh echo.sh: ## The next line ensures that command1.inc has been built before -## recurring into the subdir. +## recursing into the subdir. test -f ../command1.inc (echo '#! /bin/sh'; cat command2.inc) > $@ chmod +x $@ diff -Nru automake-1.16-1.16.1/t/built-sources-cond.sh automake-1.16-1.16.5/t/built-sources-cond.sh --- automake-1.16-1.16.1/t/built-sources-cond.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/built-sources-cond.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/built-sources-fork-bomb.sh automake-1.16-1.16.5/t/built-sources-fork-bomb.sh --- automake-1.16-1.16.1/t/built-sources-fork-bomb.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/built-sources-fork-bomb.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/built-sources-install-exec.sh automake-1.16-1.16.5/t/built-sources-install-exec.sh --- automake-1.16-1.16.1/t/built-sources-install-exec.sh 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/t/built-sources-install-exec.sh 2021-07-12 02:41:13.000000000 +0000 @@ -0,0 +1,41 @@ +#! /bin/sh +# Copyright (C) 2002-2021 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Test that 'install-exec:' honors $(BUILT_SOURCES); +# https://bugs.gnu.org/43683. + +. test-init.sh + +cat >> configure.ac << 'END' +AC_OUTPUT +END + +cat > Makefile.am << 'END' +BUILT_SOURCES = built1 +built1: + echo ok > $@ +END + +$ACLOCAL +$AUTOCONF +$AUTOMAKE +./configure --prefix "$(pwd)/inst" + +# Make sure this file is rebuilt by make install-exec. +$MAKE install-exec +test -f built1 + +: diff -Nru automake-1.16-1.16.1/t/built-sources-install.sh automake-1.16-1.16.5/t/built-sources-install.sh --- automake-1.16-1.16.1/t/built-sources-install.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/built-sources-install.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 @@ -49,7 +49,7 @@ BUILT_SOURCES = built2 built2: ## The next line ensures that command1.inc has been built before -## recurring into the subdir. +## recursing into the subdir. cp ../built1 $@ CLEANFILES = built2 END diff -Nru automake-1.16-1.16.1/t/built-sources.sh automake-1.16-1.16.5/t/built-sources.sh --- automake-1.16-1.16.1/t/built-sources.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/built-sources.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/built-sources-subdir.sh automake-1.16-1.16.5/t/built-sources-subdir.sh --- automake-1.16-1.16.1/t/built-sources-subdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/built-sources-subdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/candist.sh automake-1.16-1.16.5/t/candist.sh --- automake-1.16-1.16.1/t/candist.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/candist.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/canon2.sh automake-1.16-1.16.5/t/canon2.sh --- automake-1.16-1.16.1/t/canon2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/canon2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/canon3.sh automake-1.16-1.16.5/t/canon3.sh --- automake-1.16-1.16.1/t/canon3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/canon3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/canon4.sh automake-1.16-1.16.5/t/canon4.sh --- automake-1.16-1.16.1/t/canon4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/canon4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/canon5.sh automake-1.16-1.16.5/t/canon5.sh --- automake-1.16-1.16.1/t/canon5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/canon5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/canon6.sh automake-1.16-1.16.5/t/canon6.sh --- automake-1.16-1.16.1/t/canon6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/canon6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/canon7.sh automake-1.16-1.16.5/t/canon7.sh --- automake-1.16-1.16.1/t/canon7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/canon7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/canon8.sh automake-1.16-1.16.5/t/canon8.sh --- automake-1.16-1.16.1/t/canon8.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/canon8.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/canon-name.sh automake-1.16-1.16.5/t/canon-name.sh --- automake-1.16-1.16.1/t/canon-name.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/canon-name.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2007-2018 Free Software Foundation, Inc. +# Copyright (C) 2007-2021 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 diff -Nru automake-1.16-1.16.1/t/canon.sh automake-1.16-1.16.5/t/canon.sh --- automake-1.16-1.16.1/t/canon.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/canon.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/ccnoco3.sh automake-1.16-1.16.5/t/ccnoco3.sh --- automake-1.16-1.16.1/t/ccnoco3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ccnoco3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/ccnoco4.sh automake-1.16-1.16.5/t/ccnoco4.sh --- automake-1.16-1.16.1/t/ccnoco4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ccnoco4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/ccnoco-deps.sh automake-1.16-1.16.5/t/ccnoco-deps.sh --- automake-1.16-1.16.1/t/ccnoco-deps.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ccnoco-deps.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/ccnoco-lib.sh automake-1.16-1.16.5/t/ccnoco-lib.sh --- automake-1.16-1.16.1/t/ccnoco-lib.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ccnoco-lib.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/ccnoco-lt.sh automake-1.16-1.16.5/t/ccnoco-lt.sh --- automake-1.16-1.16.1/t/ccnoco-lt.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ccnoco-lt.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/ccnoco.sh automake-1.16-1.16.5/t/ccnoco.sh --- automake-1.16-1.16.1/t/ccnoco.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ccnoco.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/c-demo.sh automake-1.16-1.16.5/t/c-demo.sh --- automake-1.16-1.16.1/t/c-demo.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/c-demo.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/check10.sh automake-1.16-1.16.5/t/check10.sh --- automake-1.16-1.16.1/t/check10.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/check10.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/check11.sh automake-1.16-1.16.5/t/check11.sh --- automake-1.16-1.16.1/t/check11.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/check11.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/check12.sh automake-1.16-1.16.5/t/check12.sh --- automake-1.16-1.16.1/t/check12.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/check12.sh 2021-07-16 04:40:55.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 @@ -22,6 +22,7 @@ . test-init.sh cat >> configure.ac << 'END' +AC_CONFIG_FILES([testsuite/Makefile]) AC_OUTPUT END @@ -56,12 +57,17 @@ ## DejaGnu tests. cat >> Makefile.am << 'END' -AUTOMAKE_OPTIONS += dejagnu +SUBDIRS = testsuite +EXTRA_DIST += hammer spanner +END + +mkdir testsuite + +cat >> testsuite/Makefile.am << 'END' +AUTOMAKE_OPTIONS = dejagnu DEJATOOL = hammer spanner -AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer SPANNER=$(srcdir)/spanner -EXTRA_DIST += $(DEJATOOL) -EXTRA_DIST += hammer.test/hammer.exp -EXTRA_DIST += spanner.test/spanner.exp +AM_RUNTESTFLAGS = HAMMER=$(top_srcdir)/hammer SPANNER=$(top_srcdir)/spanner +EXTRA_DIST = hammer.test/hammer.exp spanner.test/spanner.exp END cat > hammer << 'END' @@ -77,9 +83,9 @@ END chmod +x hammer spanner -mkdir hammer.test spanner.test +mkdir testsuite/hammer.test testsuite/spanner.test -cat > hammer.test/hammer.exp << 'END' +cat > testsuite/hammer.test/hammer.exp << 'END' set test test_hammer spawn $HAMMER expect { @@ -88,7 +94,7 @@ } END -cat > spanner.test/spanner.exp << 'END' +cat > testsuite/spanner.test/spanner.exp << 'END' set test test_spanner spawn $SPANNER expect { @@ -133,10 +139,10 @@ $srcdir/configure $MAKE check - test -f hammer.log - test -f hammer.sum - test -f spanner.log - test -f spanner.sum + test -f testsuite/hammer.log + test -f testsuite/hammer.sum + test -f testsuite/spanner.log + test -f testsuite/spanner.sum if test x"$am_serial_tests" != x"yes"; then test -f test-suite.log test -f a.log @@ -147,10 +153,10 @@ cp -f config.status config-status.sav $MAKE distclean - test ! -e hammer.log - test ! -e hammer.sum - test ! -e spanner.log - test ! -e spanner.sum + test ! -e testsuite/hammer.log + test ! -e testsuite/hammer.sum + test ! -e testsuite/spanner.log + test ! -e testsuite/spanner.sum test ! -e test-suite.log test ! -e a.log test ! -e b.log @@ -160,12 +166,12 @@ ./config.status NAIL=screw $MAKE check && exit 1 - test -f hammer.log - test -f hammer.sum - test -f spanner.log - test -f spanner.sum - grep 'FAIL: test_hammer' hammer.sum - grep 'FAIL:' spanner.sum && exit 1 + test -f testsuite/hammer.log + test -f testsuite/hammer.sum + test -f testsuite/spanner.log + test -f testsuite/spanner.sum + grep 'FAIL: test_hammer' testsuite/hammer.sum + grep 'FAIL:' testsuite/spanner.sum && exit 1 B_EXIT_STATUS=1 $MAKE check && exit 1 if test x"$am_serial_tests" != x"yes"; then @@ -185,12 +191,12 @@ # Do not trust the exit status of 'make -k'. NAIL=screw B_EXIT_STATUS=23 CHECKLOCAL_EXIT_STATUS=1 $MAKE -k check || : - test -f hammer.log - test -f hammer.sum - test -f spanner.log - test -f spanner.sum - grep 'FAIL: test_hammer' hammer.sum - grep 'FAIL:' spanner.sum && exit 1 + test -f testsuite/hammer.log + test -f testsuite/hammer.sum + test -f testsuite/spanner.log + test -f testsuite/spanner.sum + grep 'FAIL: test_hammer' testsuite/hammer.sum + grep 'FAIL:' testsuite/spanner.sum && exit 1 if test x"$am_serial_tests" != x"yes"; then cat test-suite.log cat a.log diff -Nru automake-1.16-1.16.1/t/check2.sh automake-1.16-1.16.5/t/check2.sh --- automake-1.16-1.16.1/t/check2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/check2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/check4.sh automake-1.16-1.16.5/t/check4.sh --- automake-1.16-1.16.1/t/check4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/check4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/check5.sh automake-1.16-1.16.5/t/check5.sh --- automake-1.16-1.16.1/t/check5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/check5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 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 diff -Nru automake-1.16-1.16.1/t/check6.sh automake-1.16-1.16.5/t/check6.sh --- automake-1.16-1.16.1/t/check6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/check6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 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 diff -Nru automake-1.16-1.16.1/t/check7.sh automake-1.16-1.16.5/t/check7.sh --- automake-1.16-1.16.1/t/check7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/check7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2007-2018 Free Software Foundation, Inc. +# Copyright (C) 2007-2021 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 diff -Nru automake-1.16-1.16.1/t/check8.sh automake-1.16-1.16.5/t/check8.sh --- automake-1.16-1.16.1/t/check8.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/check8.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/checkall.sh automake-1.16-1.16.5/t/checkall.sh --- automake-1.16-1.16.1/t/checkall.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/checkall.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/check-concurrency-bug9245.sh automake-1.16-1.16.5/t/check-concurrency-bug9245.sh --- automake-1.16-1.16.1/t/check-concurrency-bug9245.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/check-concurrency-bug9245.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/check-exported-srcdir.sh automake-1.16-1.16.5/t/check-exported-srcdir.sh --- automake-1.16-1.16.1/t/check-exported-srcdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/check-exported-srcdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/check-fd-redirect.sh automake-1.16-1.16.5/t/check-fd-redirect.sh --- automake-1.16-1.16.1/t/check-fd-redirect.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/check-fd-redirect.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/CheckListOfTests.am automake-1.16-1.16.5/t/CheckListOfTests.am --- automake-1.16-1.16.1/t/CheckListOfTests.am 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/CheckListOfTests.am 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ ## -*- Automake -*- ## -## Copyright (C) 2011-2018 Free Software Foundation, Inc. +## Copyright (C) 2011-2021 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 @@ -54,7 +54,7 @@ if $$diff $(am__tmk) $(am__tfs) >$(am__tdf); then \ result=0; \ else \ - echo '$@: list of tests in Makefile an on filesystem differ' >&2; \ + echo '$@: list of tests in Makefile and on filesystem differ' >&2; \ echo "+ $$diff in-makefile on-filesystem" >&2; \ cat $(am__tdf) >&2; \ result=1; \ diff -Nru automake-1.16-1.16.1/t/check-no-test-driver.sh automake-1.16-1.16.5/t/check-no-test-driver.sh --- automake-1.16-1.16.1/t/check-no-test-driver.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/check-no-test-driver.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/check.sh automake-1.16-1.16.5/t/check.sh --- automake-1.16-1.16.1/t/check.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/check.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/check-subst-prog.sh automake-1.16-1.16.5/t/check-subst-prog.sh --- automake-1.16-1.16.1/t/check-subst-prog.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/check-subst-prog.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/check-subst.sh automake-1.16-1.16.5/t/check-subst.sh --- automake-1.16-1.16.1/t/check-subst.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/check-subst.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/check-tests-in-builddir.sh automake-1.16-1.16.5/t/check-tests-in-builddir.sh --- automake-1.16-1.16.1/t/check-tests-in-builddir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/check-tests-in-builddir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/clean.sh automake-1.16-1.16.5/t/clean.sh --- automake-1.16-1.16.1/t/clean.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/clean.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/colneq2.sh automake-1.16-1.16.5/t/colneq2.sh --- automake-1.16-1.16.1/t/colneq2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/colneq2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/colneq3.sh automake-1.16-1.16.5/t/colneq3.sh --- automake-1.16-1.16.1/t/colneq3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/colneq3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/colneq.sh automake-1.16-1.16.5/t/colneq.sh --- automake-1.16-1.16.1/t/colneq.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/colneq.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/colon2.sh automake-1.16-1.16.5/t/colon2.sh --- automake-1.16-1.16.1/t/colon2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/colon2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/colon3.sh automake-1.16-1.16.5/t/colon3.sh --- automake-1.16-1.16.1/t/colon3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/colon3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/colon4.sh automake-1.16-1.16.5/t/colon4.sh --- automake-1.16-1.16.1/t/colon4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/colon4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/colon5.sh automake-1.16-1.16.5/t/colon5.sh --- automake-1.16-1.16.1/t/colon5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/colon5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/colon6.sh automake-1.16-1.16.5/t/colon6.sh --- automake-1.16-1.16.1/t/colon6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/colon6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/colon7.sh automake-1.16-1.16.5/t/colon7.sh --- automake-1.16-1.16.1/t/colon7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/colon7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/colon.sh automake-1.16-1.16.5/t/colon.sh --- automake-1.16-1.16.1/t/colon.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/colon.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/color-tests2.sh automake-1.16-1.16.5/t/color-tests2.sh --- automake-1.16-1.16.1/t/color-tests2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/color-tests2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2007-2018 Free Software Foundation, Inc. +# Copyright (C) 2007-2021 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 diff -Nru automake-1.16-1.16.1/t/color-tests-opt.sh automake-1.16-1.16.5/t/color-tests-opt.sh --- automake-1.16-1.16.1/t/color-tests-opt.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/color-tests-opt.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2007-2018 Free Software Foundation, Inc. +# Copyright (C) 2007-2021 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 diff -Nru automake-1.16-1.16.1/t/color-tests.sh automake-1.16-1.16.5/t/color-tests.sh --- automake-1.16-1.16.1/t/color-tests.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/color-tests.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2007-2018 Free Software Foundation, Inc. +# Copyright (C) 2007-2021 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 diff -Nru automake-1.16-1.16.1/t/commen10.sh automake-1.16-1.16.5/t/commen10.sh --- automake-1.16-1.16.1/t/commen10.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/commen10.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/commen11.sh automake-1.16-1.16.5/t/commen11.sh --- automake-1.16-1.16.1/t/commen11.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/commen11.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/comment2.sh automake-1.16-1.16.5/t/comment2.sh --- automake-1.16-1.16.1/t/comment2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/comment2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/comment3.sh automake-1.16-1.16.5/t/comment3.sh --- automake-1.16-1.16.1/t/comment3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/comment3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/comment4.sh automake-1.16-1.16.5/t/comment4.sh --- automake-1.16-1.16.1/t/comment4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/comment4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/comment5.sh automake-1.16-1.16.5/t/comment5.sh --- automake-1.16-1.16.1/t/comment5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/comment5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/comment6.sh automake-1.16-1.16.5/t/comment6.sh --- automake-1.16-1.16.1/t/comment6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/comment6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/comment7.sh automake-1.16-1.16.5/t/comment7.sh --- automake-1.16-1.16.1/t/comment7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/comment7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/comment8.sh automake-1.16-1.16.5/t/comment8.sh --- automake-1.16-1.16.1/t/comment8.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/comment8.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/comment9.sh automake-1.16-1.16.5/t/comment9.sh --- automake-1.16-1.16.1/t/comment9.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/comment9.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/comment-block.sh automake-1.16-1.16.5/t/comment-block.sh --- automake-1.16-1.16.1/t/comment-block.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/comment-block.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/comment.sh automake-1.16-1.16.5/t/comment.sh --- automake-1.16-1.16.1/t/comment.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/comment.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/comments-in-var-def.sh automake-1.16-1.16.5/t/comments-in-var-def.sh --- automake-1.16-1.16.1/t/comments-in-var-def.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/comments-in-var-def.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/compile2.sh automake-1.16-1.16.5/t/compile2.sh --- automake-1.16-1.16.1/t/compile2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/compile2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/compile3.sh automake-1.16-1.16.5/t/compile3.sh --- automake-1.16-1.16.1/t/compile3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/compile3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/compile4.sh automake-1.16-1.16.5/t/compile4.sh --- automake-1.16-1.16.1/t/compile4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/compile4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/compile5.sh automake-1.16-1.16.5/t/compile5.sh --- automake-1.16-1.16.1/t/compile5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/compile5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/compile6.sh automake-1.16-1.16.5/t/compile6.sh --- automake-1.16-1.16.1/t/compile6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/compile6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/compile7.sh automake-1.16-1.16.5/t/compile7.sh --- automake-1.16-1.16.1/t/compile7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/compile7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/compile_f90_c_cxx.sh automake-1.16-1.16.5/t/compile_f90_c_cxx.sh --- automake-1.16-1.16.1/t/compile_f90_c_cxx.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/compile_f90_c_cxx.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/compile_f_c_cxx.sh automake-1.16-1.16.5/t/compile_f_c_cxx.sh --- automake-1.16-1.16.1/t/compile_f_c_cxx.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/compile_f_c_cxx.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/compile.sh automake-1.16-1.16.5/t/compile.sh --- automake-1.16-1.16.1/t/compile.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/compile.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/cond10.sh automake-1.16-1.16.5/t/cond10.sh --- automake-1.16-1.16.1/t/cond10.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond10.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/cond11.sh automake-1.16-1.16.5/t/cond11.sh --- automake-1.16-1.16.1/t/cond11.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond11.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/cond13.sh automake-1.16-1.16.5/t/cond13.sh --- automake-1.16-1.16.1/t/cond13.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond13.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/cond14.sh automake-1.16-1.16.5/t/cond14.sh --- automake-1.16-1.16.1/t/cond14.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond14.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/cond15.sh automake-1.16-1.16.5/t/cond15.sh --- automake-1.16-1.16.1/t/cond15.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond15.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/cond16.sh automake-1.16-1.16.5/t/cond16.sh --- automake-1.16-1.16.1/t/cond16.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond16.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/cond17.sh automake-1.16-1.16.5/t/cond17.sh --- automake-1.16-1.16.1/t/cond17.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond17.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/cond18.sh automake-1.16-1.16.5/t/cond18.sh --- automake-1.16-1.16.1/t/cond18.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond18.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/cond19.sh automake-1.16-1.16.5/t/cond19.sh --- automake-1.16-1.16.1/t/cond19.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond19.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/cond20.sh automake-1.16-1.16.5/t/cond20.sh --- automake-1.16-1.16.1/t/cond20.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond20.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/cond21.sh automake-1.16-1.16.5/t/cond21.sh --- automake-1.16-1.16.1/t/cond21.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond21.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/cond22.sh automake-1.16-1.16.5/t/cond22.sh --- automake-1.16-1.16.1/t/cond22.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond22.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/cond23.sh automake-1.16-1.16.5/t/cond23.sh --- automake-1.16-1.16.1/t/cond23.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond23.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/cond24.sh automake-1.16-1.16.5/t/cond24.sh --- automake-1.16-1.16.1/t/cond24.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond24.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 @@ -26,7 +26,7 @@ cat >Makefile.am < tparse.y << 'END' %{ -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %token EOF %% diff -Nru automake-1.16-1.16.1/t/cond36.sh automake-1.16-1.16.5/t/cond36.sh --- automake-1.16-1.16.1/t/cond36.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond36.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 @@ -46,7 +46,7 @@ $ACLOCAL -# Presently Automake doesn't fully support partially overriden rules +# Presently Automake doesn't fully support partially overridden rules # and should complain. AUTOMAKE_fails --add-missing grep 'tparse\.h.*already defined' stderr diff -Nru automake-1.16-1.16.1/t/cond37.sh automake-1.16-1.16.5/t/cond37.sh --- automake-1.16-1.16.1/t/cond37.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond37.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/cond38.sh automake-1.16-1.16.5/t/cond38.sh --- automake-1.16-1.16.1/t/cond38.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond38.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/cond39.sh automake-1.16-1.16.5/t/cond39.sh --- automake-1.16-1.16.1/t/cond39.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond39.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/cond3.sh automake-1.16-1.16.5/t/cond3.sh --- automake-1.16-1.16.1/t/cond3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 diff -Nru automake-1.16-1.16.1/t/cond40.sh automake-1.16-1.16.5/t/cond40.sh --- automake-1.16-1.16.1/t/cond40.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond40.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/cond41.sh automake-1.16-1.16.5/t/cond41.sh --- automake-1.16-1.16.1/t/cond41.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond41.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/cond42.sh automake-1.16-1.16.5/t/cond42.sh --- automake-1.16-1.16.1/t/cond42.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond42.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/sh nfig -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/cond43.sh automake-1.16-1.16.5/t/cond43.sh --- automake-1.16-1.16.1/t/cond43.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond43.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/cond44.sh automake-1.16-1.16.5/t/cond44.sh --- automake-1.16-1.16.1/t/cond44.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond44.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/cond45.sh automake-1.16-1.16.5/t/cond45.sh --- automake-1.16-1.16.1/t/cond45.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond45.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/cond46.sh automake-1.16-1.16.5/t/cond46.sh --- automake-1.16-1.16.1/t/cond46.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond46.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/cond4.sh automake-1.16-1.16.5/t/cond4.sh --- automake-1.16-1.16.1/t/cond4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/cond5.sh automake-1.16-1.16.5/t/cond5.sh --- automake-1.16-1.16.1/t/cond5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/cond6.sh automake-1.16-1.16.5/t/cond6.sh --- automake-1.16-1.16.1/t/cond6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/cond7.sh automake-1.16-1.16.5/t/cond7.sh --- automake-1.16-1.16.1/t/cond7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/cond8.sh automake-1.16-1.16.5/t/cond8.sh --- automake-1.16-1.16.1/t/cond8.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond8.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/cond9.sh automake-1.16-1.16.5/t/cond9.sh --- automake-1.16-1.16.1/t/cond9.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond9.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/cond-basic.sh automake-1.16-1.16.5/t/cond-basic.sh --- automake-1.16-1.16.1/t/cond-basic.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond-basic.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/condd.sh automake-1.16-1.16.5/t/condd.sh --- automake-1.16-1.16.1/t/condd.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/condd.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/condhook2.sh automake-1.16-1.16.5/t/condhook2.sh --- automake-1.16-1.16.1/t/condhook2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/condhook2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/condhook.sh automake-1.16-1.16.5/t/condhook.sh --- automake-1.16-1.16.1/t/condhook.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/condhook.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/condinc2.sh automake-1.16-1.16.5/t/condinc2.sh --- automake-1.16-1.16.1/t/condinc2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/condinc2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/condinc.sh automake-1.16-1.16.5/t/condinc.sh --- automake-1.16-1.16.1/t/condinc.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/condinc.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/condlib.sh automake-1.16-1.16.5/t/condlib.sh --- automake-1.16-1.16.1/t/condlib.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/condlib.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/condman2.sh automake-1.16-1.16.5/t/condman2.sh --- automake-1.16-1.16.1/t/condman2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/condman2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/condman3.sh automake-1.16-1.16.5/t/condman3.sh --- automake-1.16-1.16.1/t/condman3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/condman3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/cond.sh automake-1.16-1.16.5/t/cond.sh --- automake-1.16-1.16.1/t/cond.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cond.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 diff -Nru automake-1.16-1.16.1/t/confdeps.sh automake-1.16-1.16.5/t/confdeps.sh --- automake-1.16-1.16.1/t/confdeps.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/confdeps.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/conff2.sh automake-1.16-1.16.5/t/conff2.sh --- automake-1.16-1.16.1/t/conff2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/conff2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/conffile-leading-dot.sh automake-1.16-1.16.5/t/conffile-leading-dot.sh --- automake-1.16-1.16.1/t/conffile-leading-dot.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/conffile-leading-dot.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/conff.sh automake-1.16-1.16.5/t/conff.sh --- automake-1.16-1.16.1/t/conff.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/conff.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/confh4.sh automake-1.16-1.16.5/t/confh4.sh --- automake-1.16-1.16.1/t/confh4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/confh4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/confh5.sh automake-1.16-1.16.5/t/confh5.sh --- automake-1.16-1.16.1/t/confh5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/confh5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/confh6.sh automake-1.16-1.16.5/t/confh6.sh --- automake-1.16-1.16.1/t/confh6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/confh6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/confh7.sh automake-1.16-1.16.5/t/confh7.sh --- automake-1.16-1.16.1/t/confh7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/confh7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 diff -Nru automake-1.16-1.16.1/t/confh8.sh automake-1.16-1.16.5/t/confh8.sh --- automake-1.16-1.16.1/t/confh8.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/confh8.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/confh.sh automake-1.16-1.16.5/t/confh.sh --- automake-1.16-1.16.1/t/confh.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/confh.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/confh-subdir-clean.sh automake-1.16-1.16.5/t/confh-subdir-clean.sh --- automake-1.16-1.16.1/t/confh-subdir-clean.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/confh-subdir-clean.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/configure.sh automake-1.16-1.16.5/t/configure.sh --- automake-1.16-1.16.1/t/configure.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/configure.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/confincl.sh automake-1.16-1.16.5/t/confincl.sh --- automake-1.16-1.16.1/t/confincl.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/confincl.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/conflnk2.sh automake-1.16-1.16.5/t/conflnk2.sh --- automake-1.16-1.16.1/t/conflnk2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/conflnk2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/conflnk3.sh automake-1.16-1.16.5/t/conflnk3.sh --- automake-1.16-1.16.1/t/conflnk3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/conflnk3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/conflnk4.sh automake-1.16-1.16.5/t/conflnk4.sh --- automake-1.16-1.16.1/t/conflnk4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/conflnk4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/conflnk.sh automake-1.16-1.16.5/t/conflnk.sh --- automake-1.16-1.16.1/t/conflnk.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/conflnk.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/confsub.sh automake-1.16-1.16.5/t/confsub.sh --- automake-1.16-1.16.1/t/confsub.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/confsub.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/confvar2.sh automake-1.16-1.16.5/t/confvar2.sh --- automake-1.16-1.16.1/t/confvar2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/confvar2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/confvar.sh automake-1.16-1.16.5/t/confvar.sh --- automake-1.16-1.16.1/t/confvar.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/confvar.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/copy.sh automake-1.16-1.16.5/t/copy.sh --- automake-1.16-1.16.1/t/copy.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/copy.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/cscope2.sh automake-1.16-1.16.5/t/cscope2.sh --- automake-1.16-1.16.1/t/cscope2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cscope2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/cscope3.sh automake-1.16-1.16.5/t/cscope3.sh --- automake-1.16-1.16.1/t/cscope3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cscope3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/cscope.tap automake-1.16-1.16.5/t/cscope.tap --- automake-1.16-1.16.1/t/cscope.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cscope.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/cxx2.sh automake-1.16-1.16.5/t/cxx2.sh --- automake-1.16-1.16.1/t/cxx2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cxx2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/cxxcpp.sh automake-1.16-1.16.5/t/cxxcpp.sh --- automake-1.16-1.16.1/t/cxxcpp.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cxxcpp.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/cxx-demo.sh automake-1.16-1.16.5/t/cxx-demo.sh --- automake-1.16-1.16.1/t/cxx-demo.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cxx-demo.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/cxxlibobj.sh automake-1.16-1.16.5/t/cxxlibobj.sh --- automake-1.16-1.16.1/t/cxxlibobj.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cxxlibobj.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 diff -Nru automake-1.16-1.16.1/t/cxxlink.sh automake-1.16-1.16.5/t/cxxlink.sh --- automake-1.16-1.16.1/t/cxxlink.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cxxlink.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/cxx-lt-demo.sh automake-1.16-1.16.5/t/cxx-lt-demo.sh --- automake-1.16-1.16.1/t/cxx-lt-demo.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cxx-lt-demo.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/cxxnoc.sh automake-1.16-1.16.5/t/cxxnoc.sh --- automake-1.16-1.16.1/t/cxxnoc.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cxxnoc.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/cxx.sh automake-1.16-1.16.5/t/cxx.sh --- automake-1.16-1.16.1/t/cxx.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cxx.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/cygnus-no-more.sh automake-1.16-1.16.5/t/cygnus-no-more.sh --- automake-1.16-1.16.1/t/cygnus-no-more.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cygnus-no-more.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/cygwin32.sh automake-1.16-1.16.5/t/cygwin32.sh --- automake-1.16-1.16.1/t/cygwin32.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/cygwin32.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 diff -Nru automake-1.16-1.16.1/t/dash.sh automake-1.16-1.16.5/t/dash.sh --- automake-1.16-1.16.1/t/dash.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dash.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/defun2.sh automake-1.16-1.16.5/t/defun2.sh --- automake-1.16-1.16.1/t/defun2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/defun2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/defun.sh automake-1.16-1.16.5/t/defun.sh --- automake-1.16-1.16.1/t/defun.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/defun.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/dejagnu2.sh automake-1.16-1.16.5/t/dejagnu2.sh --- automake-1.16-1.16.1/t/dejagnu2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dejagnu2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/dejagnu3.sh automake-1.16-1.16.5/t/dejagnu3.sh --- automake-1.16-1.16.1/t/dejagnu3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dejagnu3.sh 2021-07-16 04:40:55.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 @@ -27,19 +27,27 @@ chmod +x hammer cat >> configure.ac << 'END' +AC_CONFIG_FILES([testsuite/Makefile]) AC_OUTPUT END cat > Makefile.am << 'END' +SUBDIRS = testsuite +EXTRA_DIST = hammer +END + +mkdir testsuite + +cat > testsuite/Makefile.am << 'END' AUTOMAKE_OPTIONS = dejagnu DEJATOOL = hammer -AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer -EXTRA_DIST = hammer hammer.test/hammer.exp +AM_RUNTESTFLAGS = HAMMER=$(top_srcdir)/hammer +EXTRA_DIST = hammer.test/hammer.exp END -mkdir hammer.test +mkdir testsuite/hammer.test -cat > hammer.test/hammer.exp << 'END' +cat > testsuite/hammer.test/hammer.exp << 'END' set test test spawn $HAMMER expect { @@ -55,8 +63,8 @@ ./configure $MAKE check -test -f hammer.log -test -f hammer.sum +test -f testsuite/hammer.log +test -f testsuite/hammer.sum $MAKE distcheck diff -Nru automake-1.16-1.16.1/t/dejagnu4.sh automake-1.16-1.16.5/t/dejagnu4.sh --- automake-1.16-1.16.1/t/dejagnu4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dejagnu4.sh 2021-07-16 04:40:55.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 @@ -39,23 +39,31 @@ chmod +x spanner cat >> configure.ac << 'END' +AC_CONFIG_FILES([testsuite/Makefile]) AC_OUTPUT END cat > Makefile.am << 'END' +SUBDIRS = testsuite +EXTRA_DIST = hammer spanner +END + +mkdir testsuite + +cat > testsuite/Makefile.am << 'END' AUTOMAKE_OPTIONS = dejagnu DEJATOOL = hammer spanner -AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer SPANNER=$(srcdir)/spanner +AM_RUNTESTFLAGS = HAMMER=$(top_srcdir)/hammer SPANNER=$(top_srcdir)/spanner -EXTRA_DIST = hammer hammer.test/hammer.exp -EXTRA_DIST += spanner spanner.test/spanner.exp +EXTRA_DIST = hammer.test/hammer.exp +EXTRA_DIST += spanner.test/spanner.exp END -mkdir hammer.test spanner.test +mkdir testsuite/hammer.test testsuite/spanner.test -cat > hammer.test/hammer.exp << 'END' +cat > testsuite/hammer.test/hammer.exp << 'END' set test test spawn $HAMMER expect { @@ -64,7 +72,7 @@ } END -cat > spanner.test/spanner.exp << 'END' +cat > testsuite/spanner.test/spanner.exp << 'END' set test test spawn $SPANNER expect { @@ -80,10 +88,10 @@ ./configure $MAKE check -test -f hammer.log -test -f hammer.sum -test -f spanner.log -test -f spanner.sum +test -f testsuite/hammer.log +test -f testsuite/hammer.sum +test -f testsuite/spanner.log +test -f testsuite/spanner.sum $MAKE distcheck @@ -92,11 +100,12 @@ mv -f thammer hammer chmod +x hammer -rm -f hammer.log hammer.sum spanner.log spanner.sum +rm -f testsuite/hammer.log testsuite/hammer.sum +rm -f testsuite/spanner.log testsuite/spanner.sum $MAKE check && exit 1 -test -f hammer.log -test -f hammer.sum -test -f spanner.log -test -f spanner.sum +test -f testsuite/hammer.log +test -f testsuite/hammer.sum +test -f testsuite/spanner.log +test -f testsuite/spanner.sum : diff -Nru automake-1.16-1.16.1/t/dejagnu5.sh automake-1.16-1.16.5/t/dejagnu5.sh --- automake-1.16-1.16.1/t/dejagnu5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dejagnu5.sh 2021-07-16 04:40:55.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 @@ -29,17 +29,25 @@ chmod +x $package cat >> configure.ac << 'END' +AC_CONFIG_FILES([testsuite/Makefile]) AC_OUTPUT END cat > Makefile.am << END +SUBDIRS = testsuite +EXTRA_DIST = $package +END + +mkdir testsuite + +cat > testsuite/Makefile.am << END AUTOMAKE_OPTIONS = dejagnu -EXTRA_DIST = $package $package.test/$package.exp -AM_RUNTESTFLAGS = PACKAGE=\$(srcdir)/$package +EXTRA_DIST = $package.test/$package.exp +AM_RUNTESTFLAGS = PACKAGE=\$(top_srcdir)/$package END -mkdir $package.test -cat > $package.test/$package.exp << 'END' +mkdir testsuite/$package.test +cat > testsuite/$package.test/$package.exp << 'END' set test "a_dejagnu_test" spawn $PACKAGE expect { @@ -55,8 +63,8 @@ ./configure $MAKE check -test -f $package.log -test -f $package.sum +test -f testsuite/$package.log +test -f testsuite/$package.sum $MAKE distcheck diff -Nru automake-1.16-1.16.1/t/dejagnu6.sh automake-1.16-1.16.5/t/dejagnu6.sh --- automake-1.16-1.16.1/t/dejagnu6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dejagnu6.sh 2021-07-16 04:40:55.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 @@ -26,17 +26,24 @@ chmod +x faildeja cat >> configure.ac << 'END' +AC_CONFIG_FILES([testsuite/Makefile]) AC_OUTPUT END cat > Makefile.am << 'END' +SUBDIRS = testsuite +END + +mkdir testsuite + +cat > testsuite/Makefile.am << 'END' AUTOMAKE_OPTIONS = dejagnu DEJATOOL = faildeja -AM_RUNTESTFLAGS = FAILDEJA=$(srcdir)/faildeja +AM_RUNTESTFLAGS = FAILDEJA=$(top_srcdir)/faildeja END -mkdir faildeja.test -cat > faildeja.test/faildeja.exp << 'END' +mkdir testsuite/faildeja.test +cat > testsuite/faildeja.test/faildeja.exp << 'END' set test failing_deja_test spawn $FAILDEJA expect { @@ -51,8 +58,8 @@ ./configure $MAKE check && exit 1 -test -f faildeja.log -test -f faildeja.sum -$FGREP 'FAIL: failing_deja_test' faildeja.sum +test -f testsuite/faildeja.log +test -f testsuite/faildeja.sum +$FGREP 'FAIL: failing_deja_test' testsuite/faildeja.sum : diff -Nru automake-1.16-1.16.1/t/dejagnu7.sh automake-1.16-1.16.5/t/dejagnu7.sh --- automake-1.16-1.16.1/t/dejagnu7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dejagnu7.sh 2021-07-16 04:40:55.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 @@ -30,17 +30,24 @@ chmod +x failtcl cat >> configure.ac << 'END' +AC_CONFIG_FILES([testsuite/Makefile]) AC_OUTPUT END cat > Makefile.am << 'END' +SUBDIRS = testsuite +END + +mkdir testsuite + +cat > testsuite/Makefile.am << 'END' AUTOMAKE_OPTIONS = dejagnu DEJATOOL = failtcl -AM_RUNTESTFLAGS = --status FAILTCL=$(srcdir)/failtcl +AM_RUNTESTFLAGS = --status FAILTCL=$(top_srcdir)/failtcl END -mkdir failtcl.test -cat > failtcl.test/failtcl.exp << 'END' +mkdir testsuite/failtcl.test +cat > testsuite/failtcl.test/failtcl.exp << 'END' set test test spawn $FAILTCL expect { @@ -55,8 +62,8 @@ ./configure $MAKE check && exit 1 -test -f failtcl.log -test -f failtcl.sum -$FGREP 'missing close-brace' failtcl.sum +test -f testsuite/failtcl.log +test -f testsuite/failtcl.sum +$FGREP 'missing close-brace' testsuite/failtcl.sum : diff -Nru automake-1.16-1.16.1/t/dejagnu-absolute-builddir.sh automake-1.16-1.16.5/t/dejagnu-absolute-builddir.sh --- automake-1.16-1.16.1/t/dejagnu-absolute-builddir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dejagnu-absolute-builddir.sh 2021-07-16 04:40:55.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -21,18 +21,25 @@ . test-init.sh cat >> configure.ac << 'END' +AC_CONFIG_FILES([testsuite/Makefile]) AC_OUTPUT END cat > Makefile.am << 'END' +SUBDIRS = testsuite +END + +mkdir testsuite + +cat > testsuite/Makefile.am << 'END' AUTOMAKE_OPTIONS = dejagnu DEJATOOL = tcl env EXTRA_DIST = tcl.test/tcl.exp END -mkdir tcl.test +mkdir testsuite/tcl.test -cat > tcl.test/tcl.exp << 'END' +cat > testsuite/tcl.test/tcl.exp << 'END' send_user "tcl_objdir: $objdir\n" if { [ regexp "^/" $objdir ] } { pass "test_tcl_objdir" @@ -50,10 +57,10 @@ $MAKE check # Sanity check: all tests have run. -test -f env.log -test -f env.sum -test -f tcl.log -test -f tcl.sum +test -f testsuite/env.log +test -f testsuite/env.sum +test -f testsuite/tcl.log +test -f testsuite/tcl.sum $MAKE distcheck diff -Nru automake-1.16-1.16.1/t/dejagnu-relative-srcdir.sh automake-1.16-1.16.5/t/dejagnu-relative-srcdir.sh --- automake-1.16-1.16.1/t/dejagnu-relative-srcdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dejagnu-relative-srcdir.sh 2021-07-16 04:40:55.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -21,44 +21,52 @@ . test-init.sh cat >> configure.ac << 'END' +AC_CONFIG_FILES([testsuite/Makefile]) AC_OUTPUT END cat > Makefile.am << 'END' +SUBDIRS = testsuite +END + +mkdir testsuite + +cat > testsuite/Makefile.am << 'END' AUTOMAKE_OPTIONS = dejagnu DEJATOOL = tcl env -EXTRA_DIST = env.test/env.exp tcl.test/tcl.exp lib/tcl.exp +EXTRA_DIST = env.test/env.exp tcl.test/tcl.exp +EXTRA_DIST += lib/tcl.exp END -mkdir env.test tcl.test lib +mkdir testsuite/env.test testsuite/tcl.test testsuite/lib # DejaGnu can change $srcdir behind our backs, so we have to # save its original value. Thanks to Ian Lance Taylor for the # suggestion. -cat > lib/tcl.exp << 'END' +cat > testsuite/lib/tcl.exp << 'END' send_user "tcl_lib_srcdir: $srcdir\n" set orig_srcdir $srcdir END -cat > env.test/env.exp << 'END' +cat > testsuite/env.test/env.exp << 'END' set env_srcdir $env(srcdir) send_user "env_srcdir: $env_srcdir\n" -if { [ regexp "^\.(\./\.\.)?$" $env_srcdir ] } { +if { [ regexp {^\.(\./\.\./\.\./testsuite)?$} $env_srcdir ] } { pass "test_env_src" } else { fail "test_env_src" } END -cat > tcl.test/tcl.exp << 'END' +cat > testsuite/tcl.test/tcl.exp << 'END' send_user "tcl_srcdir: $srcdir\n" -if { [ regexp "^\.(\./\.\.)?$" $srcdir ] } { +if { [ regexp {^\.(\./\.\./\.\./testsuite)?$} $srcdir ] } { pass "test_tcl_src" } else { fail "test_tcl_src" } send_user "tcl_orig_srcdir: $orig_srcdir\n" -if { [ regexp "^\.(\./\.\.)?$" $orig_srcdir ] } { +if { [ regexp "^\.(\./\.\./\.\./testsuite)?$" $orig_srcdir ] } { pass "test_tcl_orig_src" } else { fail "test_tcl_orig_src" @@ -74,10 +82,10 @@ $MAKE check # Sanity check: all tests have run. -test -f env.log -test -f env.sum -test -f tcl.log -test -f tcl.sum +test -f testsuite/env.log +test -f testsuite/env.sum +test -f testsuite/tcl.log +test -f testsuite/tcl.sum $MAKE distcheck diff -Nru automake-1.16-1.16.1/t/dejagnu.sh automake-1.16-1.16.5/t/dejagnu.sh --- automake-1.16-1.16.1/t/dejagnu.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dejagnu.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/dejagnu-siteexp-append.sh automake-1.16-1.16.5/t/dejagnu-siteexp-append.sh --- automake-1.16-1.16.1/t/dejagnu-siteexp-append.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dejagnu-siteexp-append.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/dejagnu-siteexp-extend.sh automake-1.16-1.16.5/t/dejagnu-siteexp-extend.sh --- automake-1.16-1.16.1/t/dejagnu-siteexp-extend.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dejagnu-siteexp-extend.sh 2021-07-16 04:40:55.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -33,10 +33,17 @@ } cat >> configure.ac << 'END' +AC_CONFIG_FILES([testsuite/Makefile]) AC_OUTPUT END cat > Makefile.am << 'END' +SUBDIRS = testsuite +END + +mkdir testsuite + +cat > testsuite/Makefile.am << 'END' AUTOMAKE_OPTIONS = dejagnu DEJATOOL = tool @@ -46,11 +53,11 @@ EXTRA_DIST += foo.exp END -echo 'set foo "/foo/"' > foo.exp +echo 'set foo "/foo/"' > testsuite/foo.exp -mkdir tool.test -write_check_for foo > tool.test/tool.exp -cat tool.test/tool.exp +mkdir testsuite/tool.test +write_check_for foo > testsuite/tool.test/tool.exp +cat testsuite/tool.test/tool.exp $ACLOCAL $AUTOCONF @@ -59,31 +66,31 @@ ./configure $MAKE check -cat foo.exp -cat site.exp -grep 'PASS: test_foo' tool.sum - -write_check_for bar >> tool.test/tool.exp -write_check_for baz >> tool.test/tool.exp -cat tool.test/tool.exp +cat testsuite/foo.exp +cat testsuite/site.exp +grep 'PASS: test_foo' testsuite/tool.sum + +write_check_for bar >> testsuite/tool.test/tool.exp +write_check_for baz >> testsuite/tool.test/tool.exp +cat testsuite/tool.test/tool.exp # Ensure that foo.exp will be newer than site.exp, which will # thus have to be remade. $sleep # With this, below we'll also check that settings in files coming later in # $(EXTRA_DEJAGNU_SITE_CONFIG) override those in files coming earlier. -cat >> foo.exp <<'END' +cat >> testsuite/foo.exp <<'END' set bar "/foo/" set baz "/foo/" set qux "/foo/" END -$MAKE check && { cat site.exp; exit 1; } -grep 'PASS: test_foo' tool.sum -grep 'FAIL: test_bar' tool.sum -grep 'FAIL: test_baz' tool.sum +$MAKE check && { cat testsuite/site.exp; exit 1; } +grep 'PASS: test_foo' testsuite/tool.sum +grep 'FAIL: test_bar' testsuite/tool.sum +grep 'FAIL: test_baz' testsuite/tool.sum -cat >> Makefile.am << 'END' +cat >> testsuite/Makefile.am << 'END' EXTRA_DEJAGNU_SITE_CONFIG += bar bar.dir/bar EXTRA_DIST += bar DISTCLEANFILES = bar.dir/bar @@ -92,41 +99,41 @@ echo 'set baz "/baz/"' > $@ END -echo 'set bar "/bar/"' > bar +echo 'set bar "/bar/"' > testsuite/bar # This will allow us to check one more time that settings in files # coming later in $(EXTRA_DEJAGNU_SITE_CONFIG) override those in # files coming earlier. -echo 'set baz "/xyz/"' >> bar +echo 'set baz "/xyz/"' >> testsuite/bar # Ensure that the Makefile will be newer than site.exp, which will # thus have to be remade. $sleep -$AUTOMAKE Makefile -./config.status Makefile +$AUTOMAKE testsuite/Makefile +./config.status testsuite/Makefile -$MAKE check || { cat site.exp; exit 1; } -cat site.exp -cat bar.dir/bar -$FGREP '/bar/' site.exp -$FGREP '/baz/' site.exp -grep 'PASS: test_foo' tool.sum -grep 'PASS: test_bar' tool.sum -grep 'PASS: test_baz' tool.sum +$MAKE check || { cat testsuite/site.exp; exit 1; } +cat testsuite/site.exp +cat testsuite/bar.dir/bar +$FGREP '/bar/' testsuite/site.exp +$FGREP '/baz/' testsuite/site.exp +grep 'PASS: test_foo' testsuite/tool.sum +grep 'PASS: test_bar' testsuite/tool.sum +grep 'PASS: test_baz' testsuite/tool.sum # Check that the features we're testing behave well in VPATH builds. $MAKE distcheck # Check that the user can edit the site.exp file, and that his edits # are retained. -write_check_for zardoz >> tool.test/tool.exp -cat tool.test/tool.exp -echo 'set zardoz "/zardoz/"' >> site.exp +write_check_for zardoz >> testsuite/tool.test/tool.exp +cat testsuite/tool.test/tool.exp +echo 'set zardoz "/zardoz/"' >> testsuite/site.exp $MAKE check -cat site.exp -grep 'PASS: test_zardoz' tool.sum +cat testsuite/site.exp +grep 'PASS: test_zardoz' testsuite/tool.sum -cat >> Makefile.am << 'END' +cat >> testsuite/Makefile.am << 'END' EXTRA_DEJAGNU_SITE_CONFIG += quux.exp quux.exp: echo 'set zardoz "/quux/"' > $@ @@ -135,25 +142,25 @@ # Ensure that the Makefile will be newer than on site.exp, which will # thus have to be remade. $sleep -$AUTOMAKE Makefile -./config.status Makefile -grep 'zardoz.*/quux/' Makefile - -$MAKE site.exp -cat site.exp -cat quux.exp -grep 'zardoz.*/quux/' site.exp +$AUTOMAKE testsuite/Makefile +./config.status testsuite/Makefile +grep 'zardoz.*/quux/' testsuite/Makefile + +(cd testsuite/ && $MAKE site.exp) +cat testsuite/site.exp +cat testsuite/quux.exp +grep 'zardoz.*/quux/' testsuite/site.exp $MAKE check -grep 'PASS: test_zardoz' tool.sum -grep 'zardoz: /zardoz/' tool.log -grep 'zardoz.*quux' tool.log && exit 1 +grep 'PASS: test_zardoz' testsuite/tool.sum +grep 'zardoz: /zardoz/' testsuite/tool.log +grep 'zardoz.*quux' testsuite/tool.log && exit 1 # Check that files in $(EXTRA_DEJAGNU_SITE_CONFIG) are not distributed # by default. $MAKE distdir ls -l $distdir -test ! -e $distdir/bar.dir/bar -test ! -e $distdir/quux.exp +test ! -e $distdir/testsuite/bar.dir/bar +test ! -e $distdir/testsuite/quux.exp : diff -Nru automake-1.16-1.16.1/t/dejagnu-siteexp-useredit.sh automake-1.16-1.16.5/t/dejagnu-siteexp-useredit.sh --- automake-1.16-1.16.1/t/dejagnu-siteexp-useredit.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dejagnu-siteexp-useredit.sh 2021-07-16 04:40:55.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -20,18 +20,25 @@ . test-init.sh cat >> configure.ac << 'END' +AC_CONFIG_FILES([testsuite/Makefile]) AC_OUTPUT END cat > Makefile.am << 'END' +SUBDIRS = testsuite +END + +mkdir testsuite + +cat > testsuite/Makefile.am << 'END' AUTOMAKE_OPTIONS = dejagnu DEJATOOL = foo END # Deliberately select a variable defined automatically by # the Makefile-generated site.exp. -mkdir foo.test -cat > foo.test/foo.exp << 'END' +mkdir testsuite/foo.test +cat > testsuite/foo.test/foo.exp << 'END' send_user "objdir: $objdir\n" set pipe "|" if { $objdir == "${pipe}objdir${pipe}" } { @@ -47,21 +54,21 @@ ./configure -$MAKE site.exp -echo 'set objdir "|objdir|"' >> site.exp -cat site.exp +(cd testsuite/ && $MAKE site.exp) +echo 'set objdir "|objdir|"' >> testsuite/site.exp +cat testsuite/site.exp $sleep -touch Makefile -$MAKE site.exp -cat site.exp -is_newest site.exp Makefile # Sanity check. -grep '|objdir|' site.exp -test $($FGREP -c '|objdir|' site.exp) -eq 1 +touch testsuite/Makefile +(cd testsuite/ && $MAKE site.exp) +cat testsuite/site.exp +is_newest testsuite/site.exp testsuite/Makefile # Sanity check. +grep '|objdir|' testsuite/site.exp +test $($FGREP -c '|objdir|' testsuite/site.exp) -eq 1 # We can do a "more semantic" check if DejaGnu is available. if runtest SOMEPROGRAM=someprogram --version; then $MAKE check - grep 'PASS: test_obj' foo.sum + grep 'PASS: test_obj' testsuite/foo.sum fi : diff -Nru automake-1.16-1.16.1/t/deleted-am.sh automake-1.16-1.16.5/t/deleted-am.sh --- automake-1.16-1.16.1/t/deleted-am.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/deleted-am.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/deleted-m4.sh automake-1.16-1.16.5/t/deleted-m4.sh --- automake-1.16-1.16.1/t/deleted-m4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/deleted-m4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/depacl2.sh automake-1.16-1.16.5/t/depacl2.sh --- automake-1.16-1.16.1/t/depacl2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/depacl2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/depcomp2.sh automake-1.16-1.16.5/t/depcomp2.sh --- automake-1.16-1.16.1/t/depcomp2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/depcomp2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/depcomp8a.sh automake-1.16-1.16.5/t/depcomp8a.sh --- automake-1.16-1.16.1/t/depcomp8a.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/depcomp8a.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/depcomp8b.sh automake-1.16-1.16.5/t/depcomp8b.sh --- automake-1.16-1.16.1/t/depcomp8b.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/depcomp8b.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/depcomp-implicit-auxdir.sh automake-1.16-1.16.5/t/depcomp-implicit-auxdir.sh --- automake-1.16-1.16.1/t/depcomp-implicit-auxdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/depcomp-implicit-auxdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2000-2018 Free Software Foundation, Inc. +# Copyright (C) 2000-2021 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 diff -Nru automake-1.16-1.16.1/t/depcomp.sh automake-1.16-1.16.5/t/depcomp.sh --- automake-1.16-1.16.1/t/depcomp.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/depcomp.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/depdist.sh automake-1.16-1.16.5/t/depdist.sh --- automake-1.16-1.16.1/t/depdist.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/depdist.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/depend3.sh automake-1.16-1.16.5/t/depend3.sh --- automake-1.16-1.16.1/t/depend3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/depend3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 diff -Nru automake-1.16-1.16.1/t/depend4.sh automake-1.16-1.16.5/t/depend4.sh --- automake-1.16-1.16.1/t/depend4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/depend4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/depend5.sh automake-1.16-1.16.5/t/depend5.sh --- automake-1.16-1.16.1/t/depend5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/depend5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/depend6.sh automake-1.16-1.16.5/t/depend6.sh --- automake-1.16-1.16.1/t/depend6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/depend6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/depend-postproc.sh automake-1.16-1.16.5/t/depend-postproc.sh --- automake-1.16-1.16.1/t/depend-postproc.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/depend-postproc.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/depend.sh automake-1.16-1.16.5/t/depend.sh --- automake-1.16-1.16.1/t/depend.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/depend.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/deprecated-acinit.sh automake-1.16-1.16.5/t/deprecated-acinit.sh --- automake-1.16-1.16.1/t/deprecated-acinit.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/deprecated-acinit.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -35,6 +35,7 @@ $ac_init $am_init_automake AC_CONFIG_FILES([Makefile]) + AC_OUTPUT END cat configure.ac # For debugging. $ACLOCAL 2>stderr && { cat stderr >&2; exit 1; } diff -Nru automake-1.16-1.16.1/t/destdir.sh automake-1.16-1.16.5/t/destdir.sh --- automake-1.16-1.16.1/t/destdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/destdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/dir-named-obj-is-bad.sh automake-1.16-1.16.5/t/dir-named-obj-is-bad.sh --- automake-1.16-1.16.1/t/dir-named-obj-is-bad.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dir-named-obj-is-bad.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/discover.sh automake-1.16-1.16.5/t/discover.sh --- automake-1.16-1.16.1/t/discover.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/discover.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/dist-auxdir-many-subdirs.sh automake-1.16-1.16.5/t/dist-auxdir-many-subdirs.sh --- automake-1.16-1.16.1/t/dist-auxdir-many-subdirs.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dist-auxdir-many-subdirs.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -100,7 +100,7 @@ else for f in $required_files; do cp "$am_scriptdir"/$f $auxdir/$f \ - || fatal_ "faild to fetch auxiliary script '$f'" + || fatal_ "failed to fetch auxiliary script '$f'" # See comments above. chmod a-w $auxdir/$f done diff -Nru automake-1.16-1.16.1/t/dist-auxfile-2.sh automake-1.16-1.16.5/t/dist-auxfile-2.sh --- automake-1.16-1.16.1/t/dist-auxfile-2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dist-auxfile-2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/dist-auxfile.sh automake-1.16-1.16.5/t/dist-auxfile.sh --- automake-1.16-1.16.1/t/dist-auxfile.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dist-auxfile.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/distcheck-configure-flags-am.sh automake-1.16-1.16.5/t/distcheck-configure-flags-am.sh --- automake-1.16-1.16.1/t/distcheck-configure-flags-am.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcheck-configure-flags-am.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/distcheck-configure-flags.sh automake-1.16-1.16.5/t/distcheck-configure-flags.sh --- automake-1.16-1.16.1/t/distcheck-configure-flags.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcheck-configure-flags.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/distcheck-configure-flags-subpkg.sh automake-1.16-1.16.5/t/distcheck-configure-flags-subpkg.sh --- automake-1.16-1.16.1/t/distcheck-configure-flags-subpkg.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcheck-configure-flags-subpkg.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/distcheck-hook2.sh automake-1.16-1.16.5/t/distcheck-hook2.sh --- automake-1.16-1.16.1/t/distcheck-hook2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcheck-hook2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/distcheck-hook.sh automake-1.16-1.16.5/t/distcheck-hook.sh --- automake-1.16-1.16.1/t/distcheck-hook.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcheck-hook.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/distcheck-missing-m4.sh automake-1.16-1.16.5/t/distcheck-missing-m4.sh --- automake-1.16-1.16.1/t/distcheck-missing-m4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcheck-missing-m4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/distcheck-no-prefix-or-srcdir-override.sh automake-1.16-1.16.5/t/distcheck-no-prefix-or-srcdir-override.sh --- automake-1.16-1.16.1/t/distcheck-no-prefix-or-srcdir-override.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcheck-no-prefix-or-srcdir-override.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/distcheck-outdated-m4.sh automake-1.16-1.16.5/t/distcheck-outdated-m4.sh --- automake-1.16-1.16.1/t/distcheck-outdated-m4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcheck-outdated-m4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/distcheck-override-dvi.sh automake-1.16-1.16.5/t/distcheck-override-dvi.sh --- automake-1.16-1.16.1/t/distcheck-override-dvi.sh 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/t/distcheck-override-dvi.sh 2021-07-12 02:41:13.000000000 +0000 @@ -0,0 +1,56 @@ +#! /bin/sh +# Copyright (C) 2011-2021 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Check that we can override the 'dvi' target run as part of distcheck, +# specifically to be 'html', so that TeX is not required. +# Related to automake bug#8289. + +# TeX and texi2dvi should not be needed or invoked. +TEX=false TEXI2DVI=false +export TEX TEXI2DVI + +required='makeinfo' +. test-init.sh + +cat >> configure.ac << 'END' +AC_OUTPUT +END + +cat > Makefile.am << 'END' +AM_DISTCHECK_DVI_TARGET = html +info_TEXINFOS = main.texi +END + +# Protect with leading " # " to avoid spurious maintainer-check failures. +sed 's/^ *# *//' > main.texi << 'END' + # \input texinfo + # @setfilename main.info + # @settitle main + # + # @node Top + # Hello. + # @bye +END + +$ACLOCAL +$AUTOMAKE -a +$AUTOCONF + +./configure +$MAKE +$MAKE distcheck + +: diff -Nru automake-1.16-1.16.1/t/distcheck-override-infodir.sh automake-1.16-1.16.5/t/distcheck-override-infodir.sh --- automake-1.16-1.16.1/t/distcheck-override-infodir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcheck-override-infodir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/distcheck-pr10470.sh automake-1.16-1.16.5/t/distcheck-pr10470.sh --- automake-1.16-1.16.1/t/distcheck-pr10470.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcheck-pr10470.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/distcheck-pr18286.sh automake-1.16-1.16.5/t/distcheck-pr18286.sh --- automake-1.16-1.16.1/t/distcheck-pr18286.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcheck-pr18286.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2014-2018 Free Software Foundation, Inc. +# Copyright (C) 2014-2021 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 diff -Nru automake-1.16-1.16.1/t/distcheck-pr9579.sh automake-1.16-1.16.5/t/distcheck-pr9579.sh --- automake-1.16-1.16.1/t/distcheck-pr9579.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcheck-pr9579.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/distcheck-writable-srcdir.sh automake-1.16-1.16.5/t/distcheck-writable-srcdir.sh --- automake-1.16-1.16.1/t/distcheck-writable-srcdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcheck-writable-srcdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/distcleancheck.sh automake-1.16-1.16.5/t/distcleancheck.sh --- automake-1.16-1.16.1/t/distcleancheck.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcleancheck.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/distcom2.sh automake-1.16-1.16.5/t/distcom2.sh --- automake-1.16-1.16.1/t/distcom2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcom2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/distcom3.sh automake-1.16-1.16.5/t/distcom3.sh --- automake-1.16-1.16.1/t/distcom3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcom3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/distcom4.sh automake-1.16-1.16.5/t/distcom4.sh --- automake-1.16-1.16.1/t/distcom4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcom4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/distcom5.sh automake-1.16-1.16.5/t/distcom5.sh --- automake-1.16-1.16.1/t/distcom5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcom5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/distcom-subdir.sh automake-1.16-1.16.5/t/distcom-subdir.sh --- automake-1.16-1.16.1/t/distcom-subdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distcom-subdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/distdir.sh automake-1.16-1.16.5/t/distdir.sh --- automake-1.16-1.16.1/t/distdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/dist-formats.tap automake-1.16-1.16.5/t/dist-formats.tap --- automake-1.16-1.16.1/t/dist-formats.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dist-formats.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 @@ -20,7 +20,7 @@ am_create_testdir=empty . test-init.sh -plan_ 66 +plan_ 75 # ---------------------------------------------------- # # Common and/or auxiliary subroutines and variables. # @@ -60,6 +60,7 @@ xz) suffix=tar.xz compressor=xz ;; bzip2) suffix=tar.bz2 compressor=bzip2 ;; zip) suffix=zip compressor=zip ;; + zstd) suffix=tar.zst compressor=zstd ;; *) fatal_ "invalid compression format '$1'";; esac } @@ -101,7 +102,7 @@ return 0 } -all_compression_formats='gzip lzip xz bzip2 zip' +all_compression_formats='gzip lzip xz bzip2 zip zstd' all_compressors=$( for x in $all_compression_formats; do @@ -294,6 +295,7 @@ nogzip in ac and xz in am nogzip in am and lzip in ac nogzip in ac and zip in ac +nogzip in ac and zstd in ac # ----------------------------------------------------------- # diff -Nru automake-1.16-1.16.1/t/disthook.sh automake-1.16-1.16.5/t/disthook.sh --- automake-1.16-1.16.1/t/disthook.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/disthook.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/dist-included-parent-dir.sh automake-1.16-1.16.5/t/dist-included-parent-dir.sh --- automake-1.16-1.16.1/t/dist-included-parent-dir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dist-included-parent-dir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/dist-install-sh.sh automake-1.16-1.16.5/t/dist-install-sh.sh --- automake-1.16-1.16.1/t/dist-install-sh.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dist-install-sh.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/distlinksbrk.sh automake-1.16-1.16.5/t/distlinksbrk.sh --- automake-1.16-1.16.1/t/distlinksbrk.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distlinksbrk.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/distlinks.sh automake-1.16-1.16.5/t/distlinks.sh --- automake-1.16-1.16.1/t/distlinks.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distlinks.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/dist-lzma.sh automake-1.16-1.16.5/t/dist-lzma.sh --- automake-1.16-1.16.1/t/dist-lzma.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dist-lzma.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/dist-missing-am.sh automake-1.16-1.16.5/t/dist-missing-am.sh --- automake-1.16-1.16.1/t/dist-missing-am.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dist-missing-am.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/dist-missing-included-m4.sh automake-1.16-1.16.5/t/dist-missing-included-m4.sh --- automake-1.16-1.16.1/t/dist-missing-included-m4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dist-missing-included-m4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/dist-missing-m4.sh automake-1.16-1.16.5/t/dist-missing-m4.sh --- automake-1.16-1.16.1/t/dist-missing-m4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/dist-missing-m4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/distname.sh automake-1.16-1.16.5/t/distname.sh --- automake-1.16-1.16.1/t/distname.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/distname.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/dist-no-built-sources.sh automake-1.16-1.16.5/t/dist-no-built-sources.sh --- automake-1.16-1.16.1/t/dist-no-built-sources.sh 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/t/dist-no-built-sources.sh 2021-07-12 02:41:13.000000000 +0000 @@ -0,0 +1,72 @@ +#! /bin/sh +# Copyright (C) 2021 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Test the presence and absence of the option no-dist-built-sources. + +. test-init.sh + +# the tests are almost the same, so do a loop with a couple conditionals. +for testopt in no-built-sources dist-built-sources; do + + if test "$testopt" = no-built-sources; then + sed -e 's/AM_INIT_AUTOMAKE/AM_INIT_AUTOMAKE([no-dist-built-sources])/' \ + configure.ac >configure.tmp + cmp configure.ac configure.tmp && fatal_ 'failed to edit configure.ac' + mv -f configure.tmp configure.ac + fi + + cat >> configure.ac << 'END' +AC_OUTPUT +END + + cat > Makefile.am <configure.ac <. + +# More install-sh checks: option -S SUFFIX should create backups. + +required=non-root +. test-init.sh + +get_shell_script install-sh + +# File gets backed up if -S is specified. +echo foo >file +echo bar >newfile +./install-sh -S .BAK newfile file +test -r file.BAK + +: diff -Nru automake-1.16-1.16.1/t/install-sh-option-S-w.sh automake-1.16-1.16.5/t/install-sh-option-S-w.sh --- automake-1.16-1.16.1/t/install-sh-option-S-w.sh 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/t/install-sh-option-S-w.sh 2021-10-04 02:51:24.000000000 +0000 @@ -0,0 +1,15 @@ +#! /bin/sh +# This file has been automatically generated. DO NOT EDIT BY HAND! +. test-lib.sh + +am_test_prefer_config_shell=yes +# In the spirit of VPATH, we prefer a test in the build tree +# over one in the source tree. +for dir in . "$am_top_srcdir"; do + if test -f "$dir/t/install-sh-option-S.sh"; then + echo "$0: will source $dir/t/install-sh-option-S.sh" + . "$dir/t/install-sh-option-S.sh"; exit $? + fi +done +echo "$0: cannot find wrapped test 't/install-sh-option-S.sh'" >&2 +exit 99 diff -Nru automake-1.16-1.16.1/t/install-sh-unittests.sh automake-1.16-1.16.5/t/install-sh-unittests.sh --- automake-1.16-1.16.1/t/install-sh-unittests.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/install-sh-unittests.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/instdat2.sh automake-1.16-1.16.5/t/instdat2.sh --- automake-1.16-1.16.1/t/instdat2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instdat2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/instdat.sh automake-1.16-1.16.5/t/instdat.sh --- automake-1.16-1.16.1/t/instdat.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instdat.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/instdir2.sh automake-1.16-1.16.5/t/instdir2.sh --- automake-1.16-1.16.1/t/instdir2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instdir2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/instdir-cond2.sh automake-1.16-1.16.5/t/instdir-cond2.sh --- automake-1.16-1.16.1/t/instdir-cond2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instdir-cond2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/instdir-cond.sh automake-1.16-1.16.5/t/instdir-cond.sh --- automake-1.16-1.16.1/t/instdir-cond.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instdir-cond.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/instdir-java.sh automake-1.16-1.16.5/t/instdir-java.sh --- automake-1.16-1.16.1/t/instdir-java.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instdir-java.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/instdir-lisp.sh automake-1.16-1.16.5/t/instdir-lisp.sh --- automake-1.16-1.16.1/t/instdir-lisp.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instdir-lisp.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/instdir-ltlib.sh automake-1.16-1.16.5/t/instdir-ltlib.sh --- automake-1.16-1.16.1/t/instdir-ltlib.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instdir-ltlib.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/instdir-no-empty.sh automake-1.16-1.16.5/t/instdir-no-empty.sh --- automake-1.16-1.16.1/t/instdir-no-empty.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instdir-no-empty.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 @@ -17,6 +17,7 @@ # An empty "foo_PRIMARY" declaration should *not* cause "make install" # to create directory $(foodir). See automake bug#10997 and bug#11030. +required='makeinfo tex texi2dvi dvips' . test-init.sh cat >> configure.ac <<'END' diff -Nru automake-1.16-1.16.1/t/instdir-prog.sh automake-1.16-1.16.5/t/instdir-prog.sh --- automake-1.16-1.16.1/t/instdir-prog.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instdir-prog.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/instdir-python.sh automake-1.16-1.16.5/t/instdir-python.sh --- automake-1.16-1.16.1/t/instdir-python.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instdir-python.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/instdir.sh automake-1.16-1.16.5/t/instdir.sh --- automake-1.16-1.16.1/t/instdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/instdir-texi.sh automake-1.16-1.16.5/t/instdir-texi.sh --- automake-1.16-1.16.1/t/instdir-texi.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instdir-texi.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/instexec.sh automake-1.16-1.16.5/t/instexec.sh --- automake-1.16-1.16.1/t/instexec.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instexec.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/instfail-info.sh automake-1.16-1.16.5/t/instfail-info.sh --- automake-1.16-1.16.1/t/instfail-info.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instfail-info.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/instfail-java.sh automake-1.16-1.16.5/t/instfail-java.sh --- automake-1.16-1.16.1/t/instfail-java.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instfail-java.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/instfail-libtool.sh automake-1.16-1.16.5/t/instfail-libtool.sh --- automake-1.16-1.16.1/t/instfail-libtool.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instfail-libtool.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/instfail.sh automake-1.16-1.16.5/t/instfail.sh --- automake-1.16-1.16.1/t/instfail.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instfail.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/insthook.sh automake-1.16-1.16.5/t/insthook.sh --- automake-1.16-1.16.1/t/insthook.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/insthook.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/instman2.sh automake-1.16-1.16.5/t/instman2.sh --- automake-1.16-1.16.1/t/instman2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instman2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2000-2018 Free Software Foundation, Inc. +# Copyright (C) 2000-2021 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 diff -Nru automake-1.16-1.16.1/t/instman.sh automake-1.16-1.16.5/t/instman.sh --- automake-1.16-1.16.1/t/instman.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instman.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/instmany-mans.sh automake-1.16-1.16.5/t/instmany-mans.sh --- automake-1.16-1.16.1/t/instmany-mans.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instmany-mans.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/instmany-python.sh automake-1.16-1.16.5/t/instmany-python.sh --- automake-1.16-1.16.1/t/instmany-python.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instmany-python.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 @@ -21,7 +21,7 @@ required='python' . test-init.sh -limit=2500 +limit=4500 subdir=long_subdir_name_with_many_characters nfiles=81 list=$(seq_ 1 $nfiles) @@ -119,18 +119,18 @@ test -n "$orig_INSTALL" $MAKE # Try whether native install (or install-sh) works. -$MAKE install +run_make install PYTHON_PREFIX="$instdir" test -n "$(find "$instdir" -name python1.py)" # Multiple uninstall should work, too. -$MAKE uninstall -$MAKE uninstall +run_make uninstall PYTHON_PREFIX="$instdir" +run_make uninstall PYTHON_PREFIX="$instdir" test $(find "$instdir" -type f -print | wc -l) -eq 0 # Try whether we don't exceed the low limit. PATH=$nPATH; export PATH -run_make INSTALL=my-install install +run_make INSTALL=my-install PYTHON_PREFIX="$instdir" install test -n "$(find "$instdir" -name python1.py)" -run_make INSTALL=my-install uninstall +run_make INSTALL=my-install PYTHON_PREFIX="$instdir" uninstall test $(find "$instdir" -type f -print | wc -l) -eq 0 PATH=$oPATH; export PATH @@ -143,14 +143,14 @@ do chmod a-r $srcdir/$file test ! -r $srcdir/$file || skip_ "cannot drop file read permissions" - $MAKE install && exit 1 + run_make install PYTHON_PREFIX="$instdir" && exit 1 chmod u+r $srcdir/$file done for file in npython3.py npython$nfiles.py do chmod a-r $srcdir/$file - $MAKE install && exit 1 + run_make install PYTHON_PREFIX="$instdir" && exit 1 chmod u+r $srcdir/$file done diff -Nru automake-1.16-1.16.1/t/instmany.sh automake-1.16-1.16.5/t/instmany.sh --- automake-1.16-1.16.1/t/instmany.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instmany.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/instspc.tap automake-1.16-1.16.5/t/instspc.tap --- automake-1.16-1.16.1/t/instspc.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/instspc.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/interp2.sh automake-1.16-1.16.5/t/interp2.sh --- automake-1.16-1.16.1/t/interp2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/interp2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/interp.sh automake-1.16-1.16.5/t/interp.sh --- automake-1.16-1.16.1/t/interp.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/interp.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/java2.sh automake-1.16-1.16.5/t/java2.sh --- automake-1.16-1.16.1/t/java2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/java2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/java3.sh automake-1.16-1.16.5/t/java3.sh --- automake-1.16-1.16.1/t/java3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/java3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/java-check.sh automake-1.16-1.16.5/t/java-check.sh --- automake-1.16-1.16.1/t/java-check.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/java-check.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/java-clean.sh automake-1.16-1.16.5/t/java-clean.sh --- automake-1.16-1.16.1/t/java-clean.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/java-clean.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/java-compile-install.sh automake-1.16-1.16.5/t/java-compile-install.sh --- automake-1.16-1.16.1/t/java-compile-install.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/java-compile-install.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -78,6 +78,11 @@ .PHONY: test test-install DISTCLEANFILES = Baz.java Foo2.java + +# Tell GNU make not to parallelize, since the tests can result in, for example: +# /usr/bin/install: cannot create regular file '/u/karl/gnu/src/akarl/t/java-compile-install.dir/_inst/share/java/Baz.class': File exists +# No evident way to debug or reliably reproduce. +.NOTPARALLEL: END echo 'class aClass {}' > Foo.java diff -Nru automake-1.16-1.16.1/t/java-compile-run-flat.sh automake-1.16-1.16.5/t/java-compile-run-flat.sh --- automake-1.16-1.16.1/t/java-compile-run-flat.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/java-compile-run-flat.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -175,6 +175,14 @@ XFAIL_TESTS = badarg.test EXTRA_DIST += $(TESTS) + +# Tell GNU make not to parallelize, since the tests can result in, for example: +# /usr/bin/install: cannot change permissions of '/tmp/am-dc-13378//u/karl/gnu/src/akarl/t/java-compile-run-flat.dir/java-compile-run-flat-1.0/_inst/share/java-compile-run-flat/java/HelloStream.class': No such file or directory +# /usr/bin/install: cannot create regular file '/tmp/am-dc-13378//u/karl/gnu/src/akarl/t/java-compile-run-flat.dir/java-compile-run-flat-1.0/_inst/share/java-compile-run-flat/java/PkgLocation.class': File exists +# make[2]: *** [Makefile:393: install-dist_javaJAVA] Error 1 +# make[2]: Leaving directory '/u/karl/gnu/src/akarl/t/java-compile-run-flat.dir/java-compile-run-flat-1.0/_build/sub' +# No evident way to debug or reliably reproduce. +.NOTPARALLEL: END cat > simple.test <<'END' diff -Nru automake-1.16-1.16.1/t/java-compile-run-nested.sh automake-1.16-1.16.5/t/java-compile-run-nested.sh --- automake-1.16-1.16.1/t/java-compile-run-nested.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/java-compile-run-nested.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -70,6 +70,10 @@ installcheck-local: test-installed run-installed .PHONY: test-built test-installed run-installed + +# The test can fail under a parallel make, so disable. +# No evident way to debug or reliably reproduce. +.NOTPARALLEL: END ## WRAPPER SCRIPT ## @@ -92,6 +96,10 @@ EXTRA_DIST = jprog.sh CLEANFILES = jprog + +# The test can fail under a parallel make, so disable. +# No evident way to debug or reliably reproduce. +.NOTPARALLEL: END cat > bin/jprog.sh <<'END' @@ -111,6 +119,12 @@ cat > jprog/Makefile.am <<'END' dist_jprogclass_JAVA = Main.java HelloStream.java nodist_jprogclass_JAVA = PkgLocation.java + +# Tell GNU make not to parallelize, since the tests can result in, for example: +# /p/bin/install: cannot create regular file '/w/co/automake/t/java-compile-run-nested.dir/_inst/share/java-compile-run-nested/jprog/HelloStream.class': +# File exists +# No evident way to debug or reliably reproduce. +.NOTPARALLEL: END cat > jprog/PkgLocation.jin <<'END' @@ -184,6 +198,10 @@ XFAIL_TESTS = badarg.test EXTRA_DIST = $(TESTS) + +# The test can fail under a parallel make, so disable. +# No evident way to debug or reliably reproduce. +.NOTPARALLEL: END cat > tests/simple.test <<'END' diff -Nru automake-1.16-1.16.1/t/javadir-undefined.sh automake-1.16-1.16.5/t/javadir-undefined.sh --- automake-1.16-1.16.1/t/javadir-undefined.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/javadir-undefined.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/java-empty-classpath.sh automake-1.16-1.16.5/t/java-empty-classpath.sh --- automake-1.16-1.16.1/t/java-empty-classpath.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/java-empty-classpath.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/java-extra.sh automake-1.16-1.16.5/t/java-extra.sh --- automake-1.16-1.16.1/t/java-extra.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/java-extra.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/javaflags.sh automake-1.16-1.16.5/t/javaflags.sh --- automake-1.16-1.16.1/t/javaflags.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/javaflags.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/java-mix.sh automake-1.16-1.16.5/t/java-mix.sh --- automake-1.16-1.16.1/t/java-mix.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/java-mix.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/java-nobase.sh automake-1.16-1.16.5/t/java-nobase.sh --- automake-1.16-1.16.1/t/java-nobase.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/java-nobase.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/java-no-duplicate.sh automake-1.16-1.16.5/t/java-no-duplicate.sh --- automake-1.16-1.16.1/t/java-no-duplicate.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/java-no-duplicate.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/java-noinst.sh automake-1.16-1.16.5/t/java-noinst.sh --- automake-1.16-1.16.1/t/java-noinst.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/java-noinst.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/javaprim.sh automake-1.16-1.16.5/t/javaprim.sh --- automake-1.16-1.16.1/t/javaprim.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/javaprim.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/java-rebuild.sh automake-1.16-1.16.5/t/java-rebuild.sh --- automake-1.16-1.16.1/t/java-rebuild.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/java-rebuild.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/java.sh automake-1.16-1.16.5/t/java.sh --- automake-1.16-1.16.1/t/java.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/java.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/java-sources.sh automake-1.16-1.16.5/t/java-sources.sh --- automake-1.16-1.16.1/t/java-sources.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/java-sources.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/javasubst.sh automake-1.16-1.16.5/t/javasubst.sh --- automake-1.16-1.16.1/t/javasubst.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/javasubst.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/java-uninstall.sh automake-1.16-1.16.5/t/java-uninstall.sh --- automake-1.16-1.16.1/t/java-uninstall.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/java-uninstall.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 @@ -47,6 +47,11 @@ chmod a-w $@-t && mv -f $@-t $@ DISTCLEANFILES = Baz.java Foo2.java + +# Tell GNU make not to parallelize, since the tests can result in, for example: +# /usr/bin/install: cannot create regular file '/u/karl/gnu/src/akarl/t/java-uninstall.dir/java-uninstall-1.0/_inst/java/Baz.class': File exists +# No evident way to debug or reliably reproduce. +.NOTPARALLEL: END echo 'class aClass {}' > Foo.java diff -Nru automake-1.16-1.16.1/t/ldadd.sh automake-1.16-1.16.5/t/ldadd.sh --- automake-1.16-1.16.1/t/ldadd.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ldadd.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 diff -Nru automake-1.16-1.16.1/t/ldflags.sh automake-1.16-1.16.5/t/ldflags.sh --- automake-1.16-1.16.1/t/ldflags.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ldflags.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2000-2018 Free Software Foundation, Inc. +# Copyright (C) 2000-2021 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 diff -Nru automake-1.16-1.16.1/t/lex2.sh automake-1.16-1.16.5/t/lex2.sh --- automake-1.16-1.16.1/t/lex2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lex2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/lex3.sh automake-1.16-1.16.5/t/lex3.sh --- automake-1.16-1.16.1/t/lex3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lex3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/lex5.sh automake-1.16-1.16.5/t/lex5.sh --- automake-1.16-1.16.1/t/lex5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lex5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/lex-clean-cxx.sh automake-1.16-1.16.5/t/lex-clean-cxx.sh --- automake-1.16-1.16.1/t/lex-clean-cxx.sh 2018-03-08 21:35:44.000000000 +0000 +++ automake-1.16-1.16.5/t/lex-clean-cxx.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/lex-clean.sh automake-1.16-1.16.5/t/lex-clean.sh --- automake-1.16-1.16.1/t/lex-clean.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lex-clean.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/lexcpp.sh automake-1.16-1.16.5/t/lexcpp.sh --- automake-1.16-1.16.1/t/lexcpp.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lexcpp.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/lex-depend-cxx.sh automake-1.16-1.16.5/t/lex-depend-cxx.sh --- automake-1.16-1.16.1/t/lex-depend-cxx.sh 2018-03-08 21:35:44.000000000 +0000 +++ automake-1.16-1.16.5/t/lex-depend-cxx.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/lex-depend-grep.sh automake-1.16-1.16.5/t/lex-depend-grep.sh --- automake-1.16-1.16.1/t/lex-depend-grep.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lex-depend-grep.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/lex-depend.sh automake-1.16-1.16.5/t/lex-depend.sh --- automake-1.16-1.16.1/t/lex-depend.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lex-depend.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/lex-header.sh automake-1.16-1.16.5/t/lex-header.sh --- automake-1.16-1.16.1/t/lex-header.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lex-header.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/lex-lib-external.sh automake-1.16-1.16.5/t/lex-lib-external.sh --- automake-1.16-1.16.1/t/lex-lib-external.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lex-lib-external.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/lex-libobj.sh automake-1.16-1.16.5/t/lex-libobj.sh --- automake-1.16-1.16.1/t/lex-libobj.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lex-libobj.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/lex-lib.sh automake-1.16-1.16.5/t/lex-lib.sh --- automake-1.16-1.16.1/t/lex-lib.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lex-lib.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/lex-line.sh automake-1.16-1.16.5/t/lex-line.sh --- automake-1.16-1.16.1/t/lex-line.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lex-line.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/lex-multiple.sh automake-1.16-1.16.5/t/lex-multiple.sh --- automake-1.16-1.16.1/t/lex-multiple.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lex-multiple.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/lex-nodist.sh automake-1.16-1.16.5/t/lex-nodist.sh --- automake-1.16-1.16.1/t/lex-nodist.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lex-nodist.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/lex-noyywrap.sh automake-1.16-1.16.5/t/lex-noyywrap.sh --- automake-1.16-1.16.1/t/lex-noyywrap.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lex-noyywrap.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/lex-pr204.sh automake-1.16-1.16.5/t/lex-pr204.sh --- automake-1.16-1.16.1/t/lex-pr204.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lex-pr204.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/lex.sh automake-1.16-1.16.5/t/lex.sh --- automake-1.16-1.16.1/t/lex.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lex.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/lex-subobj-nodep.sh automake-1.16-1.16.5/t/lex-subobj-nodep.sh --- automake-1.16-1.16.1/t/lex-subobj-nodep.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lex-subobj-nodep.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/lexvpath.sh automake-1.16-1.16.5/t/lexvpath.sh --- automake-1.16-1.16.1/t/lexvpath.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lexvpath.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/lflags-cxx.sh automake-1.16-1.16.5/t/lflags-cxx.sh --- automake-1.16-1.16.1/t/lflags-cxx.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lflags-cxx.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/lflags.sh automake-1.16-1.16.5/t/lflags.sh --- automake-1.16-1.16.1/t/lflags.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lflags.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/libexec.sh automake-1.16-1.16.5/t/libexec.sh --- automake-1.16-1.16.1/t/libexec.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libexec.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj10.sh automake-1.16-1.16.5/t/libobj10.sh --- automake-1.16-1.16.1/t/libobj10.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj10.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj12.sh automake-1.16-1.16.5/t/libobj12.sh --- automake-1.16-1.16.1/t/libobj12.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj12.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj13.sh automake-1.16-1.16.5/t/libobj13.sh --- automake-1.16-1.16.1/t/libobj13.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj13.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj14.sh automake-1.16-1.16.5/t/libobj14.sh --- automake-1.16-1.16.1/t/libobj14.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj14.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj15a.sh automake-1.16-1.16.5/t/libobj15a.sh --- automake-1.16-1.16.1/t/libobj15a.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj15a.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj15b.sh automake-1.16-1.16.5/t/libobj15b.sh --- automake-1.16-1.16.1/t/libobj15b.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj15b.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj15c.sh automake-1.16-1.16.5/t/libobj15c.sh --- automake-1.16-1.16.1/t/libobj15c.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj15c.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj16a.sh automake-1.16-1.16.5/t/libobj16a.sh --- automake-1.16-1.16.1/t/libobj16a.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj16a.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj16b.sh automake-1.16-1.16.5/t/libobj16b.sh --- automake-1.16-1.16.1/t/libobj16b.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj16b.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj17.sh automake-1.16-1.16.5/t/libobj17.sh --- automake-1.16-1.16.1/t/libobj17.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj17.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj18.sh automake-1.16-1.16.5/t/libobj18.sh --- automake-1.16-1.16.1/t/libobj18.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj18.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj19.sh automake-1.16-1.16.5/t/libobj19.sh --- automake-1.16-1.16.1/t/libobj19.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj19.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj20a.sh automake-1.16-1.16.5/t/libobj20a.sh --- automake-1.16-1.16.1/t/libobj20a.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj20a.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj20b.sh automake-1.16-1.16.5/t/libobj20b.sh --- automake-1.16-1.16.1/t/libobj20b.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj20b.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj20c.sh automake-1.16-1.16.5/t/libobj20c.sh --- automake-1.16-1.16.1/t/libobj20c.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj20c.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj2.sh automake-1.16-1.16.5/t/libobj2.sh --- automake-1.16-1.16.1/t/libobj2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj3.sh automake-1.16-1.16.5/t/libobj3.sh --- automake-1.16-1.16.1/t/libobj3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj4.sh automake-1.16-1.16.5/t/libobj4.sh --- automake-1.16-1.16.1/t/libobj4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj5.sh automake-1.16-1.16.5/t/libobj5.sh --- automake-1.16-1.16.1/t/libobj5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj7.sh automake-1.16-1.16.5/t/libobj7.sh --- automake-1.16-1.16.1/t/libobj7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj-basic.sh automake-1.16-1.16.5/t/libobj-basic.sh --- automake-1.16-1.16.1/t/libobj-basic.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj-basic.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/libobj-no-dependency-tracking.sh automake-1.16-1.16.5/t/libobj-no-dependency-tracking.sh --- automake-1.16-1.16.1/t/libobj-no-dependency-tracking.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libobj-no-dependency-tracking.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2017-2018 Free Software Foundation, Inc. +# Copyright (C) 2017-2021 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 diff -Nru automake-1.16-1.16.1/t/library2.sh automake-1.16-1.16.5/t/library2.sh --- automake-1.16-1.16.1/t/library2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/library2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/library3.sh automake-1.16-1.16.5/t/library3.sh --- automake-1.16-1.16.1/t/library3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/library3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/library.sh automake-1.16-1.16.5/t/library.sh --- automake-1.16-1.16.1/t/library.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/library.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/libtoo10.sh automake-1.16-1.16.5/t/libtoo10.sh --- automake-1.16-1.16.1/t/libtoo10.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libtoo10.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2007-2018 Free Software Foundation, Inc. +# Copyright (C) 2007-2021 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 diff -Nru automake-1.16-1.16.1/t/libtoo11.sh automake-1.16-1.16.5/t/libtoo11.sh --- automake-1.16-1.16.1/t/libtoo11.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libtoo11.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/libtool2.sh automake-1.16-1.16.5/t/libtool2.sh --- automake-1.16-1.16.1/t/libtool2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libtool2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/libtool3.sh automake-1.16-1.16.5/t/libtool3.sh --- automake-1.16-1.16.1/t/libtool3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libtool3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/libtool4.sh automake-1.16-1.16.5/t/libtool4.sh --- automake-1.16-1.16.1/t/libtool4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libtool4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/libtool5.sh automake-1.16-1.16.5/t/libtool5.sh --- automake-1.16-1.16.1/t/libtool5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libtool5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/libtool6.sh automake-1.16-1.16.5/t/libtool6.sh --- automake-1.16-1.16.1/t/libtool6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libtool6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/libtool7.sh automake-1.16-1.16.5/t/libtool7.sh --- automake-1.16-1.16.1/t/libtool7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libtool7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/libtool8.sh automake-1.16-1.16.5/t/libtool8.sh --- automake-1.16-1.16.1/t/libtool8.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libtool8.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/libtool9.sh automake-1.16-1.16.5/t/libtool9.sh --- automake-1.16-1.16.1/t/libtool9.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libtool9.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/libtool-macros.sh automake-1.16-1.16.5/t/libtool-macros.sh --- automake-1.16-1.16.1/t/libtool-macros.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libtool-macros.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/libtool.sh automake-1.16-1.16.5/t/libtool.sh --- automake-1.16-1.16.1/t/libtool.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/libtool.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/license2.sh automake-1.16-1.16.5/t/license2.sh --- automake-1.16-1.16.1/t/license2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/license2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/license.sh automake-1.16-1.16.5/t/license.sh --- automake-1.16-1.16.1/t/license.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/license.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/link_c_cxx.sh automake-1.16-1.16.5/t/link_c_cxx.sh --- automake-1.16-1.16.1/t/link_c_cxx.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/link_c_cxx.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/link_cond.sh automake-1.16-1.16.5/t/link_cond.sh --- automake-1.16-1.16.1/t/link_cond.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/link_cond.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/link_dist.sh automake-1.16-1.16.5/t/link_dist.sh --- automake-1.16-1.16.1/t/link_dist.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/link_dist.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/link_f90_only.sh automake-1.16-1.16.5/t/link_f90_only.sh --- automake-1.16-1.16.1/t/link_f90_only.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/link_f90_only.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/link_fccxx.sh automake-1.16-1.16.5/t/link_fccxx.sh --- automake-1.16-1.16.1/t/link_fccxx.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/link_fccxx.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/link_fc.sh automake-1.16-1.16.5/t/link_fc.sh --- automake-1.16-1.16.1/t/link_fc.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/link_fc.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/link_fcxx.sh automake-1.16-1.16.5/t/link_fcxx.sh --- automake-1.16-1.16.1/t/link_fcxx.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/link_fcxx.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/link_f_only.sh automake-1.16-1.16.5/t/link_f_only.sh --- automake-1.16-1.16.1/t/link_f_only.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/link_f_only.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/link_override.sh automake-1.16-1.16.5/t/link_override.sh --- automake-1.16-1.16.1/t/link_override.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/link_override.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 @@ -27,6 +27,8 @@ foo_LINK = $(LINK) bar_LINK = $(LINK) bar_LDFLAGS = $(AM_LDFLAGS) +baz_LINK = $(LINK) +AM_V_baz_LINK = xyz END $ACLOCAL @@ -41,4 +43,9 @@ grep '^ *bar_LINK *=.*bar_LDFLAGS' Makefile.in && exit 1 grep '.\$(bar_LINK).*bar' Makefile.in +# Silent make rules should use AM_V_GEN unless overridden. +grep '.\$(AM_V_GEN)\$(foo_LINK)' Makefile.in +grep '.\$(AM_V_baz_LINK)\$(baz_LINK)' Makefile.in +grep '.\$(AM_V_GEN)\$(baz_LINK)' Makefile.in && exit 1 + exit 0 diff -Nru automake-1.16-1.16.1/t/lisp2.sh automake-1.16-1.16.5/t/lisp2.sh --- automake-1.16-1.16.1/t/lisp2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lisp2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/lisp3.sh automake-1.16-1.16.5/t/lisp3.sh --- automake-1.16-1.16.1/t/lisp3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lisp3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/lisp4.sh automake-1.16-1.16.5/t/lisp4.sh --- automake-1.16-1.16.1/t/lisp4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lisp4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/lisp5.sh automake-1.16-1.16.5/t/lisp5.sh --- automake-1.16-1.16.1/t/lisp5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lisp5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/lisp6.sh automake-1.16-1.16.5/t/lisp6.sh --- automake-1.16-1.16.1/t/lisp6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lisp6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/lisp7.sh automake-1.16-1.16.5/t/lisp7.sh --- automake-1.16-1.16.1/t/lisp7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lisp7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/lisp8.sh automake-1.16-1.16.5/t/lisp8.sh --- automake-1.16-1.16.1/t/lisp8.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lisp8.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/lispdry.sh automake-1.16-1.16.5/t/lispdry.sh --- automake-1.16-1.16.1/t/lispdry.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lispdry.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/lisp-flags.sh automake-1.16-1.16.5/t/lisp-flags.sh --- automake-1.16-1.16.1/t/lisp-flags.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lisp-flags.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/lisp-loadpath.sh automake-1.16-1.16.5/t/lisp-loadpath.sh --- automake-1.16-1.16.1/t/lisp-loadpath.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lisp-loadpath.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 @@ -20,6 +20,27 @@ required=emacs . test-init.sh +# The story here is that at least in Emacs 21, -L foo -L bar ends up +# with bar before foo in load-path. The invocation in the .el.elc rule +# in lisp.am correctly uses -L $(builddir) -L $(srcdir), and thus the +# test below ends up failing. So skip the test on such old Emacs; no +# need to work around in the code. +# +# At least as of Emacs 24, -L foo -L bar preserves command line order, +# so foo is before bar in load-path, and all is well. +# +# Situation with Emacs 22 and 23 is unknown, so play it safe and skip +# the test for them too. +# +# Meanwhile, Emacs sets the EMACS envvar to t in subshells. +# If that's what we've got, use "emacs" instead. +test "$EMACS" = t && EMACS=emacs || : + +emacs_major=$(${EMACS-emacs} --version | sed -e 's/.* //;s/\..*$//;1q') +if test -z "$emacs_major" || test "$emacs_major" -le 23; then + skip_ "emacs version $emacs_major may reverse -L ordering" +fi + cat >> configure.ac << 'END' AM_PATH_LISPDIR AC_OUTPUT diff -Nru automake-1.16-1.16.1/t/lisp-pr11806.sh automake-1.16-1.16.5/t/lisp-pr11806.sh --- automake-1.16-1.16.1/t/lisp-pr11806.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lisp-pr11806.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/lisp-readonly-srcdir.sh automake-1.16-1.16.5/t/lisp-readonly-srcdir.sh --- automake-1.16-1.16.1/t/lisp-readonly-srcdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lisp-readonly-srcdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2017-2018 Free Software Foundation, Inc. +# Copyright (C) 2017-2021 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 diff -Nru automake-1.16-1.16.1/t/lisp-subdir2.sh automake-1.16-1.16.5/t/lisp-subdir2.sh --- automake-1.16-1.16.1/t/lisp-subdir2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lisp-subdir2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/lisp-subdir-mix.sh automake-1.16-1.16.5/t/lisp-subdir-mix.sh --- automake-1.16-1.16.1/t/lisp-subdir-mix.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lisp-subdir-mix.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/lisp-subdir.sh automake-1.16-1.16.5/t/lisp-subdir.sh --- automake-1.16-1.16.1/t/lisp-subdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/lisp-subdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/list-of-tests.mk automake-1.16-1.16.5/t/list-of-tests.mk --- automake-1.16-1.16.1/t/list-of-tests.mk 2018-03-08 20:27:05.000000000 +0000 +++ automake-1.16-1.16.5/t/list-of-tests.mk 2021-07-12 02:19:30.000000000 +0000 @@ -2,7 +2,7 @@ ## testsuite. This fragment is meant to be included by the Makefile.am, ## but also to be executed directly by make when bootstrapping automake. -## Copyright (C) 2011-2018 Free Software Foundation, Inc. +## Copyright (C) 2011-2021 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 @@ -30,7 +30,6 @@ XFAIL_TESTS = \ t/all.sh \ -t/auxdir-pr19311.sh \ t/cond17.sh \ t/gcj6.sh \ t/override-conditional-2.sh \ @@ -203,6 +202,7 @@ t/built-sources-cond.sh \ t/built-sources-fork-bomb.sh \ t/built-sources-install.sh \ +t/built-sources-install-exec.sh \ t/built-sources-subdir.sh \ t/built-sources.sh \ t/candist.sh \ @@ -410,6 +410,7 @@ t/dist-readonly.sh \ t/dist-repeated.sh \ t/dist-pr109765.sh \ +t/dist-no-built-sources.sh \ t/dist-vs-built-sources.sh \ t/distcleancheck.sh \ t/distcom2.sh \ @@ -431,6 +432,7 @@ t/distcheck-missing-m4.sh \ t/distcheck-outdated-m4.sh \ t/distcheck-no-prefix-or-srcdir-override.sh \ +t/distcheck-override-dvi.sh \ t/distcheck-override-infodir.sh \ t/distcheck-pr9579.sh \ t/distcheck-pr10470.sh \ @@ -529,6 +531,7 @@ t/add-missing-install-sh.sh \ t/install-sh-unittests.sh \ t/install-sh-option-C.sh \ +t/install-sh-option-S.sh \ t/instdat.sh \ t/instdat2.sh \ t/instdir.sh \ @@ -816,6 +819,7 @@ t/testsuite-summary-color.sh \ t/testsuite-summary-count.sh \ t/testsuite-summary-count-many.sh \ +t/testsuite-summary-header.sh \ t/testsuite-summary-reference-log.sh \ t/test-driver-acsubst.sh \ t/test-driver-cond.sh \ @@ -830,6 +834,7 @@ t/test-driver-trs-suffix-registered.sh \ t/test-driver-fail.sh \ t/test-driver-is-distributed.sh \ +t/test-extensions-empty.sh \ t/test-harness-vpath-rewrite.sh \ t/test-log.sh \ t/test-logs-repeated.sh \ @@ -844,6 +849,7 @@ t/test-trs-recover2.sh \ t/test-extensions.sh \ t/test-extensions-cond.sh \ +t/toplevelmd.sh \ t/parse.sh \ t/percent.sh \ t/percent2.sh \ @@ -922,6 +928,7 @@ t/python-missing.sh \ t/python-too-old.sh \ t/python-dist.sh \ +t/python-prefix.sh \ t/python-vars.sh \ t/python-virtualenv.sh \ t/python-pr10995.sh \ @@ -1188,6 +1195,7 @@ t/tags.sh \ t/tags2.sh \ t/tagsub.sh \ +t/tags-lisp-space.sh \ t/tags-pr12372.sh \ t/tar-ustar.sh \ t/tar-pax.sh \ @@ -1214,6 +1222,7 @@ t/txinfo-no-extra-dist.sh \ t/txinfo-no-installinfo.sh \ t/txinfo-no-repeated-targets.sh \ +t/txinfo-no-setfilename.sh \ t/txinfo-other-suffixes.sh \ t/txinfo-override-infodeps.sh \ t/txinfo-override-texinfo-tex.sh \ @@ -1246,6 +1255,8 @@ t/vala-grepping.sh \ t/vala-headers.sh \ t/vala-libs.sh \ +t/vala-libs-distcheck.sh \ +t/vala-libs-vpath.sh \ t/vala-mix.sh \ t/vala-mix2.sh \ t/vala-non-recursive-setup.sh \ diff -Nru automake-1.16-1.16.1/t/listval.sh automake-1.16-1.16.5/t/listval.sh --- automake-1.16-1.16.1/t/listval.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/listval.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/local.mk automake-1.16-1.16.5/t/local.mk --- automake-1.16-1.16.1/t/local.mk 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/local.mk 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ ## -*- makefile-automake -*- -## Copyright (C) 1995-2018 Free Software Foundation, Inc. +## Copyright (C) 1995-2021 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 @@ -91,12 +91,13 @@ $(AM_V_at)mv -f %D%/testsuite-part.tmp $@ EXTRA_DIST += gen-testsuite-part -# The dependecies declared here are not truly complete, but such +# The dependencies declared here are not truly complete, but such # completeness would cause more issues than it would solve. See -# automake bug#11347. +# automake bug#11347 and #44458. $(generated_TESTS): $(srcdir)/gen-testsuite-part $(srcdir)/%D%/testsuite-part.am: $(srcdir)/gen-testsuite-part $(srcdir)/%D%/testsuite-part.am: Makefile.am +$(srcdir)/%D%/testsuite-part.am: %D%/list-of-tests.mk # Hand-written tests for stuff in 'contrib/'. include $(srcdir)/contrib/%D%/local.mk @@ -244,12 +245,22 @@ test_subdirs = %D% %D%/pm contrib/%D% include %D%/CheckListOfTests.am -# Run the testsuite with the installed aclocal and automake. +# Run the testsuite with the installed aclocal and automake without using +# the 'pre-inst-env' wrapper script. installcheck-local: installcheck-testsuite installcheck-testsuite: $(AM_V_GEN)$(MAKE) $(AM_MAKEFLAGS) check \ + LOG_COMPILER=$(AM_TEST_RUNNER_SHELL) \ + PL_LOG_COMPILER=$(PERL) \ am_running_installcheck=yes +# Ensure that the installed Automake perl modules are found when running 'installcheck' target +AM_TESTS_ENVIRONMENT += \ + if test "$${am_running_installcheck}" = yes; then \ + PERL5LIB="$(DESTDIR)$(pkgvdatadir)/$${PERL5LIB:+$(PATH_SEPARATOR)}$$PERL5LIB"; \ + fi; \ + export PERL5LIB; + # Performance tests. .PHONY: perf perf: all diff -Nru automake-1.16-1.16.1/t/location.sh automake-1.16-1.16.5/t/location.sh --- automake-1.16-1.16.1/t/location.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/location.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/longlin2.sh automake-1.16-1.16.5/t/longlin2.sh --- automake-1.16-1.16.1/t/longlin2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/longlin2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/longline.sh automake-1.16-1.16.5/t/longline.sh --- automake-1.16-1.16.1/t/longline.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/longline.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/ltcond2.sh automake-1.16-1.16.5/t/ltcond2.sh --- automake-1.16-1.16.1/t/ltcond2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ltcond2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/ltcond.sh automake-1.16-1.16.5/t/ltcond.sh --- automake-1.16-1.16.1/t/ltcond.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ltcond.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/ltconv.sh automake-1.16-1.16.5/t/ltconv.sh --- automake-1.16-1.16.1/t/ltconv.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ltconv.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/ltdeps.sh automake-1.16-1.16.5/t/ltdeps.sh --- automake-1.16-1.16.1/t/ltdeps.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ltdeps.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/ltinit.sh automake-1.16-1.16.5/t/ltinit.sh --- automake-1.16-1.16.1/t/ltinit.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ltinit.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/ltinstloc.sh automake-1.16-1.16.5/t/ltinstloc.sh --- automake-1.16-1.16.1/t/ltinstloc.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ltinstloc.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/ltlibobjs.sh automake-1.16-1.16.5/t/ltlibobjs.sh --- automake-1.16-1.16.1/t/ltlibobjs.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ltlibobjs.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/ltlibsrc.sh automake-1.16-1.16.5/t/ltlibsrc.sh --- automake-1.16-1.16.1/t/ltlibsrc.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ltlibsrc.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/ltorder.sh automake-1.16-1.16.5/t/ltorder.sh --- automake-1.16-1.16.1/t/ltorder.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ltorder.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/m4-inclusion.sh automake-1.16-1.16.5/t/m4-inclusion.sh --- automake-1.16-1.16.1/t/m4-inclusion.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/m4-inclusion.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/maintclean.sh automake-1.16-1.16.5/t/maintclean.sh --- automake-1.16-1.16.1/t/maintclean.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/maintclean.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/maintclean-vpath.sh automake-1.16-1.16.5/t/maintclean-vpath.sh --- automake-1.16-1.16.1/t/maintclean-vpath.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/maintclean-vpath.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/maintmode-configure-msg.sh automake-1.16-1.16.5/t/maintmode-configure-msg.sh --- automake-1.16-1.16.1/t/maintmode-configure-msg.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/maintmode-configure-msg.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/make-dryrun.tap automake-1.16-1.16.5/t/make-dryrun.tap --- automake-1.16-1.16.1/t/make-dryrun.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/make-dryrun.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/makefile-deps.sh automake-1.16-1.16.5/t/makefile-deps.sh --- automake-1.16-1.16.1/t/makefile-deps.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/makefile-deps.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/make-is-gnu.sh automake-1.16-1.16.5/t/make-is-gnu.sh --- automake-1.16-1.16.1/t/make-is-gnu.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/make-is-gnu.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/makej2.sh automake-1.16-1.16.5/t/makej2.sh --- automake-1.16-1.16.1/t/makej2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/makej2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/makej.sh automake-1.16-1.16.5/t/makej.sh --- automake-1.16-1.16.1/t/makej.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/makej.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/make-keepgoing.tap automake-1.16-1.16.5/t/make-keepgoing.tap --- automake-1.16-1.16.1/t/make-keepgoing.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/make-keepgoing.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/maken3.sh automake-1.16-1.16.5/t/maken3.sh --- automake-1.16-1.16.1/t/maken3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/maken3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/maken.sh automake-1.16-1.16.5/t/maken.sh --- automake-1.16-1.16.1/t/maken.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/maken.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/make.sh automake-1.16-1.16.5/t/make.sh --- automake-1.16-1.16.1/t/make.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/make.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/makevars.sh automake-1.16-1.16.5/t/makevars.sh --- automake-1.16-1.16.1/t/makevars.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/makevars.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/man2.sh automake-1.16-1.16.5/t/man2.sh --- automake-1.16-1.16.1/t/man2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/man2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/man3.sh automake-1.16-1.16.5/t/man3.sh --- automake-1.16-1.16.1/t/man3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/man3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/man5.sh automake-1.16-1.16.5/t/man5.sh --- automake-1.16-1.16.1/t/man5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/man5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/man6.sh automake-1.16-1.16.5/t/man6.sh --- automake-1.16-1.16.1/t/man6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/man6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 @@ -64,8 +64,10 @@ cd build ../configure -# Sanity check. -grep '^HELP2MAN *=.*/missing help2man' Makefile +# Sanity check. The line we're matching looks like this: +# HELP2MAN = ${SHELL} '/am/checkout/t/man6.dir/missing' help2man +# so let's not try to match the exact intervening quote. +grep '^HELP2MAN *=.*/missing.* help2man' Makefile $MAKE $FGREP foobar ../foobar.1 @@ -83,8 +85,8 @@ rm -f *.1 # Remove leftover generated manpages. ./configure -# Sanity check. -grep '^HELP2MAN *=.*/missing help2man' Makefile +# Sanity check again, same as above. +grep '^HELP2MAN *=.*/missing.* help2man' Makefile $MAKE $FGREP foobar foobar.1 diff -Nru automake-1.16-1.16.1/t/man7.sh automake-1.16-1.16.5/t/man7.sh --- automake-1.16-1.16.1/t/man7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/man7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/man8.sh automake-1.16-1.16.5/t/man8.sh --- automake-1.16-1.16.1/t/man8.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/man8.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/man.sh automake-1.16-1.16.5/t/man.sh --- automake-1.16-1.16.1/t/man.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/man.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/mdate2.sh automake-1.16-1.16.5/t/mdate2.sh --- automake-1.16-1.16.1/t/mdate2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/mdate2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/mdate3.sh automake-1.16-1.16.5/t/mdate3.sh --- automake-1.16-1.16.1/t/mdate3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/mdate3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/mdate4.sh automake-1.16-1.16.5/t/mdate4.sh --- automake-1.16-1.16.1/t/mdate4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/mdate4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/mdate5.sh automake-1.16-1.16.5/t/mdate5.sh --- automake-1.16-1.16.1/t/mdate5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/mdate5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/mdate6.sh automake-1.16-1.16.5/t/mdate6.sh --- automake-1.16-1.16.1/t/mdate6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/mdate6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/mdate.sh automake-1.16-1.16.5/t/mdate.sh --- automake-1.16-1.16.1/t/mdate.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/mdate.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/missing3.sh automake-1.16-1.16.5/t/missing3.sh --- automake-1.16-1.16.1/t/missing3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/missing3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/missing-auxfile-stops-makefiles-creation.sh automake-1.16-1.16.5/t/missing-auxfile-stops-makefiles-creation.sh --- automake-1.16-1.16.1/t/missing-auxfile-stops-makefiles-creation.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/missing-auxfile-stops-makefiles-creation.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/missing-version-mismatch.sh automake-1.16-1.16.5/t/missing-version-mismatch.sh --- automake-1.16-1.16.1/t/missing-version-mismatch.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/missing-version-mismatch.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/mkdirp-deprecation.sh automake-1.16-1.16.5/t/mkdirp-deprecation.sh --- automake-1.16-1.16.1/t/mkdirp-deprecation.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/mkdirp-deprecation.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 @@ -19,12 +19,19 @@ . test-init.sh -echo AM_PROG_MKDIR_P >> configure.ac +cat > configure.ac <<'END' +AC_INIT([test], [1.0]) +AM_INIT_AUTOMAKE +AM_PROG_MKDIR_P +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT +END + : > Makefile.am grep_err () { - loc='^configure.ac:4:' + loc='^configure.ac:3:' grep "$loc.*AM_PROG_MKDIR_P.*deprecated" stderr grep "$loc.* use .*AC_PROG_MKDIR_P" stderr grep "$loc.* use '\$(MKDIR_P)' instead of '\$(mkdir_p)'.*Makefile" stderr diff -Nru automake-1.16-1.16.1/t/mkdir_p.sh automake-1.16-1.16.5/t/mkdir_p.sh --- automake-1.16-1.16.1/t/mkdir_p.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/mkdir_p.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/mkinst2.sh automake-1.16-1.16.5/t/mkinst2.sh --- automake-1.16-1.16.1/t/mkinst2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/mkinst2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/mkinst3.sh automake-1.16-1.16.5/t/mkinst3.sh --- automake-1.16-1.16.1/t/mkinst3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/mkinst3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/mkinstall.sh automake-1.16-1.16.5/t/mkinstall.sh --- automake-1.16-1.16.1/t/mkinstall.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/mkinstall.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/mmodely.sh automake-1.16-1.16.5/t/mmodely.sh --- automake-1.16-1.16.1/t/mmodely.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/mmodely.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/mmode.sh automake-1.16-1.16.5/t/mmode.sh --- automake-1.16-1.16.1/t/mmode.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/mmode.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/nobase-libtool.sh automake-1.16-1.16.5/t/nobase-libtool.sh --- automake-1.16-1.16.1/t/nobase-libtool.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/nobase-libtool.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/nobase-nodist.sh automake-1.16-1.16.5/t/nobase-nodist.sh --- automake-1.16-1.16.1/t/nobase-nodist.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/nobase-nodist.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -19,7 +19,7 @@ . test-init.sh # Simulate no emacs and no python (it shouldn't be needed in this test). -EMACS="no" PYTHON=":"; export EMCAS PYTHON +EMACS="no" PYTHON=":"; export EMACS PYTHON cat >> configure.ac << 'END' AM_PATH_LISPDIR diff -Nru automake-1.16-1.16.1/t/nobase-python.sh automake-1.16-1.16.5/t/nobase-python.sh --- automake-1.16-1.16.1/t/nobase-python.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/nobase-python.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/nobase.sh automake-1.16-1.16.5/t/nobase.sh --- automake-1.16-1.16.1/t/nobase.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/nobase.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/nodef2.sh automake-1.16-1.16.5/t/nodef2.sh --- automake-1.16-1.16.1/t/nodef2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/nodef2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/nodef.sh automake-1.16-1.16.5/t/nodef.sh --- automake-1.16-1.16.1/t/nodef.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/nodef.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/nodep2.sh automake-1.16-1.16.5/t/nodep2.sh --- automake-1.16-1.16.1/t/nodep2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/nodep2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 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 diff -Nru automake-1.16-1.16.1/t/nodepcomp.sh automake-1.16-1.16.5/t/nodepcomp.sh --- automake-1.16-1.16.1/t/nodepcomp.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/nodepcomp.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2000-2018 Free Software Foundation, Inc. +# Copyright (C) 2000-2021 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 diff -Nru automake-1.16-1.16.1/t/nodep.sh automake-1.16-1.16.5/t/nodep.sh --- automake-1.16-1.16.1/t/nodep.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/nodep.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/nodist2.sh automake-1.16-1.16.5/t/nodist2.sh --- automake-1.16-1.16.1/t/nodist2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/nodist2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/nodist3.sh automake-1.16-1.16.5/t/nodist3.sh --- automake-1.16-1.16.1/t/nodist3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/nodist3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/nodist.sh automake-1.16-1.16.5/t/nodist.sh --- automake-1.16-1.16.1/t/nodist.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/nodist.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/no-extra-c-stuff.sh automake-1.16-1.16.5/t/no-extra-c-stuff.sh --- automake-1.16-1.16.1/t/no-extra-c-stuff.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/no-extra-c-stuff.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/no-extra-makefile-code.sh automake-1.16-1.16.5/t/no-extra-makefile-code.sh --- automake-1.16-1.16.1/t/no-extra-makefile-code.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/no-extra-makefile-code.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/noinstdir.sh automake-1.16-1.16.5/t/noinstdir.sh --- automake-1.16-1.16.1/t/noinstdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/noinstdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/noinst.sh automake-1.16-1.16.5/t/noinst.sh --- automake-1.16-1.16.1/t/noinst.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/noinst.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/nolink.sh automake-1.16-1.16.5/t/nolink.sh --- automake-1.16-1.16.1/t/nolink.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/nolink.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/no-spurious-install-recursive.sh automake-1.16-1.16.5/t/no-spurious-install-recursive.sh --- automake-1.16-1.16.1/t/no-spurious-install-recursive.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/no-spurious-install-recursive.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/nostdinc.sh automake-1.16-1.16.5/t/nostdinc.sh --- automake-1.16-1.16.1/t/nostdinc.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/nostdinc.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/notrans.sh automake-1.16-1.16.5/t/notrans.sh --- automake-1.16-1.16.1/t/notrans.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/notrans.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/number.sh automake-1.16-1.16.5/t/number.sh --- automake-1.16-1.16.1/t/number.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/number.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/objc-basic.sh automake-1.16-1.16.5/t/objc-basic.sh --- automake-1.16-1.16.1/t/objc-basic.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/objc-basic.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/objc-deps.sh automake-1.16-1.16.5/t/objc-deps.sh --- automake-1.16-1.16.1/t/objc-deps.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/objc-deps.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/objc-flags.sh automake-1.16-1.16.5/t/objc-flags.sh --- automake-1.16-1.16.1/t/objc-flags.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/objc-flags.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/objc-megademo.sh automake-1.16-1.16.5/t/objc-megademo.sh --- automake-1.16-1.16.1/t/objc-megademo.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/objc-megademo.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/objc-minidemo.sh automake-1.16-1.16.5/t/objc-minidemo.sh --- automake-1.16-1.16.1/t/objc-minidemo.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/objc-minidemo.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/objcxx-basic.sh automake-1.16-1.16.5/t/objcxx-basic.sh --- automake-1.16-1.16.1/t/objcxx-basic.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/objcxx-basic.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/objcxx-deps.sh automake-1.16-1.16.5/t/objcxx-deps.sh --- automake-1.16-1.16.1/t/objcxx-deps.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/objcxx-deps.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/objcxx-flags.sh automake-1.16-1.16.5/t/objcxx-flags.sh --- automake-1.16-1.16.1/t/objcxx-flags.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/objcxx-flags.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/objcxx-minidemo.sh automake-1.16-1.16.5/t/objcxx-minidemo.sh --- automake-1.16-1.16.1/t/objcxx-minidemo.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/objcxx-minidemo.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/objext-pr10128.sh automake-1.16-1.16.5/t/objext-pr10128.sh --- automake-1.16-1.16.1/t/objext-pr10128.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/objext-pr10128.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/oldvars.sh automake-1.16-1.16.5/t/oldvars.sh --- automake-1.16-1.16.1/t/oldvars.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/oldvars.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/order.sh automake-1.16-1.16.5/t/order.sh --- automake-1.16-1.16.1/t/order.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/order.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/output10.sh automake-1.16-1.16.5/t/output10.sh --- automake-1.16-1.16.1/t/output10.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/output10.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/output11.sh automake-1.16-1.16.5/t/output11.sh --- automake-1.16-1.16.1/t/output11.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/output11.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/output12.sh automake-1.16-1.16.5/t/output12.sh --- automake-1.16-1.16.1/t/output12.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/output12.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/output13.sh automake-1.16-1.16.5/t/output13.sh --- automake-1.16-1.16.1/t/output13.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/output13.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2007-2018 Free Software Foundation, Inc. +# Copyright (C) 2007-2021 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 diff -Nru automake-1.16-1.16.1/t/output2.sh automake-1.16-1.16.5/t/output2.sh --- automake-1.16-1.16.1/t/output2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/output2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/output3.sh automake-1.16-1.16.5/t/output3.sh --- automake-1.16-1.16.1/t/output3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/output3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/output4.sh automake-1.16-1.16.5/t/output4.sh --- automake-1.16-1.16.1/t/output4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/output4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/output5.sh automake-1.16-1.16.5/t/output5.sh --- automake-1.16-1.16.1/t/output5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/output5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 diff -Nru automake-1.16-1.16.1/t/output6.sh automake-1.16-1.16.5/t/output6.sh --- automake-1.16-1.16.1/t/output6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/output6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/output7.sh automake-1.16-1.16.5/t/output7.sh --- automake-1.16-1.16.1/t/output7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/output7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/output8.sh automake-1.16-1.16.5/t/output8.sh --- automake-1.16-1.16.1/t/output8.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/output8.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/output9.sh automake-1.16-1.16.5/t/output9.sh --- automake-1.16-1.16.1/t/output9.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/output9.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/output-order.sh automake-1.16-1.16.5/t/output-order.sh --- automake-1.16-1.16.1/t/output-order.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/output-order.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/output.sh automake-1.16-1.16.5/t/output.sh --- automake-1.16-1.16.1/t/output.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/output.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/override-conditional-1.sh automake-1.16-1.16.5/t/override-conditional-1.sh --- automake-1.16-1.16.1/t/override-conditional-1.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/override-conditional-1.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/override-conditional-2.sh automake-1.16-1.16.5/t/override-conditional-2.sh --- automake-1.16-1.16.1/t/override-conditional-2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/override-conditional-2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/override-conditional-pr13940.sh automake-1.16-1.16.5/t/override-conditional-pr13940.sh --- automake-1.16-1.16.1/t/override-conditional-pr13940.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/override-conditional-pr13940.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/override-html.sh automake-1.16-1.16.5/t/override-html.sh --- automake-1.16-1.16.1/t/override-html.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/override-html.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/override-suggest-local.sh automake-1.16-1.16.5/t/override-suggest-local.sh --- automake-1.16-1.16.1/t/override-suggest-local.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/override-suggest-local.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-am2.sh automake-1.16-1.16.5/t/parallel-am2.sh --- automake-1.16-1.16.1/t/parallel-am2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-am2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-am3.sh automake-1.16-1.16.5/t/parallel-am3.sh --- automake-1.16-1.16.1/t/parallel-am3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-am3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-am.sh automake-1.16-1.16.5/t/parallel-am.sh --- automake-1.16-1.16.1/t/parallel-am.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-am.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-basics.sh automake-1.16-1.16.5/t/parallel-tests-basics.sh --- automake-1.16-1.16.1/t/parallel-tests-basics.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-basics.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-cmdline-override.sh automake-1.16-1.16.5/t/parallel-tests-cmdline-override.sh --- automake-1.16-1.16.1/t/parallel-tests-cmdline-override.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-cmdline-override.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-concurrency-2.sh automake-1.16-1.16.5/t/parallel-tests-concurrency-2.sh --- automake-1.16-1.16.1/t/parallel-tests-concurrency-2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-concurrency-2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-concurrency.sh automake-1.16-1.16.5/t/parallel-tests-concurrency.sh --- automake-1.16-1.16.1/t/parallel-tests-concurrency.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-concurrency.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-console-output.sh automake-1.16-1.16.5/t/parallel-tests-console-output.sh --- automake-1.16-1.16.1/t/parallel-tests-console-output.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-console-output.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -34,13 +34,13 @@ END cat > exp <<'END' -FAIL: fail.test -PASS: pass.test ERROR: error.test -XPASS: sub/xpass.test -XFAIL: xfail.test ERROR: sub/error2.test +FAIL: fail.test +PASS: pass.test SKIP: a/b/skip.test +XFAIL: xfail.test +XPASS: sub/xpass.test END mkdir sub a a/b @@ -60,7 +60,7 @@ #!/bin/sh # The sleep should ensure expected execution order of tests # even when make is run in parallel mode. -# Creative quoting below to plase maintainer-check. +# Creative quoting below to please maintainer-check. sleep '10' exit 1 END @@ -93,7 +93,7 @@ fi $srcdir/configure run_make -O -e FAIL check - LC_ALL=C grep '^[A-Z][A-Z]*:' stdout > got + LC_ALL=C grep '^[A-Z][A-Z]*:' stdout | sort > got cat got diff $srcdir/exp got cd $srcdir diff -Nru automake-1.16-1.16.1/t/parallel-tests-driver-install.sh automake-1.16-1.16.5/t/parallel-tests-driver-install.sh --- automake-1.16-1.16.1/t/parallel-tests-driver-install.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-driver-install.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-dry-run-1.sh automake-1.16-1.16.5/t/parallel-tests-dry-run-1.sh --- automake-1.16-1.16.1/t/parallel-tests-dry-run-1.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-dry-run-1.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-dry-run-2.sh automake-1.16-1.16.5/t/parallel-tests-dry-run-2.sh --- automake-1.16-1.16.1/t/parallel-tests-dry-run-2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-dry-run-2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-empty.sh automake-1.16-1.16.5/t/parallel-tests-empty.sh --- automake-1.16-1.16.1/t/parallel-tests-empty.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-empty.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-empty-testlogs.sh automake-1.16-1.16.5/t/parallel-tests-empty-testlogs.sh --- automake-1.16-1.16.1/t/parallel-tests-empty-testlogs.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-empty-testlogs.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-exeext.sh automake-1.16-1.16.5/t/parallel-tests-exeext.sh --- automake-1.16-1.16.1/t/parallel-tests-exeext.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-exeext.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-exit-statuses.sh automake-1.16-1.16.5/t/parallel-tests-exit-statuses.sh --- automake-1.16-1.16.1/t/parallel-tests-exit-statuses.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-exit-statuses.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-exit-status-reported.sh automake-1.16-1.16.5/t/parallel-tests-exit-status-reported.sh --- automake-1.16-1.16.1/t/parallel-tests-exit-status-reported.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-exit-status-reported.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-extra-programs.sh automake-1.16-1.16.5/t/parallel-tests-extra-programs.sh --- automake-1.16-1.16.1/t/parallel-tests-extra-programs.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-extra-programs.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-fd-redirect-exeext.sh automake-1.16-1.16.5/t/parallel-tests-fd-redirect-exeext.sh --- automake-1.16-1.16.1/t/parallel-tests-fd-redirect-exeext.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-fd-redirect-exeext.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-fd-redirect.sh automake-1.16-1.16.5/t/parallel-tests-fd-redirect.sh --- automake-1.16-1.16.1/t/parallel-tests-fd-redirect.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-fd-redirect.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-fork-bomb.sh automake-1.16-1.16.5/t/parallel-tests-fork-bomb.sh --- automake-1.16-1.16.1/t/parallel-tests-fork-bomb.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-fork-bomb.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-generated-and-distributed.sh automake-1.16-1.16.5/t/parallel-tests-generated-and-distributed.sh --- automake-1.16-1.16.1/t/parallel-tests-generated-and-distributed.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-generated-and-distributed.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-harderror.sh automake-1.16-1.16.5/t/parallel-tests-harderror.sh --- automake-1.16-1.16.1/t/parallel-tests-harderror.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-harderror.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-interrupt.tap automake-1.16-1.16.5/t/parallel-tests-interrupt.tap --- automake-1.16-1.16.1/t/parallel-tests-interrupt.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-interrupt.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-log-compiler-1.sh automake-1.16-1.16.5/t/parallel-tests-log-compiler-1.sh --- automake-1.16-1.16.1/t/parallel-tests-log-compiler-1.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-log-compiler-1.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-log-compiler-2.sh automake-1.16-1.16.5/t/parallel-tests-log-compiler-2.sh --- automake-1.16-1.16.1/t/parallel-tests-log-compiler-2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-log-compiler-2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-log-compiler-example.sh automake-1.16-1.16.5/t/parallel-tests-log-compiler-example.sh --- automake-1.16-1.16.1/t/parallel-tests-log-compiler-example.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-log-compiler-example.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-log-override-1.sh automake-1.16-1.16.5/t/parallel-tests-log-override-1.sh --- automake-1.16-1.16.1/t/parallel-tests-log-override-1.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-log-override-1.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-log-override-2.sh automake-1.16-1.16.5/t/parallel-tests-log-override-2.sh --- automake-1.16-1.16.1/t/parallel-tests-log-override-2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-log-override-2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-log-override-recheck.sh automake-1.16-1.16.5/t/parallel-tests-log-override-recheck.sh --- automake-1.16-1.16.1/t/parallel-tests-log-override-recheck.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-log-override-recheck.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-no-color-in-log.sh automake-1.16-1.16.5/t/parallel-tests-no-color-in-log.sh --- automake-1.16-1.16.1/t/parallel-tests-no-color-in-log.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-no-color-in-log.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-no-spurious-summary.sh automake-1.16-1.16.5/t/parallel-tests-no-spurious-summary.sh --- automake-1.16-1.16.1/t/parallel-tests-no-spurious-summary.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-no-spurious-summary.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-once.sh automake-1.16-1.16.5/t/parallel-tests-once.sh --- automake-1.16-1.16.1/t/parallel-tests-once.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-once.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-recheck-depends-on-all.sh automake-1.16-1.16.5/t/parallel-tests-recheck-depends-on-all.sh --- automake-1.16-1.16.1/t/parallel-tests-recheck-depends-on-all.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-recheck-depends-on-all.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-recheck-pr11791.sh automake-1.16-1.16.5/t/parallel-tests-recheck-pr11791.sh --- automake-1.16-1.16.1/t/parallel-tests-recheck-pr11791.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-recheck-pr11791.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-recheck.sh automake-1.16-1.16.5/t/parallel-tests-recheck.sh --- automake-1.16-1.16.1/t/parallel-tests-recheck.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-recheck.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-reset-term.sh automake-1.16-1.16.5/t/parallel-tests-reset-term.sh --- automake-1.16-1.16.1/t/parallel-tests-reset-term.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-reset-term.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-subdir.sh automake-1.16-1.16.5/t/parallel-tests-subdir.sh --- automake-1.16-1.16.1/t/parallel-tests-subdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-subdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-suffix-prog.sh automake-1.16-1.16.5/t/parallel-tests-suffix-prog.sh --- automake-1.16-1.16.1/t/parallel-tests-suffix-prog.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-suffix-prog.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-suffix.sh automake-1.16-1.16.5/t/parallel-tests-suffix.sh --- automake-1.16-1.16.1/t/parallel-tests-suffix.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-suffix.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-trailing-whitespace.sh automake-1.16-1.16.5/t/parallel-tests-trailing-whitespace.sh --- automake-1.16-1.16.1/t/parallel-tests-trailing-whitespace.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-trailing-whitespace.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/parallel-tests-unreadable.sh automake-1.16-1.16.5/t/parallel-tests-unreadable.sh --- automake-1.16-1.16.1/t/parallel-tests-unreadable.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parallel-tests-unreadable.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/parse.sh automake-1.16-1.16.5/t/parse.sh --- automake-1.16-1.16.1/t/parse.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/parse.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/percent2.sh automake-1.16-1.16.5/t/percent2.sh --- automake-1.16-1.16.1/t/percent2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/percent2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/percent.sh automake-1.16-1.16.5/t/percent.sh --- automake-1.16-1.16.1/t/percent.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/percent.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/perf/cond.sh automake-1.16-1.16.5/t/perf/cond.sh --- automake-1.16-1.16.1/t/perf/cond.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/perf/cond.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/perf/testsuite-recheck.sh automake-1.16-1.16.5/t/perf/testsuite-recheck.sh --- automake-1.16-1.16.1/t/perf/testsuite-recheck.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/perf/testsuite-recheck.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/perf/testsuite-summary.sh automake-1.16-1.16.5/t/perf/testsuite-summary.sh --- automake-1.16-1.16.1/t/perf/testsuite-summary.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/perf/testsuite-summary.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/per-target-flags.sh automake-1.16-1.16.5/t/per-target-flags.sh --- automake-1.16-1.16.1/t/per-target-flags.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/per-target-flags.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/phony.sh automake-1.16-1.16.5/t/phony.sh --- automake-1.16-1.16.1/t/phony.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/phony.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/pkg-config-macros.sh automake-1.16-1.16.5/t/pkg-config-macros.sh --- automake-1.16-1.16.1/t/pkg-config-macros.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pkg-config-macros.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/pluseq10.sh automake-1.16-1.16.5/t/pluseq10.sh --- automake-1.16-1.16.1/t/pluseq10.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pluseq10.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/pluseq11.sh automake-1.16-1.16.5/t/pluseq11.sh --- automake-1.16-1.16.1/t/pluseq11.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pluseq11.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/pluseq2.sh automake-1.16-1.16.5/t/pluseq2.sh --- automake-1.16-1.16.1/t/pluseq2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pluseq2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/pluseq3.sh automake-1.16-1.16.5/t/pluseq3.sh --- automake-1.16-1.16.1/t/pluseq3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pluseq3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/pluseq4.sh automake-1.16-1.16.5/t/pluseq4.sh --- automake-1.16-1.16.1/t/pluseq4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pluseq4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/pluseq5.sh automake-1.16-1.16.5/t/pluseq5.sh --- automake-1.16-1.16.1/t/pluseq5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pluseq5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/pluseq6.sh automake-1.16-1.16.5/t/pluseq6.sh --- automake-1.16-1.16.1/t/pluseq6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pluseq6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/pluseq7.sh automake-1.16-1.16.5/t/pluseq7.sh --- automake-1.16-1.16.1/t/pluseq7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pluseq7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/pluseq8.sh automake-1.16-1.16.5/t/pluseq8.sh --- automake-1.16-1.16.1/t/pluseq8.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pluseq8.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/pluseq9.sh automake-1.16-1.16.5/t/pluseq9.sh --- automake-1.16-1.16.1/t/pluseq9.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pluseq9.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/pluseq.sh automake-1.16-1.16.5/t/pluseq.sh --- automake-1.16-1.16.1/t/pluseq.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pluseq.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/pm/Cond2.pl automake-1.16-1.16.5/t/pm/Cond2.pl --- automake-1.16-1.16.1/t/pm/Cond2.pl 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pm/Cond2.pl 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/pm/Cond3.pl automake-1.16-1.16.5/t/pm/Cond3.pl --- automake-1.16-1.16.1/t/pm/Cond3.pl 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pm/Cond3.pl 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/pm/Condition.pl automake-1.16-1.16.5/t/pm/Condition.pl --- automake-1.16-1.16.1/t/pm/Condition.pl 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pm/Condition.pl 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/pm/Condition-t.pl automake-1.16-1.16.5/t/pm/Condition-t.pl --- automake-1.16-1.16.1/t/pm/Condition-t.pl 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pm/Condition-t.pl 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/pm/DisjCon2.pl automake-1.16-1.16.5/t/pm/DisjCon2.pl --- automake-1.16-1.16.1/t/pm/DisjCon2.pl 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pm/DisjCon2.pl 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/pm/DisjCon3.pl automake-1.16-1.16.5/t/pm/DisjCon3.pl --- automake-1.16-1.16.1/t/pm/DisjCon3.pl 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pm/DisjCon3.pl 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/pm/DisjConditions.pl automake-1.16-1.16.5/t/pm/DisjConditions.pl --- automake-1.16-1.16.1/t/pm/DisjConditions.pl 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pm/DisjConditions.pl 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/pm/DisjConditions-t.pl automake-1.16-1.16.5/t/pm/DisjConditions-t.pl --- automake-1.16-1.16.1/t/pm/DisjConditions-t.pl 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pm/DisjConditions-t.pl 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/pm/General.pl automake-1.16-1.16.5/t/pm/General.pl --- automake-1.16-1.16.1/t/pm/General.pl 2018-03-08 20:27:05.000000000 +0000 +++ automake-1.16-1.16.5/t/pm/General.pl 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2018 Free Software Foundation, Inc. +# Copyright (C) 2018-2021 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 diff -Nru automake-1.16-1.16.1/t/pm/Version2.pl automake-1.16-1.16.5/t/pm/Version2.pl --- automake-1.16-1.16.1/t/pm/Version2.pl 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pm/Version2.pl 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/pm/Version3.pl automake-1.16-1.16.5/t/pm/Version3.pl --- automake-1.16-1.16.1/t/pm/Version3.pl 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pm/Version3.pl 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/pm/Version.pl automake-1.16-1.16.5/t/pm/Version.pl --- automake-1.16-1.16.1/t/pm/Version.pl 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pm/Version.pl 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/pm/Wrap.pl automake-1.16-1.16.5/t/pm/Wrap.pl --- automake-1.16-1.16.1/t/pm/Wrap.pl 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pm/Wrap.pl 2021-07-12 02:41:13.000000000 +0000 @@ -1,4 +1,4 @@ -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/posixsubst-data.sh automake-1.16-1.16.5/t/posixsubst-data.sh --- automake-1.16-1.16.1/t/posixsubst-data.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/posixsubst-data.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/posixsubst-extradist.sh automake-1.16-1.16.5/t/posixsubst-extradist.sh --- automake-1.16-1.16.1/t/posixsubst-extradist.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/posixsubst-extradist.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/posixsubst-ldadd.sh automake-1.16-1.16.5/t/posixsubst-ldadd.sh --- automake-1.16-1.16.1/t/posixsubst-ldadd.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/posixsubst-ldadd.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/posixsubst-libraries.sh automake-1.16-1.16.5/t/posixsubst-libraries.sh --- automake-1.16-1.16.1/t/posixsubst-libraries.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/posixsubst-libraries.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/posixsubst-ltlibraries.sh automake-1.16-1.16.5/t/posixsubst-ltlibraries.sh --- automake-1.16-1.16.1/t/posixsubst-ltlibraries.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/posixsubst-ltlibraries.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/posixsubst-programs.sh automake-1.16-1.16.5/t/posixsubst-programs.sh --- automake-1.16-1.16.1/t/posixsubst-programs.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/posixsubst-programs.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/posixsubst-scripts.sh automake-1.16-1.16.5/t/posixsubst-scripts.sh --- automake-1.16-1.16.1/t/posixsubst-scripts.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/posixsubst-scripts.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/posixsubst-sources.sh automake-1.16-1.16.5/t/posixsubst-sources.sh --- automake-1.16-1.16.1/t/posixsubst-sources.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/posixsubst-sources.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/posixsubst-tests.sh automake-1.16-1.16.5/t/posixsubst-tests.sh --- automake-1.16-1.16.1/t/posixsubst-tests.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/posixsubst-tests.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/ppf77.sh automake-1.16-1.16.5/t/ppf77.sh --- automake-1.16-1.16.1/t/ppf77.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/ppf77.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/pr211.sh automake-1.16-1.16.5/t/pr211.sh --- automake-1.16-1.16.1/t/pr211.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr211.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/pr220.sh automake-1.16-1.16.5/t/pr220.sh --- automake-1.16-1.16.1/t/pr220.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr220.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/pr224.sh automake-1.16-1.16.5/t/pr224.sh --- automake-1.16-1.16.1/t/pr224.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr224.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/pr229.sh automake-1.16-1.16.5/t/pr229.sh --- automake-1.16-1.16.1/t/pr229.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr229.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/pr243.sh automake-1.16-1.16.5/t/pr243.sh --- automake-1.16-1.16.1/t/pr243.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr243.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/pr266.sh automake-1.16-1.16.5/t/pr266.sh --- automake-1.16-1.16.1/t/pr266.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr266.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/pr279-2.sh automake-1.16-1.16.5/t/pr279-2.sh --- automake-1.16-1.16.1/t/pr279-2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr279-2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/pr279.sh automake-1.16-1.16.5/t/pr279.sh --- automake-1.16-1.16.1/t/pr279.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr279.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/pr287.sh automake-1.16-1.16.5/t/pr287.sh --- automake-1.16-1.16.1/t/pr287.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr287.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/pr2.sh automake-1.16-1.16.5/t/pr2.sh --- automake-1.16-1.16.1/t/pr2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/pr300-lib.sh automake-1.16-1.16.5/t/pr300-lib.sh --- automake-1.16-1.16.1/t/pr300-lib.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr300-lib.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/pr300-ltlib.sh automake-1.16-1.16.5/t/pr300-ltlib.sh --- automake-1.16-1.16.1/t/pr300-ltlib.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr300-ltlib.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/pr300-prog.sh automake-1.16-1.16.5/t/pr300-prog.sh --- automake-1.16-1.16.1/t/pr300-prog.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr300-prog.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/pr307.sh automake-1.16-1.16.5/t/pr307.sh --- automake-1.16-1.16.1/t/pr307.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr307.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/pr401b.sh automake-1.16-1.16.5/t/pr401b.sh --- automake-1.16-1.16.1/t/pr401b.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr401b.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/pr401c.sh automake-1.16-1.16.5/t/pr401c.sh --- automake-1.16-1.16.1/t/pr401c.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr401c.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/pr401.sh automake-1.16-1.16.5/t/pr401.sh --- automake-1.16-1.16.1/t/pr401.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr401.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/pr72.sh automake-1.16-1.16.5/t/pr72.sh --- automake-1.16-1.16.1/t/pr72.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr72.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2000-2018 Free Software Foundation, Inc. +# Copyright (C) 2000-2021 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 diff -Nru automake-1.16-1.16.1/t/pr87.sh automake-1.16-1.16.5/t/pr87.sh --- automake-1.16-1.16.1/t/pr87.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr87.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2000-2018 Free Software Foundation, Inc. +# Copyright (C) 2000-2021 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 diff -Nru automake-1.16-1.16.1/t/pr9.sh automake-1.16-1.16.5/t/pr9.sh --- automake-1.16-1.16.1/t/pr9.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/pr9.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/precious.sh automake-1.16-1.16.5/t/precious.sh --- automake-1.16-1.16.1/t/precious.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/precious.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/prefix.sh automake-1.16-1.16.5/t/prefix.sh --- automake-1.16-1.16.1/t/prefix.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/prefix.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/preproc-basics.sh automake-1.16-1.16.5/t/preproc-basics.sh --- automake-1.16-1.16.1/t/preproc-basics.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/preproc-basics.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/preproc-c-compile.sh automake-1.16-1.16.5/t/preproc-c-compile.sh --- automake-1.16-1.16.1/t/preproc-c-compile.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/preproc-c-compile.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/preproc-demo.sh automake-1.16-1.16.5/t/preproc-demo.sh --- automake-1.16-1.16.1/t/preproc-demo.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/preproc-demo.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/preproc-errmsg.sh automake-1.16-1.16.5/t/preproc-errmsg.sh --- automake-1.16-1.16.1/t/preproc-errmsg.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/preproc-errmsg.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/primary2.sh automake-1.16-1.16.5/t/primary2.sh --- automake-1.16-1.16.1/t/primary2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/primary2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/primary3.sh automake-1.16-1.16.5/t/primary3.sh --- automake-1.16-1.16.1/t/primary3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/primary3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/primary-prefix-couples-documented-valid.sh automake-1.16-1.16.5/t/primary-prefix-couples-documented-valid.sh --- automake-1.16-1.16.1/t/primary-prefix-couples-documented-valid.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/primary-prefix-couples-documented-valid.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/primary-prefix-couples-force-valid.sh automake-1.16-1.16.5/t/primary-prefix-couples-force-valid.sh --- automake-1.16-1.16.1/t/primary-prefix-couples-force-valid.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/primary-prefix-couples-force-valid.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/primary-prefix-invalid-couples.tap automake-1.16-1.16.5/t/primary-prefix-invalid-couples.tap --- automake-1.16-1.16.1/t/primary-prefix-invalid-couples.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/primary-prefix-invalid-couples.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/primary-prefix-valid-couples.sh automake-1.16-1.16.5/t/primary-prefix-valid-couples.sh --- automake-1.16-1.16.1/t/primary-prefix-valid-couples.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/primary-prefix-valid-couples.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/primary.sh automake-1.16-1.16.5/t/primary.sh --- automake-1.16-1.16.1/t/primary.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/primary.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/print-libdir.sh automake-1.16-1.16.5/t/print-libdir.sh --- automake-1.16-1.16.1/t/print-libdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/print-libdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/proginst.sh automake-1.16-1.16.5/t/proginst.sh --- automake-1.16-1.16.1/t/proginst.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/proginst.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/programs-primary-rewritten.sh automake-1.16-1.16.5/t/programs-primary-rewritten.sh --- automake-1.16-1.16.1/t/programs-primary-rewritten.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/programs-primary-rewritten.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/py-compile-basedir.sh automake-1.16-1.16.5/t/py-compile-basedir.sh --- automake-1.16-1.16.1/t/py-compile-basedir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/py-compile-basedir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -40,11 +40,10 @@ ./py-compile --basedir "$d" "$f.py" "sub/$f.py" find "$d2" # For debugging. py_installed "$d2/$f.pyc" - py_installed "$d2/$f.pyo" py_installed "$d2/sub/$f.pyc" - py_installed "$d2/sub/$f.pyo" files=$(find "$d2" | grep '\.py[co]$') - test $(echo "$files" | wc -l) -eq 4 + # with new-enough Python3, there are six files. + test $(echo "$files" | wc -l) -eq 4 || $(echo "$files" | wc -l) -eq 6 case $d2 in .|..) rm -f $files;; *) rm -rf "$d2";; diff -Nru automake-1.16-1.16.1/t/py-compile-basic.sh automake-1.16-1.16.5/t/py-compile-basic.sh --- automake-1.16-1.16.1/t/py-compile-basic.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/py-compile-basic.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -61,10 +61,7 @@ ./py-compile foo.py sub/bar.py 1/_/2/_/3/_/0.py py_installed foo.pyc -py_installed foo.pyo py_installed sub/bar.pyc -py_installed sub/bar.pyo py_installed 1/_/2/_/3/_/0.pyc -py_installed 1/_/2/_/3/_/0.pyo : diff -Nru automake-1.16-1.16.1/t/py-compile-destdir.sh automake-1.16-1.16.5/t/py-compile-destdir.sh --- automake-1.16-1.16.1/t/py-compile-destdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/py-compile-destdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -34,13 +34,11 @@ find $destdir # For debugging. st=0 -for x in c o; do - for b in foo sub/bar; do - f=$(pyc_location -p "$destdir/$b.py$x") - test -f "$f" - strings "$f" || : # For debugging. - $FGREP $destdir $f && { echo BAD: $f; st=1; } - done +for b in foo sub/bar; do + f=$(pyc_location -p "$destdir/$b.pyc") + test -f "$f" + strings "$f" || : # For debugging. + $FGREP $destdir $f && { echo BAD: $f; st=1; } done exit $st diff -Nru automake-1.16-1.16.1/t/py-compile-env.sh automake-1.16-1.16.5/t/py-compile-env.sh --- automake-1.16-1.16.1/t/py-compile-env.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/py-compile-env.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/py-compile-option-terminate.sh automake-1.16-1.16.5/t/py-compile-option-terminate.sh --- automake-1.16-1.16.1/t/py-compile-option-terminate.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/py-compile-option-terminate.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -27,17 +27,12 @@ : > ./--foo.py ./py-compile -- -o.py --foo.py py_installed ./-o.pyc -py_installed ./-o.pyo py_installed ./--foo.pyc -py_installed ./--foo.pyo rm -f ./-*.py[co] : > x.py ./py-compile x.py -o.py --foo.py py_installed ./x.pyc -py_installed ./x.pyo py_installed ./-o.pyc -py_installed ./-o.pyo py_installed ./--foo.pyc -py_installed ./--foo.pyo : diff -Nru automake-1.16-1.16.1/t/py-compile-usage.sh automake-1.16-1.16.5/t/py-compile-usage.sh --- automake-1.16-1.16.1/t/py-compile-usage.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/py-compile-usage.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/python10.sh automake-1.16-1.16.5/t/python10.sh --- automake-1.16-1.16.1/t/python10.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/python10.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 @@ -60,27 +60,21 @@ $MAKE install test -f "$inst/your/two.py" py_installed "$inst/your/two.pyc" -py_installed "$inst/your/two.pyo" py_installed --not "$inst/my/one.py" py_installed --not "$inst/my/one.pyc" -py_installed --not "$inst/my/one.pyo" $MAKE uninstall py_installed --not "$inst/your/two.py" py_installed --not "$inst/your/two.pyc" -py_installed --not "$inst/your/two.pyo" ../configure --prefix=$cwd/"$inst" one=1 $MAKE install py_installed --not "$inst/your/two.py" py_installed --not "$inst/your/two.pyc" -py_installed --not "$inst/your/two.pyo" test -f "$inst/my/one.py" py_installed "$inst/my/one.pyc" -py_installed "$inst/my/one.pyo" $MAKE uninstall py_installed --not "$inst/my/one.py" py_installed --not "$inst/my/one.pyc" -py_installed --not "$inst/my/one.pyo" $MAKE disttest diff -Nru automake-1.16-1.16.1/t/python11.sh automake-1.16-1.16.5/t/python11.sh --- automake-1.16-1.16.1/t/python11.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/python11.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/python12.sh automake-1.16-1.16.5/t/python12.sh --- automake-1.16-1.16.1/t/python12.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/python12.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 @@ -44,11 +44,10 @@ # Perfunctory test that the files were created. test -f "$destdir/usr/share/my/my.py" -pyo=$(pyc_location -p "$destdir/usr/share/my/my.pyo") pyc=$(pyc_location -p "$destdir/usr/share/my/my.pyc") # If DESTDIR has made it into the byte compiled files, fail the test. -st=0; $FGREP "$destdir" "$pyc" "$pyo" || st=$? +st=0; $FGREP "$destdir" "$pyc" || st=$? test $st -eq 1 : diff -Nru automake-1.16-1.16.1/t/python2.sh automake-1.16-1.16.5/t/python2.sh --- automake-1.16-1.16.1/t/python2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/python2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/python3.sh automake-1.16-1.16.5/t/python3.sh --- automake-1.16-1.16.1/t/python3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/python3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 @@ -42,6 +42,5 @@ $MAKE install py_installed inst/my/one.py py_installed inst/my/one.pyc -py_installed inst/my/one.pyo : diff -Nru automake-1.16-1.16.1/t/python-am-path-iftrue.sh automake-1.16-1.16.5/t/python-am-path-iftrue.sh --- automake-1.16-1.16.1/t/python-am-path-iftrue.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/python-am-path-iftrue.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/python-dist.sh automake-1.16-1.16.5/t/python-dist.sh --- automake-1.16-1.16.1/t/python-dist.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/python-dist.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/python-missing.sh automake-1.16-1.16.5/t/python-missing.sh --- automake-1.16-1.16.1/t/python-missing.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/python-missing.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/python-pr10995.sh automake-1.16-1.16.5/t/python-pr10995.sh --- automake-1.16-1.16.1/t/python-pr10995.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/python-pr10995.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/python-prefix.sh automake-1.16-1.16.5/t/python-prefix.sh --- automake-1.16-1.16.1/t/python-prefix.sh 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/t/python-prefix.sh 2021-09-20 00:53:14.000000000 +0000 @@ -0,0 +1,89 @@ +#! /bin/sh +# Copyright (C) 2021 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Test configure options --with-python_prefix and --with-python_exec_prefix. + +required=python +. test-init.sh + +cat >>configure.ac <Makefile.am <<'END' +# to be installed in pythondir: +python_PYTHON = one.py + +# to be installed in pythonpkgdir: +pkgpython_PYTHON = pkgtwo.py + +one.py: + echo 'def one(): return 1' >$@ || rm -f $@ +pkgtwo.py: + echo 'def pkgtwo(): return 1' >$@ || rm -f $@ + +# It's too much trouble to build and install something that actually +# needs to be under exec_prefix. Instead, we'll just check the value of +# the variable. +echo-python-exec-prefix: + @echo $(PYTHON_EXEC_PREFIX) +END + +py_version=$(python -c 'import sys; print("%u.%u" % sys.version_info[:2])') +py_inst_site=inst/lib/python$py_version/site-packages +py_instexec_site=instexec/lib/python$py_version/site-packages + +# First test: if --with-python_prefix is given, by default it should +# be used for python_exec_prefix too. +# +$ACLOCAL +$AUTOCONF +$AUTOMAKE --add-missing + +mkdir build +cd build +../configure --with-python_prefix="$(pwd)/inst" +$MAKE install +# +py_installed "$py_inst_site"/one.py +py_installed "$py_inst_site"/one.pyc +# +py_installed "$py_inst_site"/python-prefix/pkgtwo.py +py_installed "$py_inst_site"/python-prefix/pkgtwo.pyc +# +test "$($MAKE echo-python-exec-prefix)" = "$(pwd)/inst" + +# Second test: specify different --with-python_prefix +# and --with-python_exec_prefix values. +# +cd .. +rm -rf build auto4mte.cache +mkdir build +cd build +../configure --with-python_prefix="$(pwd)/inst" \ + --with-python_exec_prefix="$(pwd)/instexec" +$MAKE install +# +py_installed "$py_inst_site"/one.py +py_installed "$py_inst_site"/one.pyc +# +py_installed "$py_inst_site"/python-prefix/pkgtwo.py +py_installed "$py_inst_site"/python-prefix/pkgtwo.pyc +# +test "$($MAKE echo-python-exec-prefix)" = "$(pwd)/instexec" + +: diff -Nru automake-1.16-1.16.1/t/python.sh automake-1.16-1.16.5/t/python.sh --- automake-1.16-1.16.1/t/python.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/python.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/python-too-old.sh automake-1.16-1.16.5/t/python-too-old.sh --- automake-1.16-1.16.1/t/python-too-old.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/python-too-old.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/python-vars.sh automake-1.16-1.16.5/t/python-vars.sh --- automake-1.16-1.16.1/t/python-vars.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/python-vars.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -15,7 +15,8 @@ # along with this program. If not, see . # Check that AM_PATH_PYTHON correctly sets all the output variables -# advertised in the manual. +# advertised in the manual, both with the GNU prefix values and the +# Python sys.* prefix values. required=python . test-init.sh @@ -23,15 +24,17 @@ # In case the user's config.site defines pythondir or pyexecdir. CONFIG_SITE=/dev/null; export CONFIG_SITE -# Update the definition below if the documentation changes. -# Note that the value of the 'pythondir' and 'pyexecdir' variables can -# vary among different python installations, so we need more relaxed -# and ad-hoc checks for them. Also, more proper "functional" checks -# on them should be done in the 'python-virtualenv.sh' test. -PYTHON_VERSION=$($PYTHON -c 'import sys; print(sys.version[:3])') || exit 1 -PYTHON_PLATFORM=$($PYTHON -c 'import sys; print(sys.platform)') || exit 1 -PYTHON_EXEC_PREFIX='${exec_prefix}' -PYTHON_PREFIX='${prefix}' +# Update the definition below if the documentation changes. The values +# of the 'pythondir' and 'pyexecdir' variables vary among different +# python installations, so we need more relaxed and ad-hoc checks for +# them. Also, more proper "functional" checks on them should be done in +# the 'python-virtualenv.sh' test. +# +# This version identification is duplicated in python.m4 (and the manual). +PYTHON_VERSION=$($PYTHON -c 'import sys; print ("%u.%u" % sys.version_info[:2])') || exit 1 +PYTHON_PLATFORM=$($PYTHON -c 'import sys; print (sys.platform)') || exit 1 +PYTHON_EXEC_PREFIX=$($PYTHON -c 'import sys; print (sys.exec_prefix)') || exit 1 +PYTHON_PREFIX=$($PYTHON -c 'import sys; print (sys.prefix)') || exit 1 pkgpythondir="\${pythondir}/$me" pkgpyexecdir="\${pyexecdir}/$me" @@ -59,47 +62,82 @@ .PHONY: test-in test-am test-in: + @echo "> doing test-in" + @echo ">> contents of pythondir:" cat pythondir - case `cat pythondir` in '$${prefix}'/*);; *) exit 1;; esac + case `cat pythondir` in '$${PYTHON_PREFIX}'/*);; *) exit 1;; esac + @echo ">> contents of pyexecdir:" cat pyexecdir - case `cat pyexecdir` in '$${exec_prefix}'/*);; *) exit 1;; esac + case `cat pyexecdir` in '$${PYTHON_EXEC_PREFIX}'/*);; *) exit 1;; esac + @echo ">> contents of vars-exp:" cat $(srcdir)/vars-exp + @echo ">> contents of vars-got:" cat $(builddir)/vars-got diff $(srcdir)/vars-exp $(builddir)/vars-got ## Note: this target's rules will be extended in the "for" loop below. test-am: - case '$(pythondir)' in '$(prefix)'/*);; *) exit 1;; esac - case '$(pyexecdir)' in '$(exec_prefix)'/*);; *) exit 1;; esac + @echo "> doing test-am" + case '$(pythondir)' in '$(PYTHON_PREFIX)'/*);; *) exit 1;; esac + case '$(pyexecdir)' in '$(PYTHON_EXEC_PREFIX)'/*);; *) exit 1;; esac END echo @pythondir@ > pythondir.in echo @pyexecdir@ > pyexecdir.in -: > vars-exp -: > vars-got.in - -for var in $pyvars; do - eval val=\$$var - echo "var=$val" >> vars-exp - echo "var=@$var@" >> vars-got.in - echo "${tab}test x'\$($var)' = x'$val'" >> Makefile.am -done +# This depends on whether we're doing GNU or Python values, per arg. +setup_vars_file () +{ + vartype=$1 + : > vars-exp + : > vars-got.in + + for var in $pyvars; do + if test x"$vartype" = xgnu; then + # when not using Python sys.* values, PYTHON_*PREFIX will vary; + # the computed value will be (something like) "/usr", + # but the expected value will be "${prefix}". + if test x"$var" = xPYTHON_PREFIX \ + || test x"$var" = xPYTHON_EXEC_PREFIX; then + continue + fi + fi + eval val=\$$var + echo "var=$val #$var" >> vars-exp + echo "var=@$var@ #$var" >> vars-got.in + echo "${tab}test x'\$($var)' = x'$val' || test \"\$NO_CHECK_PYTHON_PREFIX\"" >> Makefile.am + done +} -cat Makefile.am -cat vars-got.in +setup_vars_file gnu $ACLOCAL $AUTOMAKE --add-missing +# some debugging output. for var in pythondir pyexecdir $pyvars; do grep "^$var *=" Makefile.in done $AUTOCONF + +# Do GNU values. ./configure PYTHON="$PYTHON" +$MAKE test-in test-am +run_make distcheck +# Do Python values. +setup_vars_file python +instdir=$(pwd)/inst +./configure PYTHON="$PYTHON" --with-python-sys-prefix --prefix="$instdir" $MAKE test-in test-am -$MAKE distcheck +# +# This tries to install to $PYTHON_PREFIX, which may not be writable. +# Override it to something safe, but then of course we have to skip +# checking that it is what we originally set it to. +run_make distcheck \ + PYTHON_PREFIX="$instdir" \ + NO_CHECK_PYTHON_PREFIX=1 \ + AM_DISTCHECK_CONFIGURE_FLAGS=--with-python-sys-prefix : diff -Nru automake-1.16-1.16.1/t/python-virtualenv.sh automake-1.16-1.16.5/t/python-virtualenv.sh --- automake-1.16-1.16.1/t/python-virtualenv.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/python-virtualenv.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -39,13 +39,14 @@ py_version_post=$(python -V) # Sanity check. -test "$py_version_pre" = "$py_version_post" +test "$py_version_pre" = "$py_version_post" \ + || skip_ "virtualenv $py_version_post != $py_version_pre" cwd=$(pwd) || fatal_ "getting current working directory" py_version=$(python -c 'import sys; print("%u.%u" % tuple(sys.version_info[:2]))') py_site=$VIRTUAL_ENV/lib/python$py_version/site-packages -# We need to do do this early, just to set some cache variables properly, +# We need to do this early, just to set some cache variables properly, # since because we're going to unset $PYTHON next. if python_has_pep3147; then : PEP 3147 will be used in installation of ".pyc" files @@ -124,10 +125,8 @@ test -f "$py_site"/am_foo.py py_installed "$py_site"/am_foo.pyc - py_installed "$py_site"/am_foo.pyo py_installed "$py_site"/am_virtenv/__init__.py py_installed "$py_site"/am_virtenv/__init__.pyc - py_installed "$py_site"/am_virtenv/__init__.pyo test -f "$py_site"/libquux.a test -f "$py_site"/am_virtenv/libzardoz.a } @@ -138,10 +137,8 @@ test ! -e "$py_site"/am_foo.py py_installed --not "$py_site"/am_foo.pyc - py_installed --not "$py_site"/am_foo.pyo test ! -e "$py_site"/am_virtenv/__init__.py py_installed --not "$py_site"/am_virtenv/__init__.pyc - py_installed --not "$py_site"/am_virtenv/__init__.pyo test ! -e "$py_site"/libquux.a test ! -e "$py_site"/am_virtenv/libzardoz.a } diff -Nru automake-1.16-1.16.1/t/README automake-1.16-1.16.5/t/README --- automake-1.16-1.16.1/t/README 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/t/README 2020-11-15 16:11:50.000000000 +0000 @@ -204,7 +204,7 @@ 'run_make' function rather than calling $MAKE directly. Not only is this more idiomatic, but it also avoid possible spurious racy failures when the make invocations in the testsuite are run in parallel mode - (as with "make check AM_TESTSUITE_MAKE='make -j4"'). + (as with "make check AM_TESTSUITE_MAKE='make -j4'"). * Do not override Makefile variables using make arguments, as in e.g.: diff -Nru automake-1.16-1.16.1/t/recurs-user2.sh automake-1.16-1.16.5/t/recurs-user2.sh --- automake-1.16-1.16.1/t/recurs-user2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/recurs-user2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/recurs-user-deeply-nested.sh automake-1.16-1.16.5/t/recurs-user-deeply-nested.sh --- automake-1.16-1.16.1/t/recurs-user-deeply-nested.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/recurs-user-deeply-nested.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/recurs-user-indir.sh automake-1.16-1.16.5/t/recurs-user-indir.sh --- automake-1.16-1.16.1/t/recurs-user-indir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/recurs-user-indir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/recurs-user-keep-going.sh automake-1.16-1.16.5/t/recurs-user-keep-going.sh --- automake-1.16-1.16.1/t/recurs-user-keep-going.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/recurs-user-keep-going.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/recurs-user-many.sh automake-1.16-1.16.5/t/recurs-user-many.sh --- automake-1.16-1.16.1/t/recurs-user-many.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/recurs-user-many.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/recurs-user-no-subdirs.sh automake-1.16-1.16.5/t/recurs-user-no-subdirs.sh --- automake-1.16-1.16.1/t/recurs-user-no-subdirs.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/recurs-user-no-subdirs.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/recurs-user-no-top-level.sh automake-1.16-1.16.5/t/recurs-user-no-top-level.sh --- automake-1.16-1.16.1/t/recurs-user-no-top-level.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/recurs-user-no-top-level.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/recurs-user-override.sh automake-1.16-1.16.5/t/recurs-user-override.sh --- automake-1.16-1.16.1/t/recurs-user-override.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/recurs-user-override.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/recurs-user-phony.sh automake-1.16-1.16.5/t/recurs-user-phony.sh --- automake-1.16-1.16.1/t/recurs-user-phony.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/recurs-user-phony.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/recurs-user.sh automake-1.16-1.16.5/t/recurs-user.sh --- automake-1.16-1.16.1/t/recurs-user.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/recurs-user.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/recurs-user-wrap.sh automake-1.16-1.16.5/t/recurs-user-wrap.sh --- automake-1.16-1.16.1/t/recurs-user-wrap.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/recurs-user-wrap.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/relativize.tap automake-1.16-1.16.5/t/relativize.tap --- automake-1.16-1.16.1/t/relativize.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/relativize.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-aclocal-version-mismatch.sh automake-1.16-1.16.5/t/remake-aclocal-version-mismatch.sh --- automake-1.16-1.16.1/t/remake-aclocal-version-mismatch.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-aclocal-version-mismatch.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-after-acinclude-m4.sh automake-1.16-1.16.5/t/remake-after-acinclude-m4.sh --- automake-1.16-1.16.1/t/remake-after-acinclude-m4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-after-acinclude-m4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-after-aclocal-m4.sh automake-1.16-1.16.5/t/remake-after-aclocal-m4.sh --- automake-1.16-1.16.1/t/remake-after-aclocal-m4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-after-aclocal-m4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-after-configure-ac.sh automake-1.16-1.16.5/t/remake-after-configure-ac.sh --- automake-1.16-1.16.1/t/remake-after-configure-ac.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-after-configure-ac.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-after-makefile-am.sh automake-1.16-1.16.5/t/remake-after-makefile-am.sh --- automake-1.16-1.16.1/t/remake-after-makefile-am.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-after-makefile-am.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-all-1.sh automake-1.16-1.16.5/t/remake-all-1.sh --- automake-1.16-1.16.1/t/remake-all-1.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-all-1.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-all-2.sh automake-1.16-1.16.5/t/remake-all-2.sh --- automake-1.16-1.16.1/t/remake-all-2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-all-2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-am-pr10111.sh automake-1.16-1.16.5/t/remake-am-pr10111.sh --- automake-1.16-1.16.1/t/remake-am-pr10111.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-am-pr10111.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-config-status-dependencies.sh automake-1.16-1.16.5/t/remake-config-status-dependencies.sh --- automake-1.16-1.16.1/t/remake-config-status-dependencies.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-config-status-dependencies.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-configure-dependencies.sh automake-1.16-1.16.5/t/remake-configure-dependencies.sh --- automake-1.16-1.16.1/t/remake-configure-dependencies.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-configure-dependencies.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-deeply-nested.sh automake-1.16-1.16.5/t/remake-deeply-nested.sh --- automake-1.16-1.16.1/t/remake-deeply-nested.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-deeply-nested.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-deleted-am-2.sh automake-1.16-1.16.5/t/remake-deleted-am-2.sh --- automake-1.16-1.16.1/t/remake-deleted-am-2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-deleted-am-2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-deleted-am.sh automake-1.16-1.16.5/t/remake-deleted-am.sh --- automake-1.16-1.16.1/t/remake-deleted-am.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-deleted-am.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-deleted-am-subdir.sh automake-1.16-1.16.5/t/remake-deleted-am-subdir.sh --- automake-1.16-1.16.1/t/remake-deleted-am-subdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-deleted-am-subdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-deleted-m4-file.sh automake-1.16-1.16.5/t/remake-deleted-m4-file.sh --- automake-1.16-1.16.1/t/remake-deleted-m4-file.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-deleted-m4-file.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-fail.sh automake-1.16-1.16.5/t/remake-fail.sh --- automake-1.16-1.16.1/t/remake-fail.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-fail.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-gnulib-add-acsubst.sh automake-1.16-1.16.5/t/remake-gnulib-add-acsubst.sh --- automake-1.16-1.16.1/t/remake-gnulib-add-acsubst.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-gnulib-add-acsubst.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-gnulib-add-header.sh automake-1.16-1.16.5/t/remake-gnulib-add-header.sh --- automake-1.16-1.16.1/t/remake-gnulib-add-header.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-gnulib-add-header.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-gnulib-remove-header.sh automake-1.16-1.16.5/t/remake-gnulib-remove-header.sh --- automake-1.16-1.16.1/t/remake-gnulib-remove-header.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-gnulib-remove-header.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-include-aclocal.sh automake-1.16-1.16.5/t/remake-include-aclocal.sh --- automake-1.16-1.16.1/t/remake-include-aclocal.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-include-aclocal.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-include-configure.sh automake-1.16-1.16.5/t/remake-include-configure.sh --- automake-1.16-1.16.1/t/remake-include-configure.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-include-configure.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-include-makefile.sh automake-1.16-1.16.5/t/remake-include-makefile.sh --- automake-1.16-1.16.1/t/remake-include-makefile.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-include-makefile.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-m4-pr10111.sh automake-1.16-1.16.5/t/remake-m4-pr10111.sh --- automake-1.16-1.16.1/t/remake-m4-pr10111.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-m4-pr10111.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-macrodir.sh automake-1.16-1.16.5/t/remake-macrodir.sh --- automake-1.16-1.16.1/t/remake-macrodir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-macrodir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-maintainer-mode.sh automake-1.16-1.16.5/t/remake-maintainer-mode.sh --- automake-1.16-1.16.1/t/remake-maintainer-mode.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-maintainer-mode.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-makefile-intree.sh automake-1.16-1.16.5/t/remake-makefile-intree.sh --- automake-1.16-1.16.1/t/remake-makefile-intree.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-makefile-intree.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-makefile-vpath.sh automake-1.16-1.16.5/t/remake-makefile-vpath.sh --- automake-1.16-1.16.1/t/remake-makefile-vpath.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-makefile-vpath.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-mild-stress.sh automake-1.16-1.16.5/t/remake-mild-stress.sh --- automake-1.16-1.16.1/t/remake-mild-stress.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-mild-stress.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-moved-m4-file.sh automake-1.16-1.16.5/t/remake-moved-m4-file.sh --- automake-1.16-1.16.1/t/remake-moved-m4-file.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-moved-m4-file.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-not-after-make-dist.sh automake-1.16-1.16.5/t/remake-not-after-make-dist.sh --- automake-1.16-1.16.1/t/remake-not-after-make-dist.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-not-after-make-dist.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-recurs-user.sh automake-1.16-1.16.5/t/remake-recurs-user.sh --- automake-1.16-1.16.1/t/remake-recurs-user.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-recurs-user.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-renamed-am.sh automake-1.16-1.16.5/t/remake-renamed-am.sh --- automake-1.16-1.16.1/t/remake-renamed-am.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-renamed-am.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-renamed-m4-file.sh automake-1.16-1.16.5/t/remake-renamed-m4-file.sh --- automake-1.16-1.16.1/t/remake-renamed-m4-file.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-renamed-m4-file.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-renamed-m4-macro-and-file.sh automake-1.16-1.16.5/t/remake-renamed-m4-macro-and-file.sh --- automake-1.16-1.16.1/t/remake-renamed-m4-macro-and-file.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-renamed-m4-macro-and-file.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-renamed-m4-macro.sh automake-1.16-1.16.5/t/remake-renamed-m4-macro.sh --- automake-1.16-1.16.1/t/remake-renamed-m4-macro.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-renamed-m4-macro.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-subdir2.sh automake-1.16-1.16.5/t/remake-subdir2.sh --- automake-1.16-1.16.1/t/remake-subdir2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-subdir2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-subdir3.sh automake-1.16-1.16.5/t/remake-subdir3.sh --- automake-1.16-1.16.1/t/remake-subdir3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-subdir3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-subdir-from-subdir.sh automake-1.16-1.16.5/t/remake-subdir-from-subdir.sh --- automake-1.16-1.16.1/t/remake-subdir-from-subdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-subdir-from-subdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-subdir-gnu.sh automake-1.16-1.16.5/t/remake-subdir-gnu.sh --- automake-1.16-1.16.1/t/remake-subdir-gnu.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-subdir-gnu.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-subdir-grepping.sh automake-1.16-1.16.5/t/remake-subdir-grepping.sh --- automake-1.16-1.16.1/t/remake-subdir-grepping.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-subdir-grepping.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-subdir-long-time.sh automake-1.16-1.16.5/t/remake-subdir-long-time.sh --- automake-1.16-1.16.1/t/remake-subdir-long-time.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-subdir-long-time.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-subdir-no-makefile.sh automake-1.16-1.16.5/t/remake-subdir-no-makefile.sh --- automake-1.16-1.16.1/t/remake-subdir-no-makefile.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-subdir-no-makefile.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-subdir-only.sh automake-1.16-1.16.5/t/remake-subdir-only.sh --- automake-1.16-1.16.1/t/remake-subdir-only.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-subdir-only.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-subdir.sh automake-1.16-1.16.5/t/remake-subdir.sh --- automake-1.16-1.16.1/t/remake-subdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-subdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/remake-timing-bug-pr8365.sh automake-1.16-1.16.5/t/remake-timing-bug-pr8365.sh --- automake-1.16-1.16.1/t/remake-timing-bug-pr8365.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/remake-timing-bug-pr8365.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/repeated-options.sh automake-1.16-1.16.5/t/repeated-options.sh --- automake-1.16-1.16.1/t/repeated-options.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/repeated-options.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/reqd2.sh automake-1.16-1.16.5/t/reqd2.sh --- automake-1.16-1.16.1/t/reqd2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/reqd2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/rm-f-probe.sh automake-1.16-1.16.5/t/rm-f-probe.sh --- automake-1.16-1.16.1/t/rm-f-probe.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/rm-f-probe.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/rulepat.sh automake-1.16-1.16.5/t/rulepat.sh --- automake-1.16-1.16.1/t/rulepat.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/rulepat.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/sanity.sh automake-1.16-1.16.5/t/sanity.sh --- automake-1.16-1.16.1/t/sanity.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/sanity.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/seenc.sh automake-1.16-1.16.5/t/seenc.sh --- automake-1.16-1.16.1/t/seenc.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/seenc.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 diff -Nru automake-1.16-1.16.1/t/self-check-cc-no-c-o.sh automake-1.16-1.16.5/t/self-check-cc-no-c-o.sh --- automake-1.16-1.16.1/t/self-check-cc-no-c-o.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/self-check-cc-no-c-o.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/self-check-configure-help.sh automake-1.16-1.16.5/t/self-check-configure-help.sh --- automake-1.16-1.16.1/t/self-check-configure-help.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/self-check-configure-help.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/self-check-dir.tap automake-1.16-1.16.5/t/self-check-dir.tap --- automake-1.16-1.16.1/t/self-check-dir.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/self-check-dir.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/self-check-exit.tap automake-1.16-1.16.5/t/self-check-exit.tap --- automake-1.16-1.16.1/t/self-check-exit.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/self-check-exit.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/self-check-explicit-skips.sh automake-1.16-1.16.5/t/self-check-explicit-skips.sh --- automake-1.16-1.16.1/t/self-check-explicit-skips.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/self-check-explicit-skips.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/self-check-is-blocked-signal.tap automake-1.16-1.16.5/t/self-check-is-blocked-signal.tap --- automake-1.16-1.16.1/t/self-check-is-blocked-signal.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/self-check-is-blocked-signal.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/self-check-is_newest.tap automake-1.16-1.16.5/t/self-check-is_newest.tap --- automake-1.16-1.16.1/t/self-check-is_newest.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/self-check-is_newest.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/self-check-me.tap automake-1.16-1.16.5/t/self-check-me.tap --- automake-1.16-1.16.1/t/self-check-me.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/self-check-me.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/self-check-report.sh automake-1.16-1.16.5/t/self-check-report.sh --- automake-1.16-1.16.1/t/self-check-report.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/self-check-report.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/self-check-seq.tap automake-1.16-1.16.5/t/self-check-seq.tap --- automake-1.16-1.16.1/t/self-check-seq.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/self-check-seq.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/self-check-shell-no-trail-bslash.sh automake-1.16-1.16.5/t/self-check-shell-no-trail-bslash.sh --- automake-1.16-1.16.1/t/self-check-shell-no-trail-bslash.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/self-check-shell-no-trail-bslash.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/self-check-unindent.tap automake-1.16-1.16.5/t/self-check-unindent.tap --- automake-1.16-1.16.1/t/self-check-unindent.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/self-check-unindent.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/serial-tests.sh automake-1.16-1.16.5/t/serial-tests.sh --- automake-1.16-1.16.1/t/serial-tests.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/serial-tests.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/silent-configsite.sh automake-1.16-1.16.5/t/silent-configsite.sh --- automake-1.16-1.16.1/t/silent-configsite.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/silent-configsite.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/silent-c.sh automake-1.16-1.16.5/t/silent-c.sh --- automake-1.16-1.16.1/t/silent-c.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/silent-c.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/silent-custom.sh automake-1.16-1.16.5/t/silent-custom.sh --- automake-1.16-1.16.1/t/silent-custom.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/silent-custom.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/silent-cxx.sh automake-1.16-1.16.5/t/silent-cxx.sh --- automake-1.16-1.16.1/t/silent-cxx.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/silent-cxx.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/silent-f77.sh automake-1.16-1.16.5/t/silent-f77.sh --- automake-1.16-1.16.1/t/silent-f77.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/silent-f77.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/silent-f90.sh automake-1.16-1.16.5/t/silent-f90.sh --- automake-1.16-1.16.1/t/silent-f90.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/silent-f90.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/silent-gen.sh automake-1.16-1.16.5/t/silent-gen.sh --- automake-1.16-1.16.1/t/silent-gen.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/silent-gen.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/silent-lex.sh automake-1.16-1.16.5/t/silent-lex.sh --- automake-1.16-1.16.1/t/silent-lex.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/silent-lex.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/silent-lt.sh automake-1.16-1.16.5/t/silent-lt.sh --- automake-1.16-1.16.1/t/silent-lt.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/silent-lt.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/silent-many-languages.sh automake-1.16-1.16.5/t/silent-many-languages.sh --- automake-1.16-1.16.1/t/silent-many-languages.sh 2018-03-08 21:35:44.000000000 +0000 +++ automake-1.16-1.16.5/t/silent-many-languages.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 @@ -188,7 +188,7 @@ cat > foo6.y <<'EOF' %{ extern int yylex (void); -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %token EOF %% diff -Nru automake-1.16-1.16.1/t/silent-nested-vars.sh automake-1.16-1.16.5/t/silent-nested-vars.sh --- automake-1.16-1.16.1/t/silent-nested-vars.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/silent-nested-vars.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/silent-texi.sh automake-1.16-1.16.5/t/silent-texi.sh --- automake-1.16-1.16.1/t/silent-texi.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/silent-texi.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/silent-yacc-headers.sh automake-1.16-1.16.5/t/silent-yacc-headers.sh --- automake-1.16-1.16.1/t/silent-yacc-headers.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/silent-yacc-headers.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -39,7 +39,7 @@ cat > parse.y <<'EOF' %{ -void yyerror (char *s) { return; } +void yyerror (const char *s) {} int yylex (void) { return 0; } int main (void) { return 0; } %} diff -Nru automake-1.16-1.16.1/t/silent-yacc.sh automake-1.16-1.16.5/t/silent-yacc.sh --- automake-1.16-1.16.1/t/silent-yacc.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/silent-yacc.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 @@ -50,7 +50,7 @@ cat > foo.y <<'EOF' %{ -void yyerror (char *s) { return; } +void yyerror (const char *s) {} int yylex (void) { return 0; } int main (void) { return 0; } %} diff -Nru automake-1.16-1.16.1/t/sourcefile-in-subdir.sh automake-1.16-1.16.5/t/sourcefile-in-subdir.sh --- automake-1.16-1.16.1/t/sourcefile-in-subdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/sourcefile-in-subdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/space.sh automake-1.16-1.16.5/t/space.sh --- automake-1.16-1.16.1/t/space.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/space.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2000-2018 Free Software Foundation, Inc. +# Copyright (C) 2000-2021 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 diff -Nru automake-1.16-1.16.1/t/specflg6.sh automake-1.16-1.16.5/t/specflg6.sh --- automake-1.16-1.16.1/t/specflg6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/specflg6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/specflg7.sh automake-1.16-1.16.5/t/specflg7.sh --- automake-1.16-1.16.1/t/specflg7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/specflg7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/specflg8.sh automake-1.16-1.16.5/t/specflg8.sh --- automake-1.16-1.16.1/t/specflg8.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/specflg8.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/specflg9.sh automake-1.16-1.16.5/t/specflg9.sh --- automake-1.16-1.16.1/t/specflg9.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/specflg9.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/specflg-dummy.sh automake-1.16-1.16.5/t/specflg-dummy.sh --- automake-1.16-1.16.1/t/specflg-dummy.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/specflg-dummy.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/spell2.sh automake-1.16-1.16.5/t/spell2.sh --- automake-1.16-1.16.1/t/spell2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/spell2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/spell3.sh automake-1.16-1.16.5/t/spell3.sh --- automake-1.16-1.16.1/t/spell3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/spell3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/spelling.sh automake-1.16-1.16.5/t/spelling.sh --- automake-1.16-1.16.1/t/spelling.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/spelling.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/spell.sh automake-1.16-1.16.5/t/spell.sh --- automake-1.16-1.16.1/t/spell.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/spell.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/spy-double-colon.sh automake-1.16-1.16.5/t/spy-double-colon.sh --- automake-1.16-1.16.1/t/spy-double-colon.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/spy-double-colon.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/spy-rm.tap automake-1.16-1.16.5/t/spy-rm.tap --- automake-1.16-1.16.1/t/spy-rm.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/spy-rm.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/src-acsubst.sh automake-1.16-1.16.5/t/src-acsubst.sh --- automake-1.16-1.16.1/t/src-acsubst.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/src-acsubst.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/stamph2.sh automake-1.16-1.16.5/t/stamph2.sh --- automake-1.16-1.16.1/t/stamph2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/stamph2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/stdinc.sh automake-1.16-1.16.5/t/stdinc.sh --- automake-1.16-1.16.1/t/stdinc.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/stdinc.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2007-2018 Free Software Foundation, Inc. +# Copyright (C) 2007-2021 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 diff -Nru automake-1.16-1.16.1/t/stdlib2.sh automake-1.16-1.16.5/t/stdlib2.sh --- automake-1.16-1.16.1/t/stdlib2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/stdlib2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/stdlib.sh automake-1.16-1.16.5/t/stdlib.sh --- automake-1.16-1.16.1/t/stdlib.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/stdlib.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/strictness-override.sh automake-1.16-1.16.5/t/strictness-override.sh --- automake-1.16-1.16.1/t/strictness-override.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/strictness-override.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/strictness-precedence.sh automake-1.16-1.16.5/t/strictness-precedence.sh --- automake-1.16-1.16.1/t/strictness-precedence.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/strictness-precedence.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/strip2.sh automake-1.16-1.16.5/t/strip2.sh --- automake-1.16-1.16.1/t/strip2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/strip2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/strip3.sh automake-1.16-1.16.5/t/strip3.sh --- automake-1.16-1.16.1/t/strip3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/strip3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/strip.sh automake-1.16-1.16.5/t/strip.sh --- automake-1.16-1.16.1/t/strip.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/strip.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/subdir-ac-subst.sh automake-1.16-1.16.5/t/subdir-ac-subst.sh --- automake-1.16-1.16.1/t/subdir-ac-subst.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subdir-ac-subst.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/subdir-add2-pr46.sh automake-1.16-1.16.5/t/subdir-add2-pr46.sh --- automake-1.16-1.16.1/t/subdir-add2-pr46.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subdir-add2-pr46.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/subdir-add-pr46.sh automake-1.16-1.16.5/t/subdir-add-pr46.sh --- automake-1.16-1.16.1/t/subdir-add-pr46.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subdir-add-pr46.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/subdir-am-cond.sh automake-1.16-1.16.5/t/subdir-am-cond.sh --- automake-1.16-1.16.1/t/subdir-am-cond.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subdir-am-cond.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/subdir-cond-err.sh automake-1.16-1.16.5/t/subdir-cond-err.sh --- automake-1.16-1.16.1/t/subdir-cond-err.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subdir-cond-err.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 diff -Nru automake-1.16-1.16.1/t/subdir-cond-gettext.sh automake-1.16-1.16.5/t/subdir-cond-gettext.sh --- automake-1.16-1.16.1/t/subdir-cond-gettext.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subdir-cond-gettext.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/subdir-distclean.sh automake-1.16-1.16.5/t/subdir-distclean.sh --- automake-1.16-1.16.1/t/subdir-distclean.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subdir-distclean.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/subdir-env-interference.sh automake-1.16-1.16.5/t/subdir-env-interference.sh --- automake-1.16-1.16.1/t/subdir-env-interference.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subdir-env-interference.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/subdir-keep-going-pr12554.sh automake-1.16-1.16.5/t/subdir-keep-going-pr12554.sh --- automake-1.16-1.16.1/t/subdir-keep-going-pr12554.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subdir-keep-going-pr12554.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/subdir-order.sh automake-1.16-1.16.5/t/subdir-order.sh --- automake-1.16-1.16.1/t/subdir-order.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subdir-order.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/subdir.sh automake-1.16-1.16.5/t/subdir.sh --- automake-1.16-1.16.1/t/subdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/subdir-subsub.sh automake-1.16-1.16.5/t/subdir-subsub.sh --- automake-1.16-1.16.1/t/subdir-subsub.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subdir-subsub.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/subdir-with-slash.sh automake-1.16-1.16.5/t/subdir-with-slash.sh --- automake-1.16-1.16.1/t/subdir-with-slash.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subdir-with-slash.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/subobj10.sh automake-1.16-1.16.5/t/subobj10.sh --- automake-1.16-1.16.1/t/subobj10.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj10.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 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 diff -Nru automake-1.16-1.16.1/t/subobj11a.sh automake-1.16-1.16.5/t/subobj11a.sh --- automake-1.16-1.16.1/t/subobj11a.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj11a.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 @@ -15,7 +15,7 @@ # along with this program. If not, see . # Test that automake works around a bug of Solaris Make. The bug is the -# following. If we have a Makefile containg a file inclusion like this: +# following. If we have a Makefile containing a file inclusion like this: # include .//foo.mk # Solaris make fails with a message like: # make: ... can't find '/foo.mk': No such file or directory diff -Nru automake-1.16-1.16.1/t/subobj11b.sh automake-1.16-1.16.5/t/subobj11b.sh --- automake-1.16-1.16.1/t/subobj11b.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj11b.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 @@ -15,7 +15,7 @@ # along with this program. If not, see . # Test that automake works around a bug of Solaris Make. The bug is the -# following. If we have a Makefile containg a file inclusion like this: +# following. If we have a Makefile containing a file inclusion like this: # include .//foo.mk # Solaris make fails with a message like: # make: ... can't find '/foo.mk': No such file or directory diff -Nru automake-1.16-1.16.1/t/subobj11c.sh automake-1.16-1.16.5/t/subobj11c.sh --- automake-1.16-1.16.1/t/subobj11c.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj11c.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/subobj2.sh automake-1.16-1.16.5/t/subobj2.sh --- automake-1.16-1.16.1/t/subobj2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/subobj4.sh automake-1.16-1.16.5/t/subobj4.sh --- automake-1.16-1.16.1/t/subobj4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/subobj5.sh automake-1.16-1.16.5/t/subobj5.sh --- automake-1.16-1.16.1/t/subobj5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/subobj6.sh automake-1.16-1.16.5/t/subobj6.sh --- automake-1.16-1.16.1/t/subobj6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/subobj7.sh automake-1.16-1.16.5/t/subobj7.sh --- automake-1.16-1.16.1/t/subobj7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/subobj8.sh automake-1.16-1.16.5/t/subobj8.sh --- automake-1.16-1.16.1/t/subobj8.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj8.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/subobj9.sh automake-1.16-1.16.5/t/subobj9.sh --- automake-1.16-1.16.1/t/subobj9.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj9.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/subobj-clean-lt-pr10697.sh automake-1.16-1.16.5/t/subobj-clean-lt-pr10697.sh --- automake-1.16-1.16.1/t/subobj-clean-lt-pr10697.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj-clean-lt-pr10697.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/subobj-clean-pr10697.sh automake-1.16-1.16.5/t/subobj-clean-pr10697.sh --- automake-1.16-1.16.1/t/subobj-clean-pr10697.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj-clean-pr10697.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/subobj-indir-pr13928.sh automake-1.16-1.16.5/t/subobj-indir-pr13928.sh --- automake-1.16-1.16.1/t/subobj-indir-pr13928.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj-indir-pr13928.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/subobjname.sh automake-1.16-1.16.5/t/subobjname.sh --- automake-1.16-1.16.1/t/subobjname.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobjname.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/subobj-objname-clash.sh automake-1.16-1.16.5/t/subobj-objname-clash.sh --- automake-1.16-1.16.1/t/subobj-objname-clash.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj-objname-clash.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/subobj-pr13928-more-langs.sh automake-1.16-1.16.5/t/subobj-pr13928-more-langs.sh --- automake-1.16-1.16.1/t/subobj-pr13928-more-langs.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj-pr13928-more-langs.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2015-2018 Free Software Foundation, Inc. +# Copyright (C) 2015-2021 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 diff -Nru automake-1.16-1.16.1/t/subobj.sh automake-1.16-1.16.5/t/subobj.sh --- automake-1.16-1.16.1/t/subobj.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 @@ -50,8 +50,8 @@ # Verbose tips should be given, but not too many times. for msg in \ "possible forward-incompatibility" \ + "For now,.* corresponding" \ "advi[sc]e.* 'subdir-objects' option throughout" \ - "unconditionally.* object file.* same subdirectory" \ ; do test $(grep -c "$msg" stderr) -eq 1 done diff -Nru automake-1.16-1.16.1/t/subobj-vpath-pr13928.sh automake-1.16-1.16.5/t/subobj-vpath-pr13928.sh --- automake-1.16-1.16.1/t/subobj-vpath-pr13928.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subobj-vpath-pr13928.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/subpkg2.sh automake-1.16-1.16.5/t/subpkg2.sh --- automake-1.16-1.16.1/t/subpkg2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subpkg2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/subpkg3.sh automake-1.16-1.16.5/t/subpkg3.sh --- automake-1.16-1.16.1/t/subpkg3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subpkg3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 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 diff -Nru automake-1.16-1.16.1/t/subpkg4.sh automake-1.16-1.16.5/t/subpkg4.sh --- automake-1.16-1.16.1/t/subpkg4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subpkg4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 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 diff -Nru automake-1.16-1.16.1/t/subpkg-macrodir.sh automake-1.16-1.16.5/t/subpkg-macrodir.sh --- automake-1.16-1.16.1/t/subpkg-macrodir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subpkg-macrodir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/subpkg.sh automake-1.16-1.16.5/t/subpkg.sh --- automake-1.16-1.16.1/t/subpkg.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subpkg.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/subpkg-yacc.sh automake-1.16-1.16.5/t/subpkg-yacc.sh --- automake-1.16-1.16.1/t/subpkg-yacc.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subpkg-yacc.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 @@ -88,7 +88,7 @@ cat > lib/foo.y << 'END' %{ int yylex (void) { return 0; } -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %% foobar : 'f' 'o' 'o' 'b' 'a' 'r' {}; diff -Nru automake-1.16-1.16.1/t/subst3.sh automake-1.16-1.16.5/t/subst3.sh --- automake-1.16-1.16.1/t/subst3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subst3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/subst4.sh automake-1.16-1.16.5/t/subst4.sh --- automake-1.16-1.16.1/t/subst4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subst4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 diff -Nru automake-1.16-1.16.1/t/subst5.sh automake-1.16-1.16.5/t/subst5.sh --- automake-1.16-1.16.1/t/subst5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subst5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 diff -Nru automake-1.16-1.16.1/t/subst-no-trailing-empty-line.sh automake-1.16-1.16.5/t/subst-no-trailing-empty-line.sh --- automake-1.16-1.16.1/t/subst-no-trailing-empty-line.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subst-no-trailing-empty-line.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/substre2.sh automake-1.16-1.16.5/t/substre2.sh --- automake-1.16-1.16.1/t/substre2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/substre2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/substref.sh automake-1.16-1.16.5/t/substref.sh --- automake-1.16-1.16.1/t/substref.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/substref.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/subst.sh automake-1.16-1.16.5/t/subst.sh --- automake-1.16-1.16.1/t/subst.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/subst.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/substtarg.sh automake-1.16-1.16.5/t/substtarg.sh --- automake-1.16-1.16.1/t/substtarg.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/substtarg.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/suffix10.tap automake-1.16-1.16.5/t/suffix10.tap --- automake-1.16-1.16.1/t/suffix10.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix10.tap 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 @@ -39,7 +39,7 @@ :; { echo '/* autogenerated */' \ && echo '%{' \ && echo 'int yylex () {return 0;}' \ - && echo 'void yyerror (char *s) {}' \ + && echo 'void yyerror (const char *s) {}' \ && echo '%}' \ && echo '%%' \ && echo "foobar : 'f' 'o' 'o' 'b' 'a' 'r' {};" \ diff -Nru automake-1.16-1.16.1/t/suffix11.tap automake-1.16-1.16.5/t/suffix11.tap --- automake-1.16-1.16.1/t/suffix11.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix11.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/suffix2.sh automake-1.16-1.16.5/t/suffix2.sh --- automake-1.16-1.16.1/t/suffix2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/suffix3.tap automake-1.16-1.16.5/t/suffix3.tap --- automake-1.16-1.16.1/t/suffix3.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix3.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/suffix4.sh automake-1.16-1.16.5/t/suffix4.sh --- automake-1.16-1.16.1/t/suffix4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/suffix5.sh automake-1.16-1.16.5/t/suffix5.sh --- automake-1.16-1.16.1/t/suffix5.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix5.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/suffix6b.sh automake-1.16-1.16.5/t/suffix6b.sh --- automake-1.16-1.16.1/t/suffix6b.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix6b.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/suffix6c.sh automake-1.16-1.16.5/t/suffix6c.sh --- automake-1.16-1.16.1/t/suffix6c.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix6c.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/suffix6.sh automake-1.16-1.16.5/t/suffix6.sh --- automake-1.16-1.16.1/t/suffix6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/suffix7.sh automake-1.16-1.16.5/t/suffix7.sh --- automake-1.16-1.16.1/t/suffix7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/suffix8.tap automake-1.16-1.16.5/t/suffix8.tap --- automake-1.16-1.16.1/t/suffix8.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix8.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/suffix9.sh automake-1.16-1.16.5/t/suffix9.sh --- automake-1.16-1.16.1/t/suffix9.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix9.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/suffix-chain.tap automake-1.16-1.16.5/t/suffix-chain.tap --- automake-1.16-1.16.1/t/suffix-chain.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix-chain.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/suffix-custom-pr14441.sh automake-1.16-1.16.5/t/suffix-custom-pr14441.sh --- automake-1.16-1.16.1/t/suffix-custom-pr14441.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix-custom-pr14441.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/suffix-custom-subobj-and-specflg.sh automake-1.16-1.16.5/t/suffix-custom-subobj-and-specflg.sh --- automake-1.16-1.16.1/t/suffix-custom-subobj-and-specflg.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix-custom-subobj-and-specflg.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/suffix-custom-subobj.sh automake-1.16-1.16.5/t/suffix-custom-subobj.sh --- automake-1.16-1.16.1/t/suffix-custom-subobj.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix-custom-subobj.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/suffix-extra-c-stuff-pr14560.sh automake-1.16-1.16.5/t/suffix-extra-c-stuff-pr14560.sh --- automake-1.16-1.16.1/t/suffix-extra-c-stuff-pr14560.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix-extra-c-stuff-pr14560.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/suffix.sh automake-1.16-1.16.5/t/suffix.sh --- automake-1.16-1.16.1/t/suffix.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/suffix.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/symlink2.sh automake-1.16-1.16.5/t/symlink2.sh --- automake-1.16-1.16.1/t/symlink2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/symlink2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2000-2018 Free Software Foundation, Inc. +# Copyright (C) 2000-2021 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 diff -Nru automake-1.16-1.16.1/t/symlink.sh automake-1.16-1.16.5/t/symlink.sh --- automake-1.16-1.16.1/t/symlink.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/symlink.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/syntax.sh automake-1.16-1.16.5/t/syntax.sh --- automake-1.16-1.16.1/t/syntax.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/syntax.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/tags2.sh automake-1.16-1.16.5/t/tags2.sh --- automake-1.16-1.16.1/t/tags2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tags2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/tags-lisp-space.sh automake-1.16-1.16.5/t/tags-lisp-space.sh --- automake-1.16-1.16.1/t/tags-lisp-space.sh 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/t/tags-lisp-space.sh 2021-07-12 02:41:13.000000000 +0000 @@ -0,0 +1,49 @@ +#! /bin/sh +# Copyright (C) 2019-2021 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Test to ensure the space after $(LISP) for make tags is present +# if there are CONFIG_HEADERS. +# See automake bug#38139. + +required=etags +. test-init.sh + +# some AC_CONFIG_FILES header is needed to trigger the bug. +cat >> configure.ac <<'END' +AC_CONFIG_HEADERS([config.h]) +AM_PATH_LISPDIR +AC_OUTPUT +END + +cat > Makefile.am <<'END' +lisp_LISP = the-amtest-mode.el +END + +touch config.h.in +touch the-amtest-mode.el + +$ACLOCAL +$AUTOCONF +$AUTOMAKE + +./configure +run_make -O -E tags + +# make tags should fail if the problem exists, but just in case, match: +# make: *** No rule to make target 'the-amtest-mode.elconfig.h.in', needed by 'tags-am'. Stop. +grep 'No rule to make target' stderr && exit 1 + +: diff -Nru automake-1.16-1.16.1/t/tags-pr12372.sh automake-1.16-1.16.5/t/tags-pr12372.sh --- automake-1.16-1.16.1/t/tags-pr12372.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tags-pr12372.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/tags.sh automake-1.16-1.16.5/t/tags.sh --- automake-1.16-1.16.1/t/tags.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tags.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/tagsub.sh automake-1.16-1.16.5/t/tagsub.sh --- automake-1.16-1.16.1/t/tagsub.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tagsub.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-ambiguous-directive.sh automake-1.16-1.16.5/t/tap-ambiguous-directive.sh --- automake-1.16-1.16.1/t/tap-ambiguous-directive.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-ambiguous-directive.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-autonumber.sh automake-1.16-1.16.5/t/tap-autonumber.sh --- automake-1.16-1.16.1/t/tap-autonumber.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-autonumber.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-bad-prog.tap automake-1.16-1.16.5/t/tap-bad-prog.tap --- automake-1.16-1.16.1/t/tap-bad-prog.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-bad-prog.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-bailout-and-logging.sh automake-1.16-1.16.5/t/tap-bailout-and-logging.sh --- automake-1.16-1.16.1/t/tap-bailout-and-logging.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-bailout-and-logging.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-bailout-leading-space.sh automake-1.16-1.16.5/t/tap-bailout-leading-space.sh --- automake-1.16-1.16.1/t/tap-bailout-leading-space.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-bailout-leading-space.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-bailout.sh automake-1.16-1.16.5/t/tap-bailout.sh --- automake-1.16-1.16.1/t/tap-bailout.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-bailout.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-bailout-suppress-badexit.sh automake-1.16-1.16.5/t/tap-bailout-suppress-badexit.sh --- automake-1.16-1.16.1/t/tap-bailout-suppress-badexit.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-bailout-suppress-badexit.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-bailout-suppress-later-diagnostic.sh automake-1.16-1.16.5/t/tap-bailout-suppress-later-diagnostic.sh --- automake-1.16-1.16.1/t/tap-bailout-suppress-later-diagnostic.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-bailout-suppress-later-diagnostic.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-bailout-suppress-later-errors.sh automake-1.16-1.16.5/t/tap-bailout-suppress-later-errors.sh --- automake-1.16-1.16.1/t/tap-bailout-suppress-later-errors.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-bailout-suppress-later-errors.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-basic.sh automake-1.16-1.16.5/t/tap-basic.sh --- automake-1.16-1.16.1/t/tap-basic.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-basic.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-color.sh automake-1.16-1.16.5/t/tap-color.sh --- automake-1.16-1.16.1/t/tap-color.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-color.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-common-setup.sh automake-1.16-1.16.5/t/tap-common-setup.sh --- automake-1.16-1.16.1/t/tap-common-setup.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-common-setup.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-deps.sh automake-1.16-1.16.5/t/tap-deps.sh --- automake-1.16-1.16.1/t/tap-deps.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-deps.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-diagnostic-custom.sh automake-1.16-1.16.5/t/tap-diagnostic-custom.sh --- automake-1.16-1.16.1/t/tap-diagnostic-custom.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-diagnostic-custom.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-diagnostic.sh automake-1.16-1.16.5/t/tap-diagnostic.sh --- automake-1.16-1.16.1/t/tap-diagnostic.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-diagnostic.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-doc2.sh automake-1.16-1.16.5/t/tap-doc2.sh --- automake-1.16-1.16.1/t/tap-doc2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-doc2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-doc.sh automake-1.16-1.16.5/t/tap-doc.sh --- automake-1.16-1.16.1/t/tap-doc.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-doc.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-driver-stderr.sh automake-1.16-1.16.5/t/tap-driver-stderr.sh --- automake-1.16-1.16.1/t/tap-driver-stderr.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-driver-stderr.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-empty-diagnostic.sh automake-1.16-1.16.5/t/tap-empty-diagnostic.sh --- automake-1.16-1.16.1/t/tap-empty-diagnostic.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-empty-diagnostic.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-empty.sh automake-1.16-1.16.5/t/tap-empty.sh --- automake-1.16-1.16.1/t/tap-empty.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-empty.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-escape-directive-2.sh automake-1.16-1.16.5/t/tap-escape-directive-2.sh --- automake-1.16-1.16.1/t/tap-escape-directive-2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-escape-directive-2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-escape-directive.sh automake-1.16-1.16.5/t/tap-escape-directive.sh --- automake-1.16-1.16.1/t/tap-escape-directive.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-escape-directive.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-exit.sh automake-1.16-1.16.5/t/tap-exit.sh --- automake-1.16-1.16.1/t/tap-exit.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-exit.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-fancy2.sh automake-1.16-1.16.5/t/tap-fancy2.sh --- automake-1.16-1.16.1/t/tap-fancy2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-fancy2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-fancy.sh automake-1.16-1.16.5/t/tap-fancy.sh --- automake-1.16-1.16.1/t/tap-fancy.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-fancy.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-global-log.sh automake-1.16-1.16.5/t/tap-global-log.sh --- automake-1.16-1.16.1/t/tap-global-log.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-global-log.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-global-result.sh automake-1.16-1.16.5/t/tap-global-result.sh --- automake-1.16-1.16.1/t/tap-global-result.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-global-result.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-log.sh automake-1.16-1.16.5/t/tap-log.sh --- automake-1.16-1.16.1/t/tap-log.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-log.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-merge-stdout-stderr.sh automake-1.16-1.16.5/t/tap-merge-stdout-stderr.sh --- automake-1.16-1.16.1/t/tap-merge-stdout-stderr.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-merge-stdout-stderr.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-missing-plan-and-bad-exit.sh automake-1.16-1.16.5/t/tap-missing-plan-and-bad-exit.sh --- automake-1.16-1.16.1/t/tap-missing-plan-and-bad-exit.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-missing-plan-and-bad-exit.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-more2.sh automake-1.16-1.16.5/t/tap-more2.sh --- automake-1.16-1.16.1/t/tap-more2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-more2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-more.sh automake-1.16-1.16.5/t/tap-more.sh --- automake-1.16-1.16.1/t/tap-more.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-more.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-msg0-bailout.sh automake-1.16-1.16.5/t/tap-msg0-bailout.sh --- automake-1.16-1.16.1/t/tap-msg0-bailout.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-msg0-bailout.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-msg0-directive.sh automake-1.16-1.16.5/t/tap-msg0-directive.sh --- automake-1.16-1.16.1/t/tap-msg0-directive.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-msg0-directive.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-msg0-misc.sh automake-1.16-1.16.5/t/tap-msg0-misc.sh --- automake-1.16-1.16.1/t/tap-msg0-misc.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-msg0-misc.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-msg0-planskip.sh automake-1.16-1.16.5/t/tap-msg0-planskip.sh --- automake-1.16-1.16.1/t/tap-msg0-planskip.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-msg0-planskip.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-msg0-result.sh automake-1.16-1.16.5/t/tap-msg0-result.sh --- automake-1.16-1.16.1/t/tap-msg0-result.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-msg0-result.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-negative-numbers.sh automake-1.16-1.16.5/t/tap-negative-numbers.sh --- automake-1.16-1.16.1/t/tap-negative-numbers.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-negative-numbers.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-no-disable-hard-error.sh automake-1.16-1.16.5/t/tap-no-disable-hard-error.sh --- automake-1.16-1.16.1/t/tap-no-disable-hard-error.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-no-disable-hard-error.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-no-merge-stdout-stderr.sh automake-1.16-1.16.5/t/tap-no-merge-stdout-stderr.sh --- automake-1.16-1.16.1/t/tap-no-merge-stdout-stderr.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-no-merge-stdout-stderr.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-no-spurious-numbers.sh automake-1.16-1.16.5/t/tap-no-spurious-numbers.sh --- automake-1.16-1.16.1/t/tap-no-spurious-numbers.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-no-spurious-numbers.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-no-spurious.sh automake-1.16-1.16.5/t/tap-no-spurious.sh --- automake-1.16-1.16.1/t/tap-no-spurious.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-no-spurious.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-no-spurious-summary.sh automake-1.16-1.16.5/t/tap-no-spurious-summary.sh --- automake-1.16-1.16.1/t/tap-no-spurious-summary.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-no-spurious-summary.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-not-ok-skip.sh automake-1.16-1.16.5/t/tap-not-ok-skip.sh --- automake-1.16-1.16.1/t/tap-not-ok-skip.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-not-ok-skip.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-numbers-leading-zero.sh automake-1.16-1.16.5/t/tap-numbers-leading-zero.sh --- automake-1.16-1.16.1/t/tap-numbers-leading-zero.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-numbers-leading-zero.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-number-wordboundary.sh automake-1.16-1.16.5/t/tap-number-wordboundary.sh --- automake-1.16-1.16.1/t/tap-number-wordboundary.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-number-wordboundary.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-numeric-description.sh automake-1.16-1.16.5/t/tap-numeric-description.sh --- automake-1.16-1.16.1/t/tap-numeric-description.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-numeric-description.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-out-of-order.sh automake-1.16-1.16.5/t/tap-out-of-order.sh --- automake-1.16-1.16.1/t/tap-out-of-order.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-out-of-order.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-passthrough-exit.sh automake-1.16-1.16.5/t/tap-passthrough-exit.sh --- automake-1.16-1.16.1/t/tap-passthrough-exit.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-passthrough-exit.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-passthrough.sh automake-1.16-1.16.5/t/tap-passthrough.sh --- automake-1.16-1.16.1/t/tap-passthrough.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-passthrough.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-plan-corner.sh automake-1.16-1.16.5/t/tap-plan-corner.sh --- automake-1.16-1.16.1/t/tap-plan-corner.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-plan-corner.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-plan-errors.sh automake-1.16-1.16.5/t/tap-plan-errors.sh --- automake-1.16-1.16.1/t/tap-plan-errors.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-plan-errors.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-plan-leading-zero.sh automake-1.16-1.16.5/t/tap-plan-leading-zero.sh --- automake-1.16-1.16.1/t/tap-plan-leading-zero.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-plan-leading-zero.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-plan-malformed.sh automake-1.16-1.16.5/t/tap-plan-malformed.sh --- automake-1.16-1.16.1/t/tap-plan-malformed.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-plan-malformed.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-plan-middle.sh automake-1.16-1.16.5/t/tap-plan-middle.sh --- automake-1.16-1.16.1/t/tap-plan-middle.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-plan-middle.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-plan.sh automake-1.16-1.16.5/t/tap-plan.sh --- automake-1.16-1.16.1/t/tap-plan.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-plan.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-planskip-and-logging.sh automake-1.16-1.16.5/t/tap-planskip-and-logging.sh --- automake-1.16-1.16.1/t/tap-planskip-and-logging.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-planskip-and-logging.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-planskip-badexit.sh automake-1.16-1.16.5/t/tap-planskip-badexit.sh --- automake-1.16-1.16.1/t/tap-planskip-badexit.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-planskip-badexit.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-planskip-bailout.sh automake-1.16-1.16.5/t/tap-planskip-bailout.sh --- automake-1.16-1.16.1/t/tap-planskip-bailout.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-planskip-bailout.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-planskip-case-insensitive.sh automake-1.16-1.16.5/t/tap-planskip-case-insensitive.sh --- automake-1.16-1.16.1/t/tap-planskip-case-insensitive.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-planskip-case-insensitive.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-planskip-later-errors.sh automake-1.16-1.16.5/t/tap-planskip-later-errors.sh --- automake-1.16-1.16.1/t/tap-planskip-later-errors.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-planskip-later-errors.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-planskip-late.sh automake-1.16-1.16.5/t/tap-planskip-late.sh --- automake-1.16-1.16.1/t/tap-planskip-late.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-planskip-late.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-planskip.sh automake-1.16-1.16.5/t/tap-planskip.sh --- automake-1.16-1.16.1/t/tap-planskip.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-planskip.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-planskip-unplanned-corner.sh automake-1.16-1.16.5/t/tap-planskip-unplanned-corner.sh --- automake-1.16-1.16.1/t/tap-planskip-unplanned-corner.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-planskip-unplanned-corner.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-planskip-unplanned.sh automake-1.16-1.16.5/t/tap-planskip-unplanned.sh --- automake-1.16-1.16.1/t/tap-planskip-unplanned.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-planskip-unplanned.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-planskip-whitespace.sh automake-1.16-1.16.5/t/tap-planskip-whitespace.sh --- automake-1.16-1.16.1/t/tap-planskip-whitespace.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-planskip-whitespace.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-plan-whitespace.sh automake-1.16-1.16.5/t/tap-plan-whitespace.sh --- automake-1.16-1.16.1/t/tap-plan-whitespace.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-plan-whitespace.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-recheck-logs.sh automake-1.16-1.16.5/t/tap-recheck-logs.sh --- automake-1.16-1.16.1/t/tap-recheck-logs.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-recheck-logs.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-recheck.sh automake-1.16-1.16.5/t/tap-recheck.sh --- automake-1.16-1.16.1/t/tap-recheck.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-recheck.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-result-comment.sh automake-1.16-1.16.5/t/tap-result-comment.sh --- automake-1.16-1.16.1/t/tap-result-comment.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-result-comment.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-signal.tap automake-1.16-1.16.5/t/tap-signal.tap --- automake-1.16-1.16.1/t/tap-signal.tap 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-signal.tap 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-summary-color.sh automake-1.16-1.16.5/t/tap-summary-color.sh --- automake-1.16-1.16.1/t/tap-summary-color.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-summary-color.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-summary.sh automake-1.16-1.16.5/t/tap-summary.sh --- automake-1.16-1.16.1/t/tap-summary.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-summary.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-test-number-0.sh automake-1.16-1.16.5/t/tap-test-number-0.sh --- automake-1.16-1.16.1/t/tap-test-number-0.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-test-number-0.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-todo-skip.sh automake-1.16-1.16.5/t/tap-todo-skip.sh --- automake-1.16-1.16.1/t/tap-todo-skip.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-todo-skip.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-todo-skip-together.sh automake-1.16-1.16.5/t/tap-todo-skip-together.sh --- automake-1.16-1.16.1/t/tap-todo-skip-together.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-todo-skip-together.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-todo-skip-whitespace.sh automake-1.16-1.16.5/t/tap-todo-skip-whitespace.sh --- automake-1.16-1.16.1/t/tap-todo-skip-whitespace.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-todo-skip-whitespace.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-unplanned.sh automake-1.16-1.16.5/t/tap-unplanned.sh --- automake-1.16-1.16.1/t/tap-unplanned.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-unplanned.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-whitespace-normalization.sh automake-1.16-1.16.5/t/tap-whitespace-normalization.sh --- automake-1.16-1.16.1/t/tap-whitespace-normalization.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-whitespace-normalization.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-with-and-without-number.sh automake-1.16-1.16.5/t/tap-with-and-without-number.sh --- automake-1.16-1.16.1/t/tap-with-and-without-number.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-with-and-without-number.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tap-xfail-tests.sh automake-1.16-1.16.5/t/tap-xfail-tests.sh --- automake-1.16-1.16.1/t/tap-xfail-tests.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tap-xfail-tests.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/target-cflags.sh automake-1.16-1.16.5/t/target-cflags.sh --- automake-1.16-1.16.1/t/target-cflags.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/target-cflags.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2000-2018 Free Software Foundation, Inc. +# Copyright (C) 2000-2021 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 diff -Nru automake-1.16-1.16.1/t/targetclash.sh automake-1.16-1.16.5/t/targetclash.sh --- automake-1.16-1.16.1/t/targetclash.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/targetclash.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/tar-opts-errors.sh automake-1.16-1.16.5/t/tar-opts-errors.sh --- automake-1.16-1.16.1/t/tar-opts-errors.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tar-opts-errors.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/tar-override.sh automake-1.16-1.16.5/t/tar-override.sh --- automake-1.16-1.16.1/t/tar-override.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tar-override.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tar-pax.sh automake-1.16-1.16.5/t/tar-pax.sh --- automake-1.16-1.16.1/t/tar-pax.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tar-pax.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/tar-ustar-id-too-high.sh automake-1.16-1.16.5/t/tar-ustar-id-too-high.sh --- automake-1.16-1.16.1/t/tar-ustar-id-too-high.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tar-ustar-id-too-high.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/tar-ustar.sh automake-1.16-1.16.5/t/tar-ustar.sh --- automake-1.16-1.16.1/t/tar-ustar.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tar-ustar.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/test-driver-acsubst.sh automake-1.16-1.16.5/t/test-driver-acsubst.sh --- automake-1.16-1.16.1/t/test-driver-acsubst.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-driver-acsubst.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-driver-cond.sh automake-1.16-1.16.5/t/test-driver-cond.sh --- automake-1.16-1.16.1/t/test-driver-cond.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-driver-cond.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-driver-create-log-dir.sh automake-1.16-1.16.5/t/test-driver-create-log-dir.sh --- automake-1.16-1.16.1/t/test-driver-create-log-dir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-driver-create-log-dir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -42,6 +42,13 @@ test -f sub/foo.trs test -f sub/subsub/bar.trs test -f sub1/baz.trs + +# Tell GNU make not to parallelize, since the two tests under sub/ +# can result in, for example: +# fatal: making test-suite.log: failed to create sub/foo.trs +# fatal: making test-suite.log: failed to create sub/foo.log +# No evident way to debug or reliably reproduce. +.NOTPARALLEL: END echo "#!$AM_TEST_RUNNER_SHELL" > checkdir-driver diff -Nru automake-1.16-1.16.1/t/test-driver-custom-multitest-recheck2.sh automake-1.16-1.16.5/t/test-driver-custom-multitest-recheck2.sh --- automake-1.16-1.16.1/t/test-driver-custom-multitest-recheck2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-driver-custom-multitest-recheck2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-driver-custom-multitest-recheck.sh automake-1.16-1.16.5/t/test-driver-custom-multitest-recheck.sh --- automake-1.16-1.16.1/t/test-driver-custom-multitest-recheck.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-driver-custom-multitest-recheck.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-driver-custom-multitest.sh automake-1.16-1.16.5/t/test-driver-custom-multitest.sh --- automake-1.16-1.16.1/t/test-driver-custom-multitest.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-driver-custom-multitest.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-driver-custom-no-extra-driver.sh automake-1.16-1.16.5/t/test-driver-custom-no-extra-driver.sh --- automake-1.16-1.16.1/t/test-driver-custom-no-extra-driver.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-driver-custom-no-extra-driver.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-driver-custom.sh automake-1.16-1.16.5/t/test-driver-custom.sh --- automake-1.16-1.16.1/t/test-driver-custom.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-driver-custom.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-driver-custom-xfail-tests.sh automake-1.16-1.16.5/t/test-driver-custom-xfail-tests.sh --- automake-1.16-1.16.1/t/test-driver-custom-xfail-tests.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-driver-custom-xfail-tests.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-driver-fail.sh automake-1.16-1.16.5/t/test-driver-fail.sh --- automake-1.16-1.16.1/t/test-driver-fail.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-driver-fail.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-driver-is-distributed.sh automake-1.16-1.16.5/t/test-driver-is-distributed.sh --- automake-1.16-1.16.1/t/test-driver-is-distributed.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-driver-is-distributed.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-driver-strip-vpath.sh automake-1.16-1.16.5/t/test-driver-strip-vpath.sh --- automake-1.16-1.16.1/t/test-driver-strip-vpath.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-driver-strip-vpath.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-driver-trs-suffix-registered.sh automake-1.16-1.16.5/t/test-driver-trs-suffix-registered.sh --- automake-1.16-1.16.1/t/test-driver-trs-suffix-registered.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-driver-trs-suffix-registered.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-extensions-cond.sh automake-1.16-1.16.5/t/test-extensions-cond.sh --- automake-1.16-1.16.1/t/test-extensions-cond.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-extensions-cond.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-extensions-empty.sh automake-1.16-1.16.5/t/test-extensions-empty.sh --- automake-1.16-1.16.1/t/test-extensions-empty.sh 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/t/test-extensions-empty.sh 2021-10-04 02:51:12.000000000 +0000 @@ -0,0 +1,52 @@ +#! /bin/sh +# Copyright (C) 2020-2021 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Empty assignment to TEST_EXTENSIONS should not provoke Perl warning. +# https://bugs.gnu.org/42635 + +. test-init.sh + +cat > configure.ac << 'END' +AC_INIT([foo],[1.0]) +AM_INIT_AUTOMAKE([foreign]) +AC_PROG_CC dnl comment this line to make the warning disappear +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT +END + +cat > Makefile.am << 'END' +TEST_EXTENSIONS = +LOG_COMPILER = echo +TESTS = foo.test +END + +touch foo.test + +autoreconf -fi >reconf.out 2>&1 +grep 'uninitialized value' reconf.out && exit 1 + +# What we're trying to avoid: +# ... +# Use of uninitialized value in string eq at /usr/bin/automake line 4953. +# ... +# nl -ba `command -v automake` | sed -n '4951,4955p' +# 4951 if ($handle_exeext) +# 4952 { +# 4953 unshift (@test_suffixes, $at_exeext) +# 4954 unless $test_suffixes[0] eq $at_exeext; +# 4955 } + +: diff -Nru automake-1.16-1.16.1/t/test-extensions.sh automake-1.16-1.16.5/t/test-extensions.sh --- automake-1.16-1.16.1/t/test-extensions.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-extensions.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-harness-vpath-rewrite.sh automake-1.16-1.16.5/t/test-harness-vpath-rewrite.sh --- automake-1.16-1.16.1/t/test-harness-vpath-rewrite.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-harness-vpath-rewrite.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/test-log.sh automake-1.16-1.16.5/t/test-log.sh --- automake-1.16-1.16.1/t/test-log.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-log.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-logs-repeated.sh automake-1.16-1.16.5/t/test-logs-repeated.sh --- automake-1.16-1.16.1/t/test-logs-repeated.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-logs-repeated.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-metadata-global-log.sh automake-1.16-1.16.5/t/test-metadata-global-log.sh --- automake-1.16-1.16.1/t/test-metadata-global-log.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-metadata-global-log.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-metadata-global-result.sh automake-1.16-1.16.5/t/test-metadata-global-result.sh --- automake-1.16-1.16.1/t/test-metadata-global-result.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-metadata-global-result.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-metadata-recheck.sh automake-1.16-1.16.5/t/test-metadata-recheck.sh --- automake-1.16-1.16.1/t/test-metadata-recheck.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-metadata-recheck.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-metadata-results.sh automake-1.16-1.16.5/t/test-metadata-results.sh --- automake-1.16-1.16.1/t/test-metadata-results.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-metadata-results.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-missing2.sh automake-1.16-1.16.5/t/test-missing2.sh --- automake-1.16-1.16.1/t/test-missing2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-missing2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/test-missing.sh automake-1.16-1.16.5/t/test-missing.sh --- automake-1.16-1.16.1/t/test-missing.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/test-missing.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tests-environment-and-log-compiler.sh automake-1.16-1.16.5/t/tests-environment-and-log-compiler.sh --- automake-1.16-1.16.1/t/tests-environment-and-log-compiler.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tests-environment-and-log-compiler.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tests-environment-backcompat.sh automake-1.16-1.16.5/t/tests-environment-backcompat.sh --- automake-1.16-1.16.1/t/tests-environment-backcompat.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tests-environment-backcompat.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/tests-environment-fd-redirect.sh automake-1.16-1.16.5/t/tests-environment-fd-redirect.sh --- automake-1.16-1.16.1/t/tests-environment-fd-redirect.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/tests-environment-fd-redirect.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -70,6 +70,15 @@ esac for sh in "$SHELL" "$bin_ksh"; do + + # The following hangs with Fedora 34's ksh-20120801-255: + # (seq --format=z%g= 121; echo "eval ': \`(set) 2>&1\`'")|env -i ksh + # yet terminates if it emits one fewer variable assignment. + # Using that ksh here would make this test hang: the above is + # derived from the configure script generated for this test. + # Reported as https://github.com/ksh93/ksh/issues/316 + case $sh in */ksh) skip_ "skipping $sh to avoid hang"; continue;; esac + test "$sh" = : && continue for pfx in AM_ ''; do unindent > Makefile.am <. + +# Check that we can override the "Testsuite summary" header line, +# per bug#11745. + +. test-lib.sh + +use_colors=no; use_vpath=no +. testsuite-summary-checks.sh + +./configure + +# Cut down from do_check in ax/testsuite-summary-checks.sh +# so that we can pass a make variable setting in $1. +# +do_header_check () +{ + cat > summary.exp + run_make -O -e IGNORE check "$1" + test $am_make_rc -eq 0 || exit 1 + $PERL "$am_testaux_srcdir"/extract-testsuite-summary.pl stdout >summary.got \ + || fatal_ "cannot extract testsuite summary" + cat summary.exp + cat summary.got + compare=diff + $compare summary.exp summary.got || exit 1 +} + +# We don't actually run any tests, only interested in the header line. +results="\ +# TOTAL: 0 +# PASS: 0 +# SKIP: 0 +# XFAIL: 0 +# FAIL: 0 +# XPASS: 0 +# ERROR: 0" +# +success_footer=${br} + +# Check the default. +header="\ +${br} +Testsuite summary for GNU AutoFoo 7.1 +${br}" +# +do_header_check 'junkvar=junkval' <. + +# Check that the top-level files (INSTALL, NEWS, README-alpha, etc.) +# can be .md, or not. (Based on alpha2.sh.) + +. test-init.sh + +cat > configure.ac << 'END' +AC_INIT([alpha], [1.0b]) +AM_INIT_AUTOMAKE([readme-alpha]) +AC_CONFIG_FILES([Makefile sub/Makefile]) +AC_OUTPUT +END + +cat > Makefile.am << 'END' +SUBDIRS = sub +check-local: distdir + for f in AUTHORS ChangeLog INSTALL NEWS README THANKS; do \ + test -f $(distdir)/$$f.md; done + test -f $(distdir)/COPYING + test -f $(distdir)/README-alpha.md + test ! -f $(distdir)/sub/README.md + test ! -f $(distdir)/sub/README-alpha.md # not distributed + : > works +END + +mkdir sub +: > sub/Makefile.am + +# do both md and non-md. +: > README-alpha.md +: > sub/README-alpha.md +: > sub/README + +# top level +: > AUTHORS.md +: > ChangeLog.md +: > INSTALL.md +: > NEWS.md +: > README.md +: > THANKS.md + +# not md +: > COPYING + + +$ACLOCAL +$AUTOCONF +$AUTOMAKE +./configure +$MAKE check +test -f works + diff -Nru automake-1.16-1.16.1/t/transform2.sh automake-1.16-1.16.5/t/transform2.sh --- automake-1.16-1.16.1/t/transform2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/transform2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 @@ -45,6 +45,10 @@ test ! -f inst/bin/s2.sh test ! -f inst/man/man/m1.1 test ! -f inst/man/man/m2.1 + +# The test can fail under a parallel make, so disable. +# No evident way to debug or reliably reproduce. +.NOTPARALLEL: EOF cat >p1.c <<'EOF' diff -Nru automake-1.16-1.16.1/t/transform3.sh automake-1.16-1.16.5/t/transform3.sh --- automake-1.16-1.16.1/t/transform3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/transform3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/transform.sh automake-1.16-1.16.5/t/transform.sh --- automake-1.16-1.16.1/t/transform.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/transform.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo19.sh automake-1.16-1.16.5/t/txinfo19.sh --- automake-1.16-1.16.1/t/txinfo19.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo19.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo23.sh automake-1.16-1.16.5/t/txinfo23.sh --- automake-1.16-1.16.1/t/txinfo23.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo23.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo24.sh automake-1.16-1.16.5/t/txinfo24.sh --- automake-1.16-1.16.1/t/txinfo24.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo24.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo25.sh automake-1.16-1.16.5/t/txinfo25.sh --- automake-1.16-1.16.1/t/txinfo25.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo25.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo28.sh automake-1.16-1.16.5/t/txinfo28.sh --- automake-1.16-1.16.1/t/txinfo28.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo28.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-absolute-srcdir-pr408.sh automake-1.16-1.16.5/t/txinfo-absolute-srcdir-pr408.sh --- automake-1.16-1.16.1/t/txinfo-absolute-srcdir-pr408.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-absolute-srcdir-pr408.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-add-missing-and-dist.sh automake-1.16-1.16.5/t/txinfo-add-missing-and-dist.sh --- automake-1.16-1.16.1/t/txinfo-add-missing-and-dist.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-add-missing-and-dist.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-bsd-make-recurs.sh automake-1.16-1.16.5/t/txinfo-bsd-make-recurs.sh --- automake-1.16-1.16.1/t/txinfo-bsd-make-recurs.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-bsd-make-recurs.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2021 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 @@ -17,6 +17,7 @@ # Make sure the documentation targets work as required with BSD make, # even in the presence of subdirs (requires presence of default *-am rules). +required='makeinfo tex texi2dvi dvips' . test-init.sh mkdir sub diff -Nru automake-1.16-1.16.1/t/txinfo-builddir.sh automake-1.16-1.16.5/t/txinfo-builddir.sh --- automake-1.16-1.16.1/t/txinfo-builddir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-builddir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-clean.sh automake-1.16-1.16.5/t/txinfo-clean.sh --- automake-1.16-1.16.1/t/txinfo-clean.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-clean.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-dvi-recurs.sh automake-1.16-1.16.5/t/txinfo-dvi-recurs.sh --- automake-1.16-1.16.1/t/txinfo-dvi-recurs.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-dvi-recurs.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-include.sh automake-1.16-1.16.5/t/txinfo-include.sh --- automake-1.16-1.16.1/t/txinfo-include.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-include.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-info-in-srcdir.sh automake-1.16-1.16.5/t/txinfo-info-in-srcdir.sh --- automake-1.16-1.16.1/t/txinfo-info-in-srcdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-info-in-srcdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-makeinfo-error-no-clobber.sh automake-1.16-1.16.5/t/txinfo-makeinfo-error-no-clobber.sh --- automake-1.16-1.16.1/t/txinfo-makeinfo-error-no-clobber.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-makeinfo-error-no-clobber.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-many-output-formats.sh automake-1.16-1.16.5/t/txinfo-many-output-formats.sh --- automake-1.16-1.16.1/t/txinfo-many-output-formats.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-many-output-formats.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-many-output-formats-vpath.sh automake-1.16-1.16.5/t/txinfo-many-output-formats-vpath.sh --- automake-1.16-1.16.1/t/txinfo-many-output-formats-vpath.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-many-output-formats-vpath.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-no-clutter.sh automake-1.16-1.16.5/t/txinfo-no-clutter.sh --- automake-1.16-1.16.1/t/txinfo-no-clutter.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-no-clutter.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 @@ -29,6 +29,10 @@ all-local: ps pdf dvi html # For "make distcheck". info_TEXINFOS = foo.texi doc/bar.texi baz.texi SUBDIRS = sub + +# Tell GNU make not to parallelize these, because they +# have overlap between explicit and intermediate .dvi files. +.NOTPARALLEL: END mkdir sub doc diff -Nru automake-1.16-1.16.1/t/txinfo-nodist-info.sh automake-1.16-1.16.5/t/txinfo-nodist-info.sh --- automake-1.16-1.16.1/t/txinfo-nodist-info.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-nodist-info.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2013-2018 Free Software Foundation, Inc. +# Copyright (C) 2013-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-no-extra-dist.sh automake-1.16-1.16.5/t/txinfo-no-extra-dist.sh --- automake-1.16-1.16.1/t/txinfo-no-extra-dist.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-no-extra-dist.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-no-installinfo.sh automake-1.16-1.16.5/t/txinfo-no-installinfo.sh --- automake-1.16-1.16.1/t/txinfo-no-installinfo.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-no-installinfo.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-no-repeated-targets.sh automake-1.16-1.16.5/t/txinfo-no-repeated-targets.sh --- automake-1.16-1.16.1/t/txinfo-no-repeated-targets.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-no-repeated-targets.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-no-setfilename.sh automake-1.16-1.16.5/t/txinfo-no-setfilename.sh --- automake-1.16-1.16.1/t/txinfo-no-setfilename.sh 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-no-setfilename.sh 2021-07-12 02:41:13.000000000 +0000 @@ -0,0 +1,35 @@ +#! /bin/sh +# Copyright (C) 2019-2021 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Check Texinfo files work without a @setfilename line + +. test-init.sh + +cat > Makefile.am << 'END' +info_TEXINFOS = file.texi +END + +cat > file.texi << 'END' +contents +END + +$ACLOCAL +$AUTOMAKE --add-missing + + +grep 'file.info:' Makefile.in + +: diff -Nru automake-1.16-1.16.1/t/txinfo-other-suffixes.sh automake-1.16-1.16.5/t/txinfo-other-suffixes.sh --- automake-1.16-1.16.1/t/txinfo-other-suffixes.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-other-suffixes.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-override-infodeps.sh automake-1.16-1.16.5/t/txinfo-override-infodeps.sh --- automake-1.16-1.16.1/t/txinfo-override-infodeps.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-override-infodeps.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-override-texinfo-tex.sh automake-1.16-1.16.5/t/txinfo-override-texinfo-tex.sh --- automake-1.16-1.16.1/t/txinfo-override-texinfo-tex.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-override-texinfo-tex.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-setfilename-repeated.sh automake-1.16-1.16.5/t/txinfo-setfilename-repeated.sh --- automake-1.16-1.16.1/t/txinfo-setfilename-repeated.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-setfilename-repeated.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-setfilename-suffix-strip.sh automake-1.16-1.16.5/t/txinfo-setfilename-suffix-strip.sh --- automake-1.16-1.16.1/t/txinfo-setfilename-suffix-strip.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-setfilename-suffix-strip.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-subdir-pr343.sh automake-1.16-1.16.5/t/txinfo-subdir-pr343.sh --- automake-1.16-1.16.1/t/txinfo-subdir-pr343.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-subdir-pr343.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-tex-dist.sh automake-1.16-1.16.5/t/txinfo-tex-dist.sh --- automake-1.16-1.16.1/t/txinfo-tex-dist.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-tex-dist.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-unrecognized-extension.sh automake-1.16-1.16.5/t/txinfo-unrecognized-extension.sh --- automake-1.16-1.16.1/t/txinfo-unrecognized-extension.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-unrecognized-extension.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-unrecognized-info-suffix.sh automake-1.16-1.16.5/t/txinfo-unrecognized-info-suffix.sh --- automake-1.16-1.16.1/t/txinfo-unrecognized-info-suffix.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-unrecognized-info-suffix.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-vtexi2.sh automake-1.16-1.16.5/t/txinfo-vtexi2.sh --- automake-1.16-1.16.1/t/txinfo-vtexi2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-vtexi2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-vtexi3.sh automake-1.16-1.16.5/t/txinfo-vtexi3.sh --- automake-1.16-1.16.1/t/txinfo-vtexi3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-vtexi3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-vtexi4.sh automake-1.16-1.16.5/t/txinfo-vtexi4.sh --- automake-1.16-1.16.1/t/txinfo-vtexi4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-vtexi4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -17,13 +17,17 @@ # Check that the version.texi file is automatically created and distributed # if @included into a texi source. Also check that is correctly defined # @values definitions it is advertised to. -# See also the related test 'txinfo-vtexi4.sh', which does similar checks, +# See also the related test 'txinfo-vtexi3.sh', which does similar checks, # but for more vers*.texi files, and does not require makeinfo, tex and # texi2dvi. required='makeinfo tex texi2dvi grep-nonprint' . test-init.sh +# We must use UTC since mdate-sh does, else the UPDATED values might +# differ depending on local time. +TZ=UTC0; export TZ + test $(LC_ALL=C date '+%u') -gt 0 && test $(LC_ALL=C date '+%u') -lt 8 \ && day=$(LC_ALL=C date '+%d') && test -n "$day" \ && month=$(LC_ALL=C date '+%B') && test -n "$month" \ diff -Nru automake-1.16-1.16.1/t/txinfo-vtexi.sh automake-1.16-1.16.5/t/txinfo-vtexi.sh --- automake-1.16-1.16.1/t/txinfo-vtexi.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-vtexi.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/txinfo-without-info-suffix.sh automake-1.16-1.16.5/t/txinfo-without-info-suffix.sh --- automake-1.16-1.16.1/t/txinfo-without-info-suffix.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/txinfo-without-info-suffix.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 diff -Nru automake-1.16-1.16.1/t/uninstall-fail.sh automake-1.16-1.16.5/t/uninstall-fail.sh --- automake-1.16-1.16.1/t/uninstall-fail.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/uninstall-fail.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -24,7 +24,7 @@ mkdir d : > d/f -chmod a-w d || skip "cannot make directories unwritable" +chmod a-w d || skip_ "cannot make directories unwritable" # On Solaris 10, if '/bin/rm' is run with the '-f' option, it doesn't # print any error message when failing to remove a file (due to e.g., diff -Nru automake-1.16-1.16.1/t/uninstall-pr9578.sh automake-1.16-1.16.5/t/uninstall-pr9578.sh --- automake-1.16-1.16.1/t/uninstall-pr9578.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/uninstall-pr9578.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/unused.sh automake-1.16-1.16.5/t/unused.sh --- automake-1.16-1.16.1/t/unused.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/unused.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/upc2.sh automake-1.16-1.16.5/t/upc2.sh --- automake-1.16-1.16.1/t/upc2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/upc2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 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 diff -Nru automake-1.16-1.16.1/t/upc3.sh automake-1.16-1.16.5/t/upc3.sh --- automake-1.16-1.16.1/t/upc3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/upc3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 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 diff -Nru automake-1.16-1.16.1/t/upc.sh automake-1.16-1.16.5/t/upc.sh --- automake-1.16-1.16.1/t/upc.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/upc.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2021 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 diff -Nru automake-1.16-1.16.1/t/vala-configure.sh automake-1.16-1.16.5/t/vala-configure.sh --- automake-1.16-1.16.1/t/vala-configure.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vala-configure.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2008-2018 Free Software Foundation, Inc. +# Copyright (C) 2008-2021 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 @@ -37,6 +37,9 @@ if test "x$1" = x--version; then echo "${vala_version-1.2.3}" fi +if test "x$1" = x--api-version; then + echo "${vala_version-1.2.3}" +fi exit 0 END chmod +x bin/valac @@ -46,6 +49,9 @@ if test "x$1" = x--version; then echo 0.1 fi +if test "x$1" = x--api-version; then + echo 0.1 +fi exit 0 END chmod +x bin/valac.old @@ -74,13 +80,13 @@ st=0; vala_version=0.1.2 ./configure 2>stderr || st=$? cat stderr >&2 test $st -eq 0 -grep '^configure: WARNING: no proper vala compiler found' stderr +grep '^configure: WARNING: Vala compiler not found or too old' stderr $MAKE no-valac st=0; ./configure VALAC="$(pwd)/bin/valac.old" 2>stderr || st=$? cat stderr >&2 test $st -eq 0 || exit 1 -grep '^configure: WARNING: no proper vala compiler found' stderr +grep '^configure: WARNING: Vala compiler not found or too old' stderr $MAKE no-valac sed 's/^\(AM_PROG_VALAC\).*/\1([1], [: > ok], [: > ko])/' t diff -Nru automake-1.16-1.16.1/t/vala-grepping.sh automake-1.16-1.16.5/t/vala-grepping.sh --- automake-1.16-1.16.1/t/vala-grepping.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vala-grepping.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/vala-headers.sh automake-1.16-1.16.5/t/vala-headers.sh --- automake-1.16-1.16.1/t/vala-headers.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vala-headers.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 @@ -45,6 +45,12 @@ AM_CFLAGS = $(GOBJECT_CFLAGS) LDADD = $(GOBJECT_LIBS) + +# Tell GNU make not to parallelize, since the tests can result in, for example: +# mv: cannot stat 'quux_vala.stamp-t': No such file or directory +# make[1]: *** [Makefile:438: quux_vala.stamp] Error 1 +# No evident way to debug or reliably reproduce. +.NOTPARALLEL: END headers='HDR.h hello.vapi foo.h foo2.h foo3.vapi' diff -Nru automake-1.16-1.16.1/t/vala-libs-distcheck.sh automake-1.16-1.16.5/t/vala-libs-distcheck.sh --- automake-1.16-1.16.1/t/vala-libs-distcheck.sh 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/t/vala-libs-distcheck.sh 2021-07-12 02:41:13.000000000 +0000 @@ -0,0 +1,193 @@ +#! /bin/sh +# Copyright (C) 2012-2021 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Building libraries (libtool and static) from Vala sources. +# And use of vapi files to call C code from Vala. + +required="valac cc pkg-config libtoolize GNUmake" +am_create_testdir=empty +. test-init.sh + +cat >> configure.ac << 'END' +AC_INIT([atest],[0.1]) +AC_CONFIG_SRCDIR([data/atest.pc.in]) +AC_SUBST([API_VERSION],[0]) + +AM_INIT_AUTOMAKE +AM_MAINTAINER_MODE([enable]) +AM_PROG_AR +LT_INIT + +AC_PROG_CC +AC_PROG_INSTALL +PKG_PROG_PKG_CONFIG([0.22]) +AM_PROG_VALAC([0.32]) + +PKG_CHECK_MODULES(ATEST, [gio-2.0]) + +AC_CONFIG_FILES([ + Makefile + + src/Makefile + + src/atest-$API_VERSION.deps:src/atest.deps.in + + data/Makefile + data/atest-$API_VERSION.pc:data/atest.pc.in + +],[], +[API_VERSION='$API_VERSION']) +AC_OUTPUT +END + + +cat > Makefile.am << 'END' +SUBDIRS=data src +END + +mkdir data + +cat > data/atest.pc.in << 'END' +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +datarootdir=@datarootdir@ +datadir=@datadir@ +includedir=@includedir@ + +Name: atest-@API_VERSION@ +Description: atest library +Version: @VERSION@ +Requires: glib-2.0 gobject-2.0 +Libs: -L${libdir} -latest-@API_VERSION@ +Cflags: -I${includedir}/atest-@API_VERSION@ +END + + +cat > data/Makefile.am << 'END' +# pkg-config data +# Note that the template file is called atest.pc.in, but generates a +# versioned .pc file using some magic in AC_CONFIG_FILES. +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = atest-$(API_VERSION).pc + +DISTCLEANFILES = $(pkgconfig_DATA) +EXTRA_DIST = atest.pc.in +END + +mkdir src + +cat > src/atest.deps.in << 'END' +glib-2.0 +END + + +cat > src/atest.vala << 'END' +using GLib; + +namespace Atest { + public class A { + public bool foo() { return false; } + } +} +END + +cat > src/Makefile.am << 'END' +lib_LTLIBRARIES = libatest-@API_VERSION@.la + +libatest_@API_VERSION@_la_SOURCES = \ + atest.vala \ + cservice.c \ + cservice.h \ + $(NULL) + + +libatest_@API_VERSION@_la_CPPFLAGS = \ + -DOKOKIMDEFINED=1 \ + $(NULL) + +libatest_@API_VERSION@_la_CFLAGS = \ + $(ATEST_CFLAGS) \ + $(WARN_CFLAGS) \ + $(NULL) + +libatest_@API_VERSION@_la_LIBADD = \ + $(ATEST_LIBS) \ + $(NULL) + +libatest_@API_VERSION@_la_LDFLAGS = \ + $(WARN_LDFLAGS) \ + $(NULL) + +libatest_@API_VERSION@_la_VALAFLAGS = \ + --vapidir=$(VAPIDIR) \ + --vapidir=$(srcdir) \ + --pkg cservice \ + --thread \ + --target-glib=2.44 \ + --pkg glib-2.0 \ + -H atest.h \ + --library atest-@API_VERSION@ \ + $(NULL) + +header_DATA=atest.h +headerdir=$(includedir)/atest-@API_VERSION@/atest + +atest-@API_VERSION@.deps: + cp atest.deps atest-@API_VERSION@.deps + +vapi_DATA=atest-@API_VERSION@.vapi atest-@API_VERSION@.deps +vapidir=$(VAPIDIR) + +CLEANFILES = atest-@API_VERSION@.deps +END + + +cat > src/cservice.c << 'END' +#include "cservice.h" +int c_service_mu_call (void) +{ + return OKOKIMDEFINED; +} +END + +cat > src/cservice.h << 'END' +int c_service_mu (void); +END + +cat > src/cservice.vapi <<'END' +namespace CService { + public class Mu { + [CCode (cheader_filename = "cservice.h", cname = "c_service_mu_call")] + public int call (); + } +} +END + +libtoolize +$ACLOCAL +$AUTOCONF +$AUTOMAKE -a + +./configure + +$MAKE +test -f src/libatest_0_la_vala.stamp +test -f src/libatest-0.la + +$MAKE distcheck + +: diff -Nru automake-1.16-1.16.1/t/vala-libs.sh automake-1.16-1.16.5/t/vala-libs.sh --- automake-1.16-1.16.1/t/vala-libs.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vala-libs.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 @@ -32,11 +32,11 @@ cat > Makefile.am << 'END' AUTOMAKE_OPTIONS = subdir-objects -lib_LIBRARIES = libmu.a +lib_LIBRARIES = libservice.a lib_LTLIBRARIES = src/libzardoz.la -libmu_a_SOURCES = mu.vala mu2.c mu.vapi mu2.h -libmu_a_CPPFLAGS = -DOKOKIMDEFINED=1 -libmu_a_VALAFLAGS = --vapidir=$(srcdir) +libservice_a_SOURCES = service.vala cservice.c cservice.h +libservice_a_CPPFLAGS = -DOKOKIMDEFINED=1 +libservice_a_VALAFLAGS = --vapidir=$(srcdir) --pkg cservice --library service AM_CFLAGS = $(GOBJECT_CFLAGS) src_libzardoz_la_LIBADD = $(GOBJECT_LIBS) src_libzardoz_la_SOURCES = src/zardoz-foo.vala src/zardoz-bar.vala @@ -51,28 +51,37 @@ ./configure -cat > mu2.c << 'END' -#include "mu2.h" -int mu2 (void) +cat > cservice.c << 'END' +#include "cservice.h" +int c_service_mu_call (void) { return OKOKIMDEFINED; } END -cat > mu2.h << 'END' -int mu2 (void); +cat > cservice.h << 'END' +int c_service_mu (void); END -cat > mu.vapi <<'END' -[CCode (cheader_filename = "mu2.h", cname = "mu2")] -public int c_mu2 (); +cat > cservice.vapi <<'END' +namespace CService { + public class Mu { + [CCode (cheader_filename = "cservice.h", cname = "c_service_mu_call")] + public int call (); + } +} END -cat > mu.vala << 'END' -int main () -{ - stdout.printf ("mumumu\n"); - return c_mu2 (); +cat > service.vala << 'END' +namespace CService { +public class Generator : Object { + public Generator () { + stdout.printf ("construct generator"); + } + public void init () { + stdout.printf ("init generator"); + } +} } END @@ -87,12 +96,12 @@ END $MAKE -test -f libmu.a +test -f libservice.a test -f src/libzardoz.la -$FGREP "mumumu" mu.c +$FGREP "construct generator" service.c $FGREP "FooFooFoo" src/zardoz-foo.c $FGREP "BarBarBar" src/zardoz-bar.c -test -f libmu_a_vala.stamp +test -f libservice_a_vala.stamp test -f src_libzardoz_la_vala.stamp $MAKE distcheck diff -Nru automake-1.16-1.16.1/t/vala-libs-vpath.sh automake-1.16-1.16.5/t/vala-libs-vpath.sh --- automake-1.16-1.16.1/t/vala-libs-vpath.sh 1970-01-01 00:00:00.000000000 +0000 +++ automake-1.16-1.16.5/t/vala-libs-vpath.sh 2021-07-12 02:41:13.000000000 +0000 @@ -0,0 +1,106 @@ +#! /bin/sh +# Copyright (C) 2012-2021 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 +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Building libraries (libtool and static) from Vala sources. +# And use of vapi files to call C code from Vala. + +required="valac cc pkg-config libtoolize GNUmake" +am_create_testdir=empty +. test-init.sh + +cat >> configure.ac << 'END' +AC_INIT([valalibs],[0.1]) + +AC_CONFIG_MACRO_DIR([m4]) + +AM_INIT_AUTOMAKE +AM_PROG_AR +LT_INIT + +AC_PROG_CC + +AM_PROG_VALAC([0.7.3]) +PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4]) + +AC_CONFIG_FILES([Makefile src/Makefile]) +AC_OUTPUT +END + + +cat > Makefile.am << 'END' +SUBDIRS=src +END + +mkdir src + +cat > src/Makefile.am << 'END' +AUTOMAKE_OPTIONS = subdir-objects +lib_LTLIBRARIES = libservice.la +libservice_la_SOURCES = service.vala cservice.c cservice.h +libservice_la_CPPFLAGS = -DOKOKIMDEFINED=1 +libservice_la_VALAFLAGS = --vapidir=$(srcdir) --pkg cservice --library service +AM_CFLAGS = $(GOBJECT_CFLAGS) +END + +libtoolize +$ACLOCAL +$AUTOCONF +$AUTOMAKE -a + +cat > src/cservice.c << 'END' +#include "cservice.h" +int c_service_mu_call (void) +{ + return OKOKIMDEFINED; +} +END + +cat > src/cservice.h << 'END' +int c_service_mu (void); +END + +cat > src/cservice.vapi <<'END' +namespace CService { + public class Mu { + [CCode (cheader_filename = "cservice.h", cname = "c_service_mu_call")] + public int call (); + } +} +END + +cat > src/service.vala << 'END' +namespace CService { +public class Generator : Object { + public Generator () { + stdout.printf ("construct generator"); + } + public void init () { + stdout.printf ("init generator"); + } +} +} +END + +mkdir build +cd build +../configure + +$MAKE +pwd +test -f src/libservice_la_vala.stamp +test -f src/libservice.la + +: diff -Nru automake-1.16-1.16.1/t/vala-mix2.sh automake-1.16-1.16.5/t/vala-mix2.sh --- automake-1.16-1.16.1/t/vala-mix2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vala-mix2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 @@ -44,7 +44,7 @@ END cat > foo.h <<'END' -int foo; +extern int foo; int bar (void); int baz (void); END @@ -56,7 +56,7 @@ cat > baz.c <<'END' #include "foo.h" -extern int foo = 0; +int foo = 0; int baz (void) { return 0; } END diff -Nru automake-1.16-1.16.1/t/vala-mix.sh automake-1.16-1.16.5/t/vala-mix.sh --- automake-1.16-1.16.1/t/vala-mix.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vala-mix.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/vala-non-recursive-setup.sh automake-1.16-1.16.5/t/vala-non-recursive-setup.sh --- automake-1.16-1.16.1/t/vala-non-recursive-setup.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vala-non-recursive-setup.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 @@ -86,7 +86,8 @@ ./configure || skip_ "configure failure" $MAKE $MAKE distcheck -$MAKE distclean +$MAKE maintainer-clean + mkdir build cd build ../configure diff -Nru automake-1.16-1.16.1/t/vala-parallel.sh automake-1.16-1.16.5/t/vala-parallel.sh --- automake-1.16-1.16.1/t/vala-parallel.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vala-parallel.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 @@ -64,8 +64,8 @@ ../configure $MAKE -j6 ls -l . .. # For debugging. -for x in main 1 2 3 4 5 6; do test -f ../$x.c; done -test -f ../zardoz_vala.stamp +for x in main 1 2 3 4 5 6; do test -f $x.c; done +test -f ./zardoz_vala.stamp $MAKE distcheck -j4 diff -Nru automake-1.16-1.16.1/t/vala-per-target-flags.sh automake-1.16-1.16.5/t/vala-per-target-flags.sh --- automake-1.16-1.16.1/t/vala-per-target-flags.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vala-per-target-flags.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 @@ -86,8 +86,8 @@ test -f src/xbar.c $MAKE distclean -test -f src/xfoo.c -test -f src/xbar.c +test ! -e src/xfoo.c +test ! -e src/xbar.c # Re-create Makefile. mv config.sav config.status diff -Nru automake-1.16-1.16.1/t/vala-recursive-setup.sh automake-1.16-1.16.5/t/vala-recursive-setup.sh --- automake-1.16-1.16.1/t/vala-recursive-setup.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vala-recursive-setup.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 @@ -77,9 +77,9 @@ # Check the distribution. $MAKE distcheck -$MAKE distclean +$MAKE maintainer-clean -# Tru a VPATH setup. +# Try a VPATH setup. mkdir build cd build @@ -89,19 +89,19 @@ # Test rebuild rules from builddir. -rm -f ../src/zardoz.h -$MAKE -C src ../../src/zardoz.h -test -f ../src/zardoz.h +rm -f src/zardoz.h +$MAKE -C src zardoz.h +test -f src/zardoz.h -rm -f ../src/zardoz.c +rm -f src/zardoz.c $MAKE -grep 'Zardoz!' ../src/zardoz.c +grep 'Zardoz!' src/zardoz.c $sleep sed 's/Zardoz!/FooBar!/' ../src/zardoz.vala > t mv -f t ../src/zardoz.vala $MAKE -grep 'FooBar!' ../src/zardoz.c -grep 'Zardoz!' ../src/zardoz.c && exit 1 +grep 'FooBar!' src/zardoz.c +grep 'Zardoz!' src/zardoz.c && exit 1 : diff -Nru automake-1.16-1.16.1/t/vala-vapi.sh automake-1.16-1.16.5/t/vala-vapi.sh --- automake-1.16-1.16.1/t/vala-vapi.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vala-vapi.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2012-2018 Free Software Foundation, Inc. +# Copyright (C) 2012-2021 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 diff -Nru automake-1.16-1.16.1/t/vala-vpath.sh automake-1.16-1.16.5/t/vala-vpath.sh --- automake-1.16-1.16.1/t/vala-vpath.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vala-vpath.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -47,16 +47,16 @@ $ACLOCAL $AUTOCONF -$AUTOMAKE +$AUTOMAKE -a mkdir build cd build ../configure $MAKE -test -f ../foo_vala.stamp -test -f ../bar_vala.stamp -grep foofoofoo ../hello.c -test -f ../zardoz.h +test -f ./foo_vala.stamp +test -f ./bar_vala.stamp +grep foofoofoo ./hello.c +test -f ./zardoz.h $MAKE distcheck # Rebuild rules work also in VPATH builds. @@ -70,9 +70,10 @@ END $MAKE -test -f ../foo_vala.stamp -test -f ../bar_vala.stamp -grep barbarbar ../hello.c +test -f ./foo_vala.stamp +test -f ./bar_vala.stamp +grep barbarbar ./hello.c +$MAKE distcheck # Rebuild rules are not uselessly triggered. $MAKE -q @@ -80,14 +81,14 @@ # Cleanup rules work also in VPATH builds. $MAKE clean -test -f ../foo_vala.stamp -test -f ../bar_vala.stamp -test -f ../zardoz.h -test -f ../hello.c +test -f ./foo_vala.stamp +test -f ./bar_vala.stamp +test -f ./zardoz.h +test -f ./hello.c $MAKE maintainer-clean -test ! -e ../zardoz.h -test ! -e ../hello.c -test ! -e ../foo_vala.stamp -test ! -e ../bar_vala.stamp +test ! -e ./zardoz.h +test ! -e ./hello.c +test ! -e ./foo_vala.stamp +test ! -e ./bar_vala.stamp : diff -Nru automake-1.16-1.16.1/t/var-recurs2.sh automake-1.16-1.16.5/t/var-recurs2.sh --- automake-1.16-1.16.1/t/var-recurs2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/var-recurs2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/var-recurs.sh automake-1.16-1.16.5/t/var-recurs.sh --- automake-1.16-1.16.1/t/var-recurs.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/var-recurs.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/vars3.sh automake-1.16-1.16.5/t/vars3.sh --- automake-1.16-1.16.1/t/vars3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vars3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/vars.sh automake-1.16-1.16.5/t/vars.sh --- automake-1.16-1.16.1/t/vars.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vars.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/vartar.sh automake-1.16-1.16.5/t/vartar.sh --- automake-1.16-1.16.1/t/vartar.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vartar.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/vartypo2.sh automake-1.16-1.16.5/t/vartypo2.sh --- automake-1.16-1.16.1/t/vartypo2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vartypo2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/vartypos.sh automake-1.16-1.16.5/t/vartypos.sh --- automake-1.16-1.16.1/t/vartypos.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vartypos.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/version3.sh automake-1.16-1.16.5/t/version3.sh --- automake-1.16-1.16.1/t/version3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/version3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/version4.sh automake-1.16-1.16.5/t/version4.sh --- automake-1.16-1.16.1/t/version4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/version4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/version6.sh automake-1.16-1.16.5/t/version6.sh --- automake-1.16-1.16.1/t/version6.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/version6.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/version7.sh automake-1.16-1.16.5/t/version7.sh --- automake-1.16-1.16.1/t/version7.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/version7.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/version8.sh automake-1.16-1.16.5/t/version8.sh --- automake-1.16-1.16.1/t/version8.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/version8.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2005-2018 Free Software Foundation, Inc. +# Copyright (C) 2005-2021 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 diff -Nru automake-1.16-1.16.1/t/vpath.sh automake-1.16-1.16.5/t/vpath.sh --- automake-1.16-1.16.1/t/vpath.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/vpath.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/warning-groups-win-over-strictness.sh automake-1.16-1.16.5/t/warning-groups-win-over-strictness.sh --- automake-1.16-1.16.1/t/warning-groups-win-over-strictness.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/warning-groups-win-over-strictness.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/warnings-obsolete-default.sh automake-1.16-1.16.5/t/warnings-obsolete-default.sh --- automake-1.16-1.16.1/t/warnings-obsolete-default.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/warnings-obsolete-default.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/warnings-override.sh automake-1.16-1.16.5/t/warnings-override.sh --- automake-1.16-1.16.1/t/warnings-override.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/warnings-override.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/warnings-precedence.sh automake-1.16-1.16.5/t/warnings-precedence.sh --- automake-1.16-1.16.1/t/warnings-precedence.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/warnings-precedence.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/warnings-strictness-interactions.sh automake-1.16-1.16.5/t/warnings-strictness-interactions.sh --- automake-1.16-1.16.1/t/warnings-strictness-interactions.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/warnings-strictness-interactions.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/warnings-unknown.sh automake-1.16-1.16.5/t/warnings-unknown.sh --- automake-1.16-1.16.1/t/warnings-unknown.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/warnings-unknown.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/warnings-win-over-strictness.sh automake-1.16-1.16.5/t/warnings-win-over-strictness.sh --- automake-1.16-1.16.1/t/warnings-win-over-strictness.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/warnings-win-over-strictness.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/warnopts.sh automake-1.16-1.16.5/t/warnopts.sh --- automake-1.16-1.16.1/t/warnopts.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/warnopts.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 diff -Nru automake-1.16-1.16.1/t/werror2.sh automake-1.16-1.16.5/t/werror2.sh --- automake-1.16-1.16.1/t/werror2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/werror2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2021 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 diff -Nru automake-1.16-1.16.1/t/werror3.sh automake-1.16-1.16.5/t/werror3.sh --- automake-1.16-1.16.1/t/werror3.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/werror3.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/werror4.sh automake-1.16-1.16.5/t/werror4.sh --- automake-1.16-1.16.1/t/werror4.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/werror4.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/werror.sh automake-1.16-1.16.5/t/werror.sh --- automake-1.16-1.16.1/t/werror.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/werror.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/whoami.sh automake-1.16-1.16.5/t/whoami.sh --- automake-1.16-1.16.1/t/whoami.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/whoami.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1998-2018 Free Software Foundation, Inc. +# Copyright (C) 1998-2021 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 diff -Nru automake-1.16-1.16.1/t/xsource.sh automake-1.16-1.16.5/t/xsource.sh --- automake-1.16-1.16.1/t/xsource.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/xsource.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 diff -Nru automake-1.16-1.16.1/t/yacc-auxdir.sh automake-1.16-1.16.5/t/yacc-auxdir.sh --- automake-1.16-1.16.1/t/yacc-auxdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-auxdir.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/yacc-basic.sh automake-1.16-1.16.5/t/yacc-basic.sh --- automake-1.16-1.16.1/t/yacc-basic.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-basic.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 @@ -42,7 +42,7 @@ #include #include int yylex () { return getchar (); } -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %% a : 'a' { exit(0); }; diff -Nru automake-1.16-1.16.1/t/yacc-bison-skeleton-cxx.sh automake-1.16-1.16.5/t/yacc-bison-skeleton-cxx.sh --- automake-1.16-1.16.1/t/yacc-bison-skeleton-cxx.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-bison-skeleton-cxx.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/yacc-bison-skeleton.sh automake-1.16-1.16.5/t/yacc-bison-skeleton.sh --- automake-1.16-1.16.1/t/yacc-bison-skeleton.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-bison-skeleton.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -44,7 +44,7 @@ foobar : 'f' 'o' 'o' 'b' 'a' 'r' {}; %% int yylex () { return 0; } -void yyerror (const char *s) { return; } +void yyerror (const char *s) {} END cat > foo.c << 'END' diff -Nru automake-1.16-1.16.1/t/yacc-clean-cxx.sh automake-1.16-1.16.5/t/yacc-clean-cxx.sh --- automake-1.16-1.16.1/t/yacc-clean-cxx.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-clean-cxx.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -70,7 +70,7 @@ #include // "std::" qualification required by Sun C++ 5.9. int yylex (void) { return std::getchar (); } -void yyerror (const char *s) { return; } +void yyerror (const char *s) {} %} %% x : 'x' { }; diff -Nru automake-1.16-1.16.1/t/yacc-clean.sh automake-1.16-1.16.5/t/yacc-clean.sh --- automake-1.16-1.16.1/t/yacc-clean.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-clean.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -66,7 +66,7 @@ cat > sub1/parse.y << 'END' %{ int yylex () { return (getchar ()); } -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %% x : 'x' { }; diff -Nru automake-1.16-1.16.1/t/yacc-cxx-grepping.sh automake-1.16-1.16.5/t/yacc-cxx-grepping.sh --- automake-1.16-1.16.1/t/yacc-cxx-grepping.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-cxx-grepping.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2021 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 diff -Nru automake-1.16-1.16.1/t/yacc-cxx.sh automake-1.16-1.16.5/t/yacc-cxx.sh --- automake-1.16-1.16.1/t/yacc-cxx.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-cxx.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -48,7 +48,7 @@ #include // "std::" qualification required by Sun C++ 5.9. int yylex (void) { return std::getchar (); } -void yyerror (const char *s) { return; } +void yyerror (const char *s) {} %} %% a : 'a' { exit(0); }; diff -Nru automake-1.16-1.16.1/t/yacc-d-basic.sh automake-1.16-1.16.5/t/yacc-d-basic.sh --- automake-1.16-1.16.1/t/yacc-d-basic.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-d-basic.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -48,7 +48,7 @@ %{ #include "parse.h" int yylex () { return 0; } -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %% x : 'x' {}; diff -Nru automake-1.16-1.16.1/t/yacc-d-cxx.sh automake-1.16-1.16.5/t/yacc-d-cxx.sh --- automake-1.16-1.16.1/t/yacc-d-cxx.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-d-cxx.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/yacc-deleted-headers.sh automake-1.16-1.16.5/t/yacc-deleted-headers.sh --- automake-1.16-1.16.1/t/yacc-deleted-headers.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-deleted-headers.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -56,7 +56,7 @@ %{ #include "parse1.h" int yylex () { return 0; } -void yyerror (char *s) { return; } +void yyerror (const char *s) {} %} %token ZARDOZ %% @@ -81,7 +81,7 @@ cat > parse4.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) { return; } +void yyerror (const char *s) {} %} %% x : 'x' {}; diff -Nru automake-1.16-1.16.1/t/yacc-depend2.sh automake-1.16-1.16.5/t/yacc-depend2.sh --- automake-1.16-1.16.1/t/yacc-depend2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-depend2.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 @@ -42,7 +42,7 @@ cat > foo.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) { return; } +void yyerror (const char *s) {} %} %token TOKEN %% diff -Nru automake-1.16-1.16.1/t/yacc-depend.sh automake-1.16-1.16.5/t/yacc-depend.sh --- automake-1.16-1.16.1/t/yacc-depend.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-depend.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 @@ -36,7 +36,7 @@ cat > foo.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) { return; } +void yyerror (const char *s) {} %} %token TOKEN %% diff -Nru automake-1.16-1.16.1/t/yacc-dist-nobuild.sh automake-1.16-1.16.5/t/yacc-dist-nobuild.sh --- automake-1.16-1.16.1/t/yacc-dist-nobuild.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-dist-nobuild.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -37,7 +37,7 @@ cat > parse.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %% foobar : 'f' 'o' 'o' 'b' 'a' 'r' {}; diff -Nru automake-1.16-1.16.1/t/yacc-dist-nobuild-subdir.sh automake-1.16-1.16.5/t/yacc-dist-nobuild-subdir.sh --- automake-1.16-1.16.1/t/yacc-dist-nobuild-subdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-dist-nobuild-subdir.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -36,7 +36,7 @@ cat > sub/parse.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) { return; } +void yyerror (const char *s) {} %} %% x : 'x' {}; diff -Nru automake-1.16-1.16.1/t/yacc-dry.sh automake-1.16-1.16.5/t/yacc-dry.sh --- automake-1.16-1.16.1/t/yacc-dry.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-dry.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 @@ -38,7 +38,7 @@ cat > parse.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %% foobar : 'f' 'o' 'o' 'b' 'a' 'r' {}; diff -Nru automake-1.16-1.16.1/t/yacc-d-vpath.sh automake-1.16-1.16.5/t/yacc-d-vpath.sh --- automake-1.16-1.16.1/t/yacc-d-vpath.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-d-vpath.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -41,7 +41,7 @@ cat > parse.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %token FOOBAR %% @@ -74,7 +74,7 @@ cat > ../parse.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %token FUBAR %% @@ -94,7 +94,7 @@ cat > ../parse.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %token MAUDE %% diff -Nru automake-1.16-1.16.1/t/yacc-grepping2.sh automake-1.16-1.16.5/t/yacc-grepping2.sh --- automake-1.16-1.16.1/t/yacc-grepping2.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-grepping2.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/yacc-grepping.sh automake-1.16-1.16.5/t/yacc-grepping.sh --- automake-1.16-1.16.1/t/yacc-grepping.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-grepping.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 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 diff -Nru automake-1.16-1.16.1/t/yacc-headers-and-dist-pr47.sh automake-1.16-1.16.5/t/yacc-headers-and-dist-pr47.sh --- automake-1.16-1.16.1/t/yacc-headers-and-dist-pr47.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-headers-and-dist-pr47.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 diff -Nru automake-1.16-1.16.1/t/yacc-line.sh automake-1.16-1.16.5/t/yacc-line.sh --- automake-1.16-1.16.1/t/yacc-line.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-line.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 @@ -57,7 +57,7 @@ cat > zardoz.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) { return; } +void yyerror (const char *s) {} %} %% x : 'x' {}; diff -Nru automake-1.16-1.16.1/t/yacc-misc.sh automake-1.16-1.16.5/t/yacc-misc.sh --- automake-1.16-1.16.1/t/yacc-misc.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-misc.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 @@ -35,7 +35,7 @@ cat > parse.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %% foobar : 'f' 'o' 'o' 'b' 'a' 'r' {}; @@ -45,7 +45,7 @@ cat > bar.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %% fubar : 'f' 'o' 'o' 'b' 'a' 'r' {}; diff -Nru automake-1.16-1.16.1/t/yacc-mix-c-cxx.sh automake-1.16-1.16.5/t/yacc-mix-c-cxx.sh --- automake-1.16-1.16.1/t/yacc-mix-c-cxx.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-mix-c-cxx.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -53,7 +53,7 @@ cat > p.y <<'END' %{ int yylex (void) { int new = 0; return new; } -void yyerror (char *s) { return; } +void yyerror (const char *s) {} %} %token ZARDOZ %% @@ -85,7 +85,7 @@ #include #include "parse.hh" int yylex (void) { return 0; } -void yyerror (const char *s) { return; } +void yyerror (const char *s) {} %} %token FOOBAR %% @@ -97,7 +97,7 @@ %{ #include int yylex (void) { return 0; } -void yyerror (const char *s) { return; } +void yyerror (const char *s) {} %} %% x : 'x' {}; diff -Nru automake-1.16-1.16.1/t/yacc-nodist.sh automake-1.16-1.16.5/t/yacc-nodist.sh --- automake-1.16-1.16.1/t/yacc-nodist.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-nodist.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -59,7 +59,7 @@ :; { : \ && echo "%{" \ && echo "int yylex () { return 0; }" \ - && echo "void yyerror (char *s) {}" \ + && echo "void yyerror (const char *s) {}" \ && echo "%}" \ && echo "%%" \ && echo "maude : 'm' 'a' 'u' 'd' 'e' {}"; \ diff -Nru automake-1.16-1.16.1/t/yacc-pr204.sh automake-1.16-1.16.5/t/yacc-pr204.sh --- automake-1.16-1.16.1/t/yacc-pr204.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-pr204.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 @@ -51,7 +51,7 @@ cat > parse.y << 'END' %{ int yylex () {return 0;} -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %% maude : 'm' 'a' 'u' 'd' 'e' {}; diff -Nru automake-1.16-1.16.1/t/yacc-subdir.sh automake-1.16-1.16.5/t/yacc-subdir.sh --- automake-1.16-1.16.1/t/yacc-subdir.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-subdir.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2021 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 @@ -49,7 +49,7 @@ cat > foo/parse.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %% foobar : 'f' 'o' 'o' 'b' 'a' 'r' {}; diff -Nru automake-1.16-1.16.1/t/yacc-vpath.sh automake-1.16-1.16.5/t/yacc-vpath.sh --- automake-1.16-1.16.1/t/yacc-vpath.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-vpath.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2021 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 @@ -40,7 +40,7 @@ cat > parse.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %% foobar : 'f' 'o' 'o' 'b' 'a' 'r' {}; @@ -67,7 +67,7 @@ cat > ../parse.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %% fubar : 'f' 'o' 'o' 'b' 'a' 'r' {}; @@ -85,7 +85,7 @@ cat > ../parse.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) {} +void yyerror (const char *s) {} %} %% maude : 'm' 'a' 'u' 'd' 'e' {}; diff -Nru automake-1.16-1.16.1/t/yacc-weirdnames.sh automake-1.16-1.16.5/t/yacc-weirdnames.sh --- automake-1.16-1.16.1/t/yacc-weirdnames.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yacc-weirdnames.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/yflags-cmdline-override.sh automake-1.16-1.16.5/t/yflags-cmdline-override.sh --- automake-1.16-1.16.1/t/yflags-cmdline-override.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yflags-cmdline-override.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -43,7 +43,7 @@ cat > foo.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) { return; } +void yyerror (const char *s) {} int main () { return 0; } %} %% diff -Nru automake-1.16-1.16.1/t/yflags-conditional.sh automake-1.16-1.16.5/t/yflags-conditional.sh --- automake-1.16-1.16.1/t/yflags-conditional.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yflags-conditional.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/yflags-cxx.sh automake-1.16-1.16.5/t/yflags-cxx.sh --- automake-1.16-1.16.1/t/yflags-cxx.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yflags-cxx.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/yflags-d-false-positives.sh automake-1.16-1.16.5/t/yflags-d-false-positives.sh --- automake-1.16-1.16.1/t/yflags-d-false-positives.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yflags-d-false-positives.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/yflags-force-conditional.sh automake-1.16-1.16.5/t/yflags-force-conditional.sh --- automake-1.16-1.16.1/t/yflags-force-conditional.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yflags-force-conditional.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/t/yflags-force-override.sh automake-1.16-1.16.5/t/yflags-force-override.sh --- automake-1.16-1.16.1/t/yflags-force-override.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yflags-force-override.sh 2021-09-20 00:53:14.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 @@ -37,7 +37,7 @@ cat > foo.y << 'END' %{ int yylex () { return 0; } -void yyerror (char *s) { return; } +void yyerror (const char *s) {} int main () { return 0; } %} %% diff -Nru automake-1.16-1.16.1/t/yflags.sh automake-1.16-1.16.5/t/yflags.sh --- automake-1.16-1.16.1/t/yflags.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yflags.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 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 diff -Nru automake-1.16-1.16.1/t/yflags-var-expand.sh automake-1.16-1.16.5/t/yflags-var-expand.sh --- automake-1.16-1.16.1/t/yflags-var-expand.sh 2018-02-26 20:38:28.000000000 +0000 +++ automake-1.16-1.16.5/t/yflags-var-expand.sh 2021-07-12 02:41:13.000000000 +0000 @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 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 diff -Nru automake-1.16-1.16.1/THANKS automake-1.16-1.16.5/THANKS --- automake-1.16-1.16.1/THANKS 2018-02-26 20:38:27.000000000 +0000 +++ automake-1.16-1.16.5/THANKS 2021-09-20 00:53:14.000000000 +0000 @@ -18,6 +18,7 @@ Alexandre Duret-Lutz duret_g@epita.fr Alexey Mahotkin alexm@hsys.msk.ru Alfred M. Szmidt ams@gnu.org +Allison Karlitskaya allison.karlitskaya@redhat.com Andrea Urbani matfanjol@mail.com Andreas Bergmeier lcid-fire@gmx.net Andreas Buening andreas.buening@nexgo.de @@ -71,6 +72,7 @@ Claudio Fontana sick_soul@yahoo.it Clifford Wolf clifford@clifford.at Colin Watson cjwatson@ubuntu.com +Colomban Wendling lists.ban@herbesfolles.org Dagobert Michelsen dam@opencsw.org Daiki Ueno ueno@unixuser.org Dalibor Topic robilad@kaffe.org @@ -102,6 +104,8 @@ Dieter Baron dillo@stieltjes.smc.univie.ac.at Dieter Jurzitza DJurzitza@harmanbecker.com Дилян Палаузов dilyan.palauzov@aegee.org +Dirk Mueller josef.moellers@suse.com +Dimitri Papadopoulos dimitri.papadopoulos@gmail.com Dmitry Mikhin dmitrym@acres.com.au Dmitry V. Levin ldv@altlinux.org Doug Evans devans@cygnus.com @@ -127,6 +131,7 @@ Fabian Alenius fabian.alenius@gmail.com Federico Simoncelli fsimonce@redhat.com Felix Salfelder felix@salfelder.org +Felix Yan felixonmars@archlinux.org Flavien Astraud flav42@yahoo.fr Florian Briegel briegel@zone42.de Francesco Salvestrini salvestrini@gmail.com @@ -166,6 +171,7 @@ Infirit infirit@gmail.com Inoue inoue@ainet.or.jp Jack Kelly jack@jackkelly.name +Jacob Bachmeyer jcb@gnu.org James Amundson amundson@users.sourceforge.net James Bostock james.bostock@gmail.com James Henstridge james@daa.com.au @@ -209,6 +215,7 @@ Joseph S. Myers joseph@codesourcery.com Josh MacDonald jmacd@cs.berkeley.edu Joshua Cowan jcowan@jcowan.reslife.okstate.edu +Joshua Root jmr@macports.org js pendry js.pendry@msdw.com Juergen A. Erhard jae@laden.ilk.de Juergen Keil jk@tools.de @@ -234,8 +241,10 @@ Laurent Morichetti laurentm@cup.hp.com Leo Davis ldavis@fonix.com Leonardo Boiko leoboiko@conectiva.com.br +Libor Bukata libor.bukata@oracle.com Loulou Pouchet loulou@lrde.epita.fr Ludovic Courtès ludo@gnu.org +Lukas Fleischer lfleischer@lfos.de Luo Yi luoyi.ly@gmail.com Maciej Stachowiak mstachow@mit.edu Maciej W. Rozycki macro@ds2.pg.gda.pl @@ -284,6 +293,7 @@ Miloslav Trmac trmac@popelka.ms.mff.cuni.cz Miodrag Vallat miodrag@ifrance.com Mirko Streckenbach strecken@infosun.fmi.uni-passau.de +Miro Hroncok miro@hroncok.cz Miroslaw Dobrzanski-Neumann mne@mosaic-ag.com Morten Eriksen mortene@sim.no Motoyuki Kasahara m-kasahr@sra.co.jp @@ -292,6 +302,7 @@ Nicholas Wourms nwourms@netscape.net Nick Bowler nbowler@elliptictech.com Nick Brown brownn@brocade.com +Nick Gasson nick@nickg.me.uk Nicola Fontana ntd@entidi.it Nicolas Joly njoly@pasteur.fr Nicolas Thiery nthiery@Icare.mines.edu @@ -317,6 +328,7 @@ Paul Jarc prj@po.cwru.edu Paul Lunau temp@lunau.me.uk Paul Martinolich martinol@datasync.com +Paul Osmialowski pawel.osmialowski@arm.com Paul Thomas PTHOMAS@novell.com Pavel Raiskup praiskup@redhat.com Pavel Roskin pavel_roskin@geocities.com @@ -362,7 +374,9 @@ Robert Bihlmeyer robbe@orcus.priv.at Robert Boehne rboehne@ricardo-us.com Robert Collins robert.collins@itdomain.com.au +Robert Menteer reetnem@mac.com Robert Swafford robert.swafford@l-3com.com +Robert Wanamaker rlw@nycap.rr.com Roberto Bagnara bagnara@cs.unipr.it Roman Fietze roman.fietze@telemotive.de Ronald Copley ronald.copley@gmail.com @@ -375,6 +389,8 @@ Sam Hocevar sam@zoy.org Sam Sirlin sam@kalessin.jpl.nasa.gov Sam Steingold sds@gnu.org +Samuel Tardieu sam@rfc1149.net +Samy Mahmoudi samy.mahmoudi@gmail.com Sander Niemeijer niemeijer@science-and-technology.nl Santiago Vila sanvila@unex.es Scott James Remnant scott@netsplit.com