Merge bk://ntp2.isc.org/ntp-dev

into  psp-deb1.ntp.org:/home/stenn/ntp-dev-sntp

bk: 4b0a2c7eRjvWVBj3NhSLkR8zSEyiMQ

diff --cc Makefile.am
index 703fcf5ff742f63dcaef54664257f261d4453b6b,b871e65c25c833d2224246134b6e86391d961489..3d9b06c47323673c1230200b86dcdc999487173b
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -100,7 -102,14 +102,15 @@@ ETAGS_ARGS = Makefile.am configure.a
  # DIST_HOOK_DIRS = conf html scripts ports
  
  # HMS: Keep .gcc-warning first, as that way it gets printed first.
- BUILT_SOURCES = .gcc-warning $(srcdir)/COPYRIGHT $(srcdir)/version $(srcdir)/version.m4 $(srcdir)/include/version.def $(srcdir)/include/version.texi
+ BUILT_SOURCES =                               \
+       .gcc-warning                    \
+       libtool                         \
+       $(srcdir)/COPYRIGHT             \
+       $(srcdir)/version               \
+       $(srcdir)/version.m4            \
+       $(srcdir)/include/version.def   \
++      $(srcdir)/include/version.texi  \
+       $(NULL)
  
  $(srcdir)/COPYRIGHT: $(srcdir)/html/copyright.html
        ( echo "This file is automatically generated from html/copyright.html" ; lynx -dump $(srcdir)/html/copyright.html ) > $(srcdir)/COPYRIGHT.new && mv $(srcdir)/COPYRIGHT.new $(srcdir)/COPYRIGHT
@@@ -125,16 -134,12 +135,16 @@@ $(srcdir)/include/version.def: $(srcdir
        cd $(srcdir) && \
        ./scripts/genver include/version.def
  
 +$(srcdir)/include/version.texi: $(srcdir)/packageinfo.sh
 +      cd $(srcdir) && \
 +      ./scripts/genver include/version.texi
 +
+ libtool: $(LIBTOOL_DEPS)
+       ./config.status --recheck
+ 
  dist-hook:
-       @find $(distdir) -type d -name CVS -print | xargs rm -rf
        @find $(distdir) -type d -name SCCS -print | xargs rm -rf
        @chmod u+w $(distdir)/ports/winnt
-       @for i in `find $(distdir)/ports/winnt -type f -name '*.ds*' -print`; \
-          do chmod u+w $$i ; unix2dos $$i $$i; done
  
  .gcc-warning:
        @echo "Compiling with GCC now generates lots of new warnings."

diff --cc configure.ac
index 117bad2a3d09c5bed17122fce7b8e90779ca871d,69be62c486eac2640d00611acaff93701b81bd51..5221f3e6e92706bb4b1c6781d214c3986d002fb5
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1244,15 -1319,10 +1319,15 @@@ case $ac_cv_have_if_nametoindex i
        ;;
  esac
  
+ 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()])])
- AC_CHECK_FUNC(inet_aton, [], [AC_DEFINE(ISC_PLATFORM_NEEDATON, 1, [ISC: provide inet_aton()])])
 -AC_CHECK_FUNCS(K_open kvm_open memcpy memmove memset)
 +case "$ac_cv_header_kvm_h" in
 + yes)
 +    AC_CHECK_FUNCS(kvm_open)
 +    ;;
 +esac
 +AC_CHECK_FUNCS(memcpy memmove memset)
  case "$host" in
   *-*-sco3.2v5.0.*)
      # Just stubs.  Idiots.

diff --cc include/Makefile.am
index d9ba2ebb9a91c836557d7d6695f0d9834e512008,a48e6ecb0a1ef061cd3b6f55decbf18457c712f0..206021266c8fd3927ef06ef12d2629643aa17130
--- 1/include/Makefile.am
--- 2/include/Makefile.am
+++ b/include/Makefile.am
@@@ -1,9 -1,10 +1,10 @@@
- #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
+ NULL =
  AUTOMAKE_OPTIONS = 
  ETAGS_ARGS = $(srcdir)/Makefile.am
 -EXTRA_DIST = autogen-version.def copyright.def debug-opt.def homerc.def version.def
 +EXTRA_DIST = autogen-version.def copyright.def debug-opt.def homerc.def version.def version.texi
  
- NULL=
+ SUBDIRS = isc
+ 
  noinst_HEADERS =      \
        adjtime.h       \
        audio.h         \

diff --cc sntp/Makefile.am
index 858ec9304ef7eff1bf282ab777a57d5f9b060ce5,69287f19d7538c35dd5dabfeda01b574a8c2dc38..dd551be0bb178bb25abf9e2088b850adaafaac35
--- 1/sntp/Makefile.am
--- 2/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@@ -46,16 -46,23 +46,32 @@@ sntp_SOURCES =             
  #dist_man_MANS=       sntp.1
  
  EXTRA_DIST=   bincheck.mf     \
 -              depsver.mf      \
 -              deps-ver        \
                COPYRIGHT       \
--              sntp-opts.def sntp.1 sntp-opts.texi sntp-opts.menu      \
++              deps-ver        \
++              depsver.mf      \
++              sntp-opts.def   \
++              sntp-opts.menu  \
++              sntp-opts.texi  \
++              sntp.1          \
++              sntp.html       \
 +              sntp.texi       \
                $(NULL)
  OLD_EXTRA_DIST=               \
                autogen-version.def version.def version.m4
- BUILT_SOURCES=        check-autogen-version.def check-version.def             \
-               check-version.m4 check-version.texi                     \
-               sntp-opts.c sntp-opts.h sntp-opts.texi sntp-opts.menu   \
-               sntp.1 sntp.html
++
+ BUILT_SOURCES=                                                \
+               check-autogen-version.def               \
+               check-version.def check-version.m4      \
++              check-version.texi                      \
+               libtool                                 \
+               sntp-opts.c                             \
+               sntp-opts.h                             \
 -              sntp.1                                  \
 -              sntp-opts.texi                          \
+               sntp-opts.menu                          \
++              sntp-opts.texi                          \
++              sntp.1                                  \
++              sntp.html                               \
+               $(NULL)
++
  man_MANS=     sntp.1
  
  FRC:
@@@ -89,16 -96,12 +105,22 @@@ foo3
                echo "Installing new sntp/version.m4 file";     \
           fi )
  
 +check-version.texi: FRC
 +foo4:
 +      @cd $(srcdir)                                   \
 +      && test -r ../include/version.texi                      \
 +      && ( if cmp -s ../include/version.texi version.texi;    \
 +         then : ;                                     \
 +         else cp ../include/version.texi version.texi;        \
 +              echo "Installing new sntp/version.texi file";   \
 +         fi )
 +
+ $(srcdir)/../COPYRIGHT:
+       cd .. && $(MAKE) COPYRIGHT
+ 
+ $(srcdir)/COPYRIGHT: $(srcdir)/../COPYRIGHT
+       cat $(srcdir)/../COPYRIGHT > $@
+ 
  $(srcdir)/sntp-opts.h: $(srcdir)/sntp-opts.c
  $(srcdir)/sntp-opts.c: $(srcdir)/sntp-opts.def $(srcdir)/../include/version.def
        $(run_ag) sntp-opts.def
@@@ -109,7 -112,11 +131,14 @@@ $(srcdir)/sntp.1: $(srcdir)/sntp-opts.d
  $(srcdir)/sntp-opts.texi $(srcdir)/sntp-opts.menu: $(srcdir)/sntp-opts.def $(srcdir)/../include/version.def
        $(run_ag) -Taginfo.tpl -DLEVEL=section sntp-opts.def
  
- include bincheck.mf
 +$(srcdir)/sntp.html: $(srcdir)/sntp-opts.menu $(srcdir)/sntp-opts.texi $(srcdir)/sntp.texi
 +      cd $(srcdir) && makeinfo --force --html --no-split -o sntp.html sntp.texi
 +
+ ../libntp/libntp.a:
+       cd ../libntp && $(MAKE)
+ 
+ libtool: $(LIBTOOL_DEPS)
+       ./config.status --recheck
+ 
+ include $(top_srcdir)/bincheck.mf
+ include $(top_srcdir)/depsver.mf

diff --cc sntp/sntp-opts.def
Simple merge