* autoreconf.sh: Formatting changes.

When verbose, display exactly what you do, not just a synopsis.
When using `$verbose' don't use quotes to avoid spurious spaces
for empty arguments.

diff --git a/ChangeLog b/ChangeLog
index 66eb69b5e586c1b2a08e44a5d76d146bd92b7caf..476ddd8a6e5f025fbc03615fc4ecfd89cb387848 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-07-10  Akim Demaille  <akim@epita.fr>
+
+       * autoreconf.sh: Formatting changes.
+       When verbose, display exactly what you do, not just a synopsis.
+       When using `$verbose' don't use quotes to avoid spurious spaces
+       for empty arguments.
+
 2000-07-10  Akim Demaille  <akim@epita.fr>
 
        * autoreconf.sh (force): Instead of yes/no, use :/false.

diff --git a/autoreconf.in b/autoreconf.in
index 47036d64e0d8026ae80507a2dcbeeb21ad339b76..df225f85116b37588b2805e18f4dae1b2608a08f 100644 (file)
--- a/autoreconf.in
+++ b/autoreconf.in
@@ -200,17 +200,14 @@ while read dir; do
   run_aclocal=no
   aclocal_dir=`echo $aclocal_m4 | sed 's,/*[^/]*$,,;s,^$,.,'`
   if test -f "$aclocal_m4" &&
-     grep 'generated automatically by aclocal' $aclocal_m4 > /dev/null
-  then
+     grep 'generated automatically by aclocal' $aclocal_m4 >/dev/null; then
      run_aclocal=yes
   else
-     if test -f "$aclocal_dir/acinclude.m4"
-     then
+     if test -f "$aclocal_dir/acinclude.m4"; then
        run_aclocal=yes
      fi
   fi
-  if test $run_aclocal = yes
-  then
+  if test $run_aclocal = yes; then
       # If there are flags for aclocal, use them.  Makefile.am and Makefile
       # may not exists.
       aclocal_flags=`sed -ne '\
@@ -220,17 +217,13 @@ while read dir; do
   q
 }' Makefile.in 2>/dev/null`
      if $force &&
-        ls -lt configure.in $aclocal_m4 $aclocal_dir/acinclude.m4 2>/dev/null|
+        ls -lt configure.in $aclocal_m4 $aclocal_dir/acinclude.m4 2>/dev/null |
        sed 1q |
-        grep 'aclocal\.m4$' > /dev/null
-     then
-       :
-     else
-       if test x"$aclocal_dir" != x.
-       then
+        grep 'aclocal\.m4$' >/dev/null; then :; else
+       if test x"$aclocal_dir" != x.; then
           aclocal_flags="$aclocal_flags -I $aclocal_dir"
        fi
-       $verbose "running $aclocal $aclocal_flags in $dir, creating $aclocal_m4"
+       $verbose running $aclocal $aclocal_flags --output=$aclocal_m4 in $dir
        $aclocal $aclocal_flags --output=$aclocal_m4
      fi
   fi
@@ -244,13 +237,12 @@ while read dir; do
 
   test ! -f $aclocal_m4 && aclocal_m4=
 
-  if $force && test -f configure &&
-    ls -lt configure configure.in $aclocal_m4 | sed 1q |
-      grep 'configure$' > /dev/null
-  then
-    :
-  else
-    $verbose "running autoconf in $dir"
+  if $force &&
+     test -f configure &&
+     ls -lt configure configure.in $aclocal_m4 |
+       sed 1q |
+       grep 'configure$' >/dev/null; then :; else
+    $verbose running $autoconf $localdir_opt in $dir
     $autoconf $localdir_opt
   fi
 
@@ -268,17 +260,16 @@ while read dir; do
        : colon
        s/:.*//
       '`
-    stamp=`echo $template | sed 's,/*[^/]*$,,;s,^$,.,'`/stamp-h`test "$tcount" -gt 1 && echo "$tcount"`.in
+    template_dir=`echo $template | sed 's,/*[^/]*$,,;s,^$,.,'`
+    stamp_num=`test "$tcount" -gt 1 && echo "$tcount"`
+    stamp=$template_dir/stamp-h$stamp_num.in
     if test ! -f "$template" || grep autoheader "$template" >/dev/null; then
       if $force && test -f $template &&
         ls -lt $template configure.in $aclocal_m4 $stamp 2>/dev/null \
                `echo $localdir_opt | sed -e 's/--localdir=//' \
                                          -e '/./ s%$%/%'`acconfig.h |
-          sed 1q | egrep "$template$|$stamp$" > /dev/null
-      then
-        :
-      else
-        $verbose "running autoheader in $dir"
+          sed 1q | egrep "$template$|$stamp$" >/dev/null; then :; else
+        $verbose running $autoheader $localdir_opt in $dir
         $autoheader $localdir_opt &&
         $verbose "touching $stamp" &&
         touch $stamp

diff --git a/autoreconf.sh b/autoreconf.sh
index 47036d64e0d8026ae80507a2dcbeeb21ad339b76..df225f85116b37588b2805e18f4dae1b2608a08f 100644 (file)
--- a/autoreconf.sh
+++ b/autoreconf.sh
@@ -200,17 +200,14 @@ while read dir; do
   run_aclocal=no
   aclocal_dir=`echo $aclocal_m4 | sed 's,/*[^/]*$,,;s,^$,.,'`
   if test -f "$aclocal_m4" &&
-     grep 'generated automatically by aclocal' $aclocal_m4 > /dev/null
-  then
+     grep 'generated automatically by aclocal' $aclocal_m4 >/dev/null; then
      run_aclocal=yes
   else
-     if test -f "$aclocal_dir/acinclude.m4"
-     then
+     if test -f "$aclocal_dir/acinclude.m4"; then
        run_aclocal=yes
      fi
   fi
-  if test $run_aclocal = yes
-  then
+  if test $run_aclocal = yes; then
       # If there are flags for aclocal, use them.  Makefile.am and Makefile
       # may not exists.
       aclocal_flags=`sed -ne '\
@@ -220,17 +217,13 @@ while read dir; do
   q
 }' Makefile.in 2>/dev/null`
      if $force &&
-        ls -lt configure.in $aclocal_m4 $aclocal_dir/acinclude.m4 2>/dev/null|
+        ls -lt configure.in $aclocal_m4 $aclocal_dir/acinclude.m4 2>/dev/null |
        sed 1q |
-        grep 'aclocal\.m4$' > /dev/null
-     then
-       :
-     else
-       if test x"$aclocal_dir" != x.
-       then
+        grep 'aclocal\.m4$' >/dev/null; then :; else
+       if test x"$aclocal_dir" != x.; then
           aclocal_flags="$aclocal_flags -I $aclocal_dir"
        fi
-       $verbose "running $aclocal $aclocal_flags in $dir, creating $aclocal_m4"
+       $verbose running $aclocal $aclocal_flags --output=$aclocal_m4 in $dir
        $aclocal $aclocal_flags --output=$aclocal_m4
      fi
   fi
@@ -244,13 +237,12 @@ while read dir; do
 
   test ! -f $aclocal_m4 && aclocal_m4=
 
-  if $force && test -f configure &&
-    ls -lt configure configure.in $aclocal_m4 | sed 1q |
-      grep 'configure$' > /dev/null
-  then
-    :
-  else
-    $verbose "running autoconf in $dir"
+  if $force &&
+     test -f configure &&
+     ls -lt configure configure.in $aclocal_m4 |
+       sed 1q |
+       grep 'configure$' >/dev/null; then :; else
+    $verbose running $autoconf $localdir_opt in $dir
     $autoconf $localdir_opt
   fi
 
@@ -268,17 +260,16 @@ while read dir; do
        : colon
        s/:.*//
       '`
-    stamp=`echo $template | sed 's,/*[^/]*$,,;s,^$,.,'`/stamp-h`test "$tcount" -gt 1 && echo "$tcount"`.in
+    template_dir=`echo $template | sed 's,/*[^/]*$,,;s,^$,.,'`
+    stamp_num=`test "$tcount" -gt 1 && echo "$tcount"`
+    stamp=$template_dir/stamp-h$stamp_num.in
     if test ! -f "$template" || grep autoheader "$template" >/dev/null; then
       if $force && test -f $template &&
         ls -lt $template configure.in $aclocal_m4 $stamp 2>/dev/null \
                `echo $localdir_opt | sed -e 's/--localdir=//' \
                                          -e '/./ s%$%/%'`acconfig.h |
-          sed 1q | egrep "$template$|$stamp$" > /dev/null
-      then
-        :
-      else
-        $verbose "running autoheader in $dir"
+          sed 1q | egrep "$template$|$stamp$" >/dev/null; then :; else
+        $verbose running $autoheader $localdir_opt in $dir
         $autoheader $localdir_opt &&
         $verbose "touching $stamp" &&
         touch $stamp

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 47036d64e0d8026ae80507a2dcbeeb21ad339b76..df225f85116b37588b2805e18f4dae1b2608a08f 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -200,17 +200,14 @@ while read dir; do
   run_aclocal=no
   aclocal_dir=`echo $aclocal_m4 | sed 's,/*[^/]*$,,;s,^$,.,'`
   if test -f "$aclocal_m4" &&
-     grep 'generated automatically by aclocal' $aclocal_m4 > /dev/null
-  then
+     grep 'generated automatically by aclocal' $aclocal_m4 >/dev/null; then
      run_aclocal=yes
   else
-     if test -f "$aclocal_dir/acinclude.m4"
-     then
+     if test -f "$aclocal_dir/acinclude.m4"; then
        run_aclocal=yes
      fi
   fi
-  if test $run_aclocal = yes
-  then
+  if test $run_aclocal = yes; then
       # If there are flags for aclocal, use them.  Makefile.am and Makefile
       # may not exists.
       aclocal_flags=`sed -ne '\
@@ -220,17 +217,13 @@ while read dir; do
   q
 }' Makefile.in 2>/dev/null`
      if $force &&
-        ls -lt configure.in $aclocal_m4 $aclocal_dir/acinclude.m4 2>/dev/null|
+        ls -lt configure.in $aclocal_m4 $aclocal_dir/acinclude.m4 2>/dev/null |
        sed 1q |
-        grep 'aclocal\.m4$' > /dev/null
-     then
-       :
-     else
-       if test x"$aclocal_dir" != x.
-       then
+        grep 'aclocal\.m4$' >/dev/null; then :; else
+       if test x"$aclocal_dir" != x.; then
           aclocal_flags="$aclocal_flags -I $aclocal_dir"
        fi
-       $verbose "running $aclocal $aclocal_flags in $dir, creating $aclocal_m4"
+       $verbose running $aclocal $aclocal_flags --output=$aclocal_m4 in $dir
        $aclocal $aclocal_flags --output=$aclocal_m4
      fi
   fi
@@ -244,13 +237,12 @@ while read dir; do
 
   test ! -f $aclocal_m4 && aclocal_m4=
 
-  if $force && test -f configure &&
-    ls -lt configure configure.in $aclocal_m4 | sed 1q |
-      grep 'configure$' > /dev/null
-  then
-    :
-  else
-    $verbose "running autoconf in $dir"
+  if $force &&
+     test -f configure &&
+     ls -lt configure configure.in $aclocal_m4 |
+       sed 1q |
+       grep 'configure$' >/dev/null; then :; else
+    $verbose running $autoconf $localdir_opt in $dir
     $autoconf $localdir_opt
   fi
 
@@ -268,17 +260,16 @@ while read dir; do
        : colon
        s/:.*//
       '`
-    stamp=`echo $template | sed 's,/*[^/]*$,,;s,^$,.,'`/stamp-h`test "$tcount" -gt 1 && echo "$tcount"`.in
+    template_dir=`echo $template | sed 's,/*[^/]*$,,;s,^$,.,'`
+    stamp_num=`test "$tcount" -gt 1 && echo "$tcount"`
+    stamp=$template_dir/stamp-h$stamp_num.in
     if test ! -f "$template" || grep autoheader "$template" >/dev/null; then
       if $force && test -f $template &&
         ls -lt $template configure.in $aclocal_m4 $stamp 2>/dev/null \
                `echo $localdir_opt | sed -e 's/--localdir=//' \
                                          -e '/./ s%$%/%'`acconfig.h |
-          sed 1q | egrep "$template$|$stamp$" > /dev/null
-      then
-        :
-      else
-        $verbose "running autoheader in $dir"
+          sed 1q | egrep "$template$|$stamp$" >/dev/null; then :; else
+        $verbose running $autoheader $localdir_opt in $dir
         $autoheader $localdir_opt &&
         $verbose "touching $stamp" &&
         touch $stamp