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

diff --cc ChangeLog
index 4681bbb0d99a6670d086d7e92c2ef67614e10db9,ddd79f30ec7be247b1ddd98b8d47bf91c242b0fc..88d47cdd0b825ffef6f24b2ec9256e2142146a79
--- 1/ChangeLog
--- 2/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 b4b64cd9215cdcd270b93f0a603c91851b7f541f,d89839794f982e10f9e750760cf6bfb1079167b6..3ad2e85d5e79d0cc1556b87db4a6ddd26b3c5922
--- 1/configure.ac
--- 2/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