From db973eaa2be26fcfb523e3bfed65cf466e4946aa Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Tue, 21 Feb 2012 19:47:36 +0100 Subject: tests: prefer 'configure.ac' over 'configure.in' With this change, our testsuite now uses 'configure.ac' as the name for the typical autoconf input, instead of the obsolescent 'configure.in' (which has been deprecated for several years, at least since autoconf 2.50). Most of the test cases changed by this commit have been automatically modified with this sed command (using GNU sed): sed -i 's/\/configure\1.ac/g' * syntax-checks.mk (sc_tests_no_configure_in): New syntax check. (syntax_check_rules): Add it. * tests/defs: Create stub for autoconf input in 'configure.ac', not in 'configure.in'. Adjust comments. ($AUTOCONF, $AUTOHEADER, $AUTORECONF): Remove workaround for the infamous debian autoconf wrapper: we don't need such workaround anymore now that we name our autoconf input as 'configure.ac'. For more information, see commit v1.11-564-g63da492 "test defs: hack to support autoconf-wrapper programs" of 16-12-2011. * tests/README: Use 'configure.ac', not 'configure.in'. * Many many tests: Likewise. * tests/backcompat3.test: Adjust to avoid spurious failures. * tests/backcompat5.test: Likewise. * tests/missing6.test: Likewise. * tests/backcompat6.test: Likewise, and extend a bit since we are at it. --- tests/subdir5.test | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/subdir5.test') diff --git a/tests/subdir5.test b/tests/subdir5.test index c0c7548e9..ed8eb7564 100755 --- a/tests/subdir5.test +++ b/tests/subdir5.test @@ -21,7 +21,7 @@ . ./defs || Exit 1 -cat >> configure.in << 'END' +cat >> configure.ac << 'END' AC_OUTPUT END @@ -35,20 +35,20 @@ $MAKE # Now add new directories. -# First we add a new directory by modifying configure.in directly. -# We update configure.in *before* updating sub/Makefile.am; subdir8.test +# First we add a new directory by modifying configure.ac directly. +# We update configure.ac *before* updating sub/Makefile.am; subdir8.test # does it in the other way: it updates confiles.m4 (which is m4_included -# by configure.in there) after Makefile.am. +# by configure.ac there) after Makefile.am. # Modified configure dependencies must be newer than config.status. $sleep -sed configure.tmp -e '/^AC_OUTPUT$/i\ +sed configure.tmp -e '/^AC_OUTPUT$/i\ AC_CONFIG_FILES([maude/Makefile])\ m4_include([confile.m4])\ ' # Last newline required by older OpenBSD sed. -mv -f configure.tmp configure.in +mv -f configure.tmp configure.ac -cat configure.in # For debugging. +cat configure.ac # For debugging. : > confile.m4 @@ -69,7 +69,7 @@ grep '^SUBDIRS = *maude *$' Makefile test -f maude/Makefile # Then we add a new directory by modifying a file included (through -# `m4_include') by configure.in. +# `m4_include') by configure.ac. mkdir maude2 # Modified configure dependencies must be newer than config.status. $sleep -- cgit v1.2.1