diff options
Diffstat (limited to 't')
59 files changed, 62 insertions, 1003 deletions
diff --git a/t/aclocal-acdir.sh b/t/aclocal-acdir.sh index 88caef62f..e5b2bd2c5 100755 --- a/t/aclocal-acdir.sh +++ b/t/aclocal-acdir.sh @@ -14,9 +14,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Test aclocal's '--acdir', '--automake-acdir' and '--system-acdir' -# options. Also check that stuff in the automake acdir takes precedence -# over stuff in the system acdir. +# Test aclocal's '--automake-acdir' and '--system-acdir' options. Also +# check that stuff in the automake acdir takes precedence over stuff in +# the system acdir. . ./defs || Exit 1 @@ -72,24 +72,4 @@ $FGREP 'fake--init--automake' configure $FGREP 'am--macro' configure $FGREP 'my--macro' configure && Exit 1 # Just to be sure. -rm -rf autom4te*.cache - -# Obsolescent '--acdir' option. -$ACLOCAL -Wobsolete --acdir am 2>stderr && { cat stderr >&2; Exit 1; } -cat stderr >&2 -grep '.*--acdir.*deprecated' stderr - -rm -rf autom4te*.cache - -$ACLOCAL -Wno-obsolete --acdir am -$AUTOCONF --force -$FGREP 'fake--init--automake' configure -$FGREP 'am--macro' configure - -rm -rf autom4te*.cache - -$ACLOCAL -Wno-obsolete --acdir sys 2>stderr && { cat stderr >&2; Exit 1; } -cat stderr >&2 -grep 'macro .*AM_INIT_AUTOMAKE.* not found' stderr - : diff --git a/t/aclocal-print-acdir.sh b/t/aclocal-print-acdir.sh index 3d8bf4e7d..53ad5561e 100755 --- a/t/aclocal-print-acdir.sh +++ b/t/aclocal-print-acdir.sh @@ -22,9 +22,6 @@ am_create_testdir=empty $ACLOCAL --print-ac-dir test "`$ACLOCAL --print-ac-dir`" = "$am_system_acdir" -$ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir -test "`$ACLOCAL -Wno-obsolete --acdir foo --print-ac-dir`" = foo - $ACLOCAL --system-acdir /bar --print-ac-dir test "`$ACLOCAL --system-acdir /bar --print-ac-dir`" = /bar diff --git a/t/autohdr2.sh b/t/autohdr2.sh deleted file mode 100755 index 6f5415e00..000000000 --- a/t/autohdr2.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# Copyright (C) 2002-2012 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Check that autoheaders works, despite our AC_CONFIG_HEADERS hack. - -. ./defs || Exit 1 - -cat >>configure.ac <<EOF -AM_CONFIG_HEADER([thisfile.h]) -EOF - -: > Makefile.am - -$ACLOCAL -$AUTOHEADER - -test -f thisfile.h.in diff --git a/t/backcompat3.sh b/t/backcompat3.sh index 5dc78f672..985e774c6 100755 --- a/t/backcompat3.sh +++ b/t/backcompat3.sh @@ -76,15 +76,7 @@ diff exp got ### Run 2 ### cat > configure.in <<'END' -dnl: 'AC_INIT' in Autoconf <= 2.63 doesn't have an URL argument. -dnl: Luckily, 'AC_AUTOCONF_VERSION' and 'm4_version_prereq' are -dnl: both present in autoconf 2.62, which we require; so that we -dnl: can at least use the following workaround. -m4_version_prereq([2.64], - [AC_INIT([ac_name], [ac_version], [ac_bugreport], [ac_tarname], - [ac_url])], - [AC_INIT([ac_name], [ac_version], [ac_bugreport], [ac_tarname]) - AC_SUBST([PACKAGE_URL], [ac_url])]) +AC_INIT([ac_name], [ac_version], [ac_bugreport], [ac_tarname], [ac_url]) AM_INIT_AUTOMAKE([am_name], [am_version]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/t/clean2.sh b/t/clean2.sh deleted file mode 100755 index b5f5df224..000000000 --- a/t/clean2.sh +++ /dev/null @@ -1,68 +0,0 @@ -#! /bin/sh -# Copyright (C) 2004-2012 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Make sure distclean works in cygnus mode. -# Report from Daniel Jacobowitz. - -. ./defs || Exit 1 - -cat >> configure.ac << 'END' -AM_MAINTAINER_MODE -AC_CONFIG_FILES([sub/Makefile]) -AC_OUTPUT -END - -cat > Makefile.am << 'END' -SUBDIRS = sub - -data_DATA = bar - -bar: - touch $@ - -DISTCLEANFILES = bar -END - -mkdir sub - -cat > sub/Makefile.am << 'END' -data_DATA = foo - -foo: - touch $@ - -CLEANFILES = $(data_DATA) -END - -$ACLOCAL -$AUTOCONF -$AUTOMAKE --cygnus -Wno-obsolete - -./configure -$MAKE -ls -l -test -f bar -test -f sub/foo -$MAKE distclean -ls -l -test ! -r bar -test ! -r sub/foo -test ! -r Makefile -test ! -r config.status -test -f Makefile.in -test -f configure - -: diff --git a/t/compile_f_c_cxx.sh b/t/compile_f_c_cxx.sh index 99893d8c3..2f093ba62 100755 --- a/t/compile_f_c_cxx.sh +++ b/t/compile_f_c_cxx.sh @@ -39,8 +39,8 @@ $ACLOCAL $AUTOMAKE # Look for the macros at the beginning of rules. -$FGREP "$tab\$(COMPILE)" Makefile.in -$FGREP "$tab\$(CXXCOMPILE)" Makefile.in -$FGREP "$tab\$(F77COMPILE)" Makefile.in +$FGREP "$tab\$(AM_V_CC)\$(COMPILE)" Makefile.in +$FGREP "$tab\$(AM_V_CXX)\$(CXXCOMPILE)" Makefile.in +$FGREP "$tab\$(AM_V_F77)\$(F77COMPILE)" Makefile.in : diff --git a/t/confh.sh b/t/confh.sh index 475961998..9dc2f15b1 100755 --- a/t/confh.sh +++ b/t/confh.sh @@ -20,7 +20,7 @@ . ./defs || Exit 1 cat >> configure.ac << 'END' -AM_CONFIG_HEADER([include/config.h]) +AC_CONFIG_HEADERS([include/config.h]) AC_OUTPUT END diff --git a/t/confh4.sh b/t/confh4.sh index ea6a9ffc2..665e04a0a 100755 --- a/t/confh4.sh +++ b/t/confh4.sh @@ -26,7 +26,7 @@ cat >> configure.ac << 'END' AC_CONFIG_FILES([include/Makefile]) -AM_CONFIG_HEADER([include/config.h]) +AC_CONFIG_HEADERS([include/config.h]) AC_PROG_CC END diff --git a/t/confh6.sh b/t/confh6.sh index c5e7d7e58..c94c7ba92 100755 --- a/t/confh6.sh +++ b/t/confh6.sh @@ -21,7 +21,7 @@ . ./defs || Exit 1 cat >> configure.ac << 'END' -AM_CONFIG_HEADER([subdir/config.h]) +AC_CONFIG_HEADERS([subdir/config.h]) AC_OUTPUT END diff --git a/t/confh7.sh b/t/confh7.sh index 408077978..0bc2465cd 100755 --- a/t/confh7.sh +++ b/t/confh7.sh @@ -20,7 +20,7 @@ . ./defs || Exit 1 cat >> configure.ac << 'END' -AM_CONFIG_HEADER([config.h two.h]) +AC_CONFIG_HEADERS([config.h two.h]) END : > Makefile.am diff --git a/t/confh8.sh b/t/confh8.sh index c3a27d10f..2feaae582 100755 --- a/t/confh8.sh +++ b/t/confh8.sh @@ -20,7 +20,7 @@ . ./defs || Exit 1 cat >> configure.ac << 'END' -AM_CONFIG_HEADER([one.h two.h]) +AC_CONFIG_HEADERS([one.h two.h]) AC_OUTPUT END diff --git a/t/confsub.sh b/t/confsub.sh index b13f26a3b..db9f80e51 100755 --- a/t/confsub.sh +++ b/t/confsub.sh @@ -21,7 +21,7 @@ cat >> configure.ac << 'END' AC_CONFIG_FILES([subdir/Makefile]) -AM_CONFIG_HEADER([subdir/config.h:subdir/config.hin]) +AC_CONFIG_HEADERS([subdir/config.h:subdir/config.hin]) AC_OUTPUT END diff --git a/t/cygnus-check-without-all.sh b/t/cygnus-check-without-all.sh deleted file mode 100755 index 121c657f7..000000000 --- a/t/cygnus-check-without-all.sh +++ /dev/null @@ -1,50 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010-2012 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Check that, in cygnus mode, target "check" does not depend target -# "all". - -. ./defs || Exit 1 - -cat >> configure.ac <<'END' -AM_MAINTAINER_MODE -AC_OUTPUT -END - -cat > Makefile.am <<'END' -all-local: - : > all-target-has-failed - exit 1 -check-local: - touch check-target-has-run -END - -$ACLOCAL -$AUTOMAKE --cygnus -Wno-obsolete - -$EGREP '(^| )all.*(:|:.* )check' Makefile.in && Exit 1 - -$AUTOCONF -./configure - -$MAKE check -test -f check-target-has-run -test ! -r all-target-has-failed -# Sanity checks. -$MAKE && Exit 1 -test -f all-target-has-failed - -: diff --git a/t/cygnus-dependency-tracking.sh b/t/cygnus-dependency-tracking.sh deleted file mode 100755 index 6c858c1aa..000000000 --- a/t/cygnus-dependency-tracking.sh +++ /dev/null @@ -1,74 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010-2012 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Check that cygnus mode disables automatic dependency tracking. -# And check that this *cannot* be overridden. - -required=cc -. ./defs || Exit 1 - -cat >> configure.ac <<'END' -AM_MAINTAINER_MODE -AC_PROG_CC -AC_OUTPUT -END - -cat > Makefile.am <<'END' -AUTOMAKE_OPTIONS = -Wno-obsolete -bin_PROGRAMS = foo -foo_SOURCES = foo.c -.PHONY: test-nodeps -test-nodeps: - test ! -d .deps - test ! -d _deps - test ! -d '$(DEPDIR)' -END - -cat > foo.c <<'END' -#include "bar.h" -int main () -{ - GIVE_BACK 0; -} -END - -cat > bar.sav <<'END' -#define GIVE_BACK return -END - -cp bar.sav bar.h - -$ACLOCAL -$AUTOMAKE --include-deps --cygnus --include-deps -$AUTOCONF - -# Unknown options should cause just warnings from configure. -./configure --enable-dependency-tracking -$MAKE -$MAKE test-nodeps - -: > bar.h -$MAKE -$MAKE test-nodeps - -# Sanity check. -$MAKE clean -$MAKE >out 2>&1 && { cat out; Exit 1; } -cat out -# Not all compilers mention the undefined symbol in the error message. -grep GIVE_BACK out || grep main out - -: diff --git a/t/cygnus-imply-foreign.sh b/t/cygnus-imply-foreign.sh deleted file mode 100755 index 3dcf6715a..000000000 --- a/t/cygnus-imply-foreign.sh +++ /dev/null @@ -1,60 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010-2012 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Check that 'cygnus' mode imply 'foreign' mode. - -. ./defs || Exit 1 - -cat >> configure.ac <<'END' -# This is *required* in cygnus mode -AM_MAINTAINER_MODE -END - -$ACLOCAL - -: > Makefile.am - -# We want complete control automake flags, while honouring the -# user overrides for $AUTOMAKE. -AUTOMAKE=$am_original_AUTOMAKE - -# Sanity check: gnu mode must complain about missing files and -# portability problems. -AUTOMAKE_fails -grep 'required file.*README' stderr - -# But cygnus mode should imply foreign mode, so no complaints. -# And cygnus mode should by able to override gnu and gnits modes. -$AUTOMAKE --cygnus -Werror -$AUTOMAKE --gnu --cygnus -Werror -$AUTOMAKE --gnits --cygnus -Werror - -# Try again, this time enabling cygnus mode from Makefile.am. -cp Makefile.am Makefile.sav -echo 'AUTOMAKE_OPTIONS = gnu cygnus' >> Makefile.am -$AUTOMAKE -Werror -mv -f Makefile.sav Makefile.am - -# Try again, this time enabling cygnus mode from configure.ac. -cp configure.ac configure.sav -sed 's/^AM_INIT_AUTOMAKE$/&([gnits cygnus])/' configure.sav >configure.ac -cmp configure.ac configure.sav && fatal_ 'failed to edit configure.ac' - -$ACLOCAL --force -$AUTOMAKE -Werror -mv -f configure.sav configure.ac - -: diff --git a/t/cygnus-no-dist.sh b/t/cygnus-no-dist.sh deleted file mode 100755 index d94a8f51b..000000000 --- a/t/cygnus-no-dist.sh +++ /dev/null @@ -1,86 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010-2012 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Check that cygnus mode forbids creation of distribution tarball. - -. ./defs || Exit 1 - -echo AM_MAINTAINER_MODE >> configure.ac -mv -f configure.ac configure.stub - -cat configure.stub - > configure.ac <<'END' -AC_OUTPUT -END - -: > Makefile.am - -$ACLOCAL -$AUTOCONF -$AUTOMAKE --cygnus -Wno-obsolete - -./configure -$MAKE - -for target in dist distdir distcheck dist-all dist-gzip; do - $MAKE -n $target >out 2>&1 && { cat out; Exit 1; } - cat out - grep $target out -done - -# Now check that cygnus mode in a subdirectory disables -# distribution-building in that subdirectory. - -cat > Makefile.am <<'END' -SUBDIRS = sub1 sub2 -END - -mkdir sub1 sub2 -: > sub1/Makefile.am -cat > sub2/Makefile.am <<'END' -# The '-Wall' after 'cygnus' should ensure no warning gets -# unintentionally disabled. We are particularly interested -# in override warnings, for when (below) we add the 'distdir' -# target. -AUTOMAKE_OPTIONS = cygnus -Wall -# This is required because the 'cygnus' option is now deprecated. -AUTOMAKE_OPTIONS += -Wno-obsolete -END - -cat configure.stub - > configure.ac <<'END' -AC_CONFIG_FILES([sub1/Makefile sub2/Makefile]) -AC_OUTPUT -END - -$AUTOCONF -$AUTOMAKE - -./configure -$MAKE -cd sub2 -$MAKE -n distdir >out 2>&1 && { cat out; Exit 1; } -grep distdir out -cd .. - -cat >> sub2/Makefile.am <<'END' -distdir: -END -$AUTOMAKE sub2/Makefile -./config.status sub2/Makefile - -$MAKE distdir -$MAKE dist - -: diff --git a/t/cygnus-no-installinfo.sh b/t/cygnus-no-installinfo.sh deleted file mode 100755 index d46b6b36f..000000000 --- a/t/cygnus-no-installinfo.sh +++ /dev/null @@ -1,55 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010-2012 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Check that cygnus mode enables the 'no-installinfo' option. - -required=makeinfo -. ./defs || Exit 1 - -cat >> configure.ac <<'END' -AM_MAINTAINER_MODE -AC_OUTPUT -END - -cat > Makefile.am <<'END' -info_TEXINFOS = foo.texi -END - -cat > foo.texi <<'END' -@setfilename foo.info -END - -$ACLOCAL -# -Wno-override works around a buglet in definition of $(MAKEINFO) -# in cygnus mode; see also xfailing test 'txinfo5.test'. -# -Wno-obsolete accounts for the fact that the cygnus mode is now -# deprecated. -$AUTOMAKE --cygnus -Wno-override -Wno-obsolete -$AUTOCONF - -cwd=`pwd` || Exit 1 -./configure --prefix="$cwd"/_inst -$MAKE -$MAKE install -test ! -d _inst -test ! -r foo.info -test ! -d _inst/share/info -$MAKE install-info -ls -l _inst -test -f foo.info -test -f _inst/share/info/foo.info - -: diff --git a/t/cygnus-deprecation.sh b/t/cygnus-no-more.sh index 779914b9d..4be0561bf 100755 --- a/t/cygnus-deprecation.sh +++ b/t/cygnus-no-more.sh @@ -20,37 +20,18 @@ . ./defs || Exit 1 -warn_rx='support for Cygnus.*trees.*deprecated' - -cat >> configure.ac <<'END' -AC_PROG_CC -AM_MAINTAINER_MODE -END +warn_rx='support for Cygnus.*trees.*removed' $ACLOCAL -$AUTOCONF - -: > Makefile.am -# 'cygnus' option from command line -$AUTOMAKE --cygnus -Wno-obsolete -AUTOMAKE_fails --cygnus -grep "^automake.*: .*$warn_rx" stderr -AUTOMAKE_fails -Wnone -Wobsolete --cygnus -grep "^automake.*: .*$warn_rx" stderr -AUTOMAKE_fails --cygnus -Wnone -Wobsolete -grep "^automake.*: .*$warn_rx" stderr - -rm -rf autom4te*.cache +# Use of 'cygnus' option must raise an unconditional error, not a +# warning. +AUTOMAKE="$am_original_AUTOMAKE -Wnone -Wno-error" # 'cygnus' option in Makefile.am echo "AUTOMAKE_OPTIONS = cygnus" > Makefile.am -cat Makefile.am # For debugging. -$AUTOMAKE -Wno-obsolete AUTOMAKE_fails grep "^Makefile\.am:1:.*$warn_rx" stderr -AUTOMAKE_fails -Wnone -Wobsolete -grep "^Makefile\.am:1:.*$warn_rx" stderr rm -rf autom4te*.cache @@ -59,10 +40,7 @@ rm -rf autom4te*.cache sed "s|^\\(AM_INIT_AUTOMAKE\\).*|\1([cygnus])|" configure.ac > t diff configure.ac t && fatal_ "failed to edit configure.ac" mv -f t configure.ac -$AUTOMAKE -Wno-obsolete AUTOMAKE_fails grep "^configure\.ac:2:.*$warn_rx" stderr -AUTOMAKE_fails -Wnone -Wobsolete -grep "^configure\.ac:2:.*$warn_rx" stderr : diff --git a/t/cygnus-requires-maintainer-mode.sh b/t/cygnus-requires-maintainer-mode.sh deleted file mode 100755 index 546e8983e..000000000 --- a/t/cygnus-requires-maintainer-mode.sh +++ /dev/null @@ -1,53 +0,0 @@ -#! /bin/sh -# Copyright (C) 2010-2012 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Check that, in cygnus mode, maintainer mode is required. - -. ./defs || Exit 1 - -: > Makefile.am - -$ACLOCAL -AUTOMAKE_fails -Wno-obsolete --cygnus -grep '^configure\.ac:.*AM_MAINTAINER_MODE.*required.*cygnus' stderr - -cat >> configure.ac <<'END' -AC_CONFIG_FILES([sub/Makefile]) -END - -cat > Makefile.am <<'END' -SUBDIRS = sub -END - -mkdir sub -cat > sub/Makefile.am <<'END' -AUTOMAKE_OPTIONS = -Wno-obsolete cygnus -END - -rm -rf autom4te.cache -$ACLOCAL -AUTOMAKE_fails -grep '^configure\.ac:.*AM_MAINTAINER_MODE.*required.*cygnus' stderr - -cat >> configure.ac <<'END' -AM_MAINTAINER_MODE -END - -rm -rf autom4te.cache -$ACLOCAL -$AUTOMAKE --cygnus -Wno-obsolete - -: diff --git a/t/depend5.sh b/t/depend5.sh index ca900f0fc..3029bdb05 100755 --- a/t/depend5.sh +++ b/t/depend5.sh @@ -47,9 +47,8 @@ else depdir= fi -# For the fun of it, we should also cope with makefile -# names that contain weird characters, with Autoconf 2.62 -# and newer. +# For the fun of it, we should also cope with Makefile names +# that contain weird characters and newer. # Pick the first name that the file system will accept. for name in \ 'weird name with $ `#() &! characters"' \ diff --git a/t/distcom4.sh b/t/distcom4.sh index dc37fcf4f..6f9d8716c 100755 --- a/t/distcom4.sh +++ b/t/distcom4.sh @@ -18,7 +18,6 @@ # This tries to distribute a file from a subdirectory, without # Makefile in that directory. distcom5.test performs the same # test with a Makefile in the directory. -# Also make sure that README appears first in DIST_COMMON. . ./defs || Exit 1 @@ -71,7 +70,5 @@ cat dc.txt # For debugging. test 1 = `grep tests dc.txt | wc -l` grep configure dc.txt -# README must come first. -grep 'DIST_COMMON = README' Makefile.in : diff --git a/t/dollarvar.sh b/t/dollarvar.sh index 940ef23db..f39fc851d 100755 --- a/t/dollarvar.sh +++ b/t/dollarvar.sh @@ -35,6 +35,7 @@ blo = $(foo${x}) EOF $ACLOCAL + AUTOMAKE_fails -Wportability grep 'Makefile.am:2' stderr grep 'Makefile.am:3' stderr @@ -43,15 +44,7 @@ grep 'Makefile.am:5' stderr grep 'Makefile.am:6' stderr grep 'Makefile.am:7' stderr -# On the other hand, if we allow 'silent-rules' mode, then we need to -# allow recursive variable expansion, too. - -# This should work with the AM_SILENT_RULES macro. -$sleep -echo 'AM_SILENT_RULES' >> configure.ac - -$ACLOCAL --force -AUTOMAKE_fails -Wportability +AUTOMAKE_fails -Wportability -Wno-portability-recursive grep 'Makefile.am:2' stderr grep 'Makefile.am:3' stderr grep 'Makefile.am:4' stderr @@ -22,12 +22,7 @@ cat >> configure.ac << 'END' AC_PROG_F77 AC_PROG_FC AC_PROG_OBJC -# FIXME: this is to cater to older autoconf; remove this once we -# FIXME: automake requires Autoconf 2.65 or later. -m4_ifdef([AC_PROG_OBJCXX], [AC_PROG_OBJCXX], [ - AC_SUBST([OBJCXX], [whocares]) - AM_CONDITIONAL([am__fastdepOBJCXX], [whocares]) -]) +AC_PROG_OBJCXX AM_PROG_UPC END diff --git a/t/flavor.sh b/t/flavor.sh index 6a1fddb3b..8b999cc35 100755 --- a/t/flavor.sh +++ b/t/flavor.sh @@ -57,21 +57,4 @@ for flavor in --gnits --gnu --foreign --ignore-deps; do done -# Cygnus mode is deprecated now, and must be handled separately. -$AUTOMAKE --cygnus -Wno-obsolete -./configure --enable-maintainer-mode -grep " --cygnus" Makefile -$MAKE -# Two code paths in configure.am: -# - either a file in $(am__configure_deps) has been updated ... -$sleep -touch aclocal.m4 -$MAKE -grep " --cygnus" Makefile -# - ... or not; i.e., Makefile.am or an included file has. -$sleep -touch Makefile.am -$MAKE -grep " --cygnus" Makefile - : diff --git a/t/gettext-macros.sh b/t/gettext-macros.sh index 416a8e50f..e9a4739e1 100755 --- a/t/gettext-macros.sh +++ b/t/gettext-macros.sh @@ -61,10 +61,7 @@ AM_GNU_GETTEXT AM_GNU_GETTEXT_VERSION([$autopoint_version]) END -if $am_gettextize_command --force && test -f m4/gettext.m4; then - echo "ACLOCAL_PATH='`pwd`/m4':\$ACLOCAL_PATH" >> get.sh - echo "export ACLOCAL_PATH" >> get.sh -else +if $am_gettextize_command --force && test -f m4/gettext.m4; then :; else # Older versions of gettext might not have a gettextize program # available, but this doesn't mean the user hasn't made the gettext # macros available, e.g., by properly setting ACLOCAL_PATH. @@ -78,14 +75,14 @@ else fi fi -. ./get.sh +echo "ACLOCAL_PATH='`pwd`/m4':\$ACLOCAL_PATH" >> get.sh +echo "export ACLOCAL_PATH" >> get.sh -cat >> get.sh <<'END' # Even recent versions of gettext used the now-obsolete 'AM_PROG_MKDIR_P' # m4 macro. So we need the following to avoid spurious errors. -ACLOCAL="$ACLOCAL -Wno-obsolete" -AUTOMAKE="$AUTOMAKE -Wno-obsolete" -END +echo 'AC_DEFUN([AM_MKDIR_P], [AC_MKDIR_P([$@])])' >> m4/mk-dirp.m4 + +. ./get.sh $ACLOCAL --force -I m4 || cat >> get.sh <<'END' # We need to use '-Wno-syntax', since we do not want our test suite diff --git a/t/help-silent.sh b/t/help-silent.sh index d5fc34225..aaa6b6a6c 100755 --- a/t/help-silent.sh +++ b/t/help-silent.sh @@ -14,25 +14,22 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -# Make sure that our macro 'AM_SILENT_RULES' adds proper text to -# the configure help screen. +# Make sure configure options relative to automake silent rules are +# added to the configure help screen. . ./defs || Exit 1 -cat > configure.ac <<END -AC_INIT([$me], [1.0]) -AM_SILENT_RULES -END - +: > Makefile.am $ACLOCAL -mv -f configure.ac configure.tmpl +cp configure.ac configure.tmpl q="[\`'\"]" -for args in '' '([])' '([yes])' '([no])'; do - sed "s/AM_SILENT_RULES.*/&$args/" configure.tmpl >configure.ac - cat configure.ac +for args in '' 'yes' 'no'; do + cp -f configure.tmpl configure.ac + test x"$args" = x || echo "AM_SILENT_RULES([$args])/" >> configure.ac + cat configure.ac # For debugging. $AUTOCONF --force grep_configure_help --enable-silent-rules \ " less verbose build.*\\(undo.*${q}make V=1${q}" diff --git a/t/list-of-tests.mk b/t/list-of-tests.mk index e9f8d238f..3852217a4 100644 --- a/t/list-of-tests.mk +++ b/t/list-of-tests.mk @@ -152,7 +152,6 @@ t/autodist-configure-no-subdir.sh \ t/autodist-no-duplicate.sh \ t/autodist-stamp-vti.sh \ t/autohdr.sh \ -t/autohdr2.sh \ t/autohdr3.sh \ t/autohdr4.sh \ t/autohdrdry.sh \ @@ -214,7 +213,6 @@ t/check-no-test-driver.sh \ t/check-concurrency-bug9245.sh \ t/checkall.sh \ t/clean.sh \ -t/clean2.sh \ t/colneq.sh \ t/colneq2.sh \ t/colneq3.sh \ @@ -331,13 +329,7 @@ t/cxxlibobj.sh \ t/cxxlink.sh \ t/cxxnoc.sh \ t/cxxo.sh \ -t/cygnus-deprecation.sh \ -t/cygnus-check-without-all.sh \ -t/cygnus-dependency-tracking.sh \ -t/cygnus-imply-foreign.sh \ -t/cygnus-no-dist.sh \ -t/cygnus-no-installinfo.sh \ -t/cygnus-requires-maintainer-mode.sh \ +t/cygnus-no-more.sh \ t/cygwin32.sh \ t/dash.sh \ t/defun.sh \ @@ -677,7 +669,6 @@ t/missing4.sh \ t/missing5.sh \ t/missing6.sh \ t/missing-auxfile-stops-makefiles-creation.sh \ -t/mkdirp-deprecation.sh \ t/mkinstall.sh \ t/mkinst2.sh \ t/mkinst3.sh \ @@ -714,7 +705,6 @@ t/objcxx-flags.sh \ t/objcxx-deps.sh \ t/objc-megademo.sh \ t/objext-pr10128.sh \ -t/obsolete.sh \ t/oldvars.sh \ t/order.sh \ t/output.sh \ @@ -975,10 +965,8 @@ t/silentcxx.sh \ t/silentcxx-gcc.sh \ t/silentf77.sh \ t/silentf90.sh \ -t/silent-amopts.sh \ t/silent-many-gcc.sh \ t/silent-many-generic.sh \ -t/silent-nowarn.sh \ t/silent-configsite.sh \ t/silent-nested-vars.sh \ t/silent-lex.sh \ @@ -1167,8 +1155,6 @@ t/txinfo.sh \ t/txinfo2.sh \ t/txinfo3.sh \ t/txinfo4.sh \ -t/txinfo5.sh \ -t/txinfo5b.sh \ t/txinfo6.sh \ t/txinfo7.sh \ t/txinfo8.sh \ diff --git a/t/mkdirp-deprecation.sh b/t/mkdirp-deprecation.sh deleted file mode 100755 index 7b8f67f0f..000000000 --- a/t/mkdirp-deprecation.sh +++ /dev/null @@ -1,48 +0,0 @@ -#! /bin/sh -# Copyright (C) 2012 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Check that the AM_PROG_MKDIR_P macro is deprecated. It will be -# be removed in the next major Automake release. - -. ./defs || Exit 1 - -echo AM_PROG_MKDIR_P >> configure.ac -: > Makefile.am - -grep_err () -{ - loc='^configure.ac:4:' - grep "$loc.*AM_PROG_MKDIR_P.*deprecated" stderr - grep "$loc.* use .*AC_PROG_MKDIR_P" stderr - grep "$loc.* use '\$(MKDIR_P)' instead of '\$(mkdir_p)'.*Makefile" stderr -} - -$ACLOCAL - -$AUTOCONF -Werror -Wobsolete 2>stderr && { cat stderr >&2; Exit 1; } -cat stderr >&2 -grep_err - -$AUTOCONF -Werror -Wno-obsolete - -#AUTOMAKE_fails -#grep_err -AUTOMAKE_fails --verbose -Wnone -Wobsolete -grep_err - -$AUTOMAKE -Wno-obsolete - -: diff --git a/t/nodep2.sh b/t/nodep2.sh index cc80058a5..45e7d5c15 100755 --- a/t/nodep2.sh +++ b/t/nodep2.sh @@ -30,12 +30,7 @@ AC_CONFIG_FILES([Makefile]) AC_PROG_CC AC_PROG_CXX AC_PROG_OBJC -# FIXME: this is to cater to older autoconf; remove this once we -# FIXME: automake requires Autoconf 2.65 or later. -m4_ifdef([AC_PROG_OBJCXX], [AC_PROG_OBJCXX], [ - AC_SUBST([OBJCXX], [whocares]) - AM_CONDITIONAL([am__fastdepOBJCXX], [whocares]) -]) +AC_PROG_OBJCXX AM_PROG_AS AM_PROG_GCJ AM_PROG_UPC diff --git a/t/objc-megademo.sh b/t/objc-megademo.sh index bad2aeef8..0e0234172 100755 --- a/t/objc-megademo.sh +++ b/t/objc-megademo.sh @@ -24,8 +24,6 @@ required=libtoolize cat > configure.ac << 'END' AC_INIT([play], [1.3], [bug-automake@gnu.org]) -dnl Support for Object C++ was introduced only in Autoconf 2.65. -AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([play.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) @@ -86,13 +84,7 @@ END ## Run Autotools. libtoolize -if $ACLOCAL; then - : We have a modern enough autoconf, go ahead. -elif test $? -eq 63; then - skip_ "Object C++ support requires Autoconf 2.65 or later" -else - Exit 1 # Some other aclocal failure. -fi +$ACLOCAL $AUTOHEADER $AUTOCONF $AUTOMAKE --add-missing diff --git a/t/objcxx-basic.sh b/t/objcxx-basic.sh index be2cdf752..3835ab47c 100755 --- a/t/objcxx-basic.sh +++ b/t/objcxx-basic.sh @@ -30,19 +30,10 @@ grep "add .*'AC_PROG_OBJCXX'" stderr rm -rf autom4te*.cache cat >> configure.ac <<'END' -dnl Support for Object C++ was introduced only in Autoconf 2.65. -AC_PREREQ([2.65]) AC_PROG_OBJCXX END -if $ACLOCAL; then - : We have a modern enough autoconf, go ahead. -elif test $? -eq 63; then - skip_ "Object C++ support requires Autoconf 2.65 or later" -else - Exit 1 # Some other aclocal failure. -fi - +$ACLOCAL $AUTOMAKE $EGREP '^\.SUFFIXES:.* \.mm( |$)' Makefile.in diff --git a/t/objcxx-deps.sh b/t/objcxx-deps.sh index 782193ac7..c072da287 100755 --- a/t/objcxx-deps.sh +++ b/t/objcxx-deps.sh @@ -20,8 +20,6 @@ . ./defs || Exit 1 cat >> configure.ac << 'END' -dnl Support for Object C++ was introduced only in Autoconf 2.65. -AC_PREREQ([2.65]) AC_PROG_OBJCXX AC_OUTPUT END @@ -50,13 +48,7 @@ int main (void) } END -if $ACLOCAL; then - : We have a modern enough autoconf, go ahead. -elif test $? -eq 63; then - skip_ "Object C++ support requires Autoconf 2.65 or later" -else - Exit 1 # Some other aclocal failure. -fi +$ACLOCAL $AUTOCONF $AUTOMAKE --add-missing diff --git a/t/objcxx-flags.sh b/t/objcxx-flags.sh index aea7e1948..a948891da 100755 --- a/t/objcxx-flags.sh +++ b/t/objcxx-flags.sh @@ -20,8 +20,6 @@ . ./defs || Exit 1 cat >> configure.ac << 'END' -dnl Support for Object C++ was introduced only in Autoconf 2.65. -AC_PREREQ([2.65]) AC_PROG_OBJCXX AC_OUTPUT END @@ -50,14 +48,7 @@ for i in 2 4; do END done -if $ACLOCAL; then - : We have a modern enough autoconf, go ahead. -elif test $? -eq 63; then - skip_ "Object C++ support requires Autoconf 2.65 or later" -else - Exit 1 # Some other aclocal failure. -fi - +$ACLOCAL $AUTOCONF $AUTOMAKE -a diff --git a/t/objcxx-minidemo.sh b/t/objcxx-minidemo.sh index 74e152c1c..e1eabca20 100755 --- a/t/objcxx-minidemo.sh +++ b/t/objcxx-minidemo.sh @@ -21,8 +21,6 @@ required=native . ./defs || Exit 1 cat >> configure.ac << 'END' -dnl Support for Object C++ was introduced only in Autoconf 2.65. -AC_PREREQ([2.65]) AC_PROG_OBJCXX AC_CONFIG_HEADERS([config.h]) AC_OUTPUT @@ -57,13 +55,7 @@ int main (void) } END -if $ACLOCAL; then - : We have a modern enough autoconf, go ahead. -elif test $? -eq 63; then - skip_ "Object C++ support requires Autoconf 2.65 or later" -else - Exit 1 # Some other aclocal failure. -fi +$ACLOCAL $AUTOCONF $AUTOHEADER $AUTOMAKE --add-missing diff --git a/t/obsolete.sh b/t/obsolete.sh deleted file mode 100755 index c4240c200..000000000 --- a/t/obsolete.sh +++ /dev/null @@ -1,57 +0,0 @@ -#! /bin/sh -# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Test to make sure obsolete macros can be autoupdated. - -# We need the following indirection in case someone exported e.g. -# AUTOUPDATE='autoupdate --verbose'. -set x ${AUTOUPDATE-autoupdate} -required=$2 -. ./defs || Exit 1 - -cat > configure.ac << 'END' -AC_INIT -END - -$PERL -ne '/AU_DEFUN\(\[(\w+)\]/ && print "$1\n"' \ - "$am_automake_acdir/obsolete.m4" > obs -cat obs >> configure.ac -$PERL -ne 'chomp; print "grep $_ output || Exit 1\n"; ' obs > obs.1 -$PERL -ne 'chomp; print "grep $_ configure.ac && Exit 1\n"; ' obs > obs.2 -echo : >> obs.1 # Since it will be sourced, it must end with a success. -echo : >> obs.2 # Likewise. - -cat configure.ac # For debugging. -cat obs.1 # Likewise. -cat obs.2 # Likewise. - -# Sanity check. Make sure we have added something to configure.ac. -test `wc -l <configure.ac` -gt 1 - -$ACLOCAL - -# Expect Autoconf to complain about each of the macros in obs. -$AUTOCONF -Wobsolete >output 2>&1 || { cat output; Exit 1; } -cat output -. ./obs.1 -# Make sure Autoupdate remove each of these macros. -$AUTOUPDATE -. ./obs.2 - -# Autoconf should be able to grok the updated configure.ac. -$AUTOCONF - -: diff --git a/t/silent-amopts.sh b/t/silent-amopts.sh deleted file mode 100755 index f71ad13bb..000000000 --- a/t/silent-amopts.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# Copyright (C) 2012 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Check that automake complaints if the 'silent-rules' option is -# used in AUTOMAKE_OPTIONS. - -. ./defs || Exit 1 - -echo AUTOMAKE_OPTIONS = silent-rules > Makefile.am - -$ACLOCAL -AUTOMAKE_fails -grep "^Makefile\.am:1:.*'silent-rules'.*AM_INIT_AUTOMAKE" stderr - -: diff --git a/t/silent-configsite.sh b/t/silent-configsite.sh index 813753b74..d8c2b3322 100755 --- a/t/silent-configsite.sh +++ b/t/silent-configsite.sh @@ -21,7 +21,7 @@ . ./defs || Exit 1 cat >> configure.ac <<'EOF' -AM_SILENT_RULES +# This line will be edited later to force silent-rules default. AC_OUTPUT EOF @@ -51,8 +51,9 @@ $MAKE distclean : 'Disable by default in configure.ac, enable by default in config.site' -sed 's/^AM_SILENT_RULES/&([no])/' configure.ac > configure.tmp -mv -f configure.tmp configure.ac +sed 's/.*silent-rules default.*/AM_SILENT_RULES([no])/' configure.ac > t +diff t configure.ac && fatal_ "editing configure.ac" +mv -f t configure.ac $ACLOCAL $AUTOCONF $AUTOMAKE --add-missing @@ -67,8 +68,9 @@ $MAKE distclean : 'Enable by default in configure.ac, disable by default in config.site' -sed 's/^AM_SILENT_RULES/&([yes])/' configure.ac > configure.tmp -mv -f configure.tmp configure.ac +sed 's/.*AM_SILENT_RULES.*/AM_SILENT_RULES([yes])/' configure.ac > t +diff t configure.ac && fatal_ "editing configure.ac" +mv -f t configure.ac $ACLOCAL $AUTOCONF $AUTOMAKE --add-missing diff --git a/t/silent-lex.sh b/t/silent-lex.sh index ccc9a8f24..fa9623ce0 100755 --- a/t/silent-lex.sh +++ b/t/silent-lex.sh @@ -22,7 +22,6 @@ required='cc lex' mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AM_PROG_CC_C_O AC_PROG_LEX AC_CONFIG_FILES([sub/Makefile]) diff --git a/t/silent-many-gcc.sh b/t/silent-many-gcc.sh index 8b457caaf..8ad07205a 100755 --- a/t/silent-many-gcc.sh +++ b/t/silent-many-gcc.sh @@ -95,7 +95,6 @@ do_and_check_verbose_build () mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AM_PROG_CC_C_O AC_PROG_CXX AC_PROG_F77 diff --git a/t/silent-many-generic.sh b/t/silent-many-generic.sh index 394900978..cd376721a 100755 --- a/t/silent-many-generic.sh +++ b/t/silent-many-generic.sh @@ -96,7 +96,6 @@ do_and_check_verbose_build () mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AM_PROG_CC_C_O AC_PROG_F77 AC_PROG_FC diff --git a/t/silent-nowarn.sh b/t/silent-nowarn.sh deleted file mode 100755 index 5a547bc13..000000000 --- a/t/silent-nowarn.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# Copyright (C) 2011-2012 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Check that the 'silent-rules' mode suppresses the warnings for recursive -# make variable expansions. This should happen regardless of whether and -# where these warnings are requested. - -. ./defs || Exit 1 - -cat > configure.ac <<END -AC_INIT([$me], [1.0]) -# Yes, we repeat the warnings two times, both before and after -# 'silent-rules'. This is deliberate. -AM_INIT_AUTOMAKE([gnu -Wall -Wportability-recursive - silent-rules - -Wall -Wportability-recursive]) -AC_CONFIG_FILES([Makefile]) -END - -cat > Makefile.am <<'END' -AUTOMAKE_OPTIONS = gnu -Wall -Wportability-recursive -foo = $($(v)) $(x$(v)) $($(v)x) $(y$(v)z) -END - -# Files required bu gnu strictness. -touch AUTHORS ChangeLog COPYING INSTALL NEWS README THANKS - -$ACLOCAL -$AUTOMAKE --gnu -Wall -Wportability-recursive - -: diff --git a/t/silent-yacc-headers.sh b/t/silent-yacc-headers.sh index 6a738cb8d..f2722707a 100755 --- a/t/silent-yacc-headers.sh +++ b/t/silent-yacc-headers.sh @@ -23,7 +23,6 @@ required='cc yacc' mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_PROG_YACC AC_PROG_CC AC_OUTPUT diff --git a/t/silent-yacc.sh b/t/silent-yacc.sh index 639b6789d..4b493b5af 100755 --- a/t/silent-yacc.sh +++ b/t/silent-yacc.sh @@ -23,7 +23,6 @@ required='cc yacc' mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AM_PROG_CC_C_O AC_PROG_YACC AC_CONFIG_FILES([sub/Makefile]) diff --git a/t/silent.sh b/t/silent.sh index f914c445c..3cdbaff3f 100755 --- a/t/silent.sh +++ b/t/silent.sh @@ -24,7 +24,6 @@ required=cc mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_CONFIG_FILES([sub/Makefile]) AC_PROG_CC AM_PROG_CC_C_O diff --git a/t/silent2.sh b/t/silent2.sh index 6565a2701..627010475 100755 --- a/t/silent2.sh +++ b/t/silent2.sh @@ -25,7 +25,6 @@ required=gcc mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_CONFIG_FILES([sub/Makefile]) AC_PROG_CC AM_PROG_CC_C_O diff --git a/t/silent3.sh b/t/silent3.sh index 564a49001..cb3c6297f 100755 --- a/t/silent3.sh +++ b/t/silent3.sh @@ -24,7 +24,6 @@ required='cc libtoolize' mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_CONFIG_FILES([sub/Makefile]) AC_PROG_CC AM_PROG_AR diff --git a/t/silent4.sh b/t/silent4.sh index 44b7eb3a0..a44c71885 100755 --- a/t/silent4.sh +++ b/t/silent4.sh @@ -25,7 +25,6 @@ required="libtoolize gcc" mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_CONFIG_FILES([sub/Makefile]) AC_PROG_CC AM_PROG_AR diff --git a/t/silent6.sh b/t/silent6.sh index 280d25a1b..f8ad681d4 100755 --- a/t/silent6.sh +++ b/t/silent6.sh @@ -19,11 +19,12 @@ . ./defs || Exit 1 cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_OUTPUT EOF cat > Makefile.am <<'EOF' +AUTOMAKE_OPTIONS = -Wno-portability-recursive + my_verbose = $(my_verbose_$(V)) my_verbose_ = $(my_verbose_$(AM_DEFAULT_VERBOSITY)) my_verbose_0 = @echo GEN $@; @@ -68,40 +69,4 @@ cat stdout grep '^ *GEN foo *$' stdout grep 'cp ' stdout && Exit 1 -$MAKE distclean - -$sleep -# Things should also work with -Wall in AM_INIT_AUTOMAKE. -cat > configure.ac <<'END' -AC_INIT([silent6], [1.0]) -AM_INIT_AUTOMAKE([-Wall]) -AC_CONFIG_FILES([Makefile]) -END - -$ACLOCAL -AUTOMAKE_fails -$AUTOMAKE -Wno-error - -# AM_SILENT_RULES should turn off the warning. -$sleep -echo 'AM_SILENT_RULES' >> configure.ac -$ACLOCAL -$AUTOMAKE -grep 'AM_V_GEN' Makefile.in -$AUTOMAKE --force -Wno-all -Wportability -grep 'AM_V_GEN' Makefile.in - -# The 'silent-rules' option to AM_INIT_AUTOMAKE should work likewise. -$sleep -cat > configure.ac <<'END' -AC_INIT([silent6], [1.0]) -AM_INIT_AUTOMAKE([silent-rules]) -AC_CONFIG_FILES([Makefile]) -END -$ACLOCAL -$AUTOMAKE -grep 'AM_V_GEN' Makefile.in -$AUTOMAKE --force -Wno-all -Wportability -grep 'AM_V_GEN' Makefile.in - : diff --git a/t/silent7.sh b/t/silent7.sh index 02ef287de..716eadaad 100755 --- a/t/silent7.sh +++ b/t/silent7.sh @@ -15,13 +15,11 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Check user extensibility of silent-rules mode. +# Aslo check that silent rules are disabled by default. . ./defs || Exit 1 -cat >>configure.ac <<'EOF' -AM_SILENT_RULES -AC_OUTPUT -EOF +echo AC_OUTPUT >> configure.ac cat > Makefile.am <<'EOF' all-local: foo @@ -41,7 +39,9 @@ $ACLOCAL $AUTOMAKE --add-missing $AUTOCONF -./configure --disable-silent-rules +# Silent rules are disabled by default, since we haven't called +# "AM_SILENT_RULES([yes])" explicitly. +./configure $MAKE >stdout || { cat stdout; Exit 1; } cat stdout grep 'GEN ' stdout && Exit 1 @@ -85,8 +85,4 @@ grep 'GEN ' stdout && Exit 1 grep 'cp ' stdout grep 'echo ' stdout -# Ensure that setting 'silent-rules' in a Makefile.am produces an error. -echo 'AUTOMAKE_OPTIONS = silent-rules' >> Makefile.am -AUTOMAKE_fails --force - : diff --git a/t/silent8.sh b/t/silent8.sh index a2fdb44c1..f15e99f99 100755 --- a/t/silent8.sh +++ b/t/silent8.sh @@ -19,10 +19,7 @@ required='makeinfo-html tex texi2dvi-o dvips' . ./defs || Exit 1 -cat >>configure.ac <<'EOF' -AM_SILENT_RULES -AC_OUTPUT -EOF +echo AC_OUTPUT >> configure.ac cat > Makefile.am <<'EOF' info_TEXINFOS = foo.texi diff --git a/t/silent9.sh b/t/silent9.sh index 70195a1a8..9b311c66f 100755 --- a/t/silent9.sh +++ b/t/silent9.sh @@ -24,7 +24,6 @@ required='cc libtoolize' mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_CONFIG_FILES([sub/Makefile]) AC_PROG_CC AM_PROG_CC_C_O diff --git a/t/silentcxx-gcc.sh b/t/silentcxx-gcc.sh index d99f1e9cf..fff3f9112 100755 --- a/t/silentcxx-gcc.sh +++ b/t/silentcxx-gcc.sh @@ -24,7 +24,6 @@ required=g++ mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_PROG_CXX AC_CONFIG_FILES([sub/Makefile]) AC_OUTPUT diff --git a/t/silentcxx.sh b/t/silentcxx.sh index a41cc2d13..cc111d3ad 100755 --- a/t/silentcxx.sh +++ b/t/silentcxx.sh @@ -25,7 +25,6 @@ required=c++ mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_PROG_CXX AC_CONFIG_FILES([sub/Makefile]) AC_OUTPUT diff --git a/t/silentf77.sh b/t/silentf77.sh index ce6f6a044..87fbc236f 100755 --- a/t/silentf77.sh +++ b/t/silentf77.sh @@ -23,7 +23,6 @@ required=fortran77 mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_PROG_F77 AC_CONFIG_FILES([sub/Makefile]) AC_OUTPUT diff --git a/t/silentf90.sh b/t/silentf90.sh index 8bb06b262..65a35ed94 100755 --- a/t/silentf90.sh +++ b/t/silentf90.sh @@ -23,7 +23,6 @@ required=fortran mkdir sub cat >>configure.ac <<'EOF' -AM_SILENT_RULES AC_PROG_FC AC_CONFIG_FILES([sub/Makefile]) AC_OUTPUT diff --git a/t/stamph2.sh b/t/stamph2.sh index 59a373a35..5346bfc4c 100755 --- a/t/stamph2.sh +++ b/t/stamph2.sh @@ -18,10 +18,9 @@ . ./defs || Exit 1 cat >> configure.ac << END -AM_CONFIG_HEADER([1.h - 2.h:config.hin - 3.h:sdir1/config1.hin]) -# AM_CONFIG_HEADER and AC_CONFIG_HEADERS should be synonyms. +AC_CONFIG_HEADERS([1.h + 2.h:config.hin + 3.h:sdir1/config1.hin]) AC_CONFIG_HEADERS([sdir1/4.h sdir1/5.h:config.hin sdir1/6.h:sdir1/config1.hin diff --git a/t/subdir6.sh b/t/subdir6.sh index 5c17b6550..26f395724 100755 --- a/t/subdir6.sh +++ b/t/subdir6.sh @@ -19,7 +19,7 @@ . ./defs || Exit 1 cat >> configure.ac << 'END' -AM_CONFIG_HEADER([sub/config.h:sub/config.hin]) +AC_CONFIG_HEADERS([sub/config.h:sub/config.hin]) AC_OUTPUT END diff --git a/t/txinfo5.sh b/t/txinfo5.sh deleted file mode 100755 index d51561711..000000000 --- a/t/txinfo5.sh +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/sh -# Copyright (C) 1998-2012 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Test to make sure that texinfo.tex is not required by --cygnus. -# Also check that TEXINFOS + cygnus work without requiring the -# '-Wno-override' option. -# See also sister test txinfo5b.test. -# Report from Ian Taylor. - -. ./defs || Exit 1 - -cat >> configure.ac << 'END' -AM_MAINTAINER_MODE -END - -cat > Makefile.am << 'END' -info_TEXINFOS = ian.texi -END - -echo '@setfilename ian.info' > ian.texi - -$ACLOCAL -$AUTOMAKE --cygnus -Wno-obsolete - -: diff --git a/t/txinfo5b.sh b/t/txinfo5b.sh deleted file mode 100755 index a99f60758..000000000 --- a/t/txinfo5b.sh +++ /dev/null @@ -1,42 +0,0 @@ -#! /bin/sh -# Copyright (C) 1998-2012 Free Software Foundation, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Test to make sure that texinfo.tex is not required by --cygnus. -# See also sister test txinfo5.test. -# Report from Ian Taylor. - -. ./defs || Exit 1 - -cat >> configure.ac << 'END' -AM_MAINTAINER_MODE -END - -cat > Makefile.am << 'END' -# Disable 'override' warnings to work around an unrelated -# texi+cygnus bug. -# Disable obsolete warnings because the 'cygnus' mode is now deprecated. -AUTOMAKE_OPTIONS = -Wno-override -Wno-obsolete -info_TEXINFOS = ian.texi -END - -echo '@setfilename ian.info' > ian.texi - -$ACLOCAL -$AUTOMAKE --cygnus -$AUTOMAKE -a --cygnus -test ! -f texinfo.tex - -: |