ntp-stable -> ntp-dev integration wibbles.

bk: 3ca11eecJbmm0bg09BMXuHljipCCOA

diff --cc configure.in
index 2e1d80ab64418b973d0a80fabd955527c296ec47,538f568e6a5a3d242b159ff1381570d6e17b3b85..e08bb8515ab0ee7e2d8004797d04b6443dde003d
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -243,10 -241,10 +243,10 @@@ AC_EGREP_CPP(yes
  #ifdef PPS_API_VERS_1
  yes
  #endif
- ], AC_CHECK_HEADERS(sys/timepps.h))
+ ], [AC_CHECK_HEADERS(sys/timepps.h)])
  AC_CHECK_HEADERS(sys/timers.h sys/timex.h sys/tpro.h sys/types.h sys/wait.h)
  AC_HEADER_TIME
 -case "$target" in
 +case "$host" in
  *-convex-*)
    AC_CHECK_HEADERS(/sys/sync/queue.h /sys/sync/sema.h)
    ;;
@@@ -3309,33 -3245,19 +3309,33 @@@ esa
  
  AC_DEFINE_DIR(NTP_KEYSDIR, sysconfdir, [Default location of crypto key info])
  
- # This *was* necessary so that .o files in LIBOBJS are also built via
- # the ANSI2KNR-filtering rules.
- # Autoconf 2.52 doesn't need it, and 2.53 hates it.
- #LIBOBJS=`echo $LIBOBJS|sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'`
 +AC_SUBST(ARLIB_DIR)
 +if test -d $srcdir/arlib
 +then
 +    AC_ARG_WITH(arlib,
 +      AC_HELP_STRING([--with-arlib], [- Compile the async resolver library?]),
 +    [ans=$withval], [ans=no])
 +
 +    case "$ans" in
 +     yes)
 +      ARLIB_DIR=arlib
 +      AC_CONFIG_SUBDIRS(arlib)
 +      ;;
 +    esac
 +fi
 +
+ # HMS: I think we avoid this problem now...
+ ## This is necessary so that .o files in LIBOBJS are also built via
+ ## the ANSI2KNR-filtering rules.
+ #LIB@&t@OBJS=`echo "$LIB@&t@OBJS" | sed 's,\.[[^.]]* ,$U&,g;s,\.[[^.]]*$,$U&,'`
  
  AC_CONFIG_FILES(Makefile adjtimed/Makefile clockstuff/Makefile \
 -ElectricFence/Makefile
 -include/Makefile kernel/Makefile kernel/sys/Makefile libntp/Makefile \
 -libparse/Makefile librsaref/Makefile ntpd/Makefile ntpdc/Makefile \
 -ntpdate/Makefile ntpq/Makefile ntptrace/Makefile parseutil/Makefile \
 -scripts/Makefile scripts/calc_tickadj scripts/checktime scripts/freq_adj \
 -scripts/mkver scripts/ntp-wait scripts/ntpsweep scripts/ntpver \
 -scripts/plot_summary scripts/summary util/Makefile)
 + ElectricFence/Makefile include/Makefile kernel/Makefile kernel/sys/Makefile \
 + libntp/Makefile libparse/Makefile ntpd/Makefile ntpdc/Makefile \
 + ntpdate/Makefile ntpq/Makefile ntptrace/Makefile parseutil/Makefile \
 + scripts/Makefile scripts/calc_tickadj scripts/checktime scripts/freq_adj \
 + scripts/mkver scripts/ntp-wait scripts/ntpsweep scripts/ntpver \
 + scripts/plot_summary scripts/summary util/Makefile)
  AC_CONFIG_COMMANDS(default, [[chmod +x scripts/calc_tickadj scripts/checktime scripts/freq_adj scripts/mkver scripts/ntp-wait scripts/ntpsweep scripts/ntpver scripts/plot_summary scripts/summary]], [])
  AC_OUTPUT
  #test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h])

diff --cc libntp/Makefile.am
index 97f9a4f963c902388b264822717a8ea79b7814d6,bf3dc996c2daa006da5a27ce35367d689bad71a8..ab303567c3733b9d9ee70376e0a82383b8108936
--- 1/libntp/Makefile.am
--- 2/libntp/Makefile.am
+++ b/libntp/Makefile.am
@@@ -2,21 -2,19 +2,19 @@@
  AUTOMAKE_OPTIONS = ../util/ansi2knr
  noinst_LIBRARIES = libntp.a
  libntp_a_SOURCES = a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
 -      audio.c authencrypt.c authkeys.c authparity.c authreadkeys.c \
 -      authusekey.c binio.c buftvtots.c caljulian.c calleapwhen.c caltontp.c \
 -      calyearstart.c clocktime.c clocktypes.c decodenetnum.c dofptoa.c \
 -      dolfptoa.c emalloc.c findconfig.c fptoa.c fptoms.c getopt.c \
 -      gpstolfp.c hextoint.c hextolfp.c humandate.c icom.c ieee754io.c \
 -      inttoa.c iosignal.c lib_strbuf.c machines.c md5c.c memmove.c \
 -      mfp_mul.c mfptoa.c mfptoms.c mktime.c modetoa.c mstolfp.c msutotsf.c \
 -      msyslog.c netof.c numtoa.c numtohost.c octtoint.c prettydate.c \
 -      ranny.c recvbuff.c refnumtoa.c snprintf.c statestr.c strdup.c \
 -      strerror.c syssignal.c systime.c tsftomsu.c tstotv.c tvtoa.c tvtots.c \
 +      audio.c authkeys.c authreadkeys.c authusekey.c binio.c buftvtots.c \
 +      caljulian.c calleapwhen.c caltontp.c calyearstart.c clocktime.c \
 +      clocktypes.c decodenetnum.c dofptoa.c dolfptoa.c emalloc.c \
 +      findconfig.c fptoa.c fptoms.c getopt.c gpstolfp.c hextoint.c \
 +      hextolfp.c humandate.c icom.c ieee754io.c inttoa.c iosignal.c \
 +      lib_strbuf.c machines.c md5c.c memmove.c mfp_mul.c mfptoa.c \
-       mfptoms.c modetoa.c mstolfp.c msutotsf.c msyslog.c netof.c numtoa.c \
-       numtohost.c octtoint.c prettydate.c ranny.c recvbuff.c refnumtoa.c \
-       statestr.c syssignal.c systime.c tsftomsu.c tstotv.c tvtoa.c \
-       tvtots.c uglydate.c uinttoa.c utvtoa.c ymd2yd.c
++      mfptoms.c mktime.c modetoa.c mstolfp.c msutotsf.c msyslog.c netof.c \
++      numtoa.c numtohost.c octtoint.c prettydate.c ranny.c recvbuff.c \
++      refnumtoa.c snprintf.c statestr.c strdup.c strerror.c strstr.c\
++      syssignal.c systime.c tsftomsu.c tstotv.c tvtoa.c tvtots.c \
+       uglydate.c uinttoa.c utvtoa.c ymd2yd.c
  EXTRA_libntp_a_SOURCES = adjtimex.c log.c random.c
- #     mktime.c snprintf.c strdup.c strerror.c strstr.c
- libntp_a_LIBADD = @LIBOBJS@
- libntp_a_DEPENDENCIES = @LIBOBJS@
 -INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/librsaref
 +INCLUDES = -I$(top_srcdir)/include
  ETAGS_ARGS = Makefile.am
  
  noinst_HEADERS = lib_strbuf.h log.h