From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 14 Nov 2010 17:26:43 +0000 (+0100)
Subject: More stable configure output from sanity check.
X-Git-Tag: ng-0.5a~337^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8784d11e9d9675f2d430688165ae0617ed957bfa;p=thirdparty%2Fautomake.git

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 b53bb1a6f..d422c0b49 100644
--- 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 86bd8f51a..46f68af24 100755
--- 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 94e1e51f6..ba97076cb 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
 ])