From: Akim Demaille <akim@epita.fr>
Date: Fri, 2 Nov 2001 16:28:33 +0000 (+0000)
Subject: * bin/autoreconf.in (&autoreconf): Set `$aclocal_flags' to ''.
X-Git-Tag: AUTOCONF-2.52f~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e98f4efcfe7e8ec04875230dc55eff1cc904432;p=thirdparty%2Fautoconf.git

* bin/autoreconf.in (&autoreconf): Set `$aclocal_flags' to ''.
Don't run aclocal when aclocal.m4 is not from aclocal.
From Ezra Peisach.
Don't run libtoolize and gettextize if --install is not given.
---

diff --git a/ChangeLog b/ChangeLog
index 20d1c1edb..9f9010132 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,17 @@
+2001-11-02  Akim Demaille  <akim@epita.fr>
+
+	* bin/autoreconf.in (&autoreconf): Set `$aclocal_flags' to ''.
+	Don't run aclocal when aclocal.m4 is not from aclocal.
+	From Ezra Peisach.
+	Don't run libtoolize and gettextize if --install is not given.
+
 2001-11-01  Paul Eggert  <eggert@twinsun.com>
 
 	* lib/m4sugar/m4sh.m4 (AS_SHELL_SANITIZE): _AS_CR_PREPARE needs to
 	be invoked before _AS_LINENO_PREPARE.
         (_AS_LINENO_PREPARE): Use as_cr_digits and as_cr_alnum rather
 	than character ranges.
-	
+
 	* lib/m4sugar/m4sh.m4 (AS_SHELL_SANITIZE): Fix NLS before
 	invoking AS_BASENAME.  Set the locale variables to 'C' if
 	possible, as POSIX requires this to get the traditional
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 1c87b2e9c..2e5f0a74c 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -212,6 +212,7 @@ sub autoreconf ($)
   my $uses_gettext;
   my $uses_libtool;
   my $uses_autoheader;
+  my $uses_aclocal;
   while ($_ = $configure_ac_file->getline)
      {
        $uses_autoconf = 1
@@ -254,10 +255,14 @@ sub autoreconf ($)
     {
       verbose "$configure_ac: not running gettextize: `intl' is already present";
     }
-  else
+  elsif ($install)
     {
       xsystem ($gettextize);
     }
+  else
+    {
+      verbose "$configure_ac: not running gettextize: --install not given";
+    }
 
 
   # -------------------- #
@@ -268,37 +273,61 @@ sub autoreconf ($)
     {
       verbose "$configure_ac: not using Libtool";
     }
-  else
+  elsif ($install)
     {
       xsystem ($libtoolize);
     }
+  else
+    {
+      verbose "$configure_ac: not running libtoolize: --install not given";
+    }
 
 
   # ----------------- #
   # Running aclocal.  #
   # ----------------- #
 
-  # Always run aclocal.  Tracking its sources for up-to-dateness
-  # is too complex and too error prone.  The best we can do is
-  # avoiding nuking the time stamp.
+  # Always run aclocal.  Tracking its sources for up-to-dateness is
+  # too complex and too error prone.  The best we can do is avoiding
+  # nuking the time stamp.
+  $uses_aclocal = 1;
+
+  # Nevertheless, if aclocal.m4 exists and is not made by aclocal,
+  # don't run aclocal.
+
+  if (-f 'aclocal.m4')
+    {
+      my $aclocal_m4 = new Autom4te::XFile 'aclocal.m4';
+      $_ = $aclocal_m4->getline;
+      $uses_aclocal = 0
+	unless /generated.*by aclocal/;
+    }
 
   # If there are flags for aclocal in Makefile.am, use them.
-  my $aclocal_flags;
+  my $aclocal_flags = '';
   if (-f 'Makefile.am')
     {
-      my $aclocal_m4 = new Autom4te::XFile 'Makefile.am';
-      while ($_ = $aclocal_m4->getline)
+      my $makefile = new Autom4te::XFile 'Makefile.am';
+      while ($_ = $makefile->getline)
 	{
 	  if (/^ACLOCAL_[A-Z_]*FLAGS\s*=\s*(.*)/)
 	    {
 	      $aclocal_flags = $1;
+	      $uses_aclocal = 1;
 	      last;
 	    }
 	}
     }
 
-  xsystem ("$aclocal $aclocal_flags --output=aclocal.m4t");
-  update_file ('aclocal.m4t', 'aclocal.m4');
+  if (!$uses_aclocal)
+    {
+      verbose "$configure_ac: not using aclocal";
+    }
+  else
+    {
+      xsystem ("$aclocal $aclocal_flags --output=aclocal.m4t");
+      update_file ('aclocal.m4t', 'aclocal.m4');
+    }
 
   # ------------------ #
   # Running automake.  #
diff --git a/man/autoreconf.1 b/man/autoreconf.1
index 615698f66..d9c77a285 100644
--- a/man/autoreconf.1
+++ b/man/autoreconf.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.24.
-.TH AUTORECONF "1" "October 2001" "GNU Autoconf 2.52e" FSF
+.TH AUTORECONF "1" "November 2001" "GNU Autoconf 2.52e" FSF
 .SH NAME
 autoreconf \- Update generated configuration files
 .SH SYNOPSIS