Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1180

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1178-80-cver

bk: 4a06567fHBp2Farei8nbpl5bHclvwQ

diff --cc ChangeLog
index bb6285458dccd1e0578b6be1c5e2ce43a191a6c9,5f8e3948c8084af9e730f2e212679a2694ba1608..c3b62cd32a0aa6f530e94df11af4fd623186201a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,5 +1,8 @@@
- (4.2.5p174) 2009/05/09 Released by Harlan Stenn <stenn@ntp.org>
- * Stale leapsecond file fixes from Dave Mills.
+ * [Bug 1180] ntpd won't start with more than ~1000 interfaces
 +* Clean up configure.ac NTP_CACHEVERSION interface, display cache
 +  version when clearing.  Fixes a regression.
++(4.2.5p174) 2009/05/09 Released by Harlan Stenn <stenn@ntp.org>
+ * Stale leapsecond file fixes from Dave Mills.
  (4.2.5p173) 2009/05/08 Released by Harlan Stenn <stenn@ntp.org>
  * Include (4.2.4p7-RC6)
  (4.2.5p172) 2009/05/06 Released by Harlan Stenn <stenn@ntp.org>
@@@ -13,7 -11,7 +14,7 @@@
  * [Bug 1173] NMEA refclock fails with Solaris PPSAPI
  * Fix problem linking msntp on Solaris when sntp subdir is configured
    before parent caused by different gethostent library search order.
--* Do not clear config.cache when it is already empty.
++* Do not clear config.cache when it is  empty.
  (4.2.5p170) 2009/05/02 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1152] adjust PARSE to new refclock_pps logic
  * Include (4.2.4p7-RC5)

diff --cc configure.ac
index f091fc69d4a88ea2f835c9cd47b54988f7fd8684,178dd5f76e26ede0442af9fed2ebb16312e79876..416efe819468538e6029f92dca1a0c207e08315f
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -4386,9 -4386,9 +4404,9 @@@ AC_MSG_RESULT([$ntp_have_linuxcaps]
  
  AC_ARG_ENABLE(
      [linuxcaps],
-     AC_HELP_STRING(
+     AS_HELP_STRING(
        [--enable-linuxcaps],
 -      [s Use Linux capabilities for non-root clock control]
 +      [+ Use Linux capabilities for non-root clock control]
      ),
      [ntp_have_linuxcaps=$enableval]
  )