Fix the bugs recently introduced in autoreconf.

* autoreconf.sh: Don't run automake when the package is not using
it.
When checking whether autoheader should be rerun, don't ask
config.h to be newer than stamp-h and vice-versa.
Remove an unbalanced `fi'.

diff --git a/ChangeLog b/ChangeLog
index 0af4f7374bb2683fe772dd0481505a0c4a53e48f..412cc6c0e6b2beded534ee6a9ab3745795cdd422 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-07-10  Akim Demaille  <akim@epita.fr>
+
+       Fix the bugs recently introduced in autoreconf.
+
+       * autoreconf.sh: Don't run automake when the package is not using
+       it.
+       When checking whether autoheader should be rerun, don't ask
+       config.h to be newer than stamp-h and vice-versa.
+       Remove an unbalanced `fi'.
+
 2000-07-10  Akim Demaille  <akim@epita.fr>
 
        * autoreconf.sh (run_aclocal): Rename as `uses_aclocal' to avoid

diff --git a/autoreconf.in b/autoreconf.in
index 87794dac003cdd613c08777f9ae14e0f667493e2..e347f4cd1a4fc4431dc245df939590865e82c0ac 100644 (file)
--- a/autoreconf.in
+++ b/autoreconf.in
@@ -271,7 +271,11 @@ while read dir; do
   # ------------------ #
 
   # Assumes that there is a Makefile.am in the topmost directory.
-  if $force || $update Makefile.in Makefile.am; then
+  uses_automake=false
+  test -f "Makefile.am" &&
+    uses_automake=:
+  if $uses_automake &&
+     { $force || $update Makefile.in Makefile.am; } then
     $verbose running $automake in $dir
     $automake
   fi
@@ -311,18 +315,16 @@ while read dir; do
     acconfig_h=`echo $localdir_opt | sed -e 's/--localdir=//' \
                                          -e '/./ s%$%/%'`acconfig.h
     uses_autoheader=false;
-    if grep autoheader "$template" >/dev/null 2>&1; then
+    grep autoheader "$template" >/dev/null 2>&1 &&
        uses_autoheader=:
-    fi
     if $uses_autoheader &&
        { $force ||
-         $update $template $stamp configure.in $aclocal_m4 $acconfig_h ||
-         $update $stamp $template configure.in $aclocal_m4 $acconfig_h; } then
-        $verbose running $autoheader $localdir_opt in $dir
-        $autoheader $localdir_opt &&
-        $verbose "touching $stamp" &&
-        touch $stamp
-      fi
+         $update $template configure.in $aclocal_m4 $acconfig_h ||
+         $update $stamp    configure.in $aclocal_m4 $acconfig_h; } then
+      $verbose running $autoheader $localdir_opt in $dir
+      $autoheader $localdir_opt &&
+      $verbose "touching $stamp" &&
+      touch $stamp
     fi
   fi
   )

diff --git a/autoreconf.sh b/autoreconf.sh
index 87794dac003cdd613c08777f9ae14e0f667493e2..e347f4cd1a4fc4431dc245df939590865e82c0ac 100644 (file)
--- a/autoreconf.sh
+++ b/autoreconf.sh
@@ -271,7 +271,11 @@ while read dir; do
   # ------------------ #
 
   # Assumes that there is a Makefile.am in the topmost directory.
-  if $force || $update Makefile.in Makefile.am; then
+  uses_automake=false
+  test -f "Makefile.am" &&
+    uses_automake=:
+  if $uses_automake &&
+     { $force || $update Makefile.in Makefile.am; } then
     $verbose running $automake in $dir
     $automake
   fi
@@ -311,18 +315,16 @@ while read dir; do
     acconfig_h=`echo $localdir_opt | sed -e 's/--localdir=//' \
                                          -e '/./ s%$%/%'`acconfig.h
     uses_autoheader=false;
-    if grep autoheader "$template" >/dev/null 2>&1; then
+    grep autoheader "$template" >/dev/null 2>&1 &&
        uses_autoheader=:
-    fi
     if $uses_autoheader &&
        { $force ||
-         $update $template $stamp configure.in $aclocal_m4 $acconfig_h ||
-         $update $stamp $template configure.in $aclocal_m4 $acconfig_h; } then
-        $verbose running $autoheader $localdir_opt in $dir
-        $autoheader $localdir_opt &&
-        $verbose "touching $stamp" &&
-        touch $stamp
-      fi
+         $update $template configure.in $aclocal_m4 $acconfig_h ||
+         $update $stamp    configure.in $aclocal_m4 $acconfig_h; } then
+      $verbose running $autoheader $localdir_opt in $dir
+      $autoheader $localdir_opt &&
+      $verbose "touching $stamp" &&
+      touch $stamp
     fi
   fi
   )

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 87794dac003cdd613c08777f9ae14e0f667493e2..e347f4cd1a4fc4431dc245df939590865e82c0ac 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -271,7 +271,11 @@ while read dir; do
   # ------------------ #
 
   # Assumes that there is a Makefile.am in the topmost directory.
-  if $force || $update Makefile.in Makefile.am; then
+  uses_automake=false
+  test -f "Makefile.am" &&
+    uses_automake=:
+  if $uses_automake &&
+     { $force || $update Makefile.in Makefile.am; } then
     $verbose running $automake in $dir
     $automake
   fi
@@ -311,18 +315,16 @@ while read dir; do
     acconfig_h=`echo $localdir_opt | sed -e 's/--localdir=//' \
                                          -e '/./ s%$%/%'`acconfig.h
     uses_autoheader=false;
-    if grep autoheader "$template" >/dev/null 2>&1; then
+    grep autoheader "$template" >/dev/null 2>&1 &&
        uses_autoheader=:
-    fi
     if $uses_autoheader &&
        { $force ||
-         $update $template $stamp configure.in $aclocal_m4 $acconfig_h ||
-         $update $stamp $template configure.in $aclocal_m4 $acconfig_h; } then
-        $verbose running $autoheader $localdir_opt in $dir
-        $autoheader $localdir_opt &&
-        $verbose "touching $stamp" &&
-        touch $stamp
-      fi
+         $update $template configure.in $aclocal_m4 $acconfig_h ||
+         $update $stamp    configure.in $aclocal_m4 $acconfig_h; } then
+      $verbose running $autoheader $localdir_opt in $dir
+      $autoheader $localdir_opt &&
+      $verbose "touching $stamp" &&
+      touch $stamp
     fi
   fi
   )