Avoid relying on remake rules for routine build/flock-build for

  libevent as for the top-level and sntp subproject.

bk: 4d636d587WrPKVD6lQEtQtjQdEcmzw

diff --git a/ChangeLog b/ChangeLog
index 6e4365b206b4f43c6cb2bb663ee893cc9b297e21..1846ba5e7071c8dc8a37be5aa1c87f67c9f51d4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,13 @@
 * [Bug 1832] ntpdate doesn't allow timeout > 2s.
 * [Bug 1833] The checking sem_timedwait() fails without -pthread.
-* ElectricFence was suffering bitrot - remove it.  valgrind seems better.
+* ElectricFence was suffering bitrot - remove it.  valgrind works well.
 * Enable all relevant automake warnings.
 * Correct Solaris 2.1x PTHREAD_ONCE_INIT extra braces test to avoid
   triggering warnings due to excess braces.
 * Remove libevent-cfg from sntp/Makefile.am.
 * Provide bug report and URL options to Autoconf.
+* Avoid relying on remake rules for routine build/flock-build for
+  libevent as for the top-level and sntp subproject.
 (4.2.7p131) 2011/02/21 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1087] -v/--normalverbose conflicts with -v/--version in sntp.
 * [Bug 1088] sntp should (only) report the time difference without -s/-a.

diff --git a/build b/build
index 6d4c76047517b2e1a17b691d525ac8a24d1d114f..fb9095a83de1a3d8239ec1f74512d77dbb97c92a 100755 (executable)
--- a/build
+++ b/build
@@ -167,15 +167,22 @@ CONFIGURE="../configure --cache-file=../config.cache-$IAM$CCSUF $CONFIG_ARGS"
 (      # This sequence of commands is logged to make.log.
        # If config.status is newer than ../configure, and the same
        # is true for sntp, we do not need to re-run configure.
+       # For libevent, the twist is we may not be configuring the
+       # tearoff, so only act if its config.status exists.
        # Solaris /bin/sh doesn't grok -nt.
 
        ( "$TEST" config.status -nt ../configure &&
-               $TEST sntp/config.status -nt ../sntp/configure ) ||
+         "$TEST" sntp/config.status -nt ../sntp/configure &&
+         ( "$TEST" '!' -f sntp/libevent/config.status ||
+           "$TEST" sntp/libevent/config.status -nt ../sntp/libevent/configure ) ) ||
                "$NICEB" -7 $CONFIGURE
        "$TEST" Makefile -nt config.status ||
                "$NICEB" -5 ./config.status
        "$TEST" sntp/Makefile -nt sntp/config.status ||
                ( cd sntp && "$NICEB" -5 ./config.status )
+       "$TEST" '!' -f sntp/libevent/Makefile ||
+         "$TEST" sntp/libevent/Makefile -nt sntp/libevent/config.status ||
+               ( cd sntp/libevent && "$NICEB" -5 ./config.status )
        "$NICEB" -14 ${MAKE-make} && "$NICEB" -11 ${MAKE-make} check
 ) > $LOGF 2>&1