* bin/autoreconf.in: Pass the directory argument to

`require_configure_ac'.  Fix comment.
* tests/torture.at (Configuring subdirectories): Expose this.
Reported by Olly Betts.

diff --git a/ChangeLog b/ChangeLog
index 679b49090477d4ea31aa187e6e0bed42f7cd1f00..3c62ac8a6029dc997d32ebd29969a0c373ab2a05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-05-17  Olly Betts  <olly@survex.com>  (tiny change)
+       and Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * bin/autoreconf.in: Pass the directory argument to
+       `require_configure_ac'.  Fix comment.
+       * tests/torture.at (Configuring subdirectories): Expose this.
+       Reported by Olly Betts.
+
 2006-05-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * lib/Automake/Configure_ac.pm, lib/Automake/Channels.pm,

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 792cd23ea8317e9a5f501545cc7bab2445fb171b..bab8ee564f79ab65dec5290bfff1841d7216134d 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -664,11 +664,11 @@ mktmpdir ('ar');
 $ENV{'TMPDIR'} = $tmp;
 parse_args;
 
-# Autoreconf all the given configure.ac.  A while loop, not a for,
-# since the list can change at runtime because of AC_CONFIG_SUBDIRS.
+# Autoreconf all the given configure.ac.  Unless `--no-recursive' is passed,
+# AC_CONFIG_SUBDIRS will be traversed in &autoreconf_current_directory.
 for my $directory (@ARGV)
   {
-    require_configure_ac;
+    require_configure_ac ($directory);
     autoreconf ($directory);
   }
 

diff --git a/tests/torture.at b/tests/torture.at
index 919fca8e4d4ec5dba0e67bf3a732a3a9f3a583fe..9d58211bc36e852101228b15f6ebbe33e8e8e237 100644 (file)
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -853,6 +853,14 @@ top_srcdir=../../../inner
 prefix=/good
 ])
 
+# Make sure we can run autoreconf on a subdirectory
+rm -f configure configure.in
+AT_CHECK([autoreconf inner], [], [], [ignore])
+
+# Make sure we can pass a configure.ac name
+AT_CHECK([cd inner && autoreconf configure.in], [], [], [ignore])
+AT_CHECK([autoreconf inner/configure.in], [], [], [ignore])
+
 AT_CLEANUP