vendor/ntp/4.2.8

17 files changed, 527 insertions, 259 deletions

diff --git a/libparse/Makefile.am b/libparse/Makefile.am
index 12b47967de75..a92db1546cbf 100644
--- a/libparse/Makefile.am
+++ b/libparse/Makefile.am
@@ -1,15 +1,17 @@
 NULL=
-#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
-AUTOMAKE_OPTIONS = 
 BUILT_SOURCES =
+CLEANFILES =
 noinst_LIBRARIES = @MAKE_LIBPARSE@ @MAKE_LIBPARSE_KERNEL@
 EXTRA_LIBRARIES = libparse.a libparse_kernel.a
 EXTRA_PROGRAMS = parsestreams parsesolaris
 noinst_PROGRAMS = @MAKE_PARSEKMODULE@
-CLEANFILES = libparse.a libparse_kernel.a info_trimble.c
 
 K_CFLAGS = -DPARSESTREAM -DNTP_NEED_BOPS
 
+# info_trimble.c was mistakenly created in the build directory
+# previously.  It is located in $(srcdir) and any updates must
+# end up there.
+
 libparse_a_SOURCES = parse.c \
 		     parse_conf.c \
 		     clk_meinberg.c \
@@ -23,6 +25,7 @@ libparse_a_SOURCES = parse.c \
 		     clk_computime.c \
 		     clk_wharton.c \
 		     clk_varitext.c \
+		     clk_sel240x.c \
 		     data_mbg.c \
 		     info_trimble.c \
 		     trim_info.c \
@@ -47,132 +50,96 @@ libparse_kernel_a_LIBADD =	\
 	kclk_trimtsip.o		\
 	kclk_varitext.o		\
 	kclk_wharton.o		\
+	kclk_sel240x.o		\
 	kbinio.o		\
 	kieee754io.o		\
 	kmfp_mul.o		\
 	kgpstolfp.o		\
 	$(NULL)
 
+AM_CFLAGS = $(CFLAGS_NTP)
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
-	-I$(top_srcdir)/lib/isc/nothreads/include \
-	-I$(top_srcdir)/lib/isc/unix/include -I$(top_srcdir)/kernel
-
-ETAGS_ARGS = Makefile.am
+AM_CPPFLAGS  = $(NTP_INCS)
+AM_CPPFLAGS += -I$(top_srcdir)/kernel
+AM_CPPFLAGS += $(CPPFLAGS_NTP)
 
 EXTRA_DIST = parsesolaris.c parsestreams.c mkinfo_scmd.sed mkinfo_rcmd.sed info_trimble.c
 
-#
-# create info_trimble.c
-#
-info_trimble.c: $(top_srcdir)/include/trimble.h mkinfo_rcmd.sed mkinfo_scmd.sed
-	@rm -f $@
-	sed -n -f $(srcdir)/mkinfo_scmd.sed $(top_srcdir)/include/trimble.h  > $@ || rm -f $@
-	sed -n -f $(srcdir)/mkinfo_rcmd.sed $(top_srcdir)/include/trimble.h >> $@ || rm -f $@
+$(srcdir)/info_trimble.c: $(top_srcdir)/include/trimble.h $(srcdir)/Makefile.am $(srcdir)/mkinfo_scmd.sed $(srcdir)/mkinfo_rcmd.sed
+	sed -n -f $(srcdir)/mkinfo_scmd.sed $(top_srcdir)/include/trimble.h  > info_trimble.new
+	sed -n -f $(srcdir)/mkinfo_rcmd.sed $(top_srcdir)/include/trimble.h >> info_trimble.new
+	mv -f info_trimble.new $@
 
-kieee754io.o: ieee754io.c
+kieee754io.o: $(srcdir)/ieee754io.c
 	 $(COMPILE) $(K_CFLAGS) -c $(srcdir)/ieee754io.c -o $@
 
-kmfp_mul.o: mfp_mul.c
+kmfp_mul.o: $(srcdir)/mfp_mul.c
 	 $(COMPILE) $(K_CFLAGS) -c $(srcdir)/mfp_mul.c -o $@
 
-kgpstolfp.o: gpstolfp.c
+kgpstolfp.o: $(srcdir)/gpstolfp.c
 	 $(COMPILE) $(K_CFLAGS) -c $(srcdir)/gpstolfp.c -o $@
 
-kbinio.o: binio.c
+kbinio.o: $(srcdir)/binio.c
 	 $(COMPILE) $(K_CFLAGS) -c $(srcdir)/binio.c -o $@
 
-kclk_computime.o: clk_computime.c
+kclk_computime.o: $(srcdir)/clk_computime.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_computime.c -o $@
 
-kclk_computime_.o: clk_computime_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_computime_.c -o $@
-
-kclk_dcf7000.o: clk_dcf7000.c
+kclk_dcf7000.o: $(srcdir)/clk_dcf7000.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_dcf7000.c -o $@
 
-kclk_dcf7000_.o: clk_dcf7000_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_dcf7000_.c -o $@
-
-kclk_hopf6021.o: clk_hopf6021.c
+kclk_hopf6021.o: $(srcdir)/clk_hopf6021.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_hopf6021.c -o $@
 
-kclk_hopf6021_.o: clk_hopf6021_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_hopf6021_.c -o $@
-
-kclk_meinberg.o: clk_meinberg.c
+kclk_meinberg.o: $(srcdir)/clk_meinberg.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_meinberg.c -o $@
 
-kclk_meinberg_.o: clk_meinberg_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_meinberg_.c -o $@
-
-kclk_rawdcf.o: clk_rawdcf.c
+kclk_rawdcf.o: $(srcdir)/clk_rawdcf.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_rawdcf.c -o $@
 
-kclk_rawdcf_.o: clk_rawdcf_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_rawdcf_.c -o $@
-
-kclk_rcc8000.o: clk_rcc8000.c
+kclk_rcc8000.o: $(srcdir)/clk_rcc8000.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_rcc8000.c -o $@
 
-kclk_rcc8000_.o: clk_rcc8000_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_rcc8000_.c -o $@
-
-kclk_schmid.o: clk_schmid.c
+kclk_schmid.o: $(srcdir)/clk_schmid.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_schmid.c -o $@
 
-kclk_schmid_.o: clk_schmid_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_schmid_.c -o $@
-
-kclk_trimtaip.o: clk_trimtaip.c
+kclk_trimtaip.o: $(srcdir)/clk_trimtaip.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_trimtaip.c -o $@
 
-kclk_trimtaip_.o: clk_trimtaip_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_trimtaip_.c -o $@
-
-kclk_trimtsip.o: clk_trimtsip.c
+kclk_trimtsip.o: $(srcdir)/clk_trimtsip.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_trimtsip.c -o $@
 
-kclk_trimtsip_.o: clk_trimtsip_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_trimtsip_.c -o $@
-
-kclk_varitext.o: clk_varitext.c
+kclk_varitext.o: $(srcdir)/clk_varitext.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_varitext.c -o $@
 
-kclk_varitext_.o: clk_varitext_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_varitext_.c -o $@
-
-kclk_wharton.o: clk_wharton.c
+kclk_wharton.o: $(srcdir)/clk_wharton.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_wharton.c -o $@
 
-kclk_wharton_.o: clk_wharton_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_wharton_.c -o $@
+kclk_sel240x.o: $(srcdir)/clk_sel240x.c
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_sel240x.c -o $@
 
-kparse.o: parse.c
+kparse.o: $(srcdir)/parse.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/parse.c -o $@
 
-kparse_.o: parse_.c
-	$(COMPILE) $(K_CFLAGS) -c parse_.c -o $@
-
-kparse_conf.o: parse_conf.c
+kparse_conf.o: $(srcdir)/parse_conf.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/parse_conf.c -o $@
 
-kparse_conf_.o: parse_conf_.c
-	$(COMPILE) $(K_CFLAGS) -c parse_conf_.c -o $@
-
 parsestreams.loadable_module.o: $(parsestreams_OBJECTS) libparse_kernel.a ../libntp/libntp.a
 	$(LD) -r -o $@ $(parsestreams_OBJECTS) libparse_kernel.a ../libntp/libntp.a
 
 parse: $(parsesolaris_OBJECTS) libparse_kernel.a ../libntp/libntp.a
 	$(LD) -r -o $@ $(parsesolaris_OBJECTS) libparse_kernel.a ../libntp/libntp.a
 
-../libntp/libntp.a:
-	cd ../libntp && $(MAKE)
-
 parsesolaris.o: sys/systm.h
 
 sys/systm.h:
-	mkdir sys && \
+	-mkdir sys
 	sed -e '/ffs(.*)/d' < /usr/include/sys/systm.h > sys/systm.h
 
+## check-libparse is invoked by ntpd/Makefile.am
+check-libparse: $(noinst_LIBRARIES)
+	@: do-nothing action to avoid default SCCS get
+
+include $(top_srcdir)/sntp/check-libntp.mf
 include $(top_srcdir)/depsver.mf
+include $(top_srcdir)/includes.mf
diff --git a/libparse/Makefile.in b/libparse/Makefile.in
index fcbf5131423c..606763edf963 100644
--- a/libparse/Makefile.in
+++ b/libparse/Makefile.in
@@ -37,20 +37,45 @@ build_triplet = @build@
 host_triplet = @host@
 EXTRA_PROGRAMS = parsestreams$(EXEEXT) parsesolaris$(EXEEXT)
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/depsver.mf
+	$(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf \
+	$(top_srcdir)/sntp/check-libntp.mf
 subdir = libparse
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/sntp/libopts/m4/libopts.m4 \
-	$(top_srcdir)/m4/define_dir.m4 $(top_srcdir)/m4/libtool.m4 \
-	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-	$(top_srcdir)/m4/ntp_cacheversion.m4 \
-	$(top_srcdir)/m4/ntp_dir_sep.m4 \
-	$(top_srcdir)/m4/ntp_lineeditlibs.m4 \
-	$(top_srcdir)/m4/ntp_openssl.m4 \
-	$(top_srcdir)/m4/ntp_vpathhack.m4 \
-	$(top_srcdir)/m4/os_cflags.m4 $(top_srcdir)/version.m4 \
-	$(top_srcdir)/configure.ac
+	$(top_srcdir)/sntp/libopts/m4/stdnoreturn.m4 \
+	$(top_srcdir)/sntp/libevent/m4/openldap-thread-check.m4 \
+	$(top_srcdir)/sntp/libevent/m4/openldap.m4 \
+	$(top_srcdir)/sntp/m4/define_dir.m4 \
+	$(top_srcdir)/sntp/m4/hms_search_lib.m4 \
+	$(top_srcdir)/sntp/m4/libtool.m4 \
+	$(top_srcdir)/sntp/m4/ltoptions.m4 \
+	$(top_srcdir)/sntp/m4/ltsugar.m4 \
+	$(top_srcdir)/sntp/m4/ltversion.m4 \
+	$(top_srcdir)/sntp/m4/lt~obsolete.m4 \
+	$(top_srcdir)/sntp/m4/ntp_cacheversion.m4 \
+	$(top_srcdir)/sntp/m4/ntp_compiler.m4 \
+	$(top_srcdir)/sntp/m4/ntp_crosscompile.m4 \
+	$(top_srcdir)/sntp/m4/ntp_crypto_rand.m4 \
+	$(top_srcdir)/sntp/m4/ntp_debug.m4 \
+	$(top_srcdir)/sntp/m4/ntp_dir_sep.m4 \
+	$(top_srcdir)/sntp/m4/ntp_facilitynames.m4 \
+	$(top_srcdir)/sntp/m4/ntp_googletest.m4 \
+	$(top_srcdir)/sntp/m4/ntp_ipv6.m4 \
+	$(top_srcdir)/sntp/m4/ntp_lib_m.m4 \
+	$(top_srcdir)/sntp/m4/ntp_libevent.m4 \
+	$(top_srcdir)/sntp/m4/ntp_libntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_lineeditlibs.m4 \
+	$(top_srcdir)/sntp/m4/ntp_locinfo.m4 \
+	$(top_srcdir)/sntp/m4/ntp_openssl.m4 \
+	$(top_srcdir)/sntp/m4/ntp_pkg_config.m4 \
+	$(top_srcdir)/sntp/m4/ntp_prog_cc.m4 \
+	$(top_srcdir)/sntp/m4/ntp_rlimit.m4 \
+	$(top_srcdir)/sntp/m4/ntp_sntp.m4 \
+	$(top_srcdir)/sntp/m4/ntp_ver_suffix.m4 \
+	$(top_srcdir)/sntp/m4/ntp_vpathhack.m4 \
+	$(top_srcdir)/sntp/m4/os_cflags.m4 \
+	$(top_srcdir)/sntp/m4/snprintf.m4 \
+	$(top_srcdir)/sntp/m4/version.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -59,6 +84,12 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
+AM_V_AR = $(am__v_AR_$(V))
+am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
+am__v_AR_0 = @echo "  AR    " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
 libparse_a_AR = $(AR) $(ARFLAGS)
 libparse_a_LIBADD =
 am__objects_1 =
@@ -68,10 +99,10 @@ am_libparse_a_OBJECTS = parse.$(OBJEXT) parse_conf.$(OBJEXT) \
 	clk_dcf7000.$(OBJEXT) clk_trimtaip.$(OBJEXT) \
 	clk_rcc8000.$(OBJEXT) clk_hopf6021.$(OBJEXT) \
 	clk_computime.$(OBJEXT) clk_wharton.$(OBJEXT) \
-	clk_varitext.$(OBJEXT) data_mbg.$(OBJEXT) \
-	info_trimble.$(OBJEXT) trim_info.$(OBJEXT) binio.$(OBJEXT) \
-	ieee754io.$(OBJEXT) mfp_mul.$(OBJEXT) gpstolfp.$(OBJEXT) \
-	$(am__objects_1)
+	clk_varitext.$(OBJEXT) clk_sel240x.$(OBJEXT) \
+	data_mbg.$(OBJEXT) info_trimble.$(OBJEXT) trim_info.$(OBJEXT) \
+	binio.$(OBJEXT) ieee754io.$(OBJEXT) mfp_mul.$(OBJEXT) \
+	gpstolfp.$(OBJEXT) $(am__objects_1)
 libparse_a_OBJECTS = $(am_libparse_a_OBJECTS)
 libparse_kernel_a_AR = $(AR) $(ARFLAGS)
 am__DEPENDENCIES_1 =
@@ -79,7 +110,7 @@ libparse_kernel_a_DEPENDENCIES = kparse.o kparse_conf.o \
 	kclk_computime.o kclk_dcf7000.o kclk_hopf6021.o \
 	kclk_meinberg.o kclk_rawdcf.o kclk_rcc8000.o kclk_schmid.o \
 	kclk_trimtaip.o kclk_trimtsip.o kclk_varitext.o kclk_wharton.o \
-	kbinio.o kieee754io.o kmfp_mul.o kgpstolfp.o \
+	kclk_sel240x.o kbinio.o kieee754io.o kmfp_mul.o kgpstolfp.o \
 	$(am__DEPENDENCIES_1)
 am_libparse_kernel_a_OBJECTS =
 libparse_kernel_a_OBJECTS = $(am_libparse_kernel_a_OBJECTS)
@@ -87,22 +118,35 @@ PROGRAMS = $(noinst_PROGRAMS)
 parsesolaris_SOURCES = parsesolaris.c
 parsesolaris_OBJECTS = parsesolaris.$(OBJEXT)
 parsesolaris_LDADD = $(LDADD)
+AM_V_lt = $(am__v_lt_$(V))
+am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+am__v_lt_0 = --silent
 parsestreams_SOURCES = parsestreams.c
 parsestreams_OBJECTS = parsestreams.$(OBJEXT)
 parsestreams_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/sntp/libevent/build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_$(V))
+am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+am__v_CC_0 = @echo "  CC    " $@;
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_$(V))
+am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+am__v_CCLD_0 = @echo "  CCLD  " $@;
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libparse_a_SOURCES) $(libparse_kernel_a_SOURCES) \
 	parsesolaris.c parsestreams.c
 DIST_SOURCES = $(libparse_a_SOURCES) $(libparse_kernel_a_SOURCES) \
@@ -111,20 +155,32 @@ ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
+ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BINSUBDIR = @BINSUBDIR@
+CALC_TICKADJ_DB = @CALC_TICKADJ_DB@
+CALC_TICKADJ_DL = @CALC_TICKADJ_DL@
+CALC_TICKADJ_DS = @CALC_TICKADJ_DS@
+CALC_TICKADJ_MS = @CALC_TICKADJ_MS@
+CALC_TICKADJ_NI = @CALC_TICKADJ_NI@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CFLAGS_NTP = @CFLAGS_NTP@
 CHUTEST = @CHUTEST@
-CLKTEST = @CLKTEST@
+CONFIG_SHELL = @CONFIG_SHELL@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CPPFLAGS_NTP = @CPPFLAGS_NTP@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DCFD = @DCFD@
 DEFS = @DEFS@
@@ -136,21 +192,31 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EDITLINE_LIBS = @EDITLINE_LIBS@
-EF_LIBS = @EF_LIBS@
-EF_PROGS = @EF_PROGS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+GTEST_CONFIG = @GTEST_CONFIG@
+GTEST_CPPFLAGS = @GTEST_CPPFLAGS@
+GTEST_CXXFLAGS = @GTEST_CXXFLAGS@
+GTEST_LDFLAGS = @GTEST_LDFLAGS@
+GTEST_LIBS = @GTEST_LIBS@
 HAVE_INLINE = @HAVE_INLINE@
+HAVE_RLIMIT_MEMLOCK = @HAVE_RLIMIT_MEMLOCK@
+HAVE_RLIMIT_STACK = @HAVE_RLIMIT_STACK@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LCRYPTO = @LCRYPTO@
 LD = @LD@
+LDADD_LIBNTP = @LDADD_LIBNTP@
+LDADD_NLIST = @LDADD_NLIST@
+LDADD_NTP = @LDADD_NTP@
 LDFLAGS = @LDFLAGS@
+LDFLAGS_NTP = @LDFLAGS_NTP@
+LIBISC_PTHREADS_NOTHREADS = @LIBISC_PTHREADS_NOTHREADS@
+LIBM = @LIBM@
 LIBOBJS = @LIBOBJS@
 LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@
 LIBOPTS_DIR = @LIBOPTS_DIR@
@@ -158,6 +224,7 @@ LIBOPTS_LDADD = @LIBOPTS_LDADD@
 LIBPARSE = @LIBPARSE@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBTOOL_DEPS = @LIBTOOL_DEPS@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LSCF = @LSCF@
@@ -176,14 +243,68 @@ MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
 MANIFEST_TOOL = @MANIFEST_TOOL@
+MANTAGFMT = @MANTAGFMT@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
+NTPDATE_DB = @NTPDATE_DB@
+NTPDATE_DL = @NTPDATE_DL@
+NTPDATE_DS = @NTPDATE_DS@
+NTPDATE_MS = @NTPDATE_MS@
+NTPDATE_NI = @NTPDATE_NI@
+NTPDC_DB = @NTPDC_DB@
+NTPDC_DL = @NTPDC_DL@
+NTPDC_DS = @NTPDC_DS@
+NTPDC_MS = @NTPDC_MS@
+NTPDC_NI = @NTPDC_NI@
+NTPDSIM_DB = @NTPDSIM_DB@
+NTPDSIM_DL = @NTPDSIM_DL@
+NTPDSIM_DS = @NTPDSIM_DS@
+NTPDSIM_MS = @NTPDSIM_MS@
+NTPDSIM_NI = @NTPDSIM_NI@
+NTPD_DB = @NTPD_DB@
+NTPD_DL = @NTPD_DL@
+NTPD_DS = @NTPD_DS@
+NTPD_MS = @NTPD_MS@
+NTPD_NI = @NTPD_NI@
+NTPQ_DB = @NTPQ_DB@
+NTPQ_DL = @NTPQ_DL@
+NTPQ_DS = @NTPQ_DS@
+NTPQ_MS = @NTPQ_MS@
+NTPQ_NI = @NTPQ_NI@
+NTPSNMPD_DB = @NTPSNMPD_DB@
+NTPSNMPD_DL = @NTPSNMPD_DL@
+NTPSNMPD_DS = @NTPSNMPD_DS@
+NTPSNMPD_MS = @NTPSNMPD_MS@
+NTPSNMPD_NI = @NTPSNMPD_NI@
+NTPSWEEP_DB = @NTPSWEEP_DB@
+NTPSWEEP_DL = @NTPSWEEP_DL@
+NTPSWEEP_DS = @NTPSWEEP_DS@
+NTPSWEEP_MS = @NTPSWEEP_MS@
+NTPSWEEP_NI = @NTPSWEEP_NI@
+NTPTIME_DB = @NTPTIME_DB@
+NTPTIME_DL = @NTPTIME_DL@
+NTPTIME_DS = @NTPTIME_DS@
+NTPTIME_MS = @NTPTIME_MS@
+NTPTIME_NI = @NTPTIME_NI@
+NTPTRACE_DB = @NTPTRACE_DB@
+NTPTRACE_DL = @NTPTRACE_DL@
+NTPTRACE_DS = @NTPTRACE_DS@
+NTPTRACE_MS = @NTPTRACE_MS@
+NTPTRACE_NI = @NTPTRACE_NI@
+NTP_KEYGEN_DB = @NTP_KEYGEN_DB@
+NTP_KEYGEN_DL = @NTP_KEYGEN_DL@
+NTP_KEYGEN_DS = @NTP_KEYGEN_DS@
+NTP_KEYGEN_MS = @NTP_KEYGEN_MS@
+NTP_KEYGEN_NI = @NTP_KEYGEN_NI@
+NTP_KEYSDIR = @NTP_KEYSDIR@
+NTP_WAIT_DB = @NTP_WAIT_DB@
+NTP_WAIT_DL = @NTP_WAIT_DL@
+NTP_WAIT_DS = @NTP_WAIT_DS@
+NTP_WAIT_MS = @NTP_WAIT_MS@
+NTP_WAIT_NI = @NTP_WAIT_NI@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
-OPENSSL = @OPENSSL@
-OPENSSL_INC = @OPENSSL_INC@
-OPENSSL_LIB = @OPENSSL_LIB@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@@ -196,10 +317,12 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_NET_SNMP_CONFIG = @PATH_NET_SNMP_CONFIG@
 PATH_PERL = @PATH_PERL@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-PATH_SH = @PATH_SH@
 PATH_TEST = @PATH_TEST@
+PERLLIBDIR = @PERLLIBDIR@
+PKG_CONFIG = @PKG_CONFIG@
 POSIX_SHELL = @POSIX_SHELL@
 PROPDELAY = @PROPDELAY@
+PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -207,9 +330,27 @@ SHELL = @SHELL@
 SNMP_CFLAGS = @SNMP_CFLAGS@
 SNMP_CPPFLAGS = @SNMP_CPPFLAGS@
 SNMP_LIBS = @SNMP_LIBS@
+SNTP = @SNTP@
+SNTP_DB = @SNTP_DB@
+SNTP_DL = @SNTP_DL@
+SNTP_DS = @SNTP_DS@
+SNTP_MS = @SNTP_MS@
+SNTP_NI = @SNTP_NI@
+STDNORETURN_H = @STDNORETURN_H@
 STRIP = @STRIP@
 TESTDCF = @TESTDCF@
+TICKADJ_DB = @TICKADJ_DB@
+TICKADJ_DL = @TICKADJ_DL@
+TICKADJ_DS = @TICKADJ_DS@
+TICKADJ_MS = @TICKADJ_MS@
+TICKADJ_NI = @TICKADJ_NI@
+TIMETRIM_DB = @TIMETRIM_DB@
+TIMETRIM_DL = @TIMETRIM_DL@
+TIMETRIM_DS = @TIMETRIM_DS@
+TIMETRIM_MS = @TIMETRIM_MS@
+TIMETRIM_NI = @TIMETRIM_NI@
 VERSION = @VERSION@
+VER_SUFFIX = @VER_SUFFIX@
 YACC = @YACC@
 YFLAGS = @YFLAGS@
 abs_builddir = @abs_builddir@
@@ -218,6 +359,7 @@ abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -266,14 +408,16 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 NULL = 
-#AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
-AUTOMAKE_OPTIONS = 
-BUILT_SOURCES = .deps-ver
+BUILT_SOURCES = check-libntp .deps-ver
+CLEANFILES = check-libntp .deps-ver
 noinst_LIBRARIES = @MAKE_LIBPARSE@ @MAKE_LIBPARSE_KERNEL@
 EXTRA_LIBRARIES = libparse.a libparse_kernel.a
 noinst_PROGRAMS = @MAKE_PARSEKMODULE@
-CLEANFILES = libparse.a libparse_kernel.a info_trimble.c .deps-ver
 K_CFLAGS = -DPARSESTREAM -DNTP_NEED_BOPS
+
+# info_trimble.c was mistakenly created in the build directory
+# previously.  It is located in $(srcdir) and any updates must
+# end up there.
 libparse_a_SOURCES = parse.c \
 		     parse_conf.c \
 		     clk_meinberg.c \
@@ -287,6 +431,7 @@ libparse_a_SOURCES = parse.c \
 		     clk_computime.c \
 		     clk_wharton.c \
 		     clk_varitext.c \
+		     clk_sel240x.c \
 		     data_mbg.c \
 		     info_trimble.c \
 		     trim_info.c \
@@ -311,24 +456,25 @@ libparse_kernel_a_LIBADD = \
 	kclk_trimtsip.o		\
 	kclk_varitext.o		\
 	kclk_wharton.o		\
+	kclk_sel240x.o		\
 	kbinio.o		\
 	kieee754io.o		\
 	kmfp_mul.o		\
 	kgpstolfp.o		\
 	$(NULL)
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
-	-I$(top_srcdir)/lib/isc/nothreads/include \
-	-I$(top_srcdir)/lib/isc/unix/include -I$(top_srcdir)/kernel
-
-ETAGS_ARGS = Makefile.am
+AM_CFLAGS = $(CFLAGS_NTP)
+AM_CPPFLAGS = $(NTP_INCS) -I$(top_srcdir)/kernel $(CPPFLAGS_NTP)
 EXTRA_DIST = parsesolaris.c parsestreams.c mkinfo_scmd.sed mkinfo_rcmd.sed info_trimble.c
+NTP_INCS = -I$(top_srcdir)/include -I$(top_srcdir)/lib/isc/include \
+	-I$(top_srcdir)/lib/isc/$(LIBISC_PTHREADS_NOTHREADS)/include \
+	-I$(top_srcdir)/lib/isc/unix/include
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/depsver.mf $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/sntp/check-libntp.mf $(top_srcdir)/depsver.mf $(top_srcdir)/includes.mf $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -362,13 +508,13 @@ $(am__aclocal_m4_deps):
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 libparse.a: $(libparse_a_OBJECTS) $(libparse_a_DEPENDENCIES) 
-	-rm -f libparse.a
-	$(libparse_a_AR) libparse.a $(libparse_a_OBJECTS) $(libparse_a_LIBADD)
-	$(RANLIB) libparse.a
+	$(AM_V_at)-rm -f libparse.a
+	$(AM_V_AR)$(libparse_a_AR) libparse.a $(libparse_a_OBJECTS) $(libparse_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libparse.a
 libparse_kernel.a: $(libparse_kernel_a_OBJECTS) $(libparse_kernel_a_DEPENDENCIES) 
-	-rm -f libparse_kernel.a
-	$(libparse_kernel_a_AR) libparse_kernel.a $(libparse_kernel_a_OBJECTS) $(libparse_kernel_a_LIBADD)
-	$(RANLIB) libparse_kernel.a
+	$(AM_V_at)-rm -f libparse_kernel.a
+	$(AM_V_AR)$(libparse_kernel_a_AR) libparse_kernel.a $(libparse_kernel_a_OBJECTS) $(libparse_kernel_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libparse_kernel.a
 
 clean-noinstPROGRAMS:
 	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
@@ -380,10 +526,10 @@ clean-noinstPROGRAMS:
 	rm -f $$list
 parsesolaris$(EXEEXT): $(parsesolaris_OBJECTS) $(parsesolaris_DEPENDENCIES) 
 	@rm -f parsesolaris$(EXEEXT)
-	$(LINK) $(parsesolaris_OBJECTS) $(parsesolaris_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(parsesolaris_OBJECTS) $(parsesolaris_LDADD) $(LIBS)
 parsestreams$(EXEEXT): $(parsestreams_OBJECTS) $(parsestreams_DEPENDENCIES) 
 	@rm -f parsestreams$(EXEEXT)
-	$(LINK) $(parsestreams_OBJECTS) $(parsestreams_LDADD) $(LIBS)
+	$(AM_V_CCLD)$(LINK) $(parsestreams_OBJECTS) $(parsestreams_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -399,6 +545,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_rawdcf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_rcc8000.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_schmid.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_sel240x.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_trimtaip.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_trimtsip.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_varitext.Po@am__quote@
@@ -415,22 +562,25 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trim_info.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -644,125 +794,92 @@ uninstall-am:
 	tags uninstall uninstall-am
 
 
-#
-# create info_trimble.c
-#
-info_trimble.c: $(top_srcdir)/include/trimble.h mkinfo_rcmd.sed mkinfo_scmd.sed
-	@rm -f $@
-	sed -n -f $(srcdir)/mkinfo_scmd.sed $(top_srcdir)/include/trimble.h  > $@ || rm -f $@
-	sed -n -f $(srcdir)/mkinfo_rcmd.sed $(top_srcdir)/include/trimble.h >> $@ || rm -f $@
+$(srcdir)/info_trimble.c: $(top_srcdir)/include/trimble.h $(srcdir)/Makefile.am $(srcdir)/mkinfo_scmd.sed $(srcdir)/mkinfo_rcmd.sed
+	sed -n -f $(srcdir)/mkinfo_scmd.sed $(top_srcdir)/include/trimble.h  > info_trimble.new
+	sed -n -f $(srcdir)/mkinfo_rcmd.sed $(top_srcdir)/include/trimble.h >> info_trimble.new
+	mv -f info_trimble.new $@
 
-kieee754io.o: ieee754io.c
+kieee754io.o: $(srcdir)/ieee754io.c
 	 $(COMPILE) $(K_CFLAGS) -c $(srcdir)/ieee754io.c -o $@
 
-kmfp_mul.o: mfp_mul.c
+kmfp_mul.o: $(srcdir)/mfp_mul.c
 	 $(COMPILE) $(K_CFLAGS) -c $(srcdir)/mfp_mul.c -o $@
 
-kgpstolfp.o: gpstolfp.c
+kgpstolfp.o: $(srcdir)/gpstolfp.c
 	 $(COMPILE) $(K_CFLAGS) -c $(srcdir)/gpstolfp.c -o $@
 
-kbinio.o: binio.c
+kbinio.o: $(srcdir)/binio.c
 	 $(COMPILE) $(K_CFLAGS) -c $(srcdir)/binio.c -o $@
 
-kclk_computime.o: clk_computime.c
+kclk_computime.o: $(srcdir)/clk_computime.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_computime.c -o $@
 
-kclk_computime_.o: clk_computime_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_computime_.c -o $@
-
-kclk_dcf7000.o: clk_dcf7000.c
+kclk_dcf7000.o: $(srcdir)/clk_dcf7000.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_dcf7000.c -o $@
 
-kclk_dcf7000_.o: clk_dcf7000_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_dcf7000_.c -o $@
-
-kclk_hopf6021.o: clk_hopf6021.c
+kclk_hopf6021.o: $(srcdir)/clk_hopf6021.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_hopf6021.c -o $@
 
-kclk_hopf6021_.o: clk_hopf6021_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_hopf6021_.c -o $@
-
-kclk_meinberg.o: clk_meinberg.c
+kclk_meinberg.o: $(srcdir)/clk_meinberg.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_meinberg.c -o $@
 
-kclk_meinberg_.o: clk_meinberg_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_meinberg_.c -o $@
-
-kclk_rawdcf.o: clk_rawdcf.c
+kclk_rawdcf.o: $(srcdir)/clk_rawdcf.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_rawdcf.c -o $@
 
-kclk_rawdcf_.o: clk_rawdcf_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_rawdcf_.c -o $@
-
-kclk_rcc8000.o: clk_rcc8000.c
+kclk_rcc8000.o: $(srcdir)/clk_rcc8000.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_rcc8000.c -o $@
 
-kclk_rcc8000_.o: clk_rcc8000_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_rcc8000_.c -o $@
-
-kclk_schmid.o: clk_schmid.c
+kclk_schmid.o: $(srcdir)/clk_schmid.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_schmid.c -o $@
 
-kclk_schmid_.o: clk_schmid_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_schmid_.c -o $@
-
-kclk_trimtaip.o: clk_trimtaip.c
+kclk_trimtaip.o: $(srcdir)/clk_trimtaip.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_trimtaip.c -o $@
 
-kclk_trimtaip_.o: clk_trimtaip_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_trimtaip_.c -o $@
-
-kclk_trimtsip.o: clk_trimtsip.c
+kclk_trimtsip.o: $(srcdir)/clk_trimtsip.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_trimtsip.c -o $@
 
-kclk_trimtsip_.o: clk_trimtsip_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_trimtsip_.c -o $@
-
-kclk_varitext.o: clk_varitext.c
+kclk_varitext.o: $(srcdir)/clk_varitext.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_varitext.c -o $@
 
-kclk_varitext_.o: clk_varitext_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_varitext_.c -o $@
-
-kclk_wharton.o: clk_wharton.c
+kclk_wharton.o: $(srcdir)/clk_wharton.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_wharton.c -o $@
 
-kclk_wharton_.o: clk_wharton_.c
-	$(COMPILE) $(K_CFLAGS) -c clk_wharton_.c -o $@
+kclk_sel240x.o: $(srcdir)/clk_sel240x.c
+	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/clk_sel240x.c -o $@
 
-kparse.o: parse.c
+kparse.o: $(srcdir)/parse.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/parse.c -o $@
 
-kparse_.o: parse_.c
-	$(COMPILE) $(K_CFLAGS) -c parse_.c -o $@
-
-kparse_conf.o: parse_conf.c
+kparse_conf.o: $(srcdir)/parse_conf.c
 	$(COMPILE) $(K_CFLAGS) -c $(srcdir)/parse_conf.c -o $@
 
-kparse_conf_.o: parse_conf_.c
-	$(COMPILE) $(K_CFLAGS) -c parse_conf_.c -o $@
-
 parsestreams.loadable_module.o: $(parsestreams_OBJECTS) libparse_kernel.a ../libntp/libntp.a
 	$(LD) -r -o $@ $(parsestreams_OBJECTS) libparse_kernel.a ../libntp/libntp.a
 
 parse: $(parsesolaris_OBJECTS) libparse_kernel.a ../libntp/libntp.a
 	$(LD) -r -o $@ $(parsesolaris_OBJECTS) libparse_kernel.a ../libntp/libntp.a
 
-../libntp/libntp.a:
-	cd ../libntp && $(MAKE)
-
 parsesolaris.o: sys/systm.h
 
 sys/systm.h:
-	mkdir sys && \
+	-mkdir sys
 	sed -e '/ffs(.*)/d' < /usr/include/sys/systm.h > sys/systm.h
+
+check-libparse: $(noinst_LIBRARIES)
+	@: do-nothing action to avoid default SCCS get
+
+check-libntp: ../libntp/libntp.a
+	@echo stamp > $@
+
+../libntp/libntp.a:
+	cd ../libntp && $(MAKE) $(AM_MAKEFLAGS) libntp.a
 $(DEPDIR)/deps-ver: $(top_srcdir)/deps-ver
 	@[ -f $@ ] ||							\
 		cp $(top_srcdir)/deps-ver $@
 	@[ -w $@ ] ||							\
 		chmod ug+w $@
 	@cmp $(top_srcdir)/deps-ver $@ > /dev/null || (			\
-		$(MAKE) clean &&					\
+		$(MAKE) $(AM_MAKEFLAGS) clean &&					\
 		echo -n "Prior $(subdir)/$(DEPDIR) version " &&		\
 		cat $@ &&						\
 		rm -rf $(DEPDIR) &&					\
@@ -771,17 +888,10 @@ $(DEPDIR)/deps-ver: $(top_srcdir)/deps-ver
 		 .)							\
 		    ./config.status Makefile depfiles			\
 		    ;;							\
-		 ..)							\
-			cd .. &&					\
-			./config.status $(subdir)/Makefile depfiles &&	\
-			cd $(subdir)					\
-		    ;;							\
 		 *)							\
-		    echo 'Fatal: depsver.mf Automake fragment limited'	\
-			 'to immediate subdirectories.'	&&		\
-		    echo "top_builddir:	$(top_builddir)" &&		\
-		    echo "subdir:	$(subdir)" &&			\
-		    exit 1						\
+		    cd "$(top_builddir)" &&				\
+		    ./config.status $(subdir)/Makefile depfiles &&	\
+		    cd $(subdir)					\
 		    ;;							\
 		esac &&							\
 		echo -n "Cleaned $(subdir)/$(DEPDIR) version " &&	\
@@ -790,7 +900,7 @@ $(DEPDIR)/deps-ver: $(top_srcdir)/deps-ver
 	cp $(top_srcdir)/deps-ver $@
 
 .deps-ver: $(top_srcdir)/deps-ver
-	@[ ! -d $(DEPDIR) ] || $(MAKE) $(DEPDIR)/deps-ver
+	@[ ! -d $(DEPDIR) ] || $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/deps-ver
 	@touch $@
 
 #
diff --git a/libparse/binio.c b/libparse/binio.c
index 2f8546b4adbe..24aa28687b1e 100644
--- a/libparse/binio.c
+++ b/libparse/binio.c
@@ -33,6 +33,7 @@
  *
  */
 
+#include <config.h>
 #include "binio.h"
 
 long
@@ -68,7 +69,7 @@ get_lsb_long(
   retval  = *((*bufpp)++);
   retval |= *((*bufpp)++) << 8;
   retval |= *((*bufpp)++) << 16;
-  retval |= *((*bufpp)++) << 24;
+  retval |= (u_long)*((*bufpp)++) << 24;
 
   return retval;
 }
@@ -115,7 +116,7 @@ get_msb_long(
 {
   long retval;
 
-  retval  = *((*bufpp)++) << 24;
+  retval  = (u_long)*((*bufpp)++) << 24;
   retval |= *((*bufpp)++) << 16;
   retval |= *((*bufpp)++) << 8;
   retval |= *((*bufpp)++);
diff --git a/libparse/clk_rawdcf.c b/libparse/clk_rawdcf.c
index 20b3bf281b73..98848bee8fb0 100644
--- a/libparse/clk_rawdcf.c
+++ b/libparse/clk_rawdcf.c
@@ -234,7 +234,7 @@ convert_rawdcf(
 	if (size < 57)
 	{
 #ifndef PARSEKERNEL
-		msyslog(LOG_ERR, "parse: convert_rawdcf: INCOMPLETE DATA - time code only has %d bits\n", size);
+		msyslog(LOG_ERR, "parse: convert_rawdcf: INCOMPLETE DATA - time code only has %d bits", size);
 #endif
 		return CVT_NONE;
 	}
@@ -320,7 +320,7 @@ convert_rawdcf(
 		 * bad format - not for us
 		 */
 #ifndef PARSEKERNEL
-		msyslog(LOG_ERR, "parse: convert_rawdcf: parity check FAILED for \"%s\"\n", buffer);
+		msyslog(LOG_ERR, "parse: convert_rawdcf: parity check FAILED for \"%s\"", buffer);
 #endif
 		return CVT_FAIL|CVT_BADFMT;
 	}
diff --git a/libparse/clk_sel240x.c b/libparse/clk_sel240x.c
new file mode 100644
index 000000000000..a09d3478dbf6
--- /dev/null
+++ b/libparse/clk_sel240x.c
@@ -0,0 +1,178 @@
+//////////////////////////////////////////////////////////////////////////////
+// Copyright (c) 2009,2012 -
+//        Schweitzer Engineering Laboratories, Inc. <opensource@selinc.com>
+//////////////////////////////////////////////////////////////////////////////
+
+// Need to have _XOPEN_SOURCE defined for time.h to give the 
+// correct strptime signature.  As per feature_test_macros(7),
+// define this before including any header files.
+
+// #ifndef _XOPEN_SOURCE
+// #define _XOPEN_SOURCE
+// #endif
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#if defined(REFCLOCK) && defined(CLOCK_PARSE) && defined(CLOCK_SEL240X)
+
+#include "ntp_syslog.h"
+#include "ntp_types.h"
+#include "ntp_fp.h"
+#include "ntp_unixtime.h"
+#include "ntp_calendar.h"
+#include "ntp_machine.h"
+#include "ntp_stdlib.h"
+
+#include "parse.h"
+
+#ifndef PARSESTREAM
+# include <stdio.h>
+#else
+# include "sys/parsestreams.h"
+#endif
+
+#include <time.h>
+
+//////////////////////////////////////////////////////////////////////////////
+// The B8 output has the following format B8 = '\x01YYYY:ddd:hh:mm:ssq\r\n'
+//    where q = ' ' locked
+//              '.' <1 us
+//              '*' <10 us
+//              '#' <100 us
+//              '?' >100 us
+//
+// Based on this we need to recored the stime when we receive the <SOH>
+// character and end it when we see the \n.
+//
+// The q or quality character indicates satellite lock and sync.   For the
+// purposes of NTP we are going to call it valid when we receive anything but
+// a '?'.  But we are only going to call it synced when we receive a ' '
+//////////////////////////////////////////////////////////////////////////////
+
+static unsigned long inp_sel240x( parse_t *parseio,
+		                  unsigned int ch,
+				  timestamp_t *tstamp);
+static unsigned long cvt_sel240x( unsigned char *buffer,
+		                  int size,
+				  struct format *format,
+				  clocktime_t *clock_time,
+				  void *local );
+
+// Parse clock format structure describing the message above
+static struct format sel240x_fmt =
+{ { {  6, 3 },
+    {  0, 0 },
+    {  1, 4 },
+    { 10, 2 },
+    { 13, 2 },
+    { 16, 2 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 }
+  },
+  (const unsigned char *)"\x01    :   :  :  :   \x0d\x0a",
+  0
+};
+
+// Structure desctibing the parser
+clockformat_t clock_sel240x =
+{
+	inp_sel240x,
+	cvt_sel240x,
+	pps_one,
+	(void*)&sel240x_fmt,
+	"SEL B8",
+	25,
+	0
+};
+
+//////////////////////////////////////////////////////////////////////////////
+static unsigned long
+inp_sel240x( parse_t      *parseio,
+	     unsigned int ch,
+	     timestamp_t  *tstamp
+	   )
+{
+	unsigned long rc;
+
+	parseprintf( DD_PARSE,
+	             ("inp_sel240x(0x%lx, 0x%x, ...)\n",(long)parseio, ch));
+
+	switch( ch )
+	{
+	case '\x01':
+		parseio->parse_index = 1;
+		parseio->parse_data[0] = ch;
+		parseio->parse_dtime.parse_stime = *tstamp;
+		rc = PARSE_INP_SKIP;
+		break;
+	case '\n':
+		if( (rc = parse_addchar(parseio, ch)) == PARSE_INP_SKIP )
+		{
+			rc = parse_end( parseio );
+		}
+		break;
+	default:
+		rc = parse_addchar( parseio, ch );
+	}
+
+	return rc;
+}
+
+//////////////////////////////////////////////////////////////////////////////
+static unsigned long
+cvt_sel240x( unsigned char *buffer,
+	     int            size,
+	     struct format *format,
+	     clocktime_t   *clock_time,
+	     void          *local
+	   )
+{
+	unsigned long rc = CVT_NONE;
+
+	if( Strok(buffer, format->fixed_string) )
+	{
+		struct tm ptime;
+		buffer++;
+		buffer = (unsigned char *) strptime( 
+			(const char *)buffer, "%Y:%j:%H:%M:%S", &ptime );
+		if( *(buffer+1) != '\x0d' )
+		{
+			rc = CVT_FAIL | CVT_BADFMT;
+		}
+		else
+		{
+			clock_time->day = ptime.tm_mday;
+			clock_time->month = ptime.tm_mon + 1;
+			clock_time->year = ptime.tm_year + 1900;
+			clock_time->hour = ptime.tm_hour;
+			clock_time->minute = ptime.tm_min;
+			clock_time->second = ptime.tm_sec;
+			clock_time->usecond = 0;
+			clock_time->utcoffset = 0;
+			clock_time->flags = PARSEB_UTC;
+
+			if( *buffer == '?' )
+			{
+				clock_time->flags |= PARSEB_POWERUP;
+			}
+			else if( *buffer != ' ' )
+			{
+				clock_time->flags |= PARSEB_NOSYNC;
+			}
+
+			rc = CVT_OK;
+		}
+	}
+
+	return rc;
+}
+
+#else  /* not (REFCLOCK && CLOCK_PARSE && CLOCK_SEL240X) */
+int clk_sel240x_bs;
+#endif /* not (REFCLOCK && CLOCK_PARSE && CLOCK_SEL240X) */
diff --git a/libparse/clk_trimtsip.c b/libparse/clk_trimtsip.c
index 58b0f87e3503..743e39c3bc74 100644
--- a/libparse/clk_trimtsip.c
+++ b/libparse/clk_trimtsip.c
@@ -44,7 +44,7 @@
 #include "ntp_syslog.h"
 #include "ntp_types.h"
 #include "ntp_fp.h"
-#include "ntp_unixtime.h"
+#include "timevalops.h"
 #include "ntp_calendar.h"
 #include "ntp_machine.h"
 #include "ntp_stdlib.h"
diff --git a/libparse/clk_wharton.c b/libparse/clk_wharton.c
index 0a1ee0b03a47..55ab43a9b574 100644
--- a/libparse/clk_wharton.c
+++ b/libparse/clk_wharton.c
@@ -91,7 +91,7 @@ cvt_wharton_400a(
 	int	i;
 
 	/* The given `size' includes a terminating null-character. */
-	if (size != 16 || buffer[0] != STX || buffer[14] != ETX
+	if (size != 15 || buffer[0] != STX || buffer[14] != ETX
 	    || buffer[13] < '0' || buffer[13] > ('0' + 0xf))
 		return CVT_NONE;
 	for (i = 1; i < 13; i += 1)
diff --git a/libparse/data_mbg.c b/libparse/data_mbg.c
index 991f1e90e2b4..97bef35c4479 100644
--- a/libparse/data_mbg.c
+++ b/libparse/data_mbg.c
@@ -33,6 +33,7 @@
  *
  */
 
+#include <config.h>
 #ifdef PARSESTREAM
 #define NEED_BOPS
 #include "ntp_string.h"
@@ -176,7 +177,7 @@ get_mbg_tzname(
 	char *tznamep
 	)
 {
-  strncpy(tznamep, (char *)*buffpp, sizeof(TZ_NAME));
+  strlcpy(tznamep, (char *)*buffpp, sizeof(TZ_NAME));
   *buffpp += sizeof(TZ_NAME);
 }
 
@@ -241,10 +242,10 @@ mbg_time_status_str(
 			{
 				if (p != *buffpp)
 				{
-					strncpy(p, ", ", size - (p - start));
+					strlcpy(p, ", ", size - (p - start));
 					p += 2;
 				}
-				strncpy(p, s->string, size - (p - start));
+				strlcpy(p, s->string, size - (p - start));
 				p += strlen(p);
 			}
 		}
diff --git a/libparse/gpstolfp.c b/libparse/gpstolfp.c
index 9f1a9bfd601d..5354dd3223aa 100644
--- a/libparse/gpstolfp.c
+++ b/libparse/gpstolfp.c
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  *
  */
+#include <config.h>
 #include "ntp_fp.h"
 
 #define GPSORIGIN	2524953600UL	/* NTP origin - GPS origin in seconds */
diff --git a/libparse/ieee754io.c b/libparse/ieee754io.c
index 1c203d7bcdde..61bc8533b0d7 100644
--- a/libparse/ieee754io.c
+++ b/libparse/ieee754io.c
@@ -89,14 +89,15 @@ fmt_flt(
 	unsigned long ch
 	)
 {
-  char *buf;
+	char *buf;
 
-  LIB_GETBUF(buf);
-  sprintf(buf, "%c %s %s %s", sign ? '-' : '+',
-	  fmt_blong(ch, 11),
-	  fmt_blong(mh, 20),
-	  fmt_blong(ml, 32));
-  return buf;
+	LIB_GETBUF(buf);
+	snprintf(buf, LIB_BUFLENGTH, "%c %s %s %s", sign ? '-' : '+',
+		 fmt_blong(ch, 11),
+		 fmt_blong(mh, 20),
+		 fmt_blong(ml, 32));
+
+	return buf;
 }
 
 static char *
@@ -105,15 +106,18 @@ fmt_hex(
 	int length
 	)
 {
-  char *buf;
-  int i;
+	char *	buf;
+	char	hex[4];
+	int	i;
+
+	LIB_GETBUF(buf);
+	buf[0] = '\0';
+	for (i = 0; i < length; i++) {
+		snprintf(hex, sizeof(hex), "%02x", bufp[i]);
+		strlcat(buf, hex, LIB_BUFLENGTH);
+	}
 
-  LIB_GETBUF(buf);
-  for (i = 0; i < length; i++)
-    {
-      sprintf(buf+i*2, "%02x", bufp[i]);
-    }
-  return buf;
+	return buf;
 }
 
 #endif
@@ -217,7 +221,7 @@ fetch_ieee754(
       mantissa_high  = 0;
 
       mantissa_low   = (val &0x7F) << 16;
-      mantissa_low  |= get_byte(bufp, offsets, &fieldindex) << 8;
+      mantissa_low  |= (u_long)get_byte(bufp, offsets, &fieldindex) << 8;
       mantissa_low  |= get_byte(bufp, offsets, &fieldindex);
       break;
       
@@ -226,12 +230,12 @@ fetch_ieee754(
       characteristic  |= (val & 0xF0) >> 4; /* grab lower characteristic bits */
 
       mantissa_high  = (val & 0x0F) << 16;
-      mantissa_high |= get_byte(bufp, offsets, &fieldindex) << 8;
+      mantissa_high |= (u_long)get_byte(bufp, offsets, &fieldindex) << 8;
       mantissa_high |= get_byte(bufp, offsets, &fieldindex);
 
-      mantissa_low   = get_byte(bufp, offsets, &fieldindex) << 24;
-      mantissa_low  |= get_byte(bufp, offsets, &fieldindex) << 16;
-      mantissa_low  |= get_byte(bufp, offsets, &fieldindex) << 8;
+      mantissa_low   = (u_long)get_byte(bufp, offsets, &fieldindex) << 24;
+      mantissa_low  |= (u_long)get_byte(bufp, offsets, &fieldindex) << 16;
+      mantissa_low  |= (u_long)get_byte(bufp, offsets, &fieldindex) << 8;
       mantissa_low  |= get_byte(bufp, offsets, &fieldindex);
       break;
       
diff --git a/libparse/mfp_mul.c b/libparse/mfp_mul.c
index 677ed181fc8b..43c1e39faa3f 100644
--- a/libparse/mfp_mul.c
+++ b/libparse/mfp_mul.c
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  *
  */
+#include <config.h>
 #include <stdio.h>
 #include "ntp_stdlib.h"
 #include "ntp_types.h"
diff --git a/libparse/mkinfo_rcmd.sed b/libparse/mkinfo_rcmd.sed
index 570c7a0b81e2..5238d5c4eb13 100644
--- a/libparse/mkinfo_rcmd.sed
+++ b/libparse/mkinfo_rcmd.sed
@@ -1,8 +1,8 @@
 1i\
 \
+\
 cmd_info_t trimble_rcmds[] = {
-s!^#define[ 	][ 	]*\(CMD_R[^ 	]*\)[ 	][ 	]*\([^ 	]*\)[ 	][ 	]*/\*[ 	][ 	]*\(.*\)[ 	]*:\([^:]*\):\([^:]*\)[ 	][ 	]*\*/!	{ \1, "\1", "\3 (\2)", "\4", \5 },!p
+s!^#define[ \	][ \	]*\(CMD_R[^ \	]*\)[ \	][ \	]*\([^ \	]*\)[ \	][ \	]*/\*[ \	][ \	]*\(.*\)[ \	]*:\([^:]*\):\([^:]*\)[ \	][ \	]*\*/!\	{ \1, "\1", "\3 (\2)", "\4", \5 },!p
 $a\
-	{ 0xFF, "", "" }\
-};\
-
+\	{ 0xFF, "", "" }\
+};
diff --git a/libparse/mkinfo_scmd.sed b/libparse/mkinfo_scmd.sed
index cabe0654588d..9c17f39ed703 100644
--- a/libparse/mkinfo_scmd.sed
+++ b/libparse/mkinfo_scmd.sed
@@ -1,8 +1,9 @@
 1i\
 /*\
- * Automatically generated - do not modify\
- */\
+\ * Automatically generated - do not modify\
+\ */\
 \
+#include <config.h>\
 #include "ntp_types.h"\
 #include "ntpd.h"\
 #include "trimble.h"\
@@ -10,7 +11,5 @@
 cmd_info_t trimble_scmds[] = {
 s!^#define[ 	][ 	]*\(CMD_C[^ 	]*\)[ 	][ 	]*\([^ 	]*\)[ 	][ 	]*/\*[ 	][ 	]*\(.*\)[ 	][ 	]*\*/!	{ \1, "\1", "\3 (\2)", "", 0 },!p
 $a\
-	{ 0xFF, "", "" }\
-};\
-
-
+\	{ 0xFF, "", "" }\
+};
diff --git a/libparse/parse.c b/libparse/parse.c
index 83e560aff0c6..85e5299cb195 100644
--- a/libparse/parse.c
+++ b/libparse/parse.c
@@ -51,7 +51,7 @@ static char rcsid[] = "parse.c,v 4.20 2005/08/06 17:39:40 kardel RELEASE_2005080
 #endif
 
 #include "ntp_fp.h"
-#include "ntp_unixtime.h"
+#include "timevalops.h"
 #include "ntp_calendar.h"
 #include "ntp_stdlib.h"
 #include "ntp_machine.h"
@@ -128,10 +128,6 @@ parse_timedout(
 		delta.tv_usec += 1000000;
 	}
 #else
-	extern long tstouslo[];
-	extern long tstousmid[];
-	extern long tstoushi[];
-
 	l_fp delt;
 
 	delt = tstamp->fp;
@@ -719,7 +715,7 @@ timepacket(
 	default:
 		/* shouldn't happen */
 #ifndef PARSEKERNEL
-		msyslog(LOG_WARNING, "parse: INTERNAL error: bad return code of convert routine \"%s\"\n", clockformats[format]->name);
+		msyslog(LOG_WARNING, "parse: INTERNAL error: bad return code of convert routine \"%s\"", clockformats[format]->name);
 #endif	  
 		return CVT_FAIL|cvtrtc;
 	}
diff --git a/libparse/parse_conf.c b/libparse/parse_conf.c
index b5451cff1028..b7234dd419b7 100644
--- a/libparse/parse_conf.c
+++ b/libparse/parse_conf.c
@@ -96,6 +96,10 @@ extern clockformat_t clock_wharton_400a;
 extern clockformat_t clock_varitext;
 #endif
 
+#ifdef CLOCK_SEL240X
+extern clockformat_t clock_sel240x;
+#endif
+
 /*
  * format definitions
  */
@@ -136,6 +140,9 @@ clockformat_t *clockformats[] =
 #ifdef CLOCK_VARITEXT
         &clock_varitext,
 #endif
+#ifdef CLOCK_SEL240X
+        &clock_sel240x,
+#endif
 	0};
 
 unsigned short nformats = sizeof(clockformats) / sizeof(clockformats[0]) - 1;
diff --git a/libparse/parsesolaris.c b/libparse/parsesolaris.c
index 2d499f0f68ce..d3756af882a3 100644
--- a/libparse/parsesolaris.c
+++ b/libparse/parsesolaris.c
@@ -40,6 +40,7 @@
 static char rcsid[] = "parsesolaris.c,v 4.11 2005/04/16 17:32:10 kardel RELEASE_20050508_A";
 #endif
 
+#include <config.h>
 #include <sys/types.h>
 #include <sys/conf.h>
 #include <sys/errno.h>
@@ -142,7 +143,7 @@ _init(
 	{
 		if (strlen(t) >= (S - s))
 		{
-			(void) strncpy(t, s, (unsigned)(S - s));
+			strlcpy(t, s, (unsigned)(S - s));
 		}
 	}
 	return (mod_install(&modlinkage));
@@ -291,7 +292,7 @@ setup_stream(
 	mp = allocb(sizeof(struct stroptions), BPRI_MED);
 	if (mp)
 	{
-		struct stroptions *str = (struct stroptions *)mp->b_wptr;
+		struct stroptions *str = (void *)mp->b_wptr;
 
 		str->so_flags   = SO_READOPT|SO_HIWAT|SO_LOWAT|SO_ISNTTY;
 		str->so_readopt = (mode == M_PARSE) ? RMSGD : RNORM;
@@ -486,7 +487,7 @@ parsewput(
 		break;
       
 	    case M_IOCTL:
-		iocp = (struct iocblk *)mp->b_rptr;
+		iocp = (void *)mp->b_rptr;
 		switch (iocp->ioc_cmd)
 		{
 		    default:
@@ -510,7 +511,8 @@ parsewput(
 			}
 
 			mp->b_cont = datap;
-			*(struct ppsclockev *)datap->b_wptr = parse->parse_ppsclockev;
+			/* (void *) quiets cast alignment warning */
+			*(struct ppsclockev *)(void *)datap->b_wptr = parse->parse_ppsclockev;
 			datap->b_wptr +=
 				sizeof(struct ppsclockev) / sizeof(*datap->b_wptr);
 			mp->b_datap->db_type = M_IOCACK;
@@ -543,7 +545,7 @@ parsewput(
 		    case PARSEIOC_SETCS:
 			if (iocp->ioc_count == sizeof(parsectl_t))
 			{
-				parsectl_t *dct = (parsectl_t *)mp->b_cont->b_rptr;
+				parsectl_t *dct = (void *)mp->b_cont->b_rptr;
 
 				switch (iocp->ioc_cmd)
 				{
@@ -986,7 +988,7 @@ zs_xsisr(
 	 struct zscom *zs
 	 )
 {
-	register struct asyncline *za = (struct asyncline *)zs->zs_priv;
+	register struct asyncline *za = (void *)zs->zs_priv;
 	register queue_t *q;
 	register unsigned char zsstatus;
 	register int loopcheck;
diff --git a/libparse/trim_info.c b/libparse/trim_info.c
index 8fdc4f61e21c..619e23861aef 100644
--- a/libparse/trim_info.c
+++ b/libparse/trim_info.c
@@ -33,6 +33,7 @@
  * SUCH DAMAGE.
  *
  */
+#include <config.h>
 #include "ntp_types.h"
 #include "trimble.h"