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 <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index b53bb1a6fa8a28110d559654a7d3966d0eb9f91a..d422c0b491fdf62663178c2bd49c6c4cb91a0cb7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       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-10-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        tests: avoid running into timing issues due to sanity change.

diff --git a/configure b/configure
index 86bd8f51a0ca257a21f05498a351e3756f8202fa..46f68af24e204fc8acaf5b4ce6b6fda1773e72cc 100755 (executable)
--- a/configure
+++ b/configure
@@ -1917,8 +1917,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 &&
@@ -2879,13 +2879,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 94e1e51f6fd94d132d436da1fc119eb5152c3d29..ba97076cb01382e475e6fdecc699f76755944d3b 100644 (file)
--- 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
 ])