Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev

into pogo.udel.edu:/pogo/users/stenn/ntp-dev-io

bk: 3e44ad2do0pUIGSZE3iPmV7JWUD1-w

diff --cc configure.in
index 8c42f73d76baa57862b9c681568d04efc166d950,061c19aa19a286c2135193d1afd178db8224042a..5e53419f5b4b6d222d0a5037821e3f12bb232571
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -3440,87 -3440,15 +3440,96 @@@ case "$ac_cv_var_irig_sucks" i
   yes) AC_DEFINE(IRIG_SUCKS, 1, [Should we use the IRIG sawtooth filter?]) ;;
  esac
  
+ AC_CACHE_CHECK(if we should enable NIST lockclock scheme, ac_cv_var_nist_lockclock,
+ [AC_ARG_ENABLE(nist, 
+       AC_HELP_STRING([--enable-nist], [- if we should enable the NIST lockclock scheme]),
+     [ans=$enableval],[ans=no])
+ ac_cv_var_nist_lockclock=$ans])
+ case "$ac_cv_var_nist_lockclock" in
+  yes) AC_DEFINE(LOCKCLOCK, 1, [Should we align with the NIST lockclock scheme?]) ;;
+ esac
+ 
 +#
 +# ISC stuff
 +#
 +
 +if test $ac_cv_struct_sockaddr_has_sa_len = yes; then
 +    AC_DEFINE(ISC_PLATFORM_HAVESALEN, ,[[ISC: struct sockaddr as sa_len?]])
 +fi
 +
 +AC_MSG_CHECKING(for IPv6 structures)
 +AC_TRY_COMPILE([
 +#include <sys/types.h>
 +#include <sys/socket.h>
 +#include <netinet/in.h>],
 +[struct sockaddr_in6 sin6; return (0);],
 +      [AC_MSG_RESULT(yes)
 +       found_ipv6=yes],
 +      [AC_MSG_RESULT(no)
 +       found_ipv6=no])
 +
 +AC_MSG_CHECKING([for struct if_laddrconf])
 +AC_TRY_LINK([
 +#include <sys/types.h>
 +#include <net/if6.h>
 +],[ struct if_laddrconf a; ],
 +      [AC_MSG_RESULT(yes)
 +       AC_DEFINE(ISC_PLATFORM_HAVEIF_LADDRCONF, ,
 +              [[ISC: have struct if_laddrconf?]])],
 +      [AC_MSG_RESULT(no)])
 +
 +AC_MSG_CHECKING([for struct if_laddrreq])
 +AC_TRY_LINK([
 +#include <sys/types.h>
 +#include <net/if6.h>
 +],[ struct if_laddrreq a; ],
 +      [AC_MSG_RESULT(yes)
 +       AC_DEFINE(ISC_PLATFORM_HAVEIF_LADDRREQ, ,
 +              [[ISC: have struct if_laddrreq?]])],
 +      [AC_MSG_RESULT(no)])
 +
 +case "$found_ipv6" in
 + yes)
 +    AC_DEFINE(ISC_PLATFORM_HAVEIPV6, ,[[ISC: Have IPv6?]])
 +
 +    AC_MSG_CHECKING(for in6_pktinfo)
 +    AC_TRY_COMPILE([
 +#include <sys/types.h>
 +#include <sys/socket.h>
 +#include <netinet/in.h>
 +$isc_netinetin6_hack
 +$isc_netinet6in6_hack
 +],
 +      [struct in6_pktinfo xyzzy; return (0);],
 +      [AC_MSG_RESULT(yes)
 +       AC_DEFINE(ISC_PLATFORM_HAVEIN6PKTINFO, ,
 +              [[ISC: Have struct in6_pktinfo?]])],
 +      [AC_MSG_RESULT(no -- disabling runtime ipv6 support)])
 +
 +    AC_MSG_CHECKING(for in6addr_any)
 +    AC_TRY_LINK([
 +#include <sys/types.h>
 +#include <sys/socket.h>
 +#include <netinet/in.h>
 +$isc_netinetin6_hack
 +$isc_netinet6in6_hack
 +$isc_in_addr6_hack
 +],
 +      [struct in6_addr in6; in6 = in6addr_any; return (in6.s6_addr[0]);],
 +      [AC_MSG_RESULT(yes)],
 +      [AC_MSG_RESULT(no)
 +       AC_DEFINE(ISC_PLATFORM_NEEDIN6ADDRANY, ,
 +              [[ISC: Need in6addr_any?]])]
 +      )
 +    ;;
 +esac
 +
 +case "$ac_cv_header_sys_sysctl_h" in
 + yes)
 +    AC_DEFINE(HAVE_IFLIST_SYSCTL,1,[[ISC: sys/sysctl.h implies iflist_sysctl]])
 +    ;;
 +esac
 +
  case "$build" in
   $host)
      ;;