From: Harlan Stenn <stenn@ntp.org>
Date: Fri, 28 Feb 2014 08:14:13 +0000 (+0000)
Subject: [Bug 2572] cross-compiling fails for --with-yielding_select
X-Git-Tag: NTP_4_2_7P426~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cd0fa551e9f01dfe3c6749864abfc310676638c;p=thirdparty%2Fntp.git

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

bk: 53104555603dRZsJI-SAZ2qUhqmWog
---

diff --git a/ChangeLog b/ChangeLog
index bacbffee1..26be7a53c 100644
--- 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 359105a8a..40efa2230 100755
--- 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 2b3191906..e36b4af26 100644
--- 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)