From fcb93a79c3c5bae70d040ac2f9f461a43fbfa091e2a37994f0bb4860168de722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 3 Oct 2024 15:10:17 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main automake revision a04bdc3a0b0b6ccb03f401fbf5a962de --- ...ameter-parsing-in-test-driver-script.patch | 8 +- ...-primary-prefix-invalid-couples-test.patch | 26 - automake-1.16.5.tar.xz | 3 - automake-1.16.5.tar.xz.sig | 16 - automake-1.17.tar.xz | 3 + automake-1.17.tar.xz.sig | 16 + automake-require_file.patch | 24 - automake-suse-vendor.patch | 123 +- automake.changes | 43 + automake.spec | 9 +- ...Fix-type-defaults-error-in-link_cond.patch | 31 - ...icit-function-declaration-in-depcomp.patch | 56 - ...avoid-implicit-function-declarations.patch | 260 ---- ...to-prevent-flex-from-including-unist.patch | 1166 ----------------- 14 files changed, 133 insertions(+), 1651 deletions(-) delete mode 100644 automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch delete mode 100644 automake-1.16.5.tar.xz delete mode 100644 automake-1.16.5.tar.xz.sig create mode 100644 automake-1.17.tar.xz create mode 100644 automake-1.17.tar.xz.sig delete mode 100644 automake-require_file.patch delete mode 100644 tests-Fix-type-defaults-error-in-link_cond.patch delete mode 100644 tests-avoid-implicit-function-declaration-in-depcomp.patch delete mode 100644 tests-avoid-implicit-function-declarations.patch delete mode 100644 tests-don-t-try-to-prevent-flex-from-including-unist.patch diff --git a/0001-correct-parameter-parsing-in-test-driver-script.patch b/0001-correct-parameter-parsing-in-test-driver-script.patch index cf49b6e..3fd7e9a 100644 --- a/0001-correct-parameter-parsing-in-test-driver-script.patch +++ b/0001-correct-parameter-parsing-in-test-driver-script.patch @@ -14,9 +14,9 @@ Index: automake-1.16.3/lib/test-driver =================================================================== --- automake-1.16.3.orig/lib/test-driver +++ automake-1.16.3/lib/test-driver -@@ -58,21 +58,26 @@ trs_file= # Where to save the metadata - expect_failure=no +@@ -64,22 +64,27 @@ expect_failure=no color_tests=no + collect_skipped_logs=yes enable_hard_errors=yes -while test $# -gt 0; do - case $1 in @@ -29,11 +29,12 @@ Index: automake-1.16.3/lib/test-driver + fi + case $arg 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;; @@ -41,6 +42,7 @@ Index: automake-1.16.3/lib/test-driver + --log-file) log_file=$val;; + --trs-file) trs_file=$val;; + --color-tests) color_tests=$val;; ++ --collect-skipped-logs) collect_skipped_logs=$val;; + --expect-failure) expect_failure=$val;; + --enable-hard-errors) enable_hard_errors=$val;; + --) break;; diff --git a/automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch b/automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch deleted file mode 100644 index 545c97a..0000000 --- a/automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Andreas Stieger -Subject: fix test failures in openSUSE Factory -Date: Fri, 16 Aug 2013 22:59:41 +0100 -Upstream: no - -The test suite fails for factory comparing the output of two command runs. -As only the content is relevant, not the order, sort befor diffing to fix. - ---- - t/primary-prefix-invalid-couples.tap | 2 ++ - 1 file changed, 2 insertions(+) - -Index: automake-1.15.1/t/primary-prefix-invalid-couples.tap -=================================================================== ---- automake-1.15.1.orig/t/primary-prefix-invalid-couples.tap -+++ automake-1.15.1/t/primary-prefix-invalid-couples.tap -@@ -186,7 +186,9 @@ grep -v 'dir.* not a legitimate director - # Check that the same failures are present without the '--add-missing' - # option. - mv stderr stderr.old -+sort stderr.old -o stderr.old - AUTOMAKE_fails -d "automake error out on mismatched prefix/primary couples" -+sort stderr -o stderr - command_ok_ "... and with the same diagnostic of 'automake -a'" \ - diff stderr.old stderr - diff --git a/automake-1.16.5.tar.xz b/automake-1.16.5.tar.xz deleted file mode 100644 index 20f0f01..0000000 --- a/automake-1.16.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f01d58cd6d9d77fbdca9eb4bbd5ead1988228fdb73d6f7a201f5f8d6b118b469 -size 1601740 diff --git a/automake-1.16.5.tar.xz.sig b/automake-1.16.5.tar.xz.sig deleted file mode 100644 index 1580b9a..0000000 --- a/automake-1.16.5.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAmFac7IACgkQf9n8ywAL -7u7TGw/8CdJWZAdWeg8tqnthdtz4BIVr0JcqWWtv7eyYc0G66u9OaAUnGGlRLh+V -Uhign3A/HsJQkwUqEw7V1N/RBT8HtB1eDXu3H/E4XPZE7nuxlmBfy2gO4TLUmWRd -SSS8L/AEy0kWcYOGUJuk9xS+sAeDMPor2erHxx/Yo6S9tLyNpPK/rPas5Q/ZqAJf -EI9vMtaw9qedW16LkOqvrQ8U6VHOWgSS0xRgUNj8u2yG2TpNqEbyqS94fiNFtoQx -5BWzhXcunDV85LzGuqYiBkmDBLd2Ldr1WhCHh7iA/LoD8xqoLnvLQfcb8cwpHpKx -PIqGgSIcaRwcbf4dQwNWPV5d3NXyU1vE9FzooVrhyjv6uWwT4SK2jYHaNUlP34fX -RtpkAk+G79HLJCZyWjjLhVAlTxoMH+4RnzMjbzotpZp80WhQW0/mM23Hl14uEpuf -bGNiFBHx8JEbb4vCQZrudRDMPA76GTYaZRMsRIDmta7g/JURf6roOKDOWs4gPMM5 -JspOopPPyvUDt5jQRkOj1Q/nyAsrF5lCuC3RrkgQwBb4ZQ9cyLTPC5dHirV/DI4a -erM+mfDiH4coTaZ/ML4jtUvVXJreioMEMoW6KJvo09X09bEhv/0JUa/jmo9N+hoc -9T848ej8oGIswE5gG/qFVRA2I/as7oQcCEqRILf0sH0RYm5HEdk= -=lQXz ------END PGP SIGNATURE----- diff --git a/automake-1.17.tar.xz b/automake-1.17.tar.xz new file mode 100644 index 0000000..88b0536 --- /dev/null +++ b/automake-1.17.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8920c1fc411e13b90bf704ef9db6f29d540e76d232cb3b2c9f4dc4cc599bd990 +size 1652632 diff --git a/automake-1.17.tar.xz.sig b/automake-1.17.tar.xz.sig new file mode 100644 index 0000000..d4a070b --- /dev/null +++ b/automake-1.17.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEFV0/xQDINEhtHupnf9n8ywAL7u4FAmaQvW4ACgkQf9n8ywAL +7u7+WA/9EezHCJlBRweh9SWSA9GFKWpZ0UCGWHOi98bUCglxnuiSCfK5hsV5iw2Z +JRvKujnP/0fKFjkHoQF0HLYGgSEKp9NOH5efurqd1XexGhpgtt9vsHLxukOWFnp7 +eoWOUw0q2OYat9ENunxfi5w06mdOL2QS6u6IcimYQO//XWb38lqxTs5SY617YbIk +dzhsE8E9Tk137NSsJPtopIDStMahz6B29wPgWBS4BiPwzyLMeANYudmt1epQjW/d +xkW131Pe/pDwuRs89eVMDXBVroVv+kv1Dqzm9byXOQFLsjSRLV6Ej83narg+wlUf +h4UFXIBHoyHh7k0zXIpPXje9td6hCankmEFnn52yOR1h9fFQ1gse4XGqan2AR/LK +qlWVDbfzeplUc+t6jd4WKA+q2NI3XzUk020SiMbGmsmE1EKCOfTaMGDHdOK/bdEy +DhN5rpqsK4fP5G1sJ0EXwNcyVTU9Sv91Lg7pohIv3W0JkyqLqT6D53Owc9FD05wI +Oit5V64XFdYZ989L5UXZbe+AD3FPnZoOBpSqSXpA1Ifi3BZrGDyiK5uaUgDKnc44 +BQvNeUGjCpRu4fNPPhSfuqaKjqUCm4PKwymtGA8ZC1QSVmTNdyJfn1V5WqWk2dLe +EpoPY9Yz0UtOvIcbwm6YqzzdX8Rbgy6Io24ooxDFckqupx232Ng= +=Agm1 +-----END PGP SIGNATURE----- diff --git a/automake-require_file.patch b/automake-require_file.patch deleted file mode 100644 index 2511253..0000000 --- a/automake-require_file.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- - bin/automake.in | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -Index: automake-1.16.5/bin/automake.in -=================================================================== ---- automake-1.16.5.orig/bin/automake.in -+++ automake-1.16.5/bin/automake.in -@@ -7617,12 +7617,14 @@ sub required_file_check_or_copy - my $fullfile = "$dir/$file"; - my $found_it = 0; - my $dangling_sym = 0; -+ my $thisdir = dirname ($fullfile); -+ my $thisfile = basename ($fullfile); - - if (-l $fullfile && ! -f $fullfile) - { - $dangling_sym = 1; - } -- elsif (dir_has_case_matching_file ($dir, $file)) -+ elsif (dir_has_case_matching_file ($thisdir, $thisfile)) - { - $found_it = 1; - } diff --git a/automake-suse-vendor.patch b/automake-suse-vendor.patch index db7deb4..9c6c2f2 100644 --- a/automake-suse-vendor.patch +++ b/automake-suse-vendor.patch @@ -1,8 +1,8 @@ -Index: automake-1.16.5/lib/config.guess -=================================================================== ---- automake-1.16.5.orig/lib/config.guess -+++ automake-1.16.5/lib/config.guess -@@ -188,6 +188,17 @@ Linux|GNU|GNU/*) +diff --git a/lib/config.guess b/lib/config.guess +index f6d217a49..67f9aa0fb 100755 +--- a/lib/config.guess ++++ b/lib/config.guess +@@ -194,6 +194,17 @@ Linux|GNU|GNU/*) ;; esac @@ -20,7 +20,7 @@ Index: automake-1.16.5/lib/config.guess # Note: order is significant - the case branches are not exclusive. case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in -@@ -269,46 +280,46 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME +@@ -275,46 +286,46 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -80,7 +80,7 @@ Index: automake-1.16.5/lib/config.guess ;; mips:OSF1:*.*) GUESS=mips-dec-osf1 -@@ -370,13 +381,13 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME +@@ -376,13 +387,13 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in GUESS=$UNAME_MACHINE-dec-osf$OSF_REL ;; Amiga*:UNIX_System_V:4.0:*) @@ -97,7 +97,7 @@ Index: automake-1.16.5/lib/config.guess ;; *:OS/390:*:*) GUESS=i370-ibm-openedition -@@ -391,7 +402,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME +@@ -397,7 +408,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in GUESS=arm-acorn-riscix$UNAME_RELEASE ;; arm*:riscos:*:*|arm*:RISCOS:*:*) @@ -106,7 +106,7 @@ Index: automake-1.16.5/lib/config.guess ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) GUESS=hppa1.1-hitachi-hiuxmpp -@@ -505,7 +516,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME +@@ -511,7 +522,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in GUESS=m68k-hades-mint$UNAME_RELEASE ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) @@ -115,7 +115,7 @@ Index: automake-1.16.5/lib/config.guess ;; m68k:machten:*:*) GUESS=m68k-apple-machten$UNAME_RELEASE -@@ -818,9 +829,9 @@ EOF +@@ -824,9 +835,9 @@ EOF ;; i*86:OSF1:*:*) if test -x /usr/sbin/sysversion ; then @@ -127,7 +127,7 @@ Index: automake-1.16.5/lib/config.guess fi ;; parisc*:Lites*:*:*) -@@ -885,10 +896,10 @@ EOF +@@ -891,10 +902,10 @@ EOF GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE ;; sparc*:BSD/OS:*:*) @@ -140,7 +140,7 @@ Index: automake-1.16.5/lib/config.guess ;; arm:FreeBSD:*:*) UNAME_PROCESSOR=`uname -p` -@@ -897,10 +908,10 @@ EOF +@@ -903,10 +914,10 @@ EOF | grep -q __ARM_PCS_VFP then FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` @@ -153,7 +153,7 @@ Index: automake-1.16.5/lib/config.guess fi ;; *:FreeBSD:*:*) -@@ -912,7 +923,7 @@ EOF +@@ -918,7 +929,7 @@ EOF UNAME_PROCESSOR=i586 ;; esac FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` @@ -162,7 +162,7 @@ Index: automake-1.16.5/lib/config.guess ;; i*:CYGWIN*:*) GUESS=$UNAME_MACHINE-pc-cygwin -@@ -935,10 +946,10 @@ EOF +@@ -944,10 +955,10 @@ EOF GUESS=i586-pc-interix$UNAME_RELEASE ;; authenticamd | genuineintel | EM64T) @@ -175,7 +175,7 @@ Index: automake-1.16.5/lib/config.guess ;; esac ;; i*:UWIN*:*) -@@ -949,29 +960,29 @@ EOF +@@ -958,7 +969,7 @@ EOF ;; prep*:SunOS:5.*:*) SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` @@ -184,25 +184,25 @@ Index: automake-1.16.5/lib/config.guess ;; *:GNU:*:*) # the GNU system - GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` - GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` -- GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL -+ GUESS=$GNU_ARCH-${VENDOR}-$LIBC$GNU_REL +@@ -976,10 +987,10 @@ EOF + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - 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 -+ GUESS=$UNAME_MACHINE-${VENDOR}-$GNU_SYS$GNU_REL-$LIBC + *:[Mm]anagarm:*:*) +- GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" ++ GUESS="$UNAME_MACHINE-${VENDOR}-managarm-mlibc" ;; *:Minix:*:*) - GUESS=$UNAME_MACHINE-unknown-minix + GUESS=$UNAME_MACHINE-${VENDOR}-minix ;; aarch64:Linux:*:*) -- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC -+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC + set_cc_for_build +@@ -1002,11 +1013,11 @@ EOF + eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;; + esac + fi +- GUESS=$CPU-unknown-linux-$LIBCABI ++ GUESS=$CPU-${VENDOR}-linux-$LIBCABI ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be @@ -211,7 +211,7 @@ Index: automake-1.16.5/lib/config.guess ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in -@@ -985,29 +996,29 @@ EOF +@@ -1020,29 +1031,29 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi @@ -247,7 +247,7 @@ Index: automake-1.16.5/lib/config.guess ;; cris:Linux:*:*) GUESS=$UNAME_MACHINE-axis-linux-$LIBC -@@ -1016,31 +1027,31 @@ EOF +@@ -1051,40 +1062,40 @@ EOF GUESS=$UNAME_MACHINE-axis-linux-$LIBC ;; e2k:Linux:*:*) @@ -263,8 +263,7 @@ Index: automake-1.16.5/lib/config.guess + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; i*86:Linux:*:*) -- GUESS=$UNAME_MACHINE-pc-linux-$LIBC -+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC + GUESS=$UNAME_MACHINE-pc-linux-$LIBC ;; ia64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC @@ -274,7 +273,19 @@ Index: automake-1.16.5/lib/config.guess - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; - loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + kvx:Linux:*:*) +- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ++ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC + ;; + kvx:cos:*:*) +- GUESS=$UNAME_MACHINE-unknown-cos ++ GUESS=$UNAME_MACHINE-${VENDOR}-cos + ;; + kvx:mbr:*:*) +- GUESS=$UNAME_MACHINE-unknown-mbr ++ GUESS=$UNAME_MACHINE-${VENDOR}-mbr + ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBC ;; @@ -288,12 +299,8 @@ Index: automake-1.16.5/lib/config.guess ;; mips:Linux:*:* | mips64:Linux:*:*) set_cc_for_build -@@ -1088,60 +1099,60 @@ EOF - EOF - 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; } -+ test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-${VENDOR}-linux-$LIBCABI"; exit; } +@@ -1135,57 +1146,57 @@ EOF + test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC @@ -367,12 +374,8 @@ Index: automake-1.16.5/lib/config.guess ;; vax:Linux:*:*) GUESS=$UNAME_MACHINE-dec-linux-$LIBC -@@ -1157,10 +1168,10 @@ EOF - LIBCABI=${LIBC}x32 - fi - fi -- GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI -+ GUESS=$UNAME_MACHINE-${VENDOR}-linux-$LIBCABI +@@ -1215,7 +1226,7 @@ EOF + GUESS=$CPU-pc-linux-$LIBCABI ;; xtensa*:Linux:*:*) - GUESS=$UNAME_MACHINE-unknown-linux-$LIBC @@ -380,7 +383,7 @@ Index: automake-1.16.5/lib/config.guess ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -1182,16 +1193,16 @@ EOF +@@ -1237,16 +1248,16 @@ EOF GUESS=$UNAME_MACHINE-pc-os2-emx ;; i*86:XTS-300:*:STOP) @@ -400,7 +403,7 @@ Index: automake-1.16.5/lib/config.guess ;; i*86:*DOS:*:*) GUESS=$UNAME_MACHINE-pc-msdosdjgpp -@@ -1211,7 +1222,7 @@ EOF +@@ -1266,7 +1277,7 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac @@ -409,7 +412,7 @@ Index: automake-1.16.5/lib/config.guess ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then -@@ -1250,7 +1261,7 @@ EOF +@@ -1305,7 +1316,7 @@ EOF if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. @@ -418,7 +421,7 @@ Index: automake-1.16.5/lib/config.guess fi ;; mini*:CTIX:SYS*5:*) -@@ -1287,19 +1298,19 @@ EOF +@@ -1342,19 +1353,19 @@ EOF /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*:*) @@ -442,7 +445,7 @@ Index: automake-1.16.5/lib/config.guess ;; SM[BE]S:UNIX_SV:*:*) GUESS=mips-dde-sysv$UNAME_RELEASE -@@ -1349,7 +1360,7 @@ EOF +@@ -1404,7 +1415,7 @@ EOF if test -d /usr/nec; then GUESS=mips-nec-sysv$UNAME_RELEASE else @@ -451,16 +454,16 @@ Index: automake-1.16.5/lib/config.guess fi ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. -@@ -1365,7 +1376,7 @@ EOF - GUESS=i586-pc-haiku +@@ -1423,7 +1434,7 @@ EOF + GUESS=powerpc-apple-haiku ;; - x86_64:Haiku:*:*) -- GUESS=x86_64-unknown-haiku -+ GUESS=x86_64-${VENDOR}-haiku + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) +- GUESS=$UNAME_MACHINE-unknown-haiku ++ GUESS=$UNAME_MACHINE-${VENDOR}-haiku ;; SX-4:SUPER-UX:*:*) GUESS=sx4-nec-superux$UNAME_RELEASE -@@ -1478,13 +1489,13 @@ EOF +@@ -1536,13 +1547,13 @@ EOF elif test "x${cputype-}" != x; then UNAME_MACHINE=$cputype fi @@ -477,7 +480,7 @@ Index: automake-1.16.5/lib/config.guess ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) GUESS=pdp10-dec-tops20 -@@ -1493,17 +1504,17 @@ EOF +@@ -1551,17 +1562,17 @@ EOF GUESS=pdp10-xkl-tops20 ;; *:TOPS-20:*:*) @@ -498,8 +501,8 @@ Index: automake-1.16.5/lib/config.guess ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` -@@ -1523,16 +1534,16 @@ EOF - GUESS=$UNAME_MACHINE-pc-rdos +@@ -1584,19 +1595,19 @@ EOF + GUESS=$UNAME_MACHINE-pc-fiwix ;; *:AROS:*:*) - GUESS=$UNAME_MACHINE-unknown-aros @@ -517,5 +520,9 @@ Index: automake-1.16.5/lib/config.guess - GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE + GUESS=$UNAME_MACHINE-${VENDOR}-unleashed$UNAME_RELEASE ;; + *:Ironclad:*:*) +- GUESS=$UNAME_MACHINE-unknown-ironclad ++ GUESS=$UNAME_MACHINE-${VENDOR}-ironclad + ;; esac diff --git a/automake.changes b/automake.changes index a0e72a0..bd4eafd 100644 --- a/automake.changes +++ b/automake.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Fri Jul 12 17:18:39 UTC 2024 - Christoph G + +- update to 1.17 + - AM_PATH_PYTHON will, after checking "python", prefer any Python 3 + version (latest versions checked first) over any Python 2 + version. If a specific version of Python 2 is still needed, the + $PYTHON variable should be set beforehand. + - AM_PATH_PYTHON will also search for Python versions 3.20 through 3.10. + It previously searched for 3.9 through 3.0. + - RANLIB may be overridden on a per-target basis. + - AM_TEXI2FLAGS may be defined to pass extra flags to TEXI2DVI & TEXI2PDF. + - New option "posix" to emit the special target .POSIX for make. + - Systems with non-POSIX "rm -f" behavior are now supported, and the + prior intent to drop support for them has been reversed. + The ACCEPT_INFERIOR_RM_PROGRAM setting no longer exists. + - Variables using escaped \# will trigger portability warnings, but be + retained when appended. GNU Make & BSD Makes are known to support it. + - GNU Make's default pattern rules are disabled, for speed and debugging. + (.SUFFIXES was already cleared.) + - For Texinfo documents, if a .texi.in file exists, but no .texi, the + .texi.in will be read. Texinfo source files need not be present at + all, and if present, need not contain @setfilename. Then the file name + as given in the Makefile.am will be used. If @setfilename is present, + it should be the basename of the Texinfo file, extended with .info. + - aclocal has a new option --aclocal-path to override $ACLOCAL_PATH. + - The missing script also supports autoreconf, autogen, and perl. + - test-suite.log now contains basic system information, and the + console message about bug reporting on failure has a bit more detail. + - When using the (default) "parallel" test driver, you can now omit the + output of skipped tests from test-suite.log by defining the + variable IGNORE_SKIPPED_LOGS to a non-empty value. (bug#71422) +- Drop patches now included in 1.17 + * tests-Fix-type-defaults-error-in-link_cond.patch + * tests-avoid-implicit-function-declaration-in-depcomp.patch + * tests-don-t-try-to-prevent-flex-from-including-unist.patch + * tests-avoid-implicit-function-declarations.patch +- Drop patch automake-require_file.patch with different upstream fix +- Drop no longer necessary patch + automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch +- Ajust patches automake-suse-vendor.patch and + 0001-correct-parameter-parsing-in-test-driver-script.patch + ------------------------------------------------------------------- Tue May 7 15:46:57 UTC 2024 - Valentin Lefebvre diff --git a/automake.spec b/automake.spec index 52fe964..43ab7e1 100644 --- a/automake.spec +++ b/automake.spec @@ -26,7 +26,7 @@ %define nsuffix %{nil} %endif Name: automake%{nsuffix} -Version: 1.16.5 +Version: 1.17 Release: 0 Summary: A Program for Automatically Generating GNU-Style Makefile.in Files # docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT @@ -38,14 +38,7 @@ Source1: https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig # taken from https://savannah.gnu.org/project/release-gpgkeys.php?group=automake&download=1 Source2: automake.keyring Source3: automake-rpmlintrc -Patch2: automake-require_file.patch -Patch3: automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch Patch5: 0001-correct-parameter-parsing-in-test-driver-script.patch -# PATCH-FIX-UPSTREAM: Fix testuite with GCC-14 -Patch6: tests-Fix-type-defaults-error-in-link_cond.patch -Patch7: tests-avoid-implicit-function-declaration-in-depcomp.patch -Patch8: tests-don-t-try-to-prevent-flex-from-including-unist.patch -Patch9: tests-avoid-implicit-function-declarations.patch Patch100: automake-suse-vendor.patch BuildRequires: autoconf >= 2.69 BuildRequires: bison diff --git a/tests-Fix-type-defaults-error-in-link_cond.patch b/tests-Fix-type-defaults-error-in-link_cond.patch deleted file mode 100644 index db29667..0000000 --- a/tests-Fix-type-defaults-error-in-link_cond.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2a9908da9dbc075ee6c4e853cf3be0365b15f202 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= -Date: Mon, 12 Dec 2022 08:05:53 +0100 -Subject: [PATCH] tests: Fix 'type defaults' error in link_cond due to main not - being properly declared - -This is related to an effort to prepare Automake for future GCC/Clang -versions which set c99 as default standard to be used. -Not properly declaring main as "int main(...)" is rejected since c99. - -* t/link_cond.sh: Add (void) to main definition. ---- - t/link_cond.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/t/link_cond.sh b/t/link_cond.sh -index 45d0d7f40..889623131 100644 ---- a/t/link_cond.sh -+++ b/t/link_cond.sh -@@ -52,7 +52,7 @@ $AUTOCONF - rm -f *.c++ - cat > less.c <<'END' - /* Valid C but deliberately invalid C++ */ --main () -+int main (void) - { - int new = 0; - return new; --- -2.35.3 - diff --git a/tests-avoid-implicit-function-declaration-in-depcomp.patch b/tests-avoid-implicit-function-declaration-in-depcomp.patch deleted file mode 100644 index 55706b1..0000000 --- a/tests-avoid-implicit-function-declaration-in-depcomp.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 6c10512cce14d8537b33c2026aadbdbb1ff215c8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= -Date: Mon, 28 Aug 2023 06:11:39 -0700 -Subject: [PATCH] tests: avoid implicit function declaration in t/depcomp.sh. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This patch is from https://bugs.gnu.org/60962. - -* t/ax/depcomp.sh: save and restore sub/subfoo.h, so its -declaration will be seen, as required by C99. -* THANKS: add Frédéric. ---- - THANKS | 1 + - t/ax/depcomp.sh | 5 +++-- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/THANKS b/THANKS -index 446c84e1b..1217d3c2a 100644 ---- a/THANKS -+++ b/THANKS -@@ -138,6 +138,7 @@ Florian Briegel briegel@zone42.de - Francesco Salvestrini salvestrini@gmail.com - François Pinard pinard@iro.umontreal.ca - Fred Fish fnf@ninemoons.com -+Frédéric Bérat fberat@redhat.com - Ganesan Rajagopal rganesan@novell.com - Garrett D'Amore garrett@qualcomm.com - Garth Corral garthc@inktomi.com -diff --git a/t/ax/depcomp.sh b/t/ax/depcomp.sh -index 7a3ac63a7..1d29673fe 100644 ---- a/t/ax/depcomp.sh -+++ b/t/ax/depcomp.sh -@@ -243,6 +243,8 @@ cat > sub/subfoo.h <<'END' - #include - extern int subfoo (void); - END -+# Save subfoo.h so we can restore it below; see #60962. -+cp sub/subfoo.h sub/subfoo.save - - cat > src/baz.c <<'END' - #include "baz.h" -@@ -399,8 +401,7 @@ do_test () - && rewrite "$srcdir"/sub/subfoo.h echo 'choke me' \ - && not $MAKE \ - && delete "$srcdir"/sub/subfoo.h \ -- && edit "$srcdir"/sub/subfoo.c -e 1d \ -- && edit "$srcdir"/foo.h -e 2d \ -+ && cp "$srcdir"/sub/subfoo.save "$srcdir"/sub/subfoo.h \ - && make_ok \ - || r='not ok' - result_ "$r" "$pfx dependency tracking works" --- -2.35.3 - diff --git a/tests-avoid-implicit-function-declarations.patch b/tests-avoid-implicit-function-declarations.patch deleted file mode 100644 index 61b9666..0000000 --- a/tests-avoid-implicit-function-declarations.patch +++ /dev/null @@ -1,260 +0,0 @@ -From 80714ea0aba62f025780f432abfbab2e66f6f801 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= -Date: Tue, 29 Aug 2023 11:00:41 -0700 -Subject: [PATCH] tests: avoid implicit function declarations. - -This patch is from https://bugs.gnu.org/59993 (v2 part 2). - -* t/c-demo.sh: This patch is related to an effort to prepare -Automake for future GCC/Clang versions which set c99 as default -standard to be used. - -C99 requires that functions be properly declared before use. -This is true for both user functions and standard functions, -e.g., printf. - -* t/cond35.sh: Likewise. -* t/dist-vs-built-sources.sh: Likewise. -* t/lex-clean.sh: Likewise. -* t/lex-multiple.sh: Likewise. -* t/lex-nodist.sh: Likewise. -* t/ltcond2.sh: Likewise. -* t/ltconv.sh: Likewise. -* t/subobj-clean-lt-pr10697.sh: Likewise. -* t/subobj-clean-pr10697.sh: Likewise. -* t/tags-pr12372.sh: Likewise. -* t/yacc-basic.sh: Likewise. -* t/yacc-clean.sh: Likewise. -* t/yacc-nodist.sh: Likewise. - -This patch is from https://bugs.gnu.org/59993. ---- - t/c-demo.sh | 1 + - t/cond35.sh | 2 ++ - t/dist-vs-built-sources.sh | 1 + - t/lex-clean.sh | 1 + - t/lex-multiple.sh | 4 ++++ - t/lex-nodist.sh | 2 ++ - t/ltcond2.sh | 2 ++ - t/ltconv.sh | 6 ++++++ - t/subobj-clean-lt-pr10697.sh | 10 +++++++++- - t/subobj-clean-pr10697.sh | 10 +++++++++- - t/tags-pr12372.sh | 3 ++- - t/yacc-basic.sh | 1 + - t/yacc-clean.sh | 4 ++++ - t/yacc-nodist.sh | 2 ++ - 14 files changed, 46 insertions(+), 3 deletions(-) - -diff --git a/t/c-demo.sh b/t/c-demo.sh -index 446551958..ee0d5c3ec 100644 ---- a/t/c-demo.sh -+++ b/t/c-demo.sh -@@ -113,6 +113,7 @@ test -f build-aux/compile # We have per-target flags on C sources. - ./configure --enable-dependency-tracking - - cat > src/main.c << 'END' -+#include - #include "foo.h" - #include "bar.h" - int main (void) -diff --git a/t/cond35.sh b/t/cond35.sh -index 8b044644e..a00c9e280 100644 ---- a/t/cond35.sh -+++ b/t/cond35.sh -@@ -71,6 +71,8 @@ END - - cat > tparse.y << 'END' - %{ -+extern int yylex(void); -+ - void yyerror (const char *s) {} - %} - %token EOF -diff --git a/t/dist-vs-built-sources.sh b/t/dist-vs-built-sources.sh -index da8c8fb23..4c73d53b0 100644 ---- a/t/dist-vs-built-sources.sh -+++ b/t/dist-vs-built-sources.sh -@@ -41,6 +41,7 @@ foo_SOURCES = foo.c - END - - cat > foo.c << 'END' -+#include - #include "h.h" - int main (void) { printf ("%s\n", F); return 0; } - END -diff --git a/t/lex-clean.sh b/t/lex-clean.sh -index 4668e97c7..a966b4b07 100644 ---- a/t/lex-clean.sh -+++ b/t/lex-clean.sh -@@ -60,6 +60,7 @@ cat > lexer.l << 'END' - END - - cat > main.c << 'END' -+extern int yylex (void); - int main (void) - { - return yylex (); -diff --git a/t/lex-multiple.sh b/t/lex-multiple.sh -index 6486a012f..32dd854b6 100644 ---- a/t/lex-multiple.sh -+++ b/t/lex-multiple.sh -@@ -58,6 +58,10 @@ cat > main.c << 'END' - #include - #include - -+extern int yylex (void); -+extern int foolex (void); -+extern int bar_lex (void); -+ - int main (int argc, char *argv[]) - { - if (argc != 2) -diff --git a/t/lex-nodist.sh b/t/lex-nodist.sh -index d499aea7f..29f0cb0ec 100644 ---- a/t/lex-nodist.sh -+++ b/t/lex-nodist.sh -@@ -61,6 +61,8 @@ CLEANFILES = $(nodist_prog_SOURCES) - END - - cat > main.c << 'END' -+extern int yylex (void); -+ - int main () - { - return yylex (); -diff --git a/t/ltcond2.sh b/t/ltcond2.sh -index 000d0ad34..c9f7af1dc 100644 ---- a/t/ltcond2.sh -+++ b/t/ltcond2.sh -@@ -73,6 +73,8 @@ void print (void) - END - - cat > main.c <<'END' -+extern void print(void); -+ - int main (void) - { - print(); -diff --git a/t/ltconv.sh b/t/ltconv.sh -index 64e42949a..3c35f50e7 100644 ---- a/t/ltconv.sh -+++ b/t/ltconv.sh -@@ -91,6 +91,12 @@ echo 'int sub22 () { return 22; }' > sub2/sub22/sub22.c - - cat >test.c <<'EOF' - #include -+ -+extern int sub1 (void); -+extern int sub2 (void); -+extern int sub21 (void); -+extern int sub22 (void); -+ - int main () - { - if (1 != sub1 ()) -diff --git a/t/subobj-clean-lt-pr10697.sh b/t/subobj-clean-lt-pr10697.sh -index 0b4bb10a7..94af0778b 100644 ---- a/t/subobj-clean-lt-pr10697.sh -+++ b/t/subobj-clean-lt-pr10697.sh -@@ -83,7 +83,15 @@ libfoo_la_SOURCES = \ - END - - mkdir sub1 sub2 --echo 'int libmain (void)' > main.c -+ -+echo "/* Subobj clean: libtool case*/" > main.c -+for i in 1 2; do -+ for j in a b c d e f; do -+ echo "extern void $j$i (void);" >> main.c -+ done -+done -+ -+echo 'int libmain (void)' >> main.c - echo '{' >> main.c - for i in 1 2; do - for j in a b c d e f; do -diff --git a/t/subobj-clean-pr10697.sh b/t/subobj-clean-pr10697.sh -index 591684bc8..360716ec3 100644 ---- a/t/subobj-clean-pr10697.sh -+++ b/t/subobj-clean-pr10697.sh -@@ -81,7 +81,15 @@ foo_SOURCES = \ - END - - mkdir sub1 sub2 --echo 'int main (void)' > main.c -+ -+echo "/* Subobj clean: generic case*/" > main.c -+for i in 1 2; do -+ for j in a b c d e f; do -+ echo "extern void $j$i (void);" >> main.c -+ done -+done -+ -+echo 'int main (void)' >> main.c - echo '{' >> main.c - for i in 1 2; do - for j in a b c d e f; do -diff --git a/t/tags-pr12372.sh b/t/tags-pr12372.sh -index 7e86f7214..19ac07da4 100644 ---- a/t/tags-pr12372.sh -+++ b/t/tags-pr12372.sh -@@ -53,7 +53,8 @@ noinst_PROGRAMS = zap - zap_SOURCES = zardoz.pc - END - --echo 'int main(void) [ return bar(1); ]' > foo-main.pc -+echo 'extern int bar(int);' > foo-main.pc -+echo 'int main(void) [ return bar(1); ]' >> foo-main.pc - echo 'int bar(int x) { return !x; }' > barbar.c - echo 'int m@in(void) { return 0; }' > sub/zardoz.pc - -diff --git a/t/yacc-basic.sh b/t/yacc-basic.sh -index 51ee5f6a3..be578e14a 100644 ---- a/t/yacc-basic.sh -+++ b/t/yacc-basic.sh -@@ -51,6 +51,7 @@ a : 'a' { exit(0); }; - END - - cat > foo.c << 'END' -+extern int yyparse(void); - int main () { yyparse (); return 1; } - END - -diff --git a/t/yacc-clean.sh b/t/yacc-clean.sh -index d0f793843..da2e3d5b2 100644 ---- a/t/yacc-clean.sh -+++ b/t/yacc-clean.sh -@@ -67,6 +67,8 @@ END - - cat > sub1/parse.y << 'END' - %{ -+#include -+ - int yylex () { return (getchar ()); } - void yyerror (const char *s) {} - %} -@@ -76,6 +78,8 @@ END - cp sub1/parse.y sub2/parse.y - - cat > sub1/main.c << 'END' -+extern int yyparse(void); -+ - int main () - { - return yyparse (); -diff --git a/t/yacc-nodist.sh b/t/yacc-nodist.sh -index 8e5338e94..e3b02b3fa 100644 ---- a/t/yacc-nodist.sh -+++ b/t/yacc-nodist.sh -@@ -80,6 +80,8 @@ BUILT_SOURCES = parse.h - END - - cat > sub1/main.c << 'END' -+extern int yyparse(void); -+ - int main () - { - return yyparse (); --- -2.35.3 - diff --git a/tests-don-t-try-to-prevent-flex-from-including-unist.patch b/tests-don-t-try-to-prevent-flex-from-including-unist.patch deleted file mode 100644 index 64af505..0000000 --- a/tests-don-t-try-to-prevent-flex-from-including-unist.patch +++ /dev/null @@ -1,1166 +0,0 @@ -From c1f34ffe129323ec7ccebf77bc1eee89f97f971e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= -Date: Mon, 28 Aug 2023 18:32:53 -0700 -Subject: [PATCH] tests: don't try to prevent flex from including unistd.h. - -This patch is from https://bugs.gnu.org/59994. - -* t/cond35.sh: This patch is related to an effort to prepare -Automake for future GCC/Clang versions which set c99 as default -standard to be used. - -In the current version of flex, not having unistd.h leads to -implicit function declarations that are not compatible with C99. - -A future version of flex will (hopefully) make the "NO_UNISTD" -flag a no-op, and include unistd.h by default. - -Also, while flex-dedicated tests had this macro set, -yacc tests did not, despite their use of flex. - -For consistency, all the yacc/flex related tests now have the -"--never-interactive" option set in AM_LFLAGS, and do not try -define an isatty function. - -* t/lex-clean-cxx.sh: Likewise. -* t/lex-clean.sh: Likewise. -* t/lex-depend-cxx.sh: Likewise. -* t/lex-depend.sh: Likewise. -* t/lex-header.sh: Likewise. -* t/lex-lib-external.sh: Likewise. -* t/lex-lib.sh: Likewise. -* t/lex-libobj.sh: Likewise. -* t/lex-line.sh: Likewise. -* t/lex-multiple.sh: Likewise. -* t/lex-nodist.sh: Likewise. -* t/lex-noyywrap.sh: Likewise. -* t/lex-pr204.sh: Likewise. -* t/lex-subobj-nodep.sh: Likewise. -* t/lex3.sh: Likewise. -* t/lex5.sh: Likewise. -* t/lexvpath.sh: Likewise. -* t/silent-lex.sh: Likewise. -* t/silent-many-languages.sh: Likewise. -* t/silent-yacc-headers.sh: Likewise. -* t/silent-yacc.sh: Likewise. -* t/subpkg-yacc.sh: Likewise. -* t/suffix10.tap: Likewise. -* t/yacc-auxdir.sh: Likewise. -* t/yacc-basic.sh: Likewise. -* t/yacc-bison-skeleton-cxx.sh: Likewise. -* t/yacc-bison-skeleton.sh: Likewise. -* t/yacc-clean-cxx.sh: Likewise. -* t/yacc-clean.sh: Likewise. -* t/yacc-cxx-grepping.sh: Likewise. -* t/yacc-cxx.sh: Likewise. -* t/yacc-d-basic.sh: Likewise. -* t/yacc-d-cxx.sh: Likewise. -* t/yacc-d-vpath.sh: Likewise. -* t/yacc-deleted-headers.sh: Likewise. -* t/yacc-depend.sh: Likewise. -* t/yacc-depend2.sh: Likewise. -* t/yacc-dist-nobuild-subdir.sh: Likewise. -* t/yacc-dist-nobuild.sh: Likewise. -* t/yacc-dry.sh: Likewise. -* t/yacc-grepping.sh: Likewise. -* t/yacc-grepping2.sh: Likewise. -* t/yacc-headers-and-dist-pr47.sh: Likewise. -* t/yacc-line.sh: Likewise. -* t/yacc-misc.sh: Likewise. -* t/yacc-mix-c-cxx.sh: Likewise. -* t/yacc-nodist.sh: Likewise. -* t/yacc-pr204.sh: Likewise. -* t/yacc-subdir.sh: Likewise. -* t/yacc-vpath.sh: Likewise. -* t/yacc-weirdnames.sh: Likewise. -* t/yflags-cmdline-override.sh: Likewise. -* t/yflags-cxx.sh: Likewise. -* t/yflags-d-false-positives.sh: Likewise. -* t/yflags-force-conditional.sh: Likewise. -* t/yflags-force-override.sh: Likewise. -* t/yflags-var-expand.sh: Likewise. -* t/yflags.sh: Likewise. ---- - t/cond35.sh | 4 +--- - t/lex-clean-cxx.sh | 4 ++-- - t/lex-clean.sh | 5 ++--- - t/lex-depend-cxx.sh | 4 ++-- - t/lex-depend.sh | 5 ++--- - t/lex-header.sh | 6 ++---- - t/lex-lib-external.sh | 5 ++--- - t/lex-lib.sh | 5 ++--- - t/lex-libobj.sh | 5 ++--- - t/lex-line.sh | 7 ++++--- - t/lex-multiple.sh | 7 +++---- - t/lex-nodist.sh | 5 ++--- - t/lex-noyywrap.sh | 5 ++--- - t/lex-pr204.sh | 5 ++--- - t/lex-subobj-nodep.sh | 5 ++--- - t/lex3.sh | 5 ++--- - t/lex5.sh | 4 +--- - t/lexvpath.sh | 11 ++--------- - t/silent-lex.sh | 7 ++++--- - t/silent-many-languages.sh | 1 + - t/silent-yacc-headers.sh | 1 + - t/silent-yacc.sh | 4 ++++ - t/subpkg-yacc.sh | 2 ++ - t/suffix10.tap | 2 ++ - t/yacc-auxdir.sh | 4 ++++ - t/yacc-basic.sh | 2 ++ - t/yacc-bison-skeleton-cxx.sh | 2 ++ - t/yacc-bison-skeleton.sh | 2 ++ - t/yacc-clean-cxx.sh | 2 ++ - t/yacc-clean.sh | 2 ++ - t/yacc-cxx-grepping.sh | 2 ++ - t/yacc-cxx.sh | 2 ++ - t/yacc-d-basic.sh | 2 ++ - t/yacc-d-cxx.sh | 2 ++ - t/yacc-d-vpath.sh | 2 ++ - t/yacc-deleted-headers.sh | 2 ++ - t/yacc-depend.sh | 2 ++ - t/yacc-depend2.sh | 2 ++ - t/yacc-dist-nobuild-subdir.sh | 2 ++ - t/yacc-dist-nobuild.sh | 2 ++ - t/yacc-dry.sh | 2 ++ - t/yacc-grepping.sh | 2 ++ - t/yacc-grepping2.sh | 2 ++ - t/yacc-headers-and-dist-pr47.sh | 2 ++ - t/yacc-line.sh | 4 ++++ - t/yacc-misc.sh | 2 ++ - t/yacc-mix-c-cxx.sh | 2 ++ - t/yacc-nodist.sh | 2 ++ - t/yacc-pr204.sh | 2 ++ - t/yacc-subdir.sh | 2 ++ - t/yacc-vpath.sh | 2 ++ - t/yacc-weirdnames.sh | 2 ++ - t/yflags-cmdline-override.sh | 2 ++ - t/yflags-cxx.sh | 2 ++ - t/yflags-d-false-positives.sh | 2 ++ - t/yflags-force-conditional.sh | 2 ++ - t/yflags-force-override.sh | 2 ++ - t/yflags-var-expand.sh | 2 ++ - t/yflags.sh | 2 ++ - 59 files changed, 125 insertions(+), 63 deletions(-) - -diff --git a/t/cond35.sh b/t/cond35.sh -index dc3b8aae9..8b044644e 100644 ---- a/t/cond35.sh -+++ b/t/cond35.sh -@@ -30,6 +30,7 @@ EOF - - cat > Makefile.am <<'EOF' - AM_YFLAGS = -d -+AM_LFLAGS = --never-interactive - - BUILT_SOURCES = tparse.h - -@@ -58,9 +59,6 @@ $FGREP 'tparse.h' Makefile.in # For debugging. - test $($FGREP -c 'tparse.h:' Makefile.in) -eq 1 - - cat > tscan.l << 'END' --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "END" return EOF; - %% -diff --git a/t/lex-clean-cxx.sh b/t/lex-clean-cxx.sh -index 8a086304f..fea054457 100644 ---- a/t/lex-clean-cxx.sh -+++ b/t/lex-clean-cxx.sh -@@ -29,6 +29,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo bar baz qux - - foo_SOURCES = mainfoo.cc parsefoo.lxx -@@ -57,6 +57,4 @@ cat > parsefoo.lxx << 'END' - extern "C" YY_DECL; --#define YY_NO_UNISTD_H 1 --int isatty (int fd) { return 0; } - %} - %% - "GOOD" return EOF; -diff --git a/t/lex-clean.sh b/t/lex-clean.sh -index 1ee7d8f5b..4668e97c7 100644 ---- a/t/lex-clean.sh -+++ b/t/lex-clean.sh -@@ -29,6 +29,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo bar baz qux - - foo_SOURCES = main.c lexer.l -@@ -52,9 +54,6 @@ LDADD = $(LEXLIB) - END - - cat > lexer.l << 'END' --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "GOOD" return EOF; - . -diff --git a/t/lex-depend-cxx.sh b/t/lex-depend-cxx.sh -index 682b2ccc5..cc7004eab 100644 ---- a/t/lex-depend-cxx.sh -+++ b/t/lex-depend-cxx.sh -@@ -27,6 +27,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - noinst_PROGRAMS = joe moe - joe_SOURCES = joe.ll - moe_SOURCES = moe.l++ -@@ -50,6 +52,4 @@ cat > joe.ll << 'END' - extern "C" YY_DECL; --#define YY_NO_UNISTD_H 1 --int isatty (int fd) { return 0; } - %} - %% - "foo" return EOF; -diff --git a/t/lex-depend.sh b/t/lex-depend.sh -index 16f937ef1..68cc5ee7b 100644 ---- a/t/lex-depend.sh -+++ b/t/lex-depend.sh -@@ -27,6 +27,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = zoo - zoo_SOURCES = joe.l - LDADD = $(LEXLIB) -@@ -42,9 +44,6 @@ test-obj-updated: joe.$(OBJEXT) - END - - cat > joe.l << 'END' --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "foo" return EOF; - . -diff --git a/t/lex-header.sh b/t/lex-header.sh -index 22567642e..48b42457a 100644 ---- a/t/lex-header.sh -+++ b/t/lex-header.sh -@@ -33,6 +33,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo - foo_SOURCES = lexer.l main.c mylex.h - foo_LFLAGS = --header-file=mylex.h -@@ -45,9 +47,6 @@ END - - cat > lexer.l << 'END' - %option noyywrap --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "GOOD" return EOF; - . -@@ -55,7 +54,6 @@ cat > lexer.l << 'END' - END - - cat > main.c <<'END' --#define YY_NO_UNISTD_H 1 - #include "mylex.h" - int main (void) - { -diff --git a/t/lex-lib-external.sh b/t/lex-lib-external.sh -index 85403612f..25ad2a39b 100644 ---- a/t/lex-lib-external.sh -+++ b/t/lex-lib-external.sh -@@ -28,6 +28,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = lexer - lexer_SOURCES = foo.l - lexer_LDADD = $(LEXLIB) -@@ -42,9 +44,6 @@ have-lexlib: - END - - cat > foo.l <<'END' --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "GOOD" return EOF; - . -diff --git a/t/lex-lib.sh b/t/lex-lib.sh -index f0a0d37f6..7734fd228 100644 ---- a/t/lex-lib.sh -+++ b/t/lex-lib.sh -@@ -31,6 +31,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = lexer - lexer_SOURCES = foo.l - lexer_LDADD = $(LEXLIB) -@@ -47,9 +49,6 @@ int yywrap (void) - END - - cat > foo.l <<'END' --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "END" return EOF; - . -diff --git a/t/lex-libobj.sh b/t/lex-libobj.sh -index b26381fcf..6e36a98ed 100644 ---- a/t/lex-libobj.sh -+++ b/t/lex-libobj.sh -@@ -32,6 +32,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - noinst_PROGRAMS = foo - foo_SOURCES = foo.l - foo_LDADD = $(LEXLIB) $(LIBOBJS) -@@ -45,9 +47,6 @@ int yywrap (void) - END - - cat > foo.l <<'END' --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "END" return EOF; - . -diff --git a/t/lex-line.sh b/t/lex-line.sh -index 340800ef2..5f9145847 100644 ---- a/t/lex-line.sh -+++ b/t/lex-line.sh -@@ -32,6 +32,8 @@ END - mkdir dir sub sub/dir - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - SUBDIRS = sub - bin_PROGRAMS = foo bar - LDADD = $(LEXLIB) -@@ -44,6 +46,8 @@ bar-quux.@OBJEXT@: bar-quux.c - END - - cat > sub/Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - AUTOMAKE_OPTIONS = subdir-objects - noinst_PROGRAMS = foo bar - ## We already used $(LEXLIB) above, so try @LEXLIB@ now. -@@ -57,9 +61,6 @@ dir/quux.@OBJEXT@: dir/quux.c - END - - cat > zardoz.l << 'END' --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "END" return EOF; - . -diff --git a/t/lex-multiple.sh b/t/lex-multiple.sh -index 9565bd6b8..6486a012f 100644 ---- a/t/lex-multiple.sh -+++ b/t/lex-multiple.sh -@@ -31,7 +31,9 @@ AC_PROG_RANLIB - AC_OUTPUT - END - --cat > Makefile.am << 'END' -+cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = zardoz - - zardoz_SOURCES = main.c -@@ -72,9 +74,6 @@ int main (int argc, char *argv[]) - END - - cat > 0.l << 'END' --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "VANILLA" { printf (":%s:\n", yytext); return 121; } - . { printf (":%s:\n", yytext); return 1; } -diff --git a/t/lex-nodist.sh b/t/lex-nodist.sh -index 73e23a13e..d499aea7f 100644 ---- a/t/lex-nodist.sh -+++ b/t/lex-nodist.sh -@@ -31,6 +31,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - .PHONY: test-build test-dist - test-build: all - ls -l -@@ -45,9 +47,6 @@ check-local: test-build test-dist - lexer.l: - rm -f $@ $@-t - :; { : \ -- && echo '%{' \ -- && echo '#define YY_NO_UNISTD_H 1' \ -- && echo '%}' \ - && echo '%%' \ - && echo '"GOOD" return EOF;' \ - && echo '.'; \ -diff --git a/t/lex-noyywrap.sh b/t/lex-noyywrap.sh -index 1c61a1ab3..5ec68b9ba 100644 ---- a/t/lex-noyywrap.sh -+++ b/t/lex-noyywrap.sh -@@ -26,6 +26,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo - foo_SOURCES = foo.l - -@@ -37,9 +39,6 @@ END - - cat > foo.l << 'END' - %option noyywrap --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "GOOD" return EOF; - . -diff --git a/t/lex-pr204.sh b/t/lex-pr204.sh -index ebfaafef5..cbad1c266 100644 ---- a/t/lex-pr204.sh -+++ b/t/lex-pr204.sh -@@ -35,6 +35,8 @@ EOF - # The LEXER2 intermediate variable is there to make sure Automake - # matches 'nodist_' against the right variable name... - cat > Makefile.am << 'EOF' -+AM_LFLAGS = --never-interactive -+ - EXTRA_PROGRAMS = foo - LEXER2 = lexer2.l - nodist_foo_SOURCES = lexer.l $(LEXER2) -@@ -49,9 +51,6 @@ distdirtest: distdir - EOF - - cat > lexer.l << 'END' --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "GOOD" return EOF; - . -diff --git a/t/lex-subobj-nodep.sh b/t/lex-subobj-nodep.sh -index f8bb87a9c..8ef4d68b1 100644 ---- a/t/lex-subobj-nodep.sh -+++ b/t/lex-subobj-nodep.sh -@@ -28,6 +28,8 @@ END - - cat >Makefile.am <<\END - AUTOMAKE_OPTIONS = subdir-objects -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = p1 p2 - p1_SOURCES = sub1/s1.l - p2_SOURCES = sub2/s2.l -@@ -37,9 +39,6 @@ END - mkdir sub1 sub2 - - cat >sub1/s1.l <<\END --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "END" return EOF; - . -diff --git a/t/lex3.sh b/t/lex3.sh -index 41b87dc06..4a20f85da 100644 ---- a/t/lex3.sh -+++ b/t/lex3.sh -@@ -28,14 +28,13 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - noinst_PROGRAMS = foo - foo_SOURCES = foo.l - END - - cat > foo.l << 'END' --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "GOOD" return EOF; - . -diff --git a/t/lex5.sh b/t/lex5.sh -index 3d84d9b41..687903e65 100644 ---- a/t/lex5.sh -+++ b/t/lex5.sh -@@ -28,6 +28,7 @@ END - cat > Makefile.am << 'END' - AUTOMAKE_OPTIONS = subdir-objects - LDADD = @LEXLIB@ -+AM_LFLAGS = --never-interactive - - bin_PROGRAMS = foo/foo - foo_foo_SOURCES = foo/foo.l -@@ -36,9 +37,6 @@ END - mkdir foo - - cat > foo/foo.l << 'END' --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "END" return EOF; - . -diff --git a/t/lexvpath.sh b/t/lexvpath.sh -index 5185a1f71..d064fd2bd 100644 ---- a/t/lexvpath.sh -+++ b/t/lexvpath.sh -@@ -37,6 +37,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo - foo_SOURCES = lexer.l foo.c - LDADD = $(LEXLIB) -@@ -44,9 +46,6 @@ END - - # Original lexer, with a "foobar" comment - cat > lexer.l << 'END' --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "END" return EOF; - . -@@ -89,9 +88,6 @@ $sleep - - # New lexer, with 'fubar' comment. - cat > ../lexer.l << 'END' --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "END" return EOF; - . -@@ -112,9 +108,6 @@ $sleep - - # New lexer, with 'maude' comment. - cat > ../lexer.l << 'END' --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "END" return EOF; - . -diff --git a/t/silent-lex.sh b/t/silent-lex.sh -index cfe1a9b5d..e424afc38 100644 ---- a/t/silent-lex.sh -+++ b/t/silent-lex.sh -@@ -28,6 +28,8 @@ AC_OUTPUT - EOF - - cat > Makefile.am <<'EOF' -+AM_LFLAGS = --never-interactive -+ - # Need generic and non-generic rules. - bin_PROGRAMS = foo1 foo2 - foo1_SOURCES = foo.l -@@ -40,6 +42,8 @@ EOF - - cat > sub/Makefile.am <<'EOF' - AUTOMAKE_OPTIONS = subdir-objects -+AM_LFLAGS = --never-interactive -+ - # Need generic and non-generic rules. - bin_PROGRAMS = bar1 bar2 - bar1_SOURCES = bar.l -@@ -50,9 +54,6 @@ LDADD = $(LEXLIB) - EOF - - cat > foo.l <<'EOF' --%{ --#define YY_NO_UNISTD_H 1 --%} - %% - "END" return EOF; - . -diff --git a/t/silent-many-languages.sh b/t/silent-many-languages.sh -index 4edb46884..85773d339 100644 ---- a/t/silent-many-languages.sh -+++ b/t/silent-many-languages.sh -@@ -151,6 +151,7 @@ ba2_YFLAGS = -v - ba2_LFLAGS = -n - ba2_LDADD = $(LEXLIB) - AM_YFLAGS = -d -+AM_LFLAGS = --never-interactive - BUILT_SOURCES = baz6.h - EOF - -diff --git a/t/silent-yacc-headers.sh b/t/silent-yacc-headers.sh -index 98ae45b8a..f64342c82 100644 ---- a/t/silent-yacc-headers.sh -+++ b/t/silent-yacc-headers.sh -@@ -31,6 +31,7 @@ EOF - cat > Makefile.am <<'EOF' - # Need generic and non-generic rules. - AM_YFLAGS = -d -+AM_LFLAGS = --never-interactive - bin_PROGRAMS = foo bar - foo_SOURCES = parse.y - bar_SOURCES = $(foo_SOURCES) -diff --git a/t/silent-yacc.sh b/t/silent-yacc.sh -index 9645aff83..d89ff49a7 100644 ---- a/t/silent-yacc.sh -+++ b/t/silent-yacc.sh -@@ -29,6 +29,8 @@ AC_OUTPUT - EOF - - cat > Makefile.am <<'EOF' -+AM_LFLAGS = --never-interactive -+ - # Need generic and non-generic rules. - bin_PROGRAMS = foo1 foo2 - foo1_SOURCES = foo.y -@@ -40,6 +42,8 @@ EOF - - cat > sub/Makefile.am <<'EOF' - AUTOMAKE_OPTIONS = subdir-objects -+AM_LFLAGS = --never-interactive -+ - # Need generic and non-generic rules. - bin_PROGRAMS = bar1 bar2 - bar1_SOURCES = bar.y -diff --git a/t/subpkg-yacc.sh b/t/subpkg-yacc.sh -index edd14532b..782ee0957 100644 ---- a/t/subpkg-yacc.sh -+++ b/t/subpkg-yacc.sh -@@ -61,6 +61,8 @@ AC_OUTPUT - EOF - - cat >lib/Makefile.am <<'EOF' -+AM_LFLAGS = --never-interactive -+ - noinst_LIBRARIES = liblib.a - liblib_a_SOURCES = src/x.c foo.y - EXTRA_liblib_a_SOURCES = bar.y -diff --git a/t/suffix10.tap b/t/suffix10.tap -index 3869d07fd..8d3dc1756 100644 ---- a/t/suffix10.tap -+++ b/t/suffix10.tap -@@ -31,6 +31,8 @@ AC_OUTPUT - EOF - - cat >Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - lib_LTLIBRARIES = libfoo.la - libfoo_la_SOURCES = foo.x_ - .x_.y: -diff --git a/t/yacc-auxdir.sh b/t/yacc-auxdir.sh -index be8ac4fd4..f6ff7de48 100644 ---- a/t/yacc-auxdir.sh -+++ b/t/yacc-auxdir.sh -@@ -35,12 +35,16 @@ cat > Makefile.am << 'END' - SUBDIRS = sub - bin_PROGRAMS = foo - AM_YFLAGS = -d -+AM_LFLAGS = --never-interactive -+ - foo_SOURCES = foo.y - END - - cat > sub/Makefile.am << 'END' - bin_PROGRAMS = bar - AM_YFLAGS = -d -+AM_LFLAGS = --never-interactive -+ - bar_SOURCES = bar.y main.c - END - -diff --git a/t/yacc-basic.sh b/t/yacc-basic.sh -index b7a35bd39..51ee5f6a3 100644 ---- a/t/yacc-basic.sh -+++ b/t/yacc-basic.sh -@@ -27,6 +27,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo bar - foo_SOURCES = parse.y foo.c - bar_SOURCES = $(foo_SOURCES) -diff --git a/t/yacc-bison-skeleton-cxx.sh b/t/yacc-bison-skeleton-cxx.sh -index bded1a34f..da76238fa 100644 ---- a/t/yacc-bison-skeleton-cxx.sh -+++ b/t/yacc-bison-skeleton-cxx.sh -@@ -27,6 +27,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = zardoz - zardoz_SOURCES = zardoz.yy foo.cc - -diff --git a/t/yacc-bison-skeleton.sh b/t/yacc-bison-skeleton.sh -index b77b29f1e..11b64b831 100644 ---- a/t/yacc-bison-skeleton.sh -+++ b/t/yacc-bison-skeleton.sh -@@ -31,6 +31,8 @@ cat > Makefile.am << 'END' - bin_PROGRAMS = zardoz - zardoz_SOURCES = zardoz.y foo.c - AM_YFLAGS = -d --skeleton glr.c -+AM_LFLAGS = --never-interactive -+ - BUILT_SOURCES = zardoz.h - END - -diff --git a/t/yacc-clean-cxx.sh b/t/yacc-clean-cxx.sh -index d12e02308..71eb4f315 100644 ---- a/t/yacc-clean-cxx.sh -+++ b/t/yacc-clean-cxx.sh -@@ -39,6 +39,8 @@ END - mkdir sub1 sub2 - - cat > sub1/Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo bar baz qux - - foo_SOURCES = mainfoo.cc parsefoo.yxx -diff --git a/t/yacc-clean.sh b/t/yacc-clean.sh -index 0baf0afd8..d0f793843 100644 ---- a/t/yacc-clean.sh -+++ b/t/yacc-clean.sh -@@ -38,6 +38,8 @@ END - mkdir sub1 sub2 - - cat > sub1/Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo bar baz qux - - foo_SOURCES = main.c parse.y -diff --git a/t/yacc-cxx-grepping.sh b/t/yacc-cxx-grepping.sh -index 7b3a6bc5e..e094d5f16 100644 ---- a/t/yacc-cxx-grepping.sh -+++ b/t/yacc-cxx-grepping.sh -@@ -27,6 +27,8 @@ AC_PROG_YACC - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo bar baz qux - foo_SOURCES = foo.y++ - bar_SOURCES = bar.ypp -diff --git a/t/yacc-cxx.sh b/t/yacc-cxx.sh -index 5b385870c..0ce4116dd 100644 ---- a/t/yacc-cxx.sh -+++ b/t/yacc-cxx.sh -@@ -28,6 +28,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo1 foo2 foo3 foo4 - foo1_SOURCES = parse1.yy foo.cc - foo2_SOURCES = parse2.y++ bar.c++ -diff --git a/t/yacc-d-basic.sh b/t/yacc-d-basic.sh -index fe80a0888..166111fdb 100644 ---- a/t/yacc-d-basic.sh -+++ b/t/yacc-d-basic.sh -@@ -35,6 +35,8 @@ END - mkdir foo bar baz - - cat > foo/Makefile.am <<'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = zardoz - zardoz_SOURCES = parse.y main.c - .PHONY: echo-distcom -diff --git a/t/yacc-d-cxx.sh b/t/yacc-d-cxx.sh -index 576e8e2aa..40247d3c8 100644 ---- a/t/yacc-d-cxx.sh -+++ b/t/yacc-d-cxx.sh -@@ -70,6 +70,8 @@ mkdir foo bar baz qux baz/sub - - # These makefiles will be extended later. - cat > Makefile.am <<'END' -+AM_LFLAGS = --never-interactive -+ - .PHONY: echo-distcom - echo-distcom: - @echo ' ' $(DIST_COMMON) ' ' -diff --git a/t/yacc-d-vpath.sh b/t/yacc-d-vpath.sh -index dced4818f..3dcf17ade 100644 ---- a/t/yacc-d-vpath.sh -+++ b/t/yacc-d-vpath.sh -@@ -32,6 +32,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo - foo_SOURCES = parse.y foo.c - AM_YFLAGS = -d -diff --git a/t/yacc-deleted-headers.sh b/t/yacc-deleted-headers.sh -index c3fdbeee4..8c27dcefb 100644 ---- a/t/yacc-deleted-headers.sh -+++ b/t/yacc-deleted-headers.sh -@@ -26,6 +26,8 @@ AC_OUTPUT - END - - cat > Makefile.am <<'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = p1 p2 p3 p4 - # The order in which files are listed in the p*_SOURCES variables - # below is significant, since it causes make failures whenever -diff --git a/t/yacc-depend.sh b/t/yacc-depend.sh -index cf544359f..d1e09bc39 100644 ---- a/t/yacc-depend.sh -+++ b/t/yacc-depend.sh -@@ -29,6 +29,8 @@ END - cat > Makefile.am << 'END' - bin_PROGRAMS = foo - AM_YFLAGS = -d -+AM_LFLAGS = --never-interactive -+ - foo_SOURCES = foo.y main.c - BUILT_SOURCES = foo.h - END -diff --git a/t/yacc-depend2.sh b/t/yacc-depend2.sh -index a61e4957d..a52d4489f 100644 ---- a/t/yacc-depend2.sh -+++ b/t/yacc-depend2.sh -@@ -28,6 +28,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo - AM_YFLAGS = -d - foo_SOURCES = foo.y main.c -diff --git a/t/yacc-dist-nobuild-subdir.sh b/t/yacc-dist-nobuild-subdir.sh -index d1788811f..56320fe48 100644 ---- a/t/yacc-dist-nobuild-subdir.sh -+++ b/t/yacc-dist-nobuild-subdir.sh -@@ -49,6 +49,8 @@ END - - cat > Makefile.am <<'END' - AUTOMAKE_OPTIONS = subdir-objects -+AM_LFLAGS = --never-interactive -+ - noinst_PROGRAMS = foo bar - foo_SOURCES = sub/parse.y - bar_SOURCES = $(foo_SOURCES) -diff --git a/t/yacc-dist-nobuild.sh b/t/yacc-dist-nobuild.sh -index a30fefec2..71be0d52c 100644 ---- a/t/yacc-dist-nobuild.sh -+++ b/t/yacc-dist-nobuild.sh -@@ -28,6 +28,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foobar zardoz - foobar_SOURCES = parse.y main.c - zardoz_SOURCES = $(foobar_SOURCES) -diff --git a/t/yacc-dry.sh b/t/yacc-dry.sh -index 9b08d3863..6500ba811 100644 ---- a/t/yacc-dry.sh -+++ b/t/yacc-dry.sh -@@ -26,6 +26,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - AM_YFLAGS = -d - bin_PROGRAMS = foo - foo_SOURCES = foo.c parse.y -diff --git a/t/yacc-grepping.sh b/t/yacc-grepping.sh -index b0cf91353..67381ba89 100644 ---- a/t/yacc-grepping.sh -+++ b/t/yacc-grepping.sh -@@ -35,6 +35,8 @@ END - $ACLOCAL - - cat > Makefile.am <<'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = zardoz - zardoz_SOURCES = zardoz.y - END -diff --git a/t/yacc-grepping2.sh b/t/yacc-grepping2.sh -index 159dd3e15..4af321fbe 100644 ---- a/t/yacc-grepping2.sh -+++ b/t/yacc-grepping2.sh -@@ -25,6 +25,8 @@ AC_PROG_YACC - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = maude - maude_SOURCES = sub/maude.y - END -diff --git a/t/yacc-headers-and-dist-pr47.sh b/t/yacc-headers-and-dist-pr47.sh -index 57c8251ad..74ec525f9 100644 ---- a/t/yacc-headers-and-dist-pr47.sh -+++ b/t/yacc-headers-and-dist-pr47.sh -@@ -30,6 +30,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo - foo_SOURCES = foo.y - AM_YFLAGS = -d -diff --git a/t/yacc-line.sh b/t/yacc-line.sh -index e7a4d6244..2319c9791 100644 ---- a/t/yacc-line.sh -+++ b/t/yacc-line.sh -@@ -32,6 +32,8 @@ END - mkdir dir sub sub/dir - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - SUBDIRS = sub - bin_PROGRAMS = foo bar - AM_YFLAGS = -d -@@ -45,6 +47,8 @@ END - - cat > sub/Makefile.am << 'END' - AUTOMAKE_OPTIONS = subdir-objects -+AM_LFLAGS = --never-interactive -+ - noinst_PROGRAMS = foo bar - foo_YFLAGS = -d - foo_SOURCES = zardoz.y -diff --git a/t/yacc-misc.sh b/t/yacc-misc.sh -index 2bfb0c55e..fcc19aa49 100644 ---- a/t/yacc-misc.sh -+++ b/t/yacc-misc.sh -@@ -26,6 +26,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo bar - foo_SOURCES = parse.y foo.c - bar_SOURCES = bar.y foo.c -diff --git a/t/yacc-mix-c-cxx.sh b/t/yacc-mix-c-cxx.sh -index 7c44e0926..de05cdab8 100644 ---- a/t/yacc-mix-c-cxx.sh -+++ b/t/yacc-mix-c-cxx.sh -@@ -28,6 +28,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = c1 c2 cxx1 cxx2 cxx3 - AM_YFLAGS = -d - -diff --git a/t/yacc-nodist.sh b/t/yacc-nodist.sh -index dbb86bdb2..8e5338e94 100644 ---- a/t/yacc-nodist.sh -+++ b/t/yacc-nodist.sh -@@ -31,6 +31,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - SUBDIRS = sub1 sub2 - .PHONY: test-build test-dist - test-build: all -diff --git a/t/yacc-pr204.sh b/t/yacc-pr204.sh -index 91882e4d7..89acb1ee0 100644 ---- a/t/yacc-pr204.sh -+++ b/t/yacc-pr204.sh -@@ -34,6 +34,8 @@ EOF - # sure Automake match 'nodist_' against the right - # variable name... - cat > Makefile.am << 'EOF' -+AM_LFLAGS = --never-interactive -+ - AM_YFLAGS = -d - EXTRA_PROGRAMS = foo - PARSE2 = parse2.y -diff --git a/t/yacc-subdir.sh b/t/yacc-subdir.sh -index df31a3c51..d6c3f0cc8 100644 ---- a/t/yacc-subdir.sh -+++ b/t/yacc-subdir.sh -@@ -28,6 +28,8 @@ END - - cat > Makefile.am << 'END' - AUTOMAKE_OPTIONS = subdir-objects -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo/foo - foo_foo_SOURCES = foo/parse.y - AM_YFLAGS = -d -diff --git a/t/yacc-vpath.sh b/t/yacc-vpath.sh -index 52d2c45bd..42044ecf2 100644 ---- a/t/yacc-vpath.sh -+++ b/t/yacc-vpath.sh -@@ -32,6 +32,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo - foo_SOURCES = parse.y foo.c - END -diff --git a/t/yacc-weirdnames.sh b/t/yacc-weirdnames.sh -index 60f199d2d..8397bc636 100644 ---- a/t/yacc-weirdnames.sh -+++ b/t/yacc-weirdnames.sh -@@ -27,6 +27,8 @@ AC_OUTPUT - END - - cat > Makefile.am << 'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo bar foo2 bar2 - - foo_SOURCES = parse.y.y -diff --git a/t/yflags-cmdline-override.sh b/t/yflags-cmdline-override.sh -index 37304645c..73982753a 100644 ---- a/t/yflags-cmdline-override.sh -+++ b/t/yflags-cmdline-override.sh -@@ -27,6 +27,8 @@ AC_OUTPUT - END - - cat > Makefile.am <<'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo - foo_SOURCES = foo.y - # A minor automake wart: automake doesn't generate code to clean -diff --git a/t/yflags-cxx.sh b/t/yflags-cxx.sh -index 9bd28b8ce..2596a95e3 100644 ---- a/t/yflags-cxx.sh -+++ b/t/yflags-cxx.sh -@@ -39,6 +39,8 @@ END - - cat > Makefile.am <<'END' - AUTOMAKE_OPTIONS = no-dependencies -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo bar - foo_SOURCES = main.cc foo.yy - bar_SOURCES = main.cc bar.y++ -diff --git a/t/yflags-d-false-positives.sh b/t/yflags-d-false-positives.sh -index 21efb2345..666dbe938 100644 ---- a/t/yflags-d-false-positives.sh -+++ b/t/yflags-d-false-positives.sh -@@ -26,6 +26,8 @@ END - $ACLOCAL - - cat > Makefile.am <<'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = zardoz foobar - zardoz_SOURCES = zardoz.y - foobar_SOURCES = foobar.y -diff --git a/t/yflags-force-conditional.sh b/t/yflags-force-conditional.sh -index 3f9a13293..976b6f782 100644 ---- a/t/yflags-force-conditional.sh -+++ b/t/yflags-force-conditional.sh -@@ -38,6 +38,8 @@ YACC=fake-yacc; export YACC - - cat > Makefile.am <<'END' - AUTOMAKE_OPTIONS = no-dependencies -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo bar - foo_SOURCES = foo.y main.c - bar_SOURCES = $(foo_SOURCES) -diff --git a/t/yflags-force-override.sh b/t/yflags-force-override.sh -index b1c36ef0f..7c865935b 100644 ---- a/t/yflags-force-override.sh -+++ b/t/yflags-force-override.sh -@@ -28,6 +28,8 @@ AC_OUTPUT - END - - cat > Makefile.am <<'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo - foo_SOURCES = foo.y - # Don't do this in a real-life Makefile.am! -diff --git a/t/yflags-var-expand.sh b/t/yflags-var-expand.sh -index 0e06e0d9c..bf34922a6 100644 ---- a/t/yflags-var-expand.sh -+++ b/t/yflags-var-expand.sh -@@ -29,6 +29,8 @@ END - $ACLOCAL - - cat > Makefile.am <<'END' -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo bar - foo_SOURCES = foo.y - bar_SOURCES = bar.y -diff --git a/t/yflags.sh b/t/yflags.sh -index 1f73776f8..2359a76b7 100644 ---- a/t/yflags.sh -+++ b/t/yflags.sh -@@ -39,6 +39,8 @@ END - - cat > Makefile.am <<'END' - AUTOMAKE_OPTIONS = no-dependencies -+AM_LFLAGS = --never-interactive -+ - bin_PROGRAMS = foo bar - foo_SOURCES = main.c foo.y - bar_SOURCES = main.c bar.y --- -2.35.3 -