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

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

bk: 4b29fa78MwxHd9bnnTvyO2TjYLNpVg
---

8c15c3a11d5578a56ccde5de4cb71bc69da2d478
diff --cc ChangeLog
index cff2527ec,8eedd3ef6..38fbc343f
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,6 +1,10 @@@
  ---
  
 +* [Bug 1412] m4/os_cflags.m4 caches results that depend on $CC.
 +* [Bug 1413] test OpenSSL headers regarding -Wno-strict-prototypes.
 +* [Bug 1414] Enable "make distcheck" success with BSD make.
+ * [Bug 1418] building ntpd/ntpdc/ntpq statically with ssl fails.
 +* Build infrastructure updates to enable beta releases of ntp-stable.
  
  ---
  (4.2.6) 2009/12/09 Released by Harlan Stenn <stenn@ntp.org>