[Bug 2572] cross-compiling fails for --with-yielding_select

bk: 53104555603dRZsJI-SAZ2qUhqmWog

diff --git a/ChangeLog b/ChangeLog
index bacbffee198c322070d0dd9ffc4478394aa95d88..26be7a53c9c0000cb50cd3e2c2db2a5293687ff8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 * [Bug 2113] Warn about ignored extra args in ntpq.
+* [Bug 2540] bootstrap script needs to 'touch' files in finer-grained groups.
 * [Bug 2561] Allow wildcards in the target of the "interface" command.
+* [Bug 2572] cross-compiling fails for --with-yielding_select.
 (4.2.7p425) 2014/02/26 Released by Harlan Stenn <stenn@ntp.org>
 * Copyright file update.
 (4.2.7p424) 2014/02/24 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/bootstrap b/bootstrap
index 359105a8a267f1fe787d0d5c8317a8de209fa3ac..40efa22309543d830c17bdeab2974c531a467f7a 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -141,6 +141,9 @@ cp depsver.mf sntp/
 
 ${AUTORECONF} -i -v "$@"
 
+test aclocal.m4 -nt config.h.in && touch config.h.in
+test sntp/aclocal.m4 -nt sntp/config.h.in && touch sntp/config.h.in
+
 # DH: 20110118: Due to our workaround for the AM_COND_IF bug that was
 # triggering the buggy recursive autoreconf, we can once again use a
 # single autoreconf invocation.  See

diff --git a/sntp/libevent/m4/openldap-thread-check.m4 b/sntp/libevent/m4/openldap-thread-check.m4
index 2b319190645d52ca35c5de43a9b9279fb68632eb..e36b4af26651d06b6407e6c50a5e78b772f52a99 100644 (file)
--- a/sntp/libevent/m4/openldap-thread-check.m4
+++ b/sntp/libevent/m4/openldap-thread-check.m4
@@ -76,7 +76,7 @@ fi
 dnl ----------------------------------------------------------------
 dnl Threads?
 ol_link_threads=no
-ol_with_yielding_select=${ol_with_yielding_select-auto}
+ol_with_yielding_select=${ol_with_yielding_select:-auto}
 
 case $ol_with_threads in auto | yes | nt)