Make it easier to trace what autoreconf does.

* autoheader.sh: Be more verbose, and always report your name in
verbose messages.
* autoconf.sh: Likewise.
* autoreconf.sh: Likewise.
(update.sh): Redirect ls's stderr to /dev/null.

diff --git a/ChangeLog b/ChangeLog
index afa00c122bad11107e5acd6fae0fc763f98e6b38..1c333e1c557a792b9b6df06f94f982437b9f24ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-07-13  Akim Demaille  <akim@epita.fr>
+
+       Make it easier to trace what autoreconf does.
+
+       * autoheader.sh: Be more verbose, and always report your name in
+       verbose messages.
+       * autoconf.sh: Likewise.
+       * autoreconf.sh: Likewise.
+       (update.sh): Redirect ls's stderr to /dev/null.
+
 2000-07-13  Akim Demaille  <akim@epita.fr>
 
        * acgeneral.m4 (_AC_OUTPUT_FILES, _AC_OUTPUT_HEADERS): Properly

diff --git a/autoconf.in b/autoconf.in
index 2f668e6371c947ac5120cc102a8e6a7aedc6dbce..127ac95d22f0d120b7f000788e6bc91185d0ef9f 100644 (file)
--- a/autoconf.in
+++ b/autoconf.in
@@ -537,7 +537,7 @@ EOF
   fi
 
   # Run m4 on the input file to get traces.
-  $verbose "Running $run_m4_trace $infile | $M4 $tmp/trace.m4" >&2
+  $verbose "$me: running $run_m4_trace $infile | $M4 $tmp/trace.m4" >&2
   $run_m4_trace $infile 2>&1 >/dev/null |
     sed -f $tmp/trace2m4.sed |
     # Now we are ready to run m4 to process the trace file.

diff --git a/autoconf.sh b/autoconf.sh
index 2f668e6371c947ac5120cc102a8e6a7aedc6dbce..127ac95d22f0d120b7f000788e6bc91185d0ef9f 100644 (file)
--- a/autoconf.sh
+++ b/autoconf.sh
@@ -537,7 +537,7 @@ EOF
   fi
 
   # Run m4 on the input file to get traces.
-  $verbose "Running $run_m4_trace $infile | $M4 $tmp/trace.m4" >&2
+  $verbose "$me: running $run_m4_trace $infile | $M4 $tmp/trace.m4" >&2
   $run_m4_trace $infile 2>&1 >/dev/null |
     sed -f $tmp/trace2m4.sed |
     # Now we are ready to run m4 to process the trace file.

diff --git a/autoheader.in b/autoheader.in
index 031fd41dee6ad9a677cbfcd68bc1a7687666f57a..d6d929d3598ed61258057366fbeb8d365b8063c9 100644 (file)
--- a/autoheader.in
+++ b/autoheader.in
@@ -222,6 +222,7 @@ export AC_MACRODIR
 # ----------------------- #
 
 # Source what the traces are trying to tell us.
+$verbose $me: running $autoconf to trace from $infile >&2
 $autoconf  \
   --trace AC_CONFIG_HEADERS:'config_h="$1"' \
   --trace AH_OUTPUT:'ac_verbatim_$1="\
@@ -229,6 +230,8 @@ $2"' \
   --trace AC_DEFINE:'syms="$$syms $1"' \
   --trace AC_DEFINE_UNQUOTED:'syms="$$syms $1"' \
   $infile >$tmp/traces.sh || exit 1
+
+$verbose $me: sourcing $tmp/traces.sh >&2
 . $tmp/traces.sh
 
 # Make SYMS newline-separated rather than blank-separated, and remove dups.
@@ -281,6 +284,7 @@ test -f $config_h.bot && cat $config_h.bot >>$tmp/config.hin
 
 
 # Check that all the symbols have a template.
+$verbose $me: checking completeness of the template >&2
 status=0
 # Regexp for a white space.
 w='[   ]'

diff --git a/autoheader.sh b/autoheader.sh
index 031fd41dee6ad9a677cbfcd68bc1a7687666f57a..d6d929d3598ed61258057366fbeb8d365b8063c9 100644 (file)
--- a/autoheader.sh
+++ b/autoheader.sh
@@ -222,6 +222,7 @@ export AC_MACRODIR
 # ----------------------- #
 
 # Source what the traces are trying to tell us.
+$verbose $me: running $autoconf to trace from $infile >&2
 $autoconf  \
   --trace AC_CONFIG_HEADERS:'config_h="$1"' \
   --trace AH_OUTPUT:'ac_verbatim_$1="\
@@ -229,6 +230,8 @@ $2"' \
   --trace AC_DEFINE:'syms="$$syms $1"' \
   --trace AC_DEFINE_UNQUOTED:'syms="$$syms $1"' \
   $infile >$tmp/traces.sh || exit 1
+
+$verbose $me: sourcing $tmp/traces.sh >&2
 . $tmp/traces.sh
 
 # Make SYMS newline-separated rather than blank-separated, and remove dups.
@@ -281,6 +284,7 @@ test -f $config_h.bot && cat $config_h.bot >>$tmp/config.hin
 
 
 # Check that all the symbols have a template.
+$verbose $me: checking completeness of the template >&2
 status=0
 # Regexp for a white space.
 w='[   ]'

diff --git a/autoreconf.in b/autoreconf.in
index f2cf832f953f0fd544c216d10793defc7235fc48..fa223508999d477997b7dc128928193421f5939d 100644 (file)
--- a/autoreconf.in
+++ b/autoreconf.in
@@ -253,7 +253,7 @@ EOF
 # Exit 0 iff the first argument is not the most recent of all or is missing.
 cat >$tmp/update.sh <<\EOF
 test -f "$1" || exit 0
-test x`ls -1dt "$@" | sed 1q` != x"$1"
+test x`ls -1dt "$@" 2>/dev/null | sed 1q` != x"$1"
 EOF
 update="@SHELL@ $tmp/update.sh"
 
@@ -298,7 +298,7 @@ while read dir; do
            aclocal_flags="$aclocal_flags -I $m4dir";;
      esac
 
-     $verbose running $aclocal $aclocal_flags --output=$localdir/aclocal.m4 in $dir >&2
+     $verbose $me: running $aclocal $aclocal_flags --output=$localdir/aclocal.m4 in $dir >&2
      $aclocal $aclocal_flags --output=$localdir/aclocal.m4
   fi
 
@@ -315,7 +315,7 @@ while read dir; do
   # update the file or not.  In fact, the effect of `$force' is already
   # included in `$automake' via `--no-force'.
   if $uses_automake; then
-    $verbose running $automake in $dir >&2
+    $verbose $me: running $automake in $dir >&2
     $automake
   fi
 
@@ -326,7 +326,7 @@ while read dir; do
 
   if $force ||
      $update configure configure.in $localdir/aclocal.m4; then
-    $verbose running $autoconf in $dir >&2
+    $verbose $me: running $autoconf in $dir >&2
     $autoconf
   fi
 
@@ -336,6 +336,7 @@ while read dir; do
   # -------------------- #
 
   # templates -- arguments of AC_CONFIG_HEADERS.
+  $verbose $me: running $autoconf -t 'AC_CONFIG_HEADERS:$1'
   templates=`$autoconf -t 'AC_CONFIG_HEADERS:$1'`
   if test -n "$templates"; then
     tcount=`set -- $templates; echo $#`
@@ -358,7 +359,7 @@ while read dir; do
             configure.in $localdir/aclocal.m4 $localdir/acconfig.h ||
          $update $stamp    \
             configure.in $localdir/aclocal_m4 $localdir/acconfig.h; } then
-      $verbose running $autoheader in $dir >&2
+      $verbose $me: running $autoheader in $dir >&2
       $autoheader &&
       $verbose "touching $stamp" >&2 &&
       touch $stamp

diff --git a/autoreconf.sh b/autoreconf.sh
index f2cf832f953f0fd544c216d10793defc7235fc48..fa223508999d477997b7dc128928193421f5939d 100644 (file)
--- a/autoreconf.sh
+++ b/autoreconf.sh
@@ -253,7 +253,7 @@ EOF
 # Exit 0 iff the first argument is not the most recent of all or is missing.
 cat >$tmp/update.sh <<\EOF
 test -f "$1" || exit 0
-test x`ls -1dt "$@" | sed 1q` != x"$1"
+test x`ls -1dt "$@" 2>/dev/null | sed 1q` != x"$1"
 EOF
 update="@SHELL@ $tmp/update.sh"
 
@@ -298,7 +298,7 @@ while read dir; do
            aclocal_flags="$aclocal_flags -I $m4dir";;
      esac
 
-     $verbose running $aclocal $aclocal_flags --output=$localdir/aclocal.m4 in $dir >&2
+     $verbose $me: running $aclocal $aclocal_flags --output=$localdir/aclocal.m4 in $dir >&2
      $aclocal $aclocal_flags --output=$localdir/aclocal.m4
   fi
 
@@ -315,7 +315,7 @@ while read dir; do
   # update the file or not.  In fact, the effect of `$force' is already
   # included in `$automake' via `--no-force'.
   if $uses_automake; then
-    $verbose running $automake in $dir >&2
+    $verbose $me: running $automake in $dir >&2
     $automake
   fi
 
@@ -326,7 +326,7 @@ while read dir; do
 
   if $force ||
      $update configure configure.in $localdir/aclocal.m4; then
-    $verbose running $autoconf in $dir >&2
+    $verbose $me: running $autoconf in $dir >&2
     $autoconf
   fi
 
@@ -336,6 +336,7 @@ while read dir; do
   # -------------------- #
 
   # templates -- arguments of AC_CONFIG_HEADERS.
+  $verbose $me: running $autoconf -t 'AC_CONFIG_HEADERS:$1'
   templates=`$autoconf -t 'AC_CONFIG_HEADERS:$1'`
   if test -n "$templates"; then
     tcount=`set -- $templates; echo $#`
@@ -358,7 +359,7 @@ while read dir; do
             configure.in $localdir/aclocal.m4 $localdir/acconfig.h ||
          $update $stamp    \
             configure.in $localdir/aclocal_m4 $localdir/acconfig.h; } then
-      $verbose running $autoheader in $dir >&2
+      $verbose $me: running $autoheader in $dir >&2
       $autoheader &&
       $verbose "touching $stamp" >&2 &&
       touch $stamp

diff --git a/bin/autoconf.in b/bin/autoconf.in
index 2f668e6371c947ac5120cc102a8e6a7aedc6dbce..127ac95d22f0d120b7f000788e6bc91185d0ef9f 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -537,7 +537,7 @@ EOF
   fi
 
   # Run m4 on the input file to get traces.
-  $verbose "Running $run_m4_trace $infile | $M4 $tmp/trace.m4" >&2
+  $verbose "$me: running $run_m4_trace $infile | $M4 $tmp/trace.m4" >&2
   $run_m4_trace $infile 2>&1 >/dev/null |
     sed -f $tmp/trace2m4.sed |
     # Now we are ready to run m4 to process the trace file.

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 031fd41dee6ad9a677cbfcd68bc1a7687666f57a..d6d929d3598ed61258057366fbeb8d365b8063c9 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -222,6 +222,7 @@ export AC_MACRODIR
 # ----------------------- #
 
 # Source what the traces are trying to tell us.
+$verbose $me: running $autoconf to trace from $infile >&2
 $autoconf  \
   --trace AC_CONFIG_HEADERS:'config_h="$1"' \
   --trace AH_OUTPUT:'ac_verbatim_$1="\
@@ -229,6 +230,8 @@ $2"' \
   --trace AC_DEFINE:'syms="$$syms $1"' \
   --trace AC_DEFINE_UNQUOTED:'syms="$$syms $1"' \
   $infile >$tmp/traces.sh || exit 1
+
+$verbose $me: sourcing $tmp/traces.sh >&2
 . $tmp/traces.sh
 
 # Make SYMS newline-separated rather than blank-separated, and remove dups.
@@ -281,6 +284,7 @@ test -f $config_h.bot && cat $config_h.bot >>$tmp/config.hin
 
 
 # Check that all the symbols have a template.
+$verbose $me: checking completeness of the template >&2
 status=0
 # Regexp for a white space.
 w='[   ]'

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index f2cf832f953f0fd544c216d10793defc7235fc48..fa223508999d477997b7dc128928193421f5939d 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -253,7 +253,7 @@ EOF
 # Exit 0 iff the first argument is not the most recent of all or is missing.
 cat >$tmp/update.sh <<\EOF
 test -f "$1" || exit 0
-test x`ls -1dt "$@" | sed 1q` != x"$1"
+test x`ls -1dt "$@" 2>/dev/null | sed 1q` != x"$1"
 EOF
 update="@SHELL@ $tmp/update.sh"
 
@@ -298,7 +298,7 @@ while read dir; do
            aclocal_flags="$aclocal_flags -I $m4dir";;
      esac
 
-     $verbose running $aclocal $aclocal_flags --output=$localdir/aclocal.m4 in $dir >&2
+     $verbose $me: running $aclocal $aclocal_flags --output=$localdir/aclocal.m4 in $dir >&2
      $aclocal $aclocal_flags --output=$localdir/aclocal.m4
   fi
 
@@ -315,7 +315,7 @@ while read dir; do
   # update the file or not.  In fact, the effect of `$force' is already
   # included in `$automake' via `--no-force'.
   if $uses_automake; then
-    $verbose running $automake in $dir >&2
+    $verbose $me: running $automake in $dir >&2
     $automake
   fi
 
@@ -326,7 +326,7 @@ while read dir; do
 
   if $force ||
      $update configure configure.in $localdir/aclocal.m4; then
-    $verbose running $autoconf in $dir >&2
+    $verbose $me: running $autoconf in $dir >&2
     $autoconf
   fi
 
@@ -336,6 +336,7 @@ while read dir; do
   # -------------------- #
 
   # templates -- arguments of AC_CONFIG_HEADERS.
+  $verbose $me: running $autoconf -t 'AC_CONFIG_HEADERS:$1'
   templates=`$autoconf -t 'AC_CONFIG_HEADERS:$1'`
   if test -n "$templates"; then
     tcount=`set -- $templates; echo $#`
@@ -358,7 +359,7 @@ while read dir; do
             configure.in $localdir/aclocal.m4 $localdir/acconfig.h ||
          $update $stamp    \
             configure.in $localdir/aclocal_m4 $localdir/acconfig.h; } then
-      $verbose running $autoheader in $dir >&2
+      $verbose $me: running $autoheader in $dir >&2
       $autoheader &&
       $verbose "touching $stamp" >&2 &&
       touch $stamp