Merge pogo:/usa/hart/ntp-stable-1425-34

into  whimsy.udel.edu:/deacon/backroom/ntp-stable

bk: 4b344f5bQsDDBJNsvaG6Npdns6F1tA

diff --cc ChangeLog
index 7b7b83c09fd1fa0c87f09dc9237049f2863469da,f66e1ebbf4e96e75e0954a92387e179bc7421b29..5832da973166d1672e8ad894d3f9e348a7b8d0dd
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -10,7 -9,7 +10,8 @@@
  * [Bug 1428] Use AC_HEADER_RESOLV to fix breaks from resolv.h
  * [Bug 1429] ntpd -4 option does not reliably force IPv4 resolution.
  * [Bug 1431] System headers must come before ntp headers in ntp_intres.c .
 +* [Bug 1434] HP-UX 11 ip_mreq undeclared, _HPUX_SOURCE helps some.
+ * [Bug 1435] sntp: Test for -lresolv using the same tests as in ntp.
  
  ---
  (4.2.6p1-RC1) 2009/12/20 Released by Harlan Stenn <stenn@ntp.org>

diff --cc sntp/configure.ac
index 61be1b81c7f986749cc04dc9224639fc8b42ae7e,e5ee3822f5baf1152fcaab46490957216d2cecb2..f5e76815d5f14f4dcc89c10509fcee0cfb8eb115
--- 1/sntp/configure.ac
--- 2/sntp/configure.ac
+++ b/sntp/configure.ac
@@@ -411,59 -411,9 +411,62 @@@ case "$isc_cv_have_in_port_t" i
        AC_DEFINE(ISC_PLATFORM_NEEDPORTT, 1, [Declare in_port_t?])
  esac
  
 +AC_CACHE_CHECK(
 +    [for multicast IP support],
 +    ntp_cv_multicast,
 +    [
 +      ntp_cv_multicast=no
 +      case "$host" in
 +       i386-sequent-sysv4)
 +          ;;
 +       *)
 +          AC_COMPILE_IFELSE(
 +              AC_LANG_PROGRAM(
 +                  [
 +                      #ifdef HAVE_NETINET_IN_H
 +                      #include <netinet/in.h>
 +                      #endif
 +                  ],
 +                  [
 +                      struct ip_mreq ipmr;
 +                      ipmr.imr_interface.s_addr = 0;
 +                  ]
 +              ),
 +              [ntp_cv_multicast=yes],
 +              []
 +          )
 +      esac
 +    ]
 +)
 +
 +case "$ntp_cv_multicast" in
 + yes)
 +    AC_DEFINE(MCAST, 1, [Does the target support multicast IP?])
 +    AC_CACHE_CHECK(
 +      [[arg type needed for setsockopt() IP*_MULTICAST_LOOP]],
 +      ntp_cv_typeof_ip_multicast_loop,
 +      [
 +          case "$host" in
 +           *-*-netbsd*|*-*-*linux*)
 +              ntp_cv_typeof_ip_multicast_loop=u_int
 +              ;;
 +           *-*-winnt*)
 +              ntp_cv_typeof_ip_multicast_loop=BOOL
 +              ;;
 +           *)
 +              ntp_cv_typeof_ip_multicast_loop=u_char
 +          esac
 +      ]
 +    )
 +    AC_DEFINE_UNQUOTED([TYPEOF_IP_MULTICAST_LOOP],
 +      $ntp_cv_typeof_ip_multicast_loop,
 +      [What type to use for setsockopt]
 +    )
 +esac
 +
+ # HMS: We don't need res_init, but since we may be using cached 
+ # values from ntpd we need to test the same way 
+ AC_SEARCH_LIBS([res_init], [resolv], , , [-lsocket -lnsl]) 
  AC_SEARCH_LIBS([inet_ntop], [resolv], , , [-lsocket -lnsl])
  AC_CHECK_FUNC(inet_ntop, [], [AC_DEFINE(ISC_PLATFORM_NEEDNTOP, 1, [ISC: provide inet_ntop()])])
  AC_CHECK_FUNC(inet_pton, [], [AC_DEFINE(ISC_PLATFORM_NEEDPTON, 1, [ISC: provide inet_pton()])])