From: Akim Demaille Date: Tue, 29 Jan 2002 17:19:29 +0000 (+0000) Subject: * tests/torture.at (Configuring subdirectories): Use configure.in, X-Git-Tag: AUTOCONF-2.52h~29 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06978acd7b1ce2dc660e17a08d9edc88e94568eb;p=thirdparty%2Fautoconf.git * tests/torture.at (Configuring subdirectories): Use configure.in, so that aclocal 1.4 works. Reported by Alexandre Duret-Lutz and Larry Schmitt. --- diff --git a/ChangeLog b/ChangeLog index abd4b38fa..4b9bc4094 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-01-29 Akim Demaille + + * tests/torture.at (Configuring subdirectories): Use configure.in, + so that aclocal 1.4 works. + Reported by Alexandre Duret-Lutz and Larry Schmitt. + 2002-01-28 Akim Demaille * doc/autoconf.texi (Writing testsuite.at): AT_CLEANUP no longer diff --git a/THANKS b/THANKS index c8f8eedb9..36b978fa6 100644 --- a/THANKS +++ b/THANKS @@ -8,6 +8,7 @@ Aharon Robbins arnold@gnu.org Akim Demaille akim@freefriends.org Alain Knaff Alain.Knaff@imag.fr Alec Wolman wolman@cs.washington.edu +Alexandre Duret-Lutz duret_g@epita.fr Alexandre Oliva oliva@lsd.ic.unicamp.br Andreas Buening andreas.buening@nexgo.de Andreas Jaeger aj@suse.de @@ -94,6 +95,7 @@ Ken Raeburn raeburn@cygnus.com Kevin Ryde user42@zip.com.au Koji Arai JCA02266@nifty.ne.jp Kurt D. Zeilenga kurt@openldap.org +Larry Schmitt larry@mail.haleakalawebdesigns.com Larry Schwimmer rosebud@cyclone.stanford.edu Lars Hecking lhecking@nmrc.ucc.ie Lars J. Aas larsa@sim.no diff --git a/tests/torture.at b/tests/torture.at index 8626ddd27..6972bfb9b 100644 --- a/tests/torture.at +++ b/tests/torture.at @@ -554,7 +554,10 @@ cd testSubDir # The contents of `inner/', and `inner/innermost/'. AS_MKDIR_P([inner/innermost]) -AT_DATA([inner/configure.ac], +# We have to use configure.in, not configure.ac, if we still want to +# be compatible with Automake 1.4: aclocal (run by autoreconf) would +# die because it can't find configure.in. +AT_DATA([inner/configure.in], [AC_INIT(GNU Inner, 1.0) AC_CONFIG_SRCDIR([innermost/config.in]) AC_ARG_VAR([INNER], [an inner variable]) @@ -573,7 +576,7 @@ top_srcdir=@top_srcdir@ AT_DATA([install-sh], []) # nonexistent is allowed not to exist. -AT_DATA([configure.ac], +AT_DATA([configure.in], [AC_INIT(GNU Outer, 1.0) AC_ARG_VAR([OUTER], [an outer variable]) if false; then @@ -608,4 +611,4 @@ top_srcdir=../../../inner ]) -AT_CLEANUP(testSubDir) +AT_CLEANUP