From: Dave Hart <hart@ntp.org>
Date: Thu, 17 Dec 2009 09:29:57 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1413
X-Git-Tag: NTP_4_2_6P1_RC1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94f84c47cf2e0fe857b4aaa2e5913eebe5e033fe;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1413
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-updatepoint-1412-13-14-18

bk: 4b29fa15_3vO9krxAgRyo6uYI9z_Yw
---

94f84c47cf2e0fe857b4aaa2e5913eebe5e033fe
diff --cc ChangeLog
index 4681bbb0d,ddd79f30e..88d47cdd0
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,6 +1,8 @@@
  ---
  
 +* [Bug 1412] m4/os_cflags.m4 caches results that depend on $CC.
+ * [Bug 1413] test OpenSSL headers regarding -Wno-strict-prototypes.
 +* Build infrastructure updates to enable beta releases of ntp-stable.
  
  ---
  (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>
diff --cc configure.ac
index b4b64cd92,d89839794..3ad2e85d5
--- a/configure.ac
+++ b/configure.ac
@@@ -291,9 -318,28 +291,9 @@@ case "$GCC" i
       yes)
  	CFLAGS="$CFLAGS -Wstrict-overflow"
      esac
-     # if building with OpenSSL, -Wno-strict-prototypes is added later
+     # -W[no-]strict-prototypes is added later depending on OpenSSL
  esac
  
 -case "$host" in
 - *-next-nextstep3)
 -    CFLAGS="$CFLAGS -posix"
 -    ;;
 -dnl This is currently commented out by bor. 
 -dnl The new versions of ReliantUNIX round adjtime() interval down
 -dnl to 1/100s (system tick). This makes tickadj actually useless.
 -dnl So, I'd better not use additional flags.
 -dnl I leave it here just in case anybody has better idea
 -dnl  mips-sni-sysv4* )
 -dnl     #
 -dnl     # Add flags for 64 bit file access to enable tickadj to access /dev/kmem
 -dnl     #
 -dnl     if getconf _LFS_CFLAGS > /dev/null 2>&1 ; then
 -dnl       CFLAGS="$CFLAGS `getconf _LFS_CFLAGS`"
 -dnl     fi
 -dnl     ;;
 -esac
 -
  ac_busted_vpath_in_make=no
  
  case "$build" in