--- /home/max/bin/autoreconf.current	2002-12-05 20:51:01.000000000 +0000
+++ /home/max/bin/myautoreconf	2003-05-11 22:21:44.000000000 +0100
@@ -66,6 +66,7 @@
   -s, --symlink            with -i, install symbolic links instead of copies
   -m, --make               when applicable, re-run ./configure && make
   -W, --warnings=CATEGORY  report the warnings falling in CATEGORY [syntax]
+  -l, --local              local directory only (don't recurse)
 
 Warning categories include:
   \`cross\'         cross compilation issues
@@ -103,10 +104,10 @@
 # Lib files.
 my $autoconf   = $ENV{'AUTOCONF'}   || '/usr/autotool/devel/bin/autoconf';
 my $autoheader = $ENV{'AUTOHEADER'} || '/usr/autotool/devel/bin/autoheader';
-my $automake   = $ENV{'AUTOMAKE'}   || 'automake';
-my $aclocal    = $ENV{'ACLOCAL'}    || 'aclocal';
-my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize';
-my $autopoint  = $ENV{'AUTOPOINT'}  || 'autopoint';
+my $automake   = $ENV{'AUTOMAKE'}   || '/usr/autotool/devel/bin/automake';
+my $aclocal    = $ENV{'ACLOCAL'}    || '/usr/autotool/devel/bin/aclocal';
+my $libtoolize = $ENV{'LIBTOOLIZE'} || '/usr/autotool/devel/bin/libtoolize';
+my $autopoint  = $ENV{'AUTOPOINT'}  || '/usr/autotool/devel/bin/autopoint';
 
 # --install -- as --add-missing in other tools.
 my $install = 0;
@@ -122,6 +123,9 @@
 # Rerun `./configure && make'?
 my $make = 0;
 
+# Don't recurse into subdirectories
+my $local = 0;
+
 ## ---------- ##
 ## Routines.  ##
 ## ---------- ##
@@ -139,7 +143,8 @@
 	  'B|prepend-include=s'	 => \@prepend_include,
 	  'i|install'            => \$install,
 	  's|symlink'            => \$symlink,
-	  'm|make'               => \$make);
+	  'm|make'               => \$make,
+	  'l|local'              => \$local);
 
   # Split the warnings as a list of elements instead of a list of
   # lists.
@@ -381,8 +386,9 @@
     {
       if (-d)
 	{
-	  verbose "$configure_ac: subdirectory $_ to autoreconf";
-	  autoreconf ($_);
+	  verbose "$configure_ac: subdirectory $_"
+	    . ($local?": recursion off":" to autoreconf");
+	  autoreconf ($_) unless $local;
 	}
       else
 	{
@@ -391,9 +397,9 @@
     }
 
   # Gettext consistency checks...
-  error "$configure_ac: AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION"
+  print STDERR "$configure_ac: AM_GNU_GETTEXT is used, but not AM_GNU_GETTEXT_VERSION\n"
     if $uses_gettext_via_traces && ! $uses_gettext;
-  error "$configure_ac: AM_GNU_GETTEXT_VERSION is used, but not AM_GNU_GETTEXT"
+  print STDERR "$configure_ac: AM_GNU_GETTEXT_VERSION is used, but not AM_GNU_GETTEXT\n"
     if $uses_gettext && ! $uses_gettext_via_traces;