Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1413/..\ntp-stable-1413

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1413

bk: 4b255486b86ebsh7GuTG-6733Ge2oQ

diff --cc ChangeLog
index 07eac66c778e479050a6caaa692d37332541480f,ddd79f30ec7be247b1ddd98b8d47bf91c242b0fc..27742cf95045211c35a750ea8121431484fff495
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,6 +1,11 @@@
 +(4.2.7p0) 2009/12/13 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1412] m4/os_cflags.m4 caches results that depend on $CC.
 +* [Bug 1414] Enable "make distcheck" success with BSD make.
 +(4.2.7) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1407] configure.ac: recent GNU Make -v does not include "version".
+ ---
+ 
+ * [Bug 1413] test OpenSSL headers regarding -Wno-strict-prototypes.
  
  ---
  (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>

diff --cc configure.ac
index 56ee7d052bc6f233970d39f2d5b7e95baa1bbe03,d89839794f982e10f9e750760cf6bfb1079167b6..147632f2a8b8c75b67a7b133ebfc9f762366e5b4
--- 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