[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-442-g58c45a2

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=58c45a2004c5b4ae96ed4cd5b35785dc22c55875

The branch, master has been updated
       via  58c45a2004c5b4ae96ed4cd5b35785dc22c55875 (commit)
       via  8784d11e9d9675f2d430688165ae0617ed957bfa (commit)
      from  b6ee460304679c2d2f39a28004b9286b8ecbf8ea (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 58c45a2004c5b4ae96ed4cd5b35785dc22c55875
Merge: b6ee460 8784d11
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Nov 14 18:27:35 2010 +0100

    Merge branch 'sanity-sleep-fix-master'
    
    * sanity-sleep-fix-master:
      More stable configure output from sanity check.

commit 8784d11e9d9675f2d430688165ae0617ed957bfa
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Nov 14 18:26:43 2010 +0100

    More stable configure output from sanity check.
    
    * m4/sanity.m4 (AM_SANITY_CHECK): Always print check line
    about ensuring newer files, even if we don't actually need
    to wait any more.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog    |    7 +++++++
 configure    |   12 ++++++------
 m4/sanity.m4 |   12 ++++++------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ce4d82e..009190a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-11-14  Ralf Wildenhues  <address@hidden>
 
+       More stable configure output from sanity check.
+       * m4/sanity.m4 (AM_SANITY_CHECK): Always print check line
+       about ensuring newer files, even if we don't actually need
+       to wait any more.
+
+2010-11-14  Ralf Wildenhues  <address@hidden>
+
        Rebuild menus in the manual.
        * doc/automake.texi: Rebuild menus (using ^C ^U ^A in emacs).
        Thanks to Ian Lance Taylor for the suggestion.
diff --git a/configure b/configure
index 024b620..089b32a 100755
--- a/configure
+++ b/configure
@@ -1948,8 +1948,8 @@ am_sleep_pid=
 if grep 'slept: no' conftest.file >/dev/null 2>&1; then
   ( sleep 1 ) &
   am_sleep_pid=$!
-
 fi
+
 rm -f conftest.file
 
 test "$program_prefix" != NONE &&
@@ -2937,13 +2937,13 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
-if test -n "$am_sleep_pid"; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files 
are newer than configure" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are 
newer than configure" >&5
 $as_echo_n "checking that generated files are newer than configure... " >&6; }
-       wait $am_sleep_pid
-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+   if test -n "$am_sleep_pid"; then
+     wait $am_sleep_pid
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
 $as_echo "done" >&6; }
-     fi
 
 
 : "${CONFIG_STATUS=./config.status}"
diff --git a/m4/sanity.m4 b/m4/sanity.m4
index 94e1e51..ba97076 100644
--- a/m4/sanity.m4
+++ b/m4/sanity.m4
@@ -73,12 +73,12 @@ am_sleep_pid=
 if grep 'slept: no' conftest.file >/dev/null 2>&1; then
   ( sleep 1 ) &
   am_sleep_pid=$!
-  AC_CONFIG_COMMANDS_PRE(
-    [if test -n "$am_sleep_pid"; then
-       AC_MSG_CHECKING([that generated files are newer than configure])
-       wait $am_sleep_pid
-       AC_MSG_RESULT([done])
-     fi])
 fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     wait $am_sleep_pid
+   fi
+   AC_MSG_RESULT([done])])
 rm -f conftest.file
 ])


hooks/post-receive
-- 
GNU Automake