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

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

bk: 449f025arzxf2VhsXXLZPu0w8QgEBg

diff --cc Makefile.am
index 8e7d81abd5aa3b5b016616d8551494f0b3a93a77,cf4fa3a1a553b85efc67eef9e329dea8fab4082d..33f336679d0490491465b1ec346da7ae8b67ce75
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -42,48 -34,45 +42,49 @@@ DIST_SUBDIRS=              
        parseutil       \
        adjtimed        \
        clockstuff      \
 -      kernel  \
 -      sntp    \
 -      util
 -DISTCHECK_CONFIGURE_FLAGS=    --with-arlib --with-sntp
 +      kernel          \
 +      sntp            \
 +      util            \
 +      $(NULL)
 +
 +DISTCHECK_CONFIGURE_FLAGS=    --with-arlib --enable-local-libopts
  
 -EXTRA_DIST = \
 -      COPYRIGHT \
 -      ChangeLog \
 +EXTRA_DIST =          \
 +      COPYRIGHT       \
 +      ChangeLog       \
        ChangeLog-4.1.0 \
 -      NEWS \
 -      NOTES.y2kfixes \
 -      README.bk \
 -      README.hackers \
 -      README.patches \
 +      NEWS            \
 +      NOTES.y2kfixes  \
 +      README.bk       \
 +      README.hackers  \
 +      README.patches  \
        README.refclocks \
 -      README.versions \
 -      TODO \
 -      WHERE-TO-START \
 -      bootstrap \
 -      build \
 -      config.guess \
 -      config.h.in \
 -      config.sub \
 -      dot.emacs \
 -      excludes \
 -      flock-build \
 -      install-sh \
 -      packageinfo.sh \
 -      readme.y2kfixes \
 -      results.y2kfixes \
 +      README.versions \
 +      TODO            \
 +      WHERE-TO-START  \
 +      bootstrap       \
 +      build           \
 +      config.guess    \
 +      config.h.in     \
 +      config.sub      \
 +      dot.emacs       \
 +      excludes        \
 +      flock-build     \
 +      install-sh      \
 +      packageinfo.sh  \
 +      readme.y2kfixes \
 +      results.y2kfixes        \
 +      \
 +      conf            \
 +      html            \
 +      libisc          \
 +      ports           \
        \
 -      conf \
 -      html \
 -      libisc \
 -      ports \
++      bincheck.mf     \
 +      version         \
 +      version.m4      \
        \
 -      bincheck.mf \
 -      version \
 -      version.m4
 +      $(NULL)
  
  DISTCLEANFILES = .gcc-warning
  

diff --cc bootstrap
index e75b4f6dc22a93e433d6139ba79161cb69a7929c,7eecf49c088f6dad3be2771a4c510578af5bc5d0..eea61c10e5c00c386ba690987f32ebcc14a0de3a
--- 1/bootstrap
--- 2/bootstrap
+++ b/bootstrap
@@@ -52,21 -47,13 +52,23 @@@ prog_opt_files=$
  
  incdir=${PWD}/include
  
 -#for f in ${prog_opt_files}
 -#do
 -#  ( cd $(dirname ${f})
 -#    echo "Running autogen on $f..."
 -#    autogen -L${incdir} $(basename ${f}) )
 -#done
 +for f in ${prog_opt_files}
 +do
 +  ( cd $(dirname ${f})
 +    echo "Running autogen on $f..."
 +    autogen -L${incdir} $(basename ${f})
 +  ) || exit 1
 +done
  
 -(cd sntp && ${AUTORECONF} -i -v)
++cp bincheck.mf sntp/
+ 
  ${AUTORECONF} -i -v
 +
 +# HMS: 20060618: Now that we use separate copies of libopts
 +# we should only need the previous line.
 +#
 +## HMS: 20060615: the next line seems to be needed to make sure
 +## we get the correct srcdir path in sntp/libopts/Makefile.in
 +#rm -rf sntp/autom4te.cache
 +#
 +#(cd sntp && ${AUTORECONF} -f -i -v)

diff --cc sntp/Makefile.am
index 284b1ba884994e4e500670f9b55123188411a730,517fa4b276a115701f9b7ef95cf6ad15be33cb75..d681a77a8b07ba98a3d2a46794cc56f572a6d899
--- 1/sntp/Makefile.am
--- 2/sntp/Makefile.am
+++ b/sntp/Makefile.am
@@@ -1,44 -2,14 +2,25 @@@
  # Makefile for sntp
  # N.M. Maclaren, October 2000.
  
- # Take a look at README for the various preprocessor symbols, but they are
- # extremely unlikely to be needed on newer systems.  You may prefer to change
- # LOCKNAME and SAVENAME to use /var/run (or even /tmp) rather than /etc.  Note
- # that not all of the following system settings have been tested recently.
- 
  AUTOMAKE_OPTIONS = foreign
 +ACLOCAL_AMFLAGS= -I libopts/m4
 +
 +AM_CPPFLAGS=  $(LIBOPTS_CFLAGS)
 +LDADD=        $(LIBOPTS_LDADD)
  
- # Compiling this sort of ANSI C under SunOS 4.1 is a mug's game, because Sun's
- # Unix headers make GNU C vomit even in compatibility mode, but the following
- # will compile main.c and unix.c.  At least two people have got it to work.
- # CC = gcc -ansi
- # CFLAGS = -O -DNONBLOCK_BROKEN
- # LDFLAGS =
- # LIBS = -lm
- 
- # The following settings can be used under Linux.  While adjtime is present,
- # it is completely broken (i.e. it will work only if xntp is running), so it
- # is a good idea to add -DADJTIME_MISSING.
- # CC = cc -DADJTIME_MISSING
- # CFLAGS = -O
- # LDFLAGS = 
- # LIBS = -lm
- 
  NULL=
  
+ EXTRA_DIST=   bincheck.mf
+ 
  bindir=       ${exec_prefix}/${BINSUBDIR}
- bin_PROGRAMS = sntp
+ bin_PROGRAMS= sntp
 +run_ag=         cd $(srcdir) && autogen -L $(top_srcdir)/include
 +
 +SUBDIRS=
 +if NEED_LIBOPTS
 +SUBDIRS+= libopts
 +endif
 +SUBDIRS+= .
  
  sntp_SOURCES = \
        header.h \
@@@ -55,18 -24,4 +37,18 @@@
  
  dist_man_MANS=        sntp.1
  
- include ../bincheck.mf
 +EXTRA_DIST=   sntp-opts.def sntp.1 sntp-opts.texi sntp-opts.menu
 +BUILT_SOURCES=        sntp-opts.c sntp-opts.h sntp.1 sntp-opts.texi sntp-opts.menu
 +man_MANS=     sntp.1
 +
 +$(srcdir)/sntp-opts.h: sntp-opts.c
 +$(srcdir)/sntp-opts.c: sntp-opts.def
 +      $(run_ag) sntp-opts.def
 +
 +$(srcdir)/sntp.1: sntp-opts.def
 +      $(run_ag) -Tagman1.tpl -bsntp sntp-opts.def
 +
 +$(srcdir)/sntp-opts.texi $(srcdir)/sntp-opts.menu: sntp-opts.def
 +      $(run_ag) -Taginfo.tpl -DLEVEL=section sntp-opts.def
 +
+ include bincheck.mf