[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: fix an error message during configure
|
From: |
Gavin Smith |
|
Subject: |
Re: fix an error message during configure |
|
Date: |
Wed, 14 Aug 2024 18:12:08 +0100 |
On Wed, Aug 14, 2024 at 02:15:14AM +0200, Bruno Haible wrote:
> Gavin Smith wrote:
> > > The first part serves the purpose of updating the same files also
> > > in the build-aux/ directory, so that you don't risk distributing
> > > outdated files for 6 years any more :) ...
> > ... I'm not sure which files you are saying were 6 years out of date.
>
> When comparing the contents of texinfo/build-aux/ with the corresponding
> files from the newest Automake release (1.17), some files ('compile',
> 'missing', 'mdate-sh') have a time stamp of 2018. Find attached a diff.
>
> Bruno
>
I'm not sure applying a patch such as this is the best way to upgrade
these files. If these files came from Automake then it would make sense
to update them from the Automake release with an installed version of
Automake by running "automake" or similar (it's probably done by
the autogen.sh script).
You can see from the "NEWS" file in Texinfo under the release notes
for 7.1 (18 October 2023) that the version of automake used was
automake 1.16.5.
The distribution of automake 1.17 at https://ftp.gnu.org/gnu/automake/ shows
a date of 12 July 2024. So it is unsurprising that the files from that
release would not have been used.
When making a new Texinfo release, I check what version of automake I have
installed on my computer and upgrade if appropriate.
I wonder if we should untrack some of these files in git, as you said
in your message yesterday that we didn't track files from Automake, only
files from Gnulib. This would stop such divergences being reported.
> diff -r -u texinfo/build-aux/ar-lib
> /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/ar-lib
> --- texinfo/build-aux/ar-lib 2024-06-09 00:04:10.038562136 +0200
> +++ /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/ar-lib
> 2024-07-12 13:06:17.470000000 +0200
> @@ -2,9 +2,9 @@
> # Wrapper for Microsoft lib.exe
>
> me=ar-lib
> -scriptversion=2012-03-01.08; # UTC
> +scriptversion=2024-06-19.01; # UTC
>
> -# Copyright (C) 2010-2014 Free Software Foundation, Inc.
> +# Copyright (C) 2010-2024 Free Software Foundation, Inc.
> # Written by Peter Rosin <peda@lysator.liu.se>.
> #
> # This program is free software; you can redistribute it and/or modify
> @@ -18,7 +18,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 <http://www.gnu.org/licenses/>.
> +# along with this program. If not, see <https://www.gnu.org/licenses/>.
>
> # As a special exception to the GNU General Public License, if you
> # distribute this file as part of a program that contains a
> @@ -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)
> @@ -105,11 +105,15 @@
> Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
>
> Members may be specified in a file named with @FILE.
> +
> +Report bugs to <bug-automake@gnu.org>.
> +GNU Automake home page: <https://www.gnu.org/software/automake/>.
> +General help using GNU software: <https://www.gnu.org/gethelp/>.
> EOF
> exit $?
> ;;
> -v | --v*)
> - echo "$me, version $scriptversion"
> + echo "$me (GNU Automake) $scriptversion"
> exit $?
> ;;
> esac
> @@ -135,6 +139,10 @@
> AR="$AR $1"
> shift
> ;;
> + -nologo | -NOLOGO)
> + # We always invoke AR with -nologo, so don't need to add it again.
> + shift
> + ;;
> *)
> action=$1
> shift
> @@ -224,10 +232,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 -r -u texinfo/build-aux/compile
> /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/compile
> --- texinfo/build-aux/compile 2024-08-12 12:12:48.922769922 +0200
> +++ /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/compile
> 2024-07-12 13:06:17.460000000 +0200
> @@ -1,9 +1,9 @@
> #! /bin/sh
> # Wrapper for compilers which do not understand '-c -o'.
>
> -scriptversion=2018-03-07.03; # UTC
> +scriptversion=2024-06-19.01; # UTC
>
> -# Copyright (C) 1999-2023 Free Software Foundation, Inc.
> +# Copyright (C) 1999-2024 Free Software Foundation, Inc.
> # Written by Tom Tromey <tromey@cygnus.com>.
> #
> # This program is free software; you can redistribute it and/or modify
> @@ -143,7 +143,7 @@
> # configure might choose to run compile as 'compile cc -o foo foo.c'.
> eat=1
> case $2 in
> - *.o | *.[oO][bB][jJ])
> + *.o | *.lo | *.[oO][bB][jJ])
> func_file_conv "$2"
> set x "$@" -Fo"$file"
> shift
> @@ -248,11 +248,13 @@
> right script to run: please start by reading the file 'INSTALL'.
>
> Report bugs to <bug-automake@gnu.org>.
> +GNU Automake home page: <https://www.gnu.org/software/automake/>.
> +General help using GNU software: <https://www.gnu.org/gethelp/>.
> EOF
> exit $?
> ;;
> -v | --v*)
> - echo "compile $scriptversion"
> + echo "compile (GNU Automake) $scriptversion"
> exit $?
> ;;
> cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
> diff -r -u texinfo/build-aux/config.guess
> /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/config.guess
> --- texinfo/build-aux/config.guess 2024-08-12 12:12:48.922769922 +0200
> +++
> /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/config.guess
> 2024-07-12 13:06:17.420000000 +0200
> @@ -1,10 +1,10 @@
> #! /bin/sh
> # Attempt to guess a canonical system name.
> -# Copyright 1992-2023 Free Software Foundation, Inc.
> +# Copyright 1992-2024 Free Software Foundation, Inc.
>
> # shellcheck disable=SC2006,SC2268 # see below for rationale
>
> -timestamp='2023-07-20'
> +timestamp='2024-01-01'
>
> # 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
> @@ -60,7 +60,7 @@
> GNU config.guess ($timestamp)
>
> Originally written by Per Bothner.
> -Copyright 1992-2023 Free Software Foundation, Inc.
> +Copyright 1992-2024 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."
> @@ -155,6 +155,9 @@
>
> set_cc_for_build
> cat <<-EOF > "$dummy.c"
> + #if defined(__ANDROID__)
> + LIBC=android
> + #else
> #include <features.h>
> #if defined(__UCLIBC__)
> LIBC=uclibc
> @@ -162,6 +165,8 @@
> LIBC=dietlibc
> #elif defined(__GLIBC__)
> LIBC=gnu
> + #elif defined(__LLVM_LIBC__)
> + LIBC=llvm
> #else
> #include <stdarg.h>
> /* First heuristic to detect musl libc. */
> @@ -169,6 +174,7 @@
> LIBC=musl
> #endif
> #endif
> + #endif
> EOF
> cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' |
> sed 's, ,,g'`
> eval "$cc_set_libc"
> @@ -904,7 +910,7 @@
> fi
> ;;
> *:FreeBSD:*:*)
> - UNAME_PROCESSOR=`/usr/bin/uname -p`
> + UNAME_PROCESSOR=`uname -p`
> case $UNAME_PROCESSOR in
> amd64)
> UNAME_PROCESSOR=x86_64 ;;
> @@ -1589,6 +1595,9 @@
> *:Unleashed:*:*)
> GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
> ;;
> + *:Ironclad:*:*)
> + GUESS=$UNAME_MACHINE-unknown-ironclad
> + ;;
> esac
>
> # Do we have a guess based on uname results?
> diff -r -u texinfo/build-aux/config.sub
> /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/config.sub
> --- texinfo/build-aux/config.sub 2024-08-12 12:12:48.922769922 +0200
> +++
> /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/config.sub
> 2024-07-12 13:06:17.430000000 +0200
> @@ -1,10 +1,10 @@
> #! /bin/sh
> # Configuration validation subroutine script.
> -# Copyright 1992-2023 Free Software Foundation, Inc.
> +# Copyright 1992-2024 Free Software Foundation, Inc.
>
> # shellcheck disable=SC2006,SC2268 # see below for rationale
>
> -timestamp='2023-07-31'
> +timestamp='2024-01-01'
>
> # 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
> @@ -76,7 +76,7 @@
> version="\
> GNU config.sub ($timestamp)
>
> -Copyright 1992-2023 Free Software Foundation, Inc.
> +Copyright 1992-2024 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."
> @@ -1181,7 +1181,7 @@
> case $cpu in
> 1750a | 580 \
> | a29k \
> - | aarch64 | aarch64_be \
> + | aarch64 | aarch64_be | aarch64c | arm64ec \
> | abacus \
> | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
> | alpha64 | alpha64ev[4-8] | alpha64ev56 |
> alpha64ev6[78] \
> @@ -1200,6 +1200,7 @@
> | d10v | d30v | dlx | dsp16xx \
> | e2k | elxsi | epiphany \
> | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
> + | javascript \
> | h8300 | h8500 \
> | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
> | hexagon \
> @@ -1221,6 +1222,7 @@
> | moxie \
> | mt \
> | msp430 \
> + | nanomips* \
> | nds32 | nds32le | nds32be \
> | nfp \
> | nios | nios2 | nios2eb | nios2el \
> @@ -1252,6 +1254,7 @@
> | ubicom32 \
> | v70 | v850 | v850e | v850e1 | v850es | v850e2 |
> v850e2v3 \
> | vax \
> + | vc4 \
> | visium \
> | w65 \
> | wasm32 | wasm64 \
> @@ -1284,11 +1287,12 @@
>
> # Decode manufacturer-specific aliases for certain operating systems.
>
> -if test x$basic_os != x
> +if test x"$basic_os" != x
> then
>
> # First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
> # set os.
> +obj=
> case $basic_os in
> gnu/linux*)
> kernel=linux
> @@ -1488,10 +1492,16 @@
> os=eabi
> ;;
> *)
> - os=elf
> + os=
> + obj=elf
> ;;
> esac
> ;;
> + aout* | coff* | elf* | pe*)
> + # These are machine code file formats, not OSes
> + obj=$os
> + os=
> + ;;
> *)
> # No normalization, but not necessarily accepted, that comes
> below.
> ;;
> @@ -1510,12 +1520,15 @@
> # system, and we'll never get to this point.
>
> kernel=
> +obj=
> case $cpu-$vendor in
> score-*)
> - os=elf
> + os=
> + obj=elf
> ;;
> spu-*)
> - os=elf
> + os=
> + obj=elf
> ;;
> *-acorn)
> os=riscix1.2
> @@ -1525,28 +1538,35 @@
> os=gnu
> ;;
> arm*-semi)
> - os=aout
> + os=
> + obj=aout
> ;;
> c4x-* | tic4x-*)
> - os=coff
> + os=
> + obj=coff
> ;;
> c8051-*)
> - os=elf
> + os=
> + obj=elf
> ;;
> clipper-intergraph)
> os=clix
> ;;
> hexagon-*)
> - os=elf
> + os=
> + obj=elf
> ;;
> tic54x-*)
> - os=coff
> + os=
> + obj=coff
> ;;
> tic55x-*)
> - os=coff
> + os=
> + obj=coff
> ;;
> tic6x-*)
> - os=coff
> + os=
> + obj=coff
> ;;
> # This must come before the *-dec entry.
> pdp10-*)
> @@ -1568,19 +1588,24 @@
> os=sunos3
> ;;
> m68*-cisco)
> - os=aout
> + os=
> + obj=aout
> ;;
> mep-*)
> - os=elf
> + os=
> + obj=elf
> ;;
> mips*-cisco)
> - os=elf
> + os=
> + obj=elf
> ;;
> - mips*-*)
> - os=elf
> + mips*-*|nanomips*-*)
> + os=
> + obj=elf
> ;;
> or32-*)
> - os=coff
> + os=
> + obj=coff
> ;;
> *-tti) # must be before sparc entry or we get the wrong os.
> os=sysv3
> @@ -1589,7 +1614,8 @@
> os=sunos4.1.1
> ;;
> pru-*)
> - os=elf
> + os=
> + obj=elf
> ;;
> *-be)
> os=beos
> @@ -1670,10 +1696,12 @@
> os=uxpv
> ;;
> *-rom68k)
> - os=coff
> + os=
> + obj=coff
> ;;
> *-*bug)
> - os=coff
> + os=
> + obj=coff
> ;;
> *-apple)
> os=macos
> @@ -1691,10 +1719,11 @@
>
> fi
>
> -# Now, validate our (potentially fixed-up) OS.
> +# Now, validate our (potentially fixed-up) individual pieces (OS, OBJ).
> +
> case $os in
> # Sometimes we do "kernel-libc", so those need to count as OSes.
> - musl* | newlib* | relibc* | uclibc*)
> + llvm* | musl* | newlib* | relibc* | uclibc*)
> ;;
> # Likewise for "kernel-abi"
> eabi* | gnueabi*)
> @@ -1702,6 +1731,9 @@
> # VxWorks passes extra cpu info in the 4th filed.
> simlinux | simwindows | spe)
> ;;
> + # See `case $cpu-$os` validation below
> + ghcjs)
> + ;;
> # Now accept the basic system types.
> # The portable systems comes first.
> # Each alternative MUST end in a * to match a version number.
> @@ -1719,11 +1751,11 @@
> | 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* \
> + | bosx* | nextstep* | cxux* | oabi* \
> + | ptx* | ecoff* | winnt* | domain* | vsta* \
> | udi* | lites* | ieee* | go32* | aux* | hcos* \
> | chorusrdb* | cegcc* | glidix* | serenity* \
> - | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
> + | cygwin* | msys* | moss* | proelf* | rtems* \
> | midipix* | mingw32* | mingw64* | mint* \
> | uxpv* | beos* | mpeix* | udk* | moxiebox* \
> | interix* | uwin* | mks* | rhapsody* | darwin* \
> @@ -1736,71 +1768,115 @@
> | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
> | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
> | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
> - | fiwix* | mlibc* | cos* | mbr* )
> + | fiwix* | mlibc* | cos* | mbr* | ironclad* )
> ;;
> # 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.
> ;;
> + # This refers to builds using the UEFI calling convention
> + # (which depends on the architecture) and PE file format.
> + # Note that this is both a different calling convention and
> + # different file format than that of GNU-EFI
> + # (x86_64-w64-mingw32).
> + uefi)
> + ;;
> none)
> ;;
> kernel* | msvc* )
> # Restricted further below
> ;;
> + '')
> + if test x"$obj" = x
> + then
> + echo "Invalid configuration '$1': Blank OS only allowed
> with explicit machine code file format" 1>&2
> + fi
> + ;;
> *)
> echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2
> exit 1
> ;;
> esac
>
> +case $obj in
> + aout* | coff* | elf* | pe*)
> + ;;
> + '')
> + # empty is fine
> + ;;
> + *)
> + echo "Invalid configuration '$1': Machine code format '$obj'
> not recognized" 1>&2
> + exit 1
> + ;;
> +esac
> +
> +# Here we handle the constraint that a (synthetic) cpu and os are
> +# valid only in combination with each other and nowhere else.
> +case $cpu-$os in
> + # The "javascript-unknown-ghcjs" triple is used by GHC; we
> + # accept it here in order to tolerate that, but reject any
> + # variations.
> + javascript-ghcjs)
> + ;;
> + javascript-* | *-ghcjs)
> + echo "Invalid configuration '$1': cpu '$cpu' is not valid with
> os '$os$obj'" 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* | linux-mlibc*
> )
> +case $kernel-$os-$obj in
> + linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \
> + | linux-mlibc*- | linux-musl*- | linux-newlib*- \
> + | linux-relibc*- | linux-uclibc*- )
> ;;
> - uclinux-uclibc* )
> + uclinux-uclibc*- )
> ;;
> - managarm-mlibc* | managarm-kernel* )
> + managarm-mlibc*- | managarm-kernel*- )
> ;;
> - windows*-gnu* | windows*-msvc*)
> + windows*-msvc*-)
> ;;
> - -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* | -mlibc* )
> + -dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -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
> ;;
> - -kernel* )
> + -kernel*- )
> echo "Invalid configuration '$1': '$os' needs explicit kernel."
> 1>&2
> exit 1
> ;;
> - *-kernel* )
> + *-kernel*- )
> echo "Invalid configuration '$1': '$kernel' does not support
> '$os'." 1>&2
> exit 1
> ;;
> - *-msvc* )
> + *-msvc*- )
> echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
> exit 1
> ;;
> - kfreebsd*-gnu* | kopensolaris*-gnu*)
> + kfreebsd*-gnu*- | kopensolaris*-gnu*-)
> ;;
> - vxworks-simlinux | vxworks-simwindows | vxworks-spe)
> + vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
> ;;
> - nto-qnx*)
> + nto-qnx*-)
> ;;
> - os2-emx)
> + os2-emx-)
> ;;
> - *-eabi* | *-gnueabi*)
> + *-eabi*- | *-gnueabi*-)
> ;;
> - none-coff* | none-elf*)
> + none--*)
> # None (no kernel, i.e. freestanding / bare metal),
> - # can be paired with an output format "OS"
> + # can be paired with an machine code file format
> ;;
> - -*)
> + -*-)
> # Blank kernel with real OS is always fine.
> ;;
> - *-*)
> + --*)
> + # Blank kernel and OS with real machine code file format is
> always fine.
> + ;;
> + *-*-*)
> echo "Invalid configuration '$1': Kernel '$kernel' not known to
> work with OS '$os'." 1>&2
> exit 1
> ;;
> @@ -1884,7 +1960,7 @@
> ;;
> esac
>
> -echo "$cpu-$vendor-${kernel:+$kernel-}$os"
> +echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}"
> exit
>
> # Local variables:
> diff -r -u texinfo/build-aux/depcomp
> /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/depcomp
> --- texinfo/build-aux/depcomp 2024-08-12 12:12:48.922769922 +0200
> +++ /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/depcomp
> 2024-07-12 13:06:17.460000000 +0200
> @@ -1,9 +1,9 @@
> #! /bin/sh
> # depcomp - compile a program generating dependencies as side-effects
>
> -scriptversion=2022-09-18.14; # UTC
> +scriptversion=2024-06-19.01; # UTC
>
> -# Copyright (C) 1999-2023 Free Software Foundation, Inc.
> +# Copyright (C) 1999-2024 Free Software Foundation, Inc.
>
> # This program is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
> @@ -47,11 +47,13 @@
> libtool Whether libtool is used (yes/no).
>
> Report bugs to <bug-automake@gnu.org>.
> +GNU Automake home page: <https://www.gnu.org/software/automake/>.
> +General help using GNU software: <https://www.gnu.org/gethelp/>.
> EOF
> exit $?
> ;;
> -v | --v*)
> - echo "depcomp $scriptversion"
> + echo "depcomp (GNU Automake) $scriptversion"
> exit $?
> ;;
> esac
> @@ -127,7 +129,7 @@
>
> rm -f "$tmpdepfile"
>
> -# Avoid interferences from the environment.
> +# Avoid interference from the environment.
> gccflag= dashmflag=
>
> # Some modes work just like other modes, but use different flags. We
> diff -r -u texinfo/build-aux/install-sh
> /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/install-sh
> --- texinfo/build-aux/install-sh 2024-08-12 12:12:48.922769922 +0200
> +++
> /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/install-sh
> 2024-07-12 13:06:17.430000000 +0200
> @@ -1,7 +1,7 @@
> #!/bin/sh
> # install - install a program, script, or datafile
>
> -scriptversion=2020-11-14.01; # UTC
> +scriptversion=2024-06-19.01; # UTC
>
> # This originates from X11R5 (mit/util/scripts/install.sh), which was
> # later released in X11R6 (xc/config/util/install.sh) with the
> @@ -124,9 +124,9 @@
>
> 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/
> -"
> +Report bugs to <bug-automake@gnu.org>.
> +GNU Automake home page: <https://www.gnu.org/software/automake/>.
> +General help using GNU software: <https://www.gnu.org/gethelp/>."
>
> while test $# -ne 0; do
> case $1 in
> @@ -170,7 +170,7 @@
>
> -T) is_target_a_directory=never;;
>
> - --version) echo "$0 $scriptversion"; exit $?;;
> + --version) echo "$0 (GNU Automake) $scriptversion"; exit $?;;
>
> --) shift
> break;;
> @@ -345,7 +345,7 @@
> ' 0
>
> # Because "mkdir -p" follows existing symlinks and we likely work
> - # directly in world-writeable /tmp, make sure that the '$tmpdir'
> + # directly in world-writable /tmp, make sure that the '$tmpdir'
> # directory is successfully created first before we actually test
> # 'mkdir -p'.
> if (umask $mkdir_umask &&
> @@ -353,7 +353,7 @@
> exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
> then
> if test -z "$dir_arg" || {
> - # Check for POSIX incompatibilities with -m.
> + # Check for POSIX incompatibility with -m.
> # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
> # other-writable bit of parent directory when it shouldn't.
> # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
> diff -r -u texinfo/build-aux/mdate-sh
> /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/mdate-sh
> --- texinfo/build-aux/mdate-sh 2024-06-09 00:04:10.038562136 +0200
> +++
> /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/mdate-sh
> 2024-07-12 13:06:17.440000000 +0200
> @@ -1,9 +1,9 @@
> #!/bin/sh
> # Get modification time of a file or directory and pretty-print it.
>
> -scriptversion=2018-03-07.03; # UTC
> +scriptversion=2024-06-19.01; # UTC
>
> -# Copyright (C) 1995-2023 Free Software Foundation, Inc.
> +# Copyright (C) 1995-2024 Free Software Foundation, Inc.
> # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
> #
> # This program is free software; you can redistribute it and/or modify
> @@ -50,11 +50,13 @@
> 1 January 1970
>
> Report bugs to <bug-automake@gnu.org>.
> +GNU Automake home page: <https://www.gnu.org/software/automake/>.
> +General help using GNU software: <https://www.gnu.org/gethelp/>.
> EOF
> exit $?
> ;;
> -v | --v*)
> - echo "mdate-sh $scriptversion"
> + echo "mdate-sh (GNU Automake) $scriptversion"
> exit $?
> ;;
> esac
> diff -r -u texinfo/build-aux/missing
> /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/missing
> --- texinfo/build-aux/missing 2024-08-12 12:12:48.922769922 +0200
> +++ /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/missing
> 2024-07-12 13:06:17.440000000 +0200
> @@ -1,9 +1,11 @@
> #! /bin/sh
> -# Common wrapper for a few potentially missing GNU programs.
> +# Common wrapper for a few potentially missing GNU and other programs.
>
> -scriptversion=2018-03-07.03; # UTC
> +scriptversion=2024-06-07.14; # UTC
>
> -# Copyright (C) 1996-2021 Free Software Foundation, Inc.
> +# shellcheck disable=SC2006,SC2268 # we must support pre-POSIX shells
> +
> +# Copyright (C) 1996-2024 Free Software Foundation, Inc.
> # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
>
> # This program is free software; you can redistribute it and/or modify
> @@ -54,18 +56,20 @@
> -v, --version output version information and exit
>
> Supported PROGRAM values:
> - aclocal autoconf autoheader autom4te automake makeinfo
> - bison yacc flex lex help2man
> +aclocal autoconf autogen autoheader autom4te automake autoreconf
> +bison flex help2man lex makeinfo perl yacc
>
> Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
> 'g' are ignored when checking the name.
>
> -Send bug reports to <bug-automake@gnu.org>."
> +Report bugs to <bug-automake@gnu.org>.
> +GNU Automake home page: <https://www.gnu.org/software/automake/>.
> +General help using GNU software: <https://www.gnu.org/gethelp/>."
> exit $?
> ;;
>
> -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
> - echo "missing $scriptversion (GNU Automake)"
> + echo "missing (GNU Automake) $scriptversion"
> exit $?
> ;;
>
> @@ -108,7 +112,7 @@
> program_details ()
> {
> case $1 in
> - aclocal|automake)
> + aclocal|automake|autoreconf)
> echo "The '$1' program is part of the GNU Automake package:"
> echo "<$gnu_software_URL/automake>"
> echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
> @@ -123,6 +127,9 @@
> echo "<$gnu_software_URL/m4/>"
> echo "<$perl_URL>"
> ;;
> + *)
> + :
> + ;;
> esac
> }
>
> @@ -137,48 +144,55 @@
> printf '%s\n' "'$1' is $msg."
>
> configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
> + autoheader_deps="'acconfig.h'"
> + automake_deps="'Makefile.am'"
> + aclocal_deps="'acinclude.m4'"
> case $normalized_program in
> + aclocal*)
> + echo "You should only need it if you modified $aclocal_deps or"
> + echo "$configure_deps."
> + ;;
> autoconf*)
> - echo "You should only need it if you modified 'configure.ac',"
> - echo "or m4 files included by it."
> - program_details 'autoconf'
> + echo "You should only need it if you modified $configure_deps."
> + ;;
> + autogen*)
> + echo "You should only need it if you modified a '.def' or '.tpl' file."
> + echo "You may want to install the GNU AutoGen package:"
> + echo "<$gnu_software_URL/autogen/>"
> ;;
> autoheader*)
> - echo "You should only need it if you modified 'acconfig.h' or"
> + echo "You should only need it if you modified $autoheader_deps or"
> echo "$configure_deps."
> - program_details 'autoheader'
> ;;
> automake*)
> - echo "You should only need it if you modified 'Makefile.am' or"
> - echo "$configure_deps."
> - program_details 'automake'
> - ;;
> - aclocal*)
> - echo "You should only need it if you modified 'acinclude.m4' or"
> + echo "You should only need it if you modified $automake_deps or"
> echo "$configure_deps."
> - program_details 'aclocal'
> ;;
> - autom4te*)
> + autom4te*)
> echo "You might have modified some maintainer files that require"
> echo "the 'autom4te' program to be rebuilt."
> - program_details 'autom4te'
> + ;;
> + autoreconf*)
> + echo "You should only need it if you modified $aclocal_deps or"
> + echo "$automake_deps or $autoheader_deps or $automake_deps or"
> + echo "$configure_deps."
> ;;
> bison*|yacc*)
> echo "You should only need it if you modified a '.y' file."
> echo "You may want to install the GNU Bison package:"
> echo "<$gnu_software_URL/bison/>"
> ;;
> - lex*|flex*)
> - echo "You should only need it if you modified a '.l' file."
> - echo "You may want to install the Fast Lexical Analyzer package:"
> - echo "<$flex_URL>"
> - ;;
> help2man*)
> echo "You should only need it if you modified a dependency" \
> "of a man page."
> echo "You may want to install the GNU Help2man package:"
> echo "<$gnu_software_URL/help2man/>"
> ;;
> + lex*|flex*)
> + echo "You should only need it if you modified a '.l' file."
> + echo "You may want to install the Fast Lexical Analyzer package:"
> + echo "<$flex_URL>"
> + ;;
> makeinfo*)
> echo "You should only need it if you modified a '.texi' file, or"
> echo "any other file indirectly affecting the aspect of the manual."
> @@ -189,6 +203,12 @@
> echo "want to install GNU make:"
> echo "<$gnu_software_URL/make/>"
> ;;
> + perl*)
> + echo "You should only need it to run GNU Autoconf, GNU Automake, "
> + echo " assorted other tools, or if you modified a Perl source file."
> + echo "You may want to install the Perl 5 language interpreter:"
> + echo "<$perl_URL>"
> + ;;
> *)
> echo "You might have modified some files without having the proper"
> echo "tools for further handling them. Check the 'README' file, it"
> @@ -197,6 +217,7 @@
> echo "case some other package contains this missing '$1' program."
> ;;
> esac
> + program_details "$normalized_program"
> }
>
> give_advice "$1" | sed -e '1s/^/WARNING: /' \
> diff -r -u texinfo/build-aux/tap-driver.sh
> /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/tap-driver.sh
> --- texinfo/build-aux/tap-driver.sh 2024-06-10 18:55:21.766786025 +0200
> +++
> /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/tap-driver.sh
> 2024-07-12 13:06:17.480000000 +0200
> @@ -23,7 +23,7 @@
> # bugs to <bug-automake@gnu.org> or send patches to
> # <automake-patches@gnu.org>.
>
> -scriptversion=2013-12-23.17; # UTC
> +scriptversion=2024-06-19.01; # UTC
>
> # Make unconditional expansion of undefined variables an error. This
> # helps a lot in preventing typo-related bugs.
> @@ -48,12 +48,16 @@
> {
> cat <<END
> Usage:
> - tap-driver.sh --test-name=NAME --log-file=PATH --trs-file=PATH
> - [--expect-failure={yes|no}] [--color-tests={yes|no}]
> - [--enable-hard-errors={yes|no}] [--ignore-exit]
> - [--diagnostic-string=STRING] [--merge|--no-merge]
> + tap-driver.sh --test-name NAME --log-file PATH --trs-file PATH
> + [--expect-failure {yes|no}] [--color-tests {yes|no}]
> + [--enable-hard-errors {yes|no}] [--ignore-exit]
> + [--diagnostic-string STRING] [--merge|--no-merge]
> [--comments|--no-comments] [--] TEST-COMMAND
> The '--test-name', '-log-file' and '--trs-file' options are mandatory.
> +
> +Report bugs to <bug-automake@gnu.org>.
> +GNU Automake home page: <https://www.gnu.org/software/automake/>.
> +General help using GNU software: <https://www.gnu.org/gethelp/>.
> END
> }
>
> @@ -71,7 +75,7 @@
> while test $# -gt 0; do
> case $1 in
> --help) print_usage; exit $?;;
> - --version) echo "$me $scriptversion"; exit $?;;
> + --version) echo "$me (GNU Automake) $scriptversion"; exit $?;;
> --test-name) test_name=$2; shift;;
> --log-file) log_file=$2; shift;;
> --trs-file) trs_file=$2; shift;;
> @@ -124,7 +128,7 @@
> # problems with Korn shells. Some Korn shells are known to propagate
> # to themselves signals that have killed a child process they were
> # waiting for; this is done at least for SIGINT (and usually only for
> - # it, in truth). Without the `trap' below, such a behaviour could
> + # it, in truth). Without the `trap' below, such a behavior could
> # cause a premature exit in the current subshell, e.g., in case the
> # test command it runs gets terminated by a SIGINT. Thus, the awk
> # script we are piping into would never seen the exit status it
> @@ -462,8 +466,8 @@
> # We used to report an "abnormal termination" here, but some Korn
> # shells, when a child process die due to signal number n, can leave
> # in $? an exit status of 256+n instead of the more standard 128+n.
> - # Apparently, both behaviours are allowed by POSIX (2008), so be
> - # prepared to handle them both. See also Austing Group report ID
> + # Apparently, both behaviors are allowed by POSIX (2008), so be
> + # prepared to handle them both. See also Austin Group report ID
> # 0000051 <http://www.austingroupbugs.net/view.php?id=51>
> exit_details = sprintf(" (terminated by signal %d?)", status - 256)
> else
> @@ -578,7 +582,7 @@
> # Older versions of prove and TAP::Harness (e.g., 3.17) did not
> # recognize a "Bail out!" directive when preceded by leading
> # whitespace, but more modern versions (e.g., 3.23) do. So we
> - # emulate the latter, "more modern" behaviour.
> + # emulate the latter, "more modern" behavior.
> else if ($0 ~ /^[ \t]*Bail out!/)
> {
> bailed_out = 1
> @@ -592,7 +596,7 @@
> bailout_message = bailout_message " " $0
> testsuite_error(bailout_message)
> }
> - # Maybe we have too look for dianogtic comments too.
> + # Maybe we have to look for diagnostic comments too.
> else if (comments != 0)
> {
> comment = extract_tap_comment($0);
> diff -r -u texinfo/build-aux/test-driver
> /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/test-driver
> --- texinfo/build-aux/test-driver 2024-06-09 00:04:10.038562136 +0200
> +++
> /arch/x86_64-linux-gnu/gnu-inst-automake/1.17/share/automake-1.17/test-driver
> 2024-07-12 13:06:17.480000000 +0200
> @@ -1,9 +1,9 @@
> #! /bin/sh
> # test-driver - basic testsuite driver script.
>
> -scriptversion=2018-03-07.03; # UTC
> +scriptversion=2024-06-19.01; # UTC
>
> -# Copyright (C) 2011-2021 Free Software Foundation, Inc.
> +# Copyright (C) 2011-2024 Free Software Foundation, Inc.
> #
> # This program is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
> @@ -44,11 +44,16 @@
> Usage:
> test-driver --test-name NAME --log-file PATH --trs-file PATH
> [--expect-failure {yes|no}] [--color-tests {yes|no}]
> + [--collect-skipped-logs {yes|no}]
> [--enable-hard-errors {yes|no}] [--]
> TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS]
>
> The '--test-name', '--log-file' and '--trs-file' options are mandatory.
> See the GNU Automake documentation for information.
> +
> +Report bugs to <bug-automake@gnu.org>.
> +GNU Automake home page: <https://www.gnu.org/software/automake/>.
> +General help using GNU software: <https://www.gnu.org/gethelp/>.
> END
> }
>
> @@ -57,15 +62,17 @@
> trs_file= # Where to save the metadata of the test run.
> expect_failure=no
> color_tests=no
> +collect_skipped_logs=yes
> enable_hard_errors=yes
> while test $# -gt 0; do
> case $1 in
> --help) print_usage; exit $?;;
> - --version) echo "test-driver $scriptversion"; exit $?;;
> + --version) echo "test-driver (GNU Automake) $scriptversion"; exit $?;;
> --test-name) test_name=$2; shift;;
> --log-file) log_file=$2; shift;;
> --trs-file) trs_file=$2; shift;;
> --color-tests) color_tests=$2; shift;;
> + --collect-skipped-logs) collect_skipped_logs=$2; shift;;
> --expect-failure) expect_failure=$2; shift;;
> --enable-hard-errors) enable_hard_errors=$2; shift;;
> --) shift; break;;
> @@ -121,7 +128,7 @@
> case $tweaked_estatus:$expect_failure in
> 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
> 0:*) col=$grn res=PASS recheck=no gcopy=no;;
> - 77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
> + 77:*) col=$blu res=SKIP recheck=no gcopy=$collect_skipped_logs;;
> 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;;
> *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;;
> *:*) col=$red res=FAIL recheck=yes gcopy=yes;;
- fix an error message during configure, Bruno Haible, 2024/08/06
- Re: fix an error message during configure, Gavin Smith, 2024/08/06
- Re: fix an error message during configure, Bruno Haible, 2024/08/06
- Re: fix an error message during configure, Gavin Smith, 2024/08/07
- Re: fix an error message during configure, Bruno Haible, 2024/08/07
- Re: fix an error message during configure, Patrice Dumas, 2024/08/10
- Re: fix an error message during configure, Bruno Haible, 2024/08/12
- Re: fix an error message during configure, Gavin Smith, 2024/08/13
- Re: fix an error message during configure, Bruno Haible, 2024/08/13
- Re: fix an error message during configure,
Gavin Smith <=
- Re: fix an error message during configure, Bruno Haible, 2024/08/14
- Re: fix an error message during configure, Gavin Smith, 2024/08/15
- Re: fix an error message during configure, Bruno Haible, 2024/08/16
- Re: fix an error message during configure, Gavin Smith, 2024/08/17
- Re: fix an error message during configure, Gavin Smith, 2024/08/13
Re: fix an error message during configure, Gavin Smith, 2024/08/31