Merge ntpd & friends 4.2.4p5 from vendor/ntp/dist into head. Next commit

will update usr.sbin/ntp to match this. MFC after: 2 weeks
author: roberto <roberto@FreeBSD.org> 2008-08-22 15:58:00 +0000
committer: roberto <roberto@FreeBSD.org> 2008-08-22 15:58:00 +0000
commit: b85c7169a740b2edf0106ad59fdaa1b0160f823c (patch)
tree: 2b9fb7f64eacb322e95695e412c923e97ba33e88 /contrib/ntp/libntp
parent: 1d197cfe9feac6bc29537d8e53c30b6435937b95 (diff)
parent: 7a6072eb585696f8856cd498c3fd194cf49f14c6 (diff)
download: FreeBSD-src-b85c7169a740b2edf0106ad59fdaa1b0160f823c.zip
FreeBSD-src-b85c7169a740b2edf0106ad59fdaa1b0160f823c.tar.gz
34 files changed, 1221 insertions, 2192 deletions
diff --git a/contrib/ntp/libntp/Makefile.am b/contrib/ntp/libntp/Makefile.am
index 75b5505..932f87b 100644
--- a/contrib/ntp/libntp/Makefile.am
+++ b/contrib/ntp/libntp/Makefile.am
@@ -3,15 +3,15 @@ AUTOMAKE_OPTIONS = ../util/ansi2knr
 noinst_LIBRARIES = libntp.a @MAKE_LIBNTPSIM@
 EXTRA_LIBRARIES = libntpsim.a
 libntp_a_SRCS = a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
-	audio.c authkeys.c authreadkeys.c authusekey.c binio.c buftvtots.c \
-	caljulian.c calleapwhen.c caltontp.c calyearstart.c clocktime.c \
+	audio.c authkeys.c authreadkeys.c authusekey.c buftvtots.c \
+	caljulian.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 \
+	findconfig.c fptoa.c fptoms.c getopt.c hextoint.c \
+	hextolfp.c humandate.c icom.c inttoa.c iosignal.c \
+	lib_strbuf.c machines.c md5c.c memmove.c mfptoa.c \
 	mfptoms.c mktime.c modetoa.c mstolfp.c msutotsf.c msyslog.c netof.c \
 	ntp_rfc2553.c numtoa.c numtohost.c octtoint.c prettydate.c \
-	ranny.c recvbuff.c refnumtoa.c snprintf.c socktoa.c socktohost.c \
+	ntp_random.c recvbuff.c refnumtoa.c snprintf.c socktoa.c socktohost.c \
 	statestr.c strdup.c strerror.c strstr.c \
 	syssignal.c tsftomsu.c tstotv.c tvtoa.c tvtots.c \
 	uglydate.c uinttoa.c utvtoa.c ymd2yd.c \
@@ -19,14 +19,17 @@ libntp_a_SRCS = a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
 	$(srcdir)/../libisc/interfaceiter.c $(srcdir)/../libisc/lib.c \
 	$(srcdir)/../libisc/mem.c $(srcdir)/../libisc/msgcat.c \
 	$(srcdir)/../libisc/net.c $(srcdir)/../libisc/isc_strerror.c \
-	$(srcdir)/../libisc/inet_ntop.c
+	$(srcdir)/../libisc/inet_ntop.c \
+	$(srcdir)/../libisc/inet_pton.c \
+	$(srcdir)/../libisc/netaddr.c $(srcdir)/../libisc/sockaddr.c \
+	$(srcdir)/../libisc/netscope.c
 libntp_a_SOURCES = systime.c $(libntp_a_SRCS)
 libntpsim_a_SOURCES = systime_s.c $(libntp_a_SRCS)
-EXTRA_libntp_a_SOURCES = adjtimex.c log.c random.c
+EXTRA_libntp_a_SOURCES = adjtimex.c
 INCLUDES = -I$(top_srcdir)/include -I../include
 ETAGS_ARGS = Makefile.am
 
-noinst_HEADERS = lib_strbuf.h log.h
+noinst_HEADERS = lib_strbuf.h 
 
 ../include/des.h:
 	touch ../include/des.h
diff --git a/contrib/ntp/libntp/Makefile.in b/contrib/ntp/libntp/Makefile.in
index 1565b0b..802ba71 100644
--- a/contrib/ntp/libntp/Makefile.in
+++ b/contrib/ntp/libntp/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.7.7 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,6 +14,7 @@
 
 @SET_MAKE@
 
+
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
@@ -21,7 +22,6 @@ pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
@@ -37,16 +37,92 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-target_triplet = @target@
+ANSI2KNR = ../util/ansi2knr
+subdir = libntp
+DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/libopts/m4/libopts.m4 \
+	$(top_srcdir)/m4/define_dir.m4 \
+	$(top_srcdir)/m4/hs_ulong_const.m4 \
+	$(top_srcdir)/m4/os_cflags.m4 $(top_srcdir)/version.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LIBRARIES = $(noinst_LIBRARIES)
+ARFLAGS = cru
+libntp_a_AR = $(AR) $(ARFLAGS)
+libntp_a_LIBADD =
+am__objects_1 = a_md5encrypt$U.$(OBJEXT) adjtime$U.$(OBJEXT) \
+	atoint$U.$(OBJEXT) atolfp$U.$(OBJEXT) atouint$U.$(OBJEXT) \
+	audio$U.$(OBJEXT) authkeys$U.$(OBJEXT) \
+	authreadkeys$U.$(OBJEXT) authusekey$U.$(OBJEXT) \
+	buftvtots$U.$(OBJEXT) caljulian$U.$(OBJEXT) \
+	caltontp$U.$(OBJEXT) calyearstart$U.$(OBJEXT) \
+	clocktime$U.$(OBJEXT) clocktypes$U.$(OBJEXT) \
+	decodenetnum$U.$(OBJEXT) dofptoa$U.$(OBJEXT) \
+	dolfptoa$U.$(OBJEXT) emalloc$U.$(OBJEXT) \
+	findconfig$U.$(OBJEXT) fptoa$U.$(OBJEXT) fptoms$U.$(OBJEXT) \
+	getopt$U.$(OBJEXT) hextoint$U.$(OBJEXT) hextolfp$U.$(OBJEXT) \
+	humandate$U.$(OBJEXT) icom$U.$(OBJEXT) inttoa$U.$(OBJEXT) \
+	iosignal$U.$(OBJEXT) lib_strbuf$U.$(OBJEXT) \
+	machines$U.$(OBJEXT) md5c$U.$(OBJEXT) memmove$U.$(OBJEXT) \
+	mfptoa$U.$(OBJEXT) mfptoms$U.$(OBJEXT) mktime$U.$(OBJEXT) \
+	modetoa$U.$(OBJEXT) mstolfp$U.$(OBJEXT) msutotsf$U.$(OBJEXT) \
+	msyslog$U.$(OBJEXT) netof$U.$(OBJEXT) ntp_rfc2553$U.$(OBJEXT) \
+	numtoa$U.$(OBJEXT) numtohost$U.$(OBJEXT) octtoint$U.$(OBJEXT) \
+	prettydate$U.$(OBJEXT) ntp_random$U.$(OBJEXT) \
+	recvbuff$U.$(OBJEXT) refnumtoa$U.$(OBJEXT) \
+	snprintf$U.$(OBJEXT) socktoa$U.$(OBJEXT) \
+	socktohost$U.$(OBJEXT) statestr$U.$(OBJEXT) strdup$U.$(OBJEXT) \
+	strerror$U.$(OBJEXT) strstr$U.$(OBJEXT) syssignal$U.$(OBJEXT) \
+	tsftomsu$U.$(OBJEXT) tstotv$U.$(OBJEXT) tvtoa$U.$(OBJEXT) \
+	tvtots$U.$(OBJEXT) uglydate$U.$(OBJEXT) uinttoa$U.$(OBJEXT) \
+	utvtoa$U.$(OBJEXT) ymd2yd$U.$(OBJEXT) assertions$U.$(OBJEXT) \
+	error$U.$(OBJEXT) interfaceiter$U.$(OBJEXT) lib$U.$(OBJEXT) \
+	mem$U.$(OBJEXT) msgcat$U.$(OBJEXT) net$U.$(OBJEXT) \
+	isc_strerror$U.$(OBJEXT) inet_ntop$U.$(OBJEXT) \
+	inet_pton$U.$(OBJEXT) netaddr$U.$(OBJEXT) sockaddr$U.$(OBJEXT) \
+	netscope$U.$(OBJEXT)
+am_libntp_a_OBJECTS = systime$U.$(OBJEXT) $(am__objects_1)
+libntp_a_OBJECTS = $(am_libntp_a_OBJECTS)
+libntpsim_a_AR = $(AR) $(ARFLAGS)
+libntpsim_a_LIBADD =
+am_libntpsim_a_OBJECTS = systime_s$U.$(OBJEXT) $(am__objects_1)
+libntpsim_a_OBJECTS = $(am_libntpsim_a_OBJECTS)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libntp_a_SOURCES) $(EXTRA_libntp_a_SOURCES) \
+	$(libntpsim_a_SOURCES)
+DIST_SOURCES = $(libntp_a_SOURCES) $(EXTRA_libntp_a_SOURCES) \
+	$(libntpsim_a_SOURCES)
+HEADERS = $(noinst_HEADERS)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
+AR = @AR@
 ARLIB_DIR = @ARLIB_DIR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+BINSUBDIR = @BINSUBDIR@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
@@ -54,10 +130,15 @@ CHUTEST = @CHUTEST@
 CLKTEST = @CLKTEST@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DCFD = @DCFD@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -65,30 +146,39 @@ EF_LIBS = @EF_LIBS@
 EF_PROGS = @EF_PROGS@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
 INSTALL_DATA = @INSTALL_DATA@
+INSTALL_LIBOPTS_FALSE = @INSTALL_LIBOPTS_FALSE@
+INSTALL_LIBOPTS_TRUE = @INSTALL_LIBOPTS_TRUE@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LCRYPTO = @LCRYPTO@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
+LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@
+LIBOPTS_DIR = @LIBOPTS_DIR@
+LIBOPTS_LDADD = @LIBOPTS_LDADD@
 LIBPARSE = @LIBPARSE@
 LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_LAYOUT = @MAKE_CHECK_LAYOUT@
 MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBNTPSIM = @MAKE_LIBNTPSIM@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_NTPDSIM = @MAKE_NTPDSIM@
 MAKE_NTPTIME = @MAKE_NTPTIME@
-MAKE_NTP_KEYGEN = @MAKE_NTP_KEYGEN@
 MAKE_PARSEKMODULE = @MAKE_PARSEKMODULE@
-MAKE_SNTP = @MAKE_SNTP@
 MAKE_TICKADJ = @MAKE_TICKADJ@
 MAKE_TIMETRIM = @MAKE_TIMETRIM@
+NEED_LIBOPTS_FALSE = @NEED_LIBOPTS_FALSE@
+NEED_LIBOPTS_TRUE = @NEED_LIBOPTS_TRUE@
 OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OPENSSL_INC = @OPENSSL_INC@
@@ -111,14 +201,21 @@ STRIP = @STRIP@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@
@@ -139,6 +236,7 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localstatedir = @localstatedir@
 mandir = @mandir@
+mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
@@ -146,26 +244,22 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
-target = @target@
 target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
 
 #AUTOMAKE_OPTIONS = ../ansi2knr no-dependencies
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 noinst_LIBRARIES = libntp.a @MAKE_LIBNTPSIM@
 EXTRA_LIBRARIES = libntpsim.a
 libntp_a_SRCS = a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
-	audio.c authkeys.c authreadkeys.c authusekey.c binio.c buftvtots.c \
-	caljulian.c calleapwhen.c caltontp.c calyearstart.c clocktime.c \
+	audio.c authkeys.c authreadkeys.c authusekey.c buftvtots.c \
+	caljulian.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 \
+	findconfig.c fptoa.c fptoms.c getopt.c hextoint.c \
+	hextolfp.c humandate.c icom.c inttoa.c iosignal.c \
+	lib_strbuf.c machines.c md5c.c memmove.c mfptoa.c \
 	mfptoms.c mktime.c modetoa.c mstolfp.c msutotsf.c msyslog.c netof.c \
 	ntp_rfc2553.c numtoa.c numtohost.c octtoint.c prettydate.c \
-	ranny.c recvbuff.c refnumtoa.c snprintf.c socktoa.c socktohost.c \
+	ntp_random.c recvbuff.c refnumtoa.c snprintf.c socktoa.c socktohost.c \
 	statestr.c strdup.c strerror.c strstr.c \
 	syssignal.c tsftomsu.c tstotv.c tvtoa.c tvtots.c \
 	uglydate.c uinttoa.c utvtoa.c ymd2yd.c \
@@ -173,139 +267,51 @@ libntp_a_SRCS = a_md5encrypt.c adjtime.c atoint.c atolfp.c atouint.c \
 	$(srcdir)/../libisc/interfaceiter.c $(srcdir)/../libisc/lib.c \
 	$(srcdir)/../libisc/mem.c $(srcdir)/../libisc/msgcat.c \
 	$(srcdir)/../libisc/net.c $(srcdir)/../libisc/isc_strerror.c \
-	$(srcdir)/../libisc/inet_ntop.c
+	$(srcdir)/../libisc/inet_ntop.c \
+	$(srcdir)/../libisc/inet_pton.c \
+	$(srcdir)/../libisc/netaddr.c $(srcdir)/../libisc/sockaddr.c \
+	$(srcdir)/../libisc/netscope.c
 
 libntp_a_SOURCES = systime.c $(libntp_a_SRCS)
 libntpsim_a_SOURCES = systime_s.c $(libntp_a_SRCS)
-EXTRA_libntp_a_SOURCES = adjtimex.c log.c random.c
+EXTRA_libntp_a_SOURCES = adjtimex.c
 INCLUDES = -I$(top_srcdir)/include -I../include
 ETAGS_ARGS = Makefile.am
-
-noinst_HEADERS = lib_strbuf.h log.h
-
+noinst_HEADERS = lib_strbuf.h 
 EXTRA_DIST = README
-subdir = libntp
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libntp_a_AR = $(AR) cru
-libntp_a_LIBADD =
-am__objects_1 = a_md5encrypt$U.$(OBJEXT) adjtime$U.$(OBJEXT) \
-	atoint$U.$(OBJEXT) atolfp$U.$(OBJEXT) atouint$U.$(OBJEXT) \
-	audio$U.$(OBJEXT) authkeys$U.$(OBJEXT) authreadkeys$U.$(OBJEXT) \
-	authusekey$U.$(OBJEXT) binio$U.$(OBJEXT) buftvtots$U.$(OBJEXT) \
-	caljulian$U.$(OBJEXT) calleapwhen$U.$(OBJEXT) \
-	caltontp$U.$(OBJEXT) calyearstart$U.$(OBJEXT) \
-	clocktime$U.$(OBJEXT) clocktypes$U.$(OBJEXT) \
-	decodenetnum$U.$(OBJEXT) dofptoa$U.$(OBJEXT) \
-	dolfptoa$U.$(OBJEXT) emalloc$U.$(OBJEXT) findconfig$U.$(OBJEXT) \
-	fptoa$U.$(OBJEXT) fptoms$U.$(OBJEXT) getopt$U.$(OBJEXT) \
-	gpstolfp$U.$(OBJEXT) hextoint$U.$(OBJEXT) hextolfp$U.$(OBJEXT) \
-	humandate$U.$(OBJEXT) icom$U.$(OBJEXT) ieee754io$U.$(OBJEXT) \
-	inttoa$U.$(OBJEXT) iosignal$U.$(OBJEXT) lib_strbuf$U.$(OBJEXT) \
-	machines$U.$(OBJEXT) md5c$U.$(OBJEXT) memmove$U.$(OBJEXT) \
-	mfp_mul$U.$(OBJEXT) mfptoa$U.$(OBJEXT) mfptoms$U.$(OBJEXT) \
-	mktime$U.$(OBJEXT) modetoa$U.$(OBJEXT) mstolfp$U.$(OBJEXT) \
-	msutotsf$U.$(OBJEXT) msyslog$U.$(OBJEXT) netof$U.$(OBJEXT) \
-	ntp_rfc2553$U.$(OBJEXT) numtoa$U.$(OBJEXT) \
-	numtohost$U.$(OBJEXT) octtoint$U.$(OBJEXT) \
-	prettydate$U.$(OBJEXT) ranny$U.$(OBJEXT) recvbuff$U.$(OBJEXT) \
-	refnumtoa$U.$(OBJEXT) snprintf$U.$(OBJEXT) socktoa$U.$(OBJEXT) \
-	socktohost$U.$(OBJEXT) statestr$U.$(OBJEXT) strdup$U.$(OBJEXT) \
-	strerror$U.$(OBJEXT) strstr$U.$(OBJEXT) syssignal$U.$(OBJEXT) \
-	tsftomsu$U.$(OBJEXT) tstotv$U.$(OBJEXT) tvtoa$U.$(OBJEXT) \
-	tvtots$U.$(OBJEXT) uglydate$U.$(OBJEXT) uinttoa$U.$(OBJEXT) \
-	utvtoa$U.$(OBJEXT) ymd2yd$U.$(OBJEXT) assertions$U.$(OBJEXT) \
-	error$U.$(OBJEXT) interfaceiter$U.$(OBJEXT) lib$U.$(OBJEXT) \
-	mem$U.$(OBJEXT) msgcat$U.$(OBJEXT) net$U.$(OBJEXT) \
-	isc_strerror$U.$(OBJEXT) inet_ntop$U.$(OBJEXT)
-am_libntp_a_OBJECTS = systime$U.$(OBJEXT) $(am__objects_1)
-libntp_a_OBJECTS = $(am_libntp_a_OBJECTS)
-libntpsim_a_AR = $(AR) cru
-libntpsim_a_LIBADD =
-am_libntpsim_a_OBJECTS = systime_s$U.$(OBJEXT) $(am__objects_1)
-libntpsim_a_OBJECTS = $(am_libntpsim_a_OBJECTS)
-
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/a_md5encrypt$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/adjtime$U.Po ./$(DEPDIR)/adjtimex$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/assertions$U.Po ./$(DEPDIR)/atoint$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/atolfp$U.Po ./$(DEPDIR)/atouint$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/audio$U.Po ./$(DEPDIR)/authkeys$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/authreadkeys$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/authusekey$U.Po ./$(DEPDIR)/binio$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/buftvtots$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/caljulian$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/calleapwhen$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/caltontp$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/calyearstart$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/clocktime$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/clocktypes$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/decodenetnum$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/dofptoa$U.Po ./$(DEPDIR)/dolfptoa$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/emalloc$U.Po ./$(DEPDIR)/error$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/findconfig$U.Po ./$(DEPDIR)/fptoa$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/fptoms$U.Po ./$(DEPDIR)/getopt$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/gpstolfp$U.Po ./$(DEPDIR)/hextoint$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/hextolfp$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/humandate$U.Po ./$(DEPDIR)/icom$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ieee754io$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/inet_ntop$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/interfaceiter$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/inttoa$U.Po ./$(DEPDIR)/iosignal$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/isc_strerror$U.Po ./$(DEPDIR)/lib$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/lib_strbuf$U.Po ./$(DEPDIR)/log$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/machines$U.Po ./$(DEPDIR)/md5c$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/mem$U.Po ./$(DEPDIR)/memmove$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/mfp_mul$U.Po ./$(DEPDIR)/mfptoa$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/mfptoms$U.Po ./$(DEPDIR)/mktime$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/modetoa$U.Po ./$(DEPDIR)/msgcat$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/mstolfp$U.Po ./$(DEPDIR)/msutotsf$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/msyslog$U.Po ./$(DEPDIR)/net$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/netof$U.Po ./$(DEPDIR)/ntp_rfc2553$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/numtoa$U.Po ./$(DEPDIR)/numtohost$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/octtoint$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/prettydate$U.Po ./$(DEPDIR)/random$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ranny$U.Po ./$(DEPDIR)/recvbuff$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/refnumtoa$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/snprintf$U.Po ./$(DEPDIR)/socktoa$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/socktohost$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/statestr$U.Po ./$(DEPDIR)/strdup$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/strerror$U.Po ./$(DEPDIR)/strstr$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/syssignal$U.Po ./$(DEPDIR)/systime$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/systime_s$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/tsftomsu$U.Po ./$(DEPDIR)/tstotv$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/tvtoa$U.Po ./$(DEPDIR)/tvtots$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/uglydate$U.Po ./$(DEPDIR)/uinttoa$U.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/utvtoa$U.Po ./$(DEPDIR)/ymd2yd$U.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES = $(libntp_a_SOURCES) $(EXTRA_libntp_a_SOURCES) \
-	$(libntpsim_a_SOURCES)
-HEADERS = $(noinst_HEADERS)
-
-DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.in \
-	Makefile.am
-SOURCES = $(libntp_a_SOURCES) $(EXTRA_libntp_a_SOURCES) $(libntpsim_a_SOURCES)
-
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  libntp/Makefile'; \
 	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libntp/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-
-AR = ar
+	  $(AUTOMAKE) --foreign  libntp/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -319,12 +325,10 @@ libntpsim.a: $(libntpsim_a_OBJECTS) $(libntpsim_a_DEPENDENCIES)
 	$(RANLIB) libntpsim.a
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
-
-ANSI2KNR = ../util/ansi2knr
 ../util/ansi2knr:
 	cd ../util && $(MAKE) $(AM_MAKEFLAGS) ansi2knr
 
@@ -342,10 +346,8 @@ mostlyclean-kr:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authkeys$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authreadkeys$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authusekey$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binio$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buftvtots$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caljulian$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calleapwhen$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/caltontp$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/calyearstart$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clocktime$U.Po@am__quote@
@@ -359,25 +361,22 @@ mostlyclean-kr:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fptoa$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fptoms$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpstolfp$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hextoint$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hextolfp$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/humandate$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/icom$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ieee754io$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet_ntop$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet_pton$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interfaceiter$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inttoa$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iosignal$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isc_strerror$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib_strbuf$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/machines$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5c$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mem$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memmove$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfp_mul$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfptoa$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mfptoms$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mktime$U.Po@am__quote@
@@ -387,17 +386,19 @@ mostlyclean-kr:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msutotsf$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msyslog$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/net$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netaddr$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netof$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netscope$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntp_random$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntp_rfc2553$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/numtoa$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/numtohost$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/octtoint$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prettydate$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/random$U.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ranny$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recvbuff$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refnumtoa$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snprintf$U.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sockaddr$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socktoa$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/socktohost$U.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/statestr$U.Po@am__quote@
@@ -417,422 +418,389 @@ mostlyclean-kr:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ymd2yd$U.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@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 $@ $<
 
 assertions_.o: assertions_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT assertions_.o -MD -MP -MF "$(DEPDIR)/assertions_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o assertions_.o `test -f 'assertions_.c' || echo '$(srcdir)/'`assertions_.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/assertions_.Tpo" "$(DEPDIR)/assertions_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/assertions_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT assertions_.o -MD -MP -MF "$(DEPDIR)/assertions_.Tpo" -c -o assertions_.o `test -f 'assertions_.c' || echo '$(srcdir)/'`assertions_.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/assertions_.Tpo" "$(DEPDIR)/assertions_.Po"; else rm -f "$(DEPDIR)/assertions_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='assertions_.c' object='assertions_.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/assertions_.Po' tmpdepfile='$(DEPDIR)/assertions_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o assertions_.o `test -f 'assertions_.c' || echo '$(srcdir)/'`assertions_.c
 
 assertions_.obj: assertions_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT assertions_.obj -MD -MP -MF "$(DEPDIR)/assertions_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o assertions_.obj `if test -f 'assertions_.c'; then $(CYGPATH_W) 'assertions_.c'; else $(CYGPATH_W) '$(srcdir)/assertions_.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/assertions_.Tpo" "$(DEPDIR)/assertions_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/assertions_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT assertions_.obj -MD -MP -MF "$(DEPDIR)/assertions_.Tpo" -c -o assertions_.obj `if test -f 'assertions_.c'; then $(CYGPATH_W) 'assertions_.c'; else $(CYGPATH_W) '$(srcdir)/assertions_.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/assertions_.Tpo" "$(DEPDIR)/assertions_.Po"; else rm -f "$(DEPDIR)/assertions_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='assertions_.c' object='assertions_.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/assertions_.Po' tmpdepfile='$(DEPDIR)/assertions_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o assertions_.obj `if test -f 'assertions_.c'; then $(CYGPATH_W) 'assertions_.c'; else $(CYGPATH_W) '$(srcdir)/assertions_.c'; fi`
 
 assertions.o: $(srcdir)/../libisc/assertions.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT assertions.o -MD -MP -MF "$(DEPDIR)/assertions.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o assertions.o `test -f '$(srcdir)/../libisc/assertions.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/assertions.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/assertions.Tpo" "$(DEPDIR)/assertions.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/assertions.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT assertions.o -MD -MP -MF "$(DEPDIR)/assertions.Tpo" -c -o assertions.o `test -f '$(srcdir)/../libisc/assertions.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/assertions.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/assertions.Tpo" "$(DEPDIR)/assertions.Po"; else rm -f "$(DEPDIR)/assertions.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/assertions.c' object='assertions.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/assertions.Po' tmpdepfile='$(DEPDIR)/assertions.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o assertions.o `test -f '$(srcdir)/../libisc/assertions.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/assertions.c
 
 assertions.obj: $(srcdir)/../libisc/assertions.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT assertions.obj -MD -MP -MF "$(DEPDIR)/assertions.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o assertions.obj `if test -f '$(srcdir)/../libisc/assertions.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/assertions.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/assertions.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/assertions.Tpo" "$(DEPDIR)/assertions.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/assertions.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT assertions.obj -MD -MP -MF "$(DEPDIR)/assertions.Tpo" -c -o assertions.obj `if test -f '$(srcdir)/../libisc/assertions.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/assertions.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/assertions.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/assertions.Tpo" "$(DEPDIR)/assertions.Po"; else rm -f "$(DEPDIR)/assertions.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/assertions.c' object='assertions.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/assertions.Po' tmpdepfile='$(DEPDIR)/assertions.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o assertions.obj `if test -f '$(srcdir)/../libisc/assertions.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/assertions.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/assertions.c'; fi`
 
 error_.o: error_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT error_.o -MD -MP -MF "$(DEPDIR)/error_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o error_.o `test -f 'error_.c' || echo '$(srcdir)/'`error_.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/error_.Tpo" "$(DEPDIR)/error_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/error_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT error_.o -MD -MP -MF "$(DEPDIR)/error_.Tpo" -c -o error_.o `test -f 'error_.c' || echo '$(srcdir)/'`error_.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/error_.Tpo" "$(DEPDIR)/error_.Po"; else rm -f "$(DEPDIR)/error_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='error_.c' object='error_.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/error_.Po' tmpdepfile='$(DEPDIR)/error_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o error_.o `test -f 'error_.c' || echo '$(srcdir)/'`error_.c
 
 error_.obj: error_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT error_.obj -MD -MP -MF "$(DEPDIR)/error_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o error_.obj `if test -f 'error_.c'; then $(CYGPATH_W) 'error_.c'; else $(CYGPATH_W) '$(srcdir)/error_.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/error_.Tpo" "$(DEPDIR)/error_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/error_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT error_.obj -MD -MP -MF "$(DEPDIR)/error_.Tpo" -c -o error_.obj `if test -f 'error_.c'; then $(CYGPATH_W) 'error_.c'; else $(CYGPATH_W) '$(srcdir)/error_.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/error_.Tpo" "$(DEPDIR)/error_.Po"; else rm -f "$(DEPDIR)/error_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='error_.c' object='error_.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/error_.Po' tmpdepfile='$(DEPDIR)/error_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o error_.obj `if test -f 'error_.c'; then $(CYGPATH_W) 'error_.c'; else $(CYGPATH_W) '$(srcdir)/error_.c'; fi`
 
 error.o: $(srcdir)/../libisc/error.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT error.o -MD -MP -MF "$(DEPDIR)/error.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o error.o `test -f '$(srcdir)/../libisc/error.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/error.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/error.Tpo" "$(DEPDIR)/error.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/error.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT error.o -MD -MP -MF "$(DEPDIR)/error.Tpo" -c -o error.o `test -f '$(srcdir)/../libisc/error.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/error.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/error.Tpo" "$(DEPDIR)/error.Po"; else rm -f "$(DEPDIR)/error.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/error.c' object='error.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/error.Po' tmpdepfile='$(DEPDIR)/error.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o error.o `test -f '$(srcdir)/../libisc/error.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/error.c
 
 error.obj: $(srcdir)/../libisc/error.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT error.obj -MD -MP -MF "$(DEPDIR)/error.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o error.obj `if test -f '$(srcdir)/../libisc/error.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/error.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/error.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/error.Tpo" "$(DEPDIR)/error.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/error.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT error.obj -MD -MP -MF "$(DEPDIR)/error.Tpo" -c -o error.obj `if test -f '$(srcdir)/../libisc/error.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/error.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/error.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/error.Tpo" "$(DEPDIR)/error.Po"; else rm -f "$(DEPDIR)/error.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/error.c' object='error.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/error.Po' tmpdepfile='$(DEPDIR)/error.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o error.obj `if test -f '$(srcdir)/../libisc/error.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/error.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/error.c'; fi`
 
 interfaceiter_.o: interfaceiter_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT interfaceiter_.o -MD -MP -MF "$(DEPDIR)/interfaceiter_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o interfaceiter_.o `test -f 'interfaceiter_.c' || echo '$(srcdir)/'`interfaceiter_.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/interfaceiter_.Tpo" "$(DEPDIR)/interfaceiter_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/interfaceiter_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT interfaceiter_.o -MD -MP -MF "$(DEPDIR)/interfaceiter_.Tpo" -c -o interfaceiter_.o `test -f 'interfaceiter_.c' || echo '$(srcdir)/'`interfaceiter_.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/interfaceiter_.Tpo" "$(DEPDIR)/interfaceiter_.Po"; else rm -f "$(DEPDIR)/interfaceiter_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interfaceiter_.c' object='interfaceiter_.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/interfaceiter_.Po' tmpdepfile='$(DEPDIR)/interfaceiter_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o interfaceiter_.o `test -f 'interfaceiter_.c' || echo '$(srcdir)/'`interfaceiter_.c
 
 interfaceiter_.obj: interfaceiter_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT interfaceiter_.obj -MD -MP -MF "$(DEPDIR)/interfaceiter_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o interfaceiter_.obj `if test -f 'interfaceiter_.c'; then $(CYGPATH_W) 'interfaceiter_.c'; else $(CYGPATH_W) '$(srcdir)/interfaceiter_.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/interfaceiter_.Tpo" "$(DEPDIR)/interfaceiter_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/interfaceiter_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT interfaceiter_.obj -MD -MP -MF "$(DEPDIR)/interfaceiter_.Tpo" -c -o interfaceiter_.obj `if test -f 'interfaceiter_.c'; then $(CYGPATH_W) 'interfaceiter_.c'; else $(CYGPATH_W) '$(srcdir)/interfaceiter_.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/interfaceiter_.Tpo" "$(DEPDIR)/interfaceiter_.Po"; else rm -f "$(DEPDIR)/interfaceiter_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='interfaceiter_.c' object='interfaceiter_.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/interfaceiter_.Po' tmpdepfile='$(DEPDIR)/interfaceiter_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o interfaceiter_.obj `if test -f 'interfaceiter_.c'; then $(CYGPATH_W) 'interfaceiter_.c'; else $(CYGPATH_W) '$(srcdir)/interfaceiter_.c'; fi`
 
 interfaceiter.o: $(srcdir)/../libisc/interfaceiter.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT interfaceiter.o -MD -MP -MF "$(DEPDIR)/interfaceiter.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o interfaceiter.o `test -f '$(srcdir)/../libisc/interfaceiter.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/interfaceiter.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/interfaceiter.Tpo" "$(DEPDIR)/interfaceiter.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/interfaceiter.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT interfaceiter.o -MD -MP -MF "$(DEPDIR)/interfaceiter.Tpo" -c -o interfaceiter.o `test -f '$(srcdir)/../libisc/interfaceiter.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/interfaceiter.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/interfaceiter.Tpo" "$(DEPDIR)/interfaceiter.Po"; else rm -f "$(DEPDIR)/interfaceiter.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/interfaceiter.c' object='interfaceiter.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/interfaceiter.Po' tmpdepfile='$(DEPDIR)/interfaceiter.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o interfaceiter.o `test -f '$(srcdir)/../libisc/interfaceiter.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/interfaceiter.c
 
 interfaceiter.obj: $(srcdir)/../libisc/interfaceiter.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT interfaceiter.obj -MD -MP -MF "$(DEPDIR)/interfaceiter.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o interfaceiter.obj `if test -f '$(srcdir)/../libisc/interfaceiter.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/interfaceiter.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/interfaceiter.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/interfaceiter.Tpo" "$(DEPDIR)/interfaceiter.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/interfaceiter.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT interfaceiter.obj -MD -MP -MF "$(DEPDIR)/interfaceiter.Tpo" -c -o interfaceiter.obj `if test -f '$(srcdir)/../libisc/interfaceiter.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/interfaceiter.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/interfaceiter.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/interfaceiter.Tpo" "$(DEPDIR)/interfaceiter.Po"; else rm -f "$(DEPDIR)/interfaceiter.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/interfaceiter.c' object='interfaceiter.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/interfaceiter.Po' tmpdepfile='$(DEPDIR)/interfaceiter.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o interfaceiter.obj `if test -f '$(srcdir)/../libisc/interfaceiter.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/interfaceiter.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/interfaceiter.c'; fi`
 
 lib_.o: lib_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_.o -MD -MP -MF "$(DEPDIR)/lib_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o lib_.o `test -f 'lib_.c' || echo '$(srcdir)/'`lib_.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/lib_.Tpo" "$(DEPDIR)/lib_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/lib_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_.o -MD -MP -MF "$(DEPDIR)/lib_.Tpo" -c -o lib_.o `test -f 'lib_.c' || echo '$(srcdir)/'`lib_.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/lib_.Tpo" "$(DEPDIR)/lib_.Po"; else rm -f "$(DEPDIR)/lib_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib_.c' object='lib_.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/lib_.Po' tmpdepfile='$(DEPDIR)/lib_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_.o `test -f 'lib_.c' || echo '$(srcdir)/'`lib_.c
 
 lib_.obj: lib_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_.obj -MD -MP -MF "$(DEPDIR)/lib_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o lib_.obj `if test -f 'lib_.c'; then $(CYGPATH_W) 'lib_.c'; else $(CYGPATH_W) '$(srcdir)/lib_.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/lib_.Tpo" "$(DEPDIR)/lib_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/lib_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib_.obj -MD -MP -MF "$(DEPDIR)/lib_.Tpo" -c -o lib_.obj `if test -f 'lib_.c'; then $(CYGPATH_W) 'lib_.c'; else $(CYGPATH_W) '$(srcdir)/lib_.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/lib_.Tpo" "$(DEPDIR)/lib_.Po"; else rm -f "$(DEPDIR)/lib_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lib_.c' object='lib_.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/lib_.Po' tmpdepfile='$(DEPDIR)/lib_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib_.obj `if test -f 'lib_.c'; then $(CYGPATH_W) 'lib_.c'; else $(CYGPATH_W) '$(srcdir)/lib_.c'; fi`
 
 lib.o: $(srcdir)/../libisc/lib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib.o -MD -MP -MF "$(DEPDIR)/lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o lib.o `test -f '$(srcdir)/../libisc/lib.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/lib.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/lib.Tpo" "$(DEPDIR)/lib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib.o -MD -MP -MF "$(DEPDIR)/lib.Tpo" -c -o lib.o `test -f '$(srcdir)/../libisc/lib.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/lib.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/lib.Tpo" "$(DEPDIR)/lib.Po"; else rm -f "$(DEPDIR)/lib.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/lib.c' object='lib.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/lib.Po' tmpdepfile='$(DEPDIR)/lib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib.o `test -f '$(srcdir)/../libisc/lib.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/lib.c
 
 lib.obj: $(srcdir)/../libisc/lib.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib.obj -MD -MP -MF "$(DEPDIR)/lib.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o lib.obj `if test -f '$(srcdir)/../libisc/lib.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/lib.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/lib.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/lib.Tpo" "$(DEPDIR)/lib.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/lib.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib.obj -MD -MP -MF "$(DEPDIR)/lib.Tpo" -c -o lib.obj `if test -f '$(srcdir)/../libisc/lib.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/lib.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/lib.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/lib.Tpo" "$(DEPDIR)/lib.Po"; else rm -f "$(DEPDIR)/lib.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/lib.c' object='lib.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/lib.Po' tmpdepfile='$(DEPDIR)/lib.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib.obj `if test -f '$(srcdir)/../libisc/lib.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/lib.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/lib.c'; fi`
 
 mem_.o: mem_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mem_.o -MD -MP -MF "$(DEPDIR)/mem_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o mem_.o `test -f 'mem_.c' || echo '$(srcdir)/'`mem_.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mem_.Tpo" "$(DEPDIR)/mem_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/mem_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mem_.o -MD -MP -MF "$(DEPDIR)/mem_.Tpo" -c -o mem_.o `test -f 'mem_.c' || echo '$(srcdir)/'`mem_.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mem_.Tpo" "$(DEPDIR)/mem_.Po"; else rm -f "$(DEPDIR)/mem_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mem_.c' object='mem_.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/mem_.Po' tmpdepfile='$(DEPDIR)/mem_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mem_.o `test -f 'mem_.c' || echo '$(srcdir)/'`mem_.c
 
 mem_.obj: mem_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mem_.obj -MD -MP -MF "$(DEPDIR)/mem_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o mem_.obj `if test -f 'mem_.c'; then $(CYGPATH_W) 'mem_.c'; else $(CYGPATH_W) '$(srcdir)/mem_.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mem_.Tpo" "$(DEPDIR)/mem_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/mem_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mem_.obj -MD -MP -MF "$(DEPDIR)/mem_.Tpo" -c -o mem_.obj `if test -f 'mem_.c'; then $(CYGPATH_W) 'mem_.c'; else $(CYGPATH_W) '$(srcdir)/mem_.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mem_.Tpo" "$(DEPDIR)/mem_.Po"; else rm -f "$(DEPDIR)/mem_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='mem_.c' object='mem_.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/mem_.Po' tmpdepfile='$(DEPDIR)/mem_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mem_.obj `if test -f 'mem_.c'; then $(CYGPATH_W) 'mem_.c'; else $(CYGPATH_W) '$(srcdir)/mem_.c'; fi`
 
 mem.o: $(srcdir)/../libisc/mem.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mem.o -MD -MP -MF "$(DEPDIR)/mem.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o mem.o `test -f '$(srcdir)/../libisc/mem.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/mem.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mem.Tpo" "$(DEPDIR)/mem.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/mem.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mem.o -MD -MP -MF "$(DEPDIR)/mem.Tpo" -c -o mem.o `test -f '$(srcdir)/../libisc/mem.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/mem.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mem.Tpo" "$(DEPDIR)/mem.Po"; else rm -f "$(DEPDIR)/mem.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/mem.c' object='mem.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/mem.Po' tmpdepfile='$(DEPDIR)/mem.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mem.o `test -f '$(srcdir)/../libisc/mem.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/mem.c
 
 mem.obj: $(srcdir)/../libisc/mem.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mem.obj -MD -MP -MF "$(DEPDIR)/mem.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o mem.obj `if test -f '$(srcdir)/../libisc/mem.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/mem.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/mem.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mem.Tpo" "$(DEPDIR)/mem.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/mem.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mem.obj -MD -MP -MF "$(DEPDIR)/mem.Tpo" -c -o mem.obj `if test -f '$(srcdir)/../libisc/mem.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/mem.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/mem.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/mem.Tpo" "$(DEPDIR)/mem.Po"; else rm -f "$(DEPDIR)/mem.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/mem.c' object='mem.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/mem.Po' tmpdepfile='$(DEPDIR)/mem.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mem.obj `if test -f '$(srcdir)/../libisc/mem.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/mem.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/mem.c'; fi`
 
 msgcat_.o: msgcat_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT msgcat_.o -MD -MP -MF "$(DEPDIR)/msgcat_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o msgcat_.o `test -f 'msgcat_.c' || echo '$(srcdir)/'`msgcat_.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/msgcat_.Tpo" "$(DEPDIR)/msgcat_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/msgcat_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT msgcat_.o -MD -MP -MF "$(DEPDIR)/msgcat_.Tpo" -c -o msgcat_.o `test -f 'msgcat_.c' || echo '$(srcdir)/'`msgcat_.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/msgcat_.Tpo" "$(DEPDIR)/msgcat_.Po"; else rm -f "$(DEPDIR)/msgcat_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='msgcat_.c' object='msgcat_.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/msgcat_.Po' tmpdepfile='$(DEPDIR)/msgcat_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcat_.o `test -f 'msgcat_.c' || echo '$(srcdir)/'`msgcat_.c
 
 msgcat_.obj: msgcat_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT msgcat_.obj -MD -MP -MF "$(DEPDIR)/msgcat_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o msgcat_.obj `if test -f 'msgcat_.c'; then $(CYGPATH_W) 'msgcat_.c'; else $(CYGPATH_W) '$(srcdir)/msgcat_.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/msgcat_.Tpo" "$(DEPDIR)/msgcat_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/msgcat_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT msgcat_.obj -MD -MP -MF "$(DEPDIR)/msgcat_.Tpo" -c -o msgcat_.obj `if test -f 'msgcat_.c'; then $(CYGPATH_W) 'msgcat_.c'; else $(CYGPATH_W) '$(srcdir)/msgcat_.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/msgcat_.Tpo" "$(DEPDIR)/msgcat_.Po"; else rm -f "$(DEPDIR)/msgcat_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='msgcat_.c' object='msgcat_.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/msgcat_.Po' tmpdepfile='$(DEPDIR)/msgcat_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcat_.obj `if test -f 'msgcat_.c'; then $(CYGPATH_W) 'msgcat_.c'; else $(CYGPATH_W) '$(srcdir)/msgcat_.c'; fi`
 
 msgcat.o: $(srcdir)/../libisc/msgcat.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT msgcat.o -MD -MP -MF "$(DEPDIR)/msgcat.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o msgcat.o `test -f '$(srcdir)/../libisc/msgcat.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/msgcat.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/msgcat.Tpo" "$(DEPDIR)/msgcat.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/msgcat.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT msgcat.o -MD -MP -MF "$(DEPDIR)/msgcat.Tpo" -c -o msgcat.o `test -f '$(srcdir)/../libisc/msgcat.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/msgcat.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/msgcat.Tpo" "$(DEPDIR)/msgcat.Po"; else rm -f "$(DEPDIR)/msgcat.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/msgcat.c' object='msgcat.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/msgcat.Po' tmpdepfile='$(DEPDIR)/msgcat.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcat.o `test -f '$(srcdir)/../libisc/msgcat.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/msgcat.c
 
 msgcat.obj: $(srcdir)/../libisc/msgcat.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT msgcat.obj -MD -MP -MF "$(DEPDIR)/msgcat.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o msgcat.obj `if test -f '$(srcdir)/../libisc/msgcat.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/msgcat.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/msgcat.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/msgcat.Tpo" "$(DEPDIR)/msgcat.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/msgcat.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT msgcat.obj -MD -MP -MF "$(DEPDIR)/msgcat.Tpo" -c -o msgcat.obj `if test -f '$(srcdir)/../libisc/msgcat.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/msgcat.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/msgcat.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/msgcat.Tpo" "$(DEPDIR)/msgcat.Po"; else rm -f "$(DEPDIR)/msgcat.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/msgcat.c' object='msgcat.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/msgcat.Po' tmpdepfile='$(DEPDIR)/msgcat.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o msgcat.obj `if test -f '$(srcdir)/../libisc/msgcat.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/msgcat.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/msgcat.c'; fi`
 
 net_.o: net_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT net_.o -MD -MP -MF "$(DEPDIR)/net_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o net_.o `test -f 'net_.c' || echo '$(srcdir)/'`net_.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/net_.Tpo" "$(DEPDIR)/net_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/net_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT net_.o -MD -MP -MF "$(DEPDIR)/net_.Tpo" -c -o net_.o `test -f 'net_.c' || echo '$(srcdir)/'`net_.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/net_.Tpo" "$(DEPDIR)/net_.Po"; else rm -f "$(DEPDIR)/net_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='net_.c' object='net_.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/net_.Po' tmpdepfile='$(DEPDIR)/net_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o net_.o `test -f 'net_.c' || echo '$(srcdir)/'`net_.c
 
 net_.obj: net_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT net_.obj -MD -MP -MF "$(DEPDIR)/net_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o net_.obj `if test -f 'net_.c'; then $(CYGPATH_W) 'net_.c'; else $(CYGPATH_W) '$(srcdir)/net_.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/net_.Tpo" "$(DEPDIR)/net_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/net_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT net_.obj -MD -MP -MF "$(DEPDIR)/net_.Tpo" -c -o net_.obj `if test -f 'net_.c'; then $(CYGPATH_W) 'net_.c'; else $(CYGPATH_W) '$(srcdir)/net_.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/net_.Tpo" "$(DEPDIR)/net_.Po"; else rm -f "$(DEPDIR)/net_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='net_.c' object='net_.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/net_.Po' tmpdepfile='$(DEPDIR)/net_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o net_.obj `if test -f 'net_.c'; then $(CYGPATH_W) 'net_.c'; else $(CYGPATH_W) '$(srcdir)/net_.c'; fi`
 
 net.o: $(srcdir)/../libisc/net.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT net.o -MD -MP -MF "$(DEPDIR)/net.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o net.o `test -f '$(srcdir)/../libisc/net.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/net.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/net.Tpo" "$(DEPDIR)/net.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/net.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT net.o -MD -MP -MF "$(DEPDIR)/net.Tpo" -c -o net.o `test -f '$(srcdir)/../libisc/net.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/net.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/net.Tpo" "$(DEPDIR)/net.Po"; else rm -f "$(DEPDIR)/net.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/net.c' object='net.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/net.Po' tmpdepfile='$(DEPDIR)/net.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o net.o `test -f '$(srcdir)/../libisc/net.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/net.c
 
 net.obj: $(srcdir)/../libisc/net.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT net.obj -MD -MP -MF "$(DEPDIR)/net.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o net.obj `if test -f '$(srcdir)/../libisc/net.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/net.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/net.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/net.Tpo" "$(DEPDIR)/net.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/net.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT net.obj -MD -MP -MF "$(DEPDIR)/net.Tpo" -c -o net.obj `if test -f '$(srcdir)/../libisc/net.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/net.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/net.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/net.Tpo" "$(DEPDIR)/net.Po"; else rm -f "$(DEPDIR)/net.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/net.c' object='net.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/net.Po' tmpdepfile='$(DEPDIR)/net.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o net.obj `if test -f '$(srcdir)/../libisc/net.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/net.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/net.c'; fi`
 
 isc_strerror_.o: isc_strerror_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT isc_strerror_.o -MD -MP -MF "$(DEPDIR)/isc_strerror_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o isc_strerror_.o `test -f 'isc_strerror_.c' || echo '$(srcdir)/'`isc_strerror_.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/isc_strerror_.Tpo" "$(DEPDIR)/isc_strerror_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/isc_strerror_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT isc_strerror_.o -MD -MP -MF "$(DEPDIR)/isc_strerror_.Tpo" -c -o isc_strerror_.o `test -f 'isc_strerror_.c' || echo '$(srcdir)/'`isc_strerror_.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/isc_strerror_.Tpo" "$(DEPDIR)/isc_strerror_.Po"; else rm -f "$(DEPDIR)/isc_strerror_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='isc_strerror_.c' object='isc_strerror_.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/isc_strerror_.Po' tmpdepfile='$(DEPDIR)/isc_strerror_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o isc_strerror_.o `test -f 'isc_strerror_.c' || echo '$(srcdir)/'`isc_strerror_.c
 
 isc_strerror_.obj: isc_strerror_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT isc_strerror_.obj -MD -MP -MF "$(DEPDIR)/isc_strerror_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o isc_strerror_.obj `if test -f 'isc_strerror_.c'; then $(CYGPATH_W) 'isc_strerror_.c'; else $(CYGPATH_W) '$(srcdir)/isc_strerror_.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/isc_strerror_.Tpo" "$(DEPDIR)/isc_strerror_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/isc_strerror_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT isc_strerror_.obj -MD -MP -MF "$(DEPDIR)/isc_strerror_.Tpo" -c -o isc_strerror_.obj `if test -f 'isc_strerror_.c'; then $(CYGPATH_W) 'isc_strerror_.c'; else $(CYGPATH_W) '$(srcdir)/isc_strerror_.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/isc_strerror_.Tpo" "$(DEPDIR)/isc_strerror_.Po"; else rm -f "$(DEPDIR)/isc_strerror_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='isc_strerror_.c' object='isc_strerror_.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/isc_strerror_.Po' tmpdepfile='$(DEPDIR)/isc_strerror_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o isc_strerror_.obj `if test -f 'isc_strerror_.c'; then $(CYGPATH_W) 'isc_strerror_.c'; else $(CYGPATH_W) '$(srcdir)/isc_strerror_.c'; fi`
 
 isc_strerror.o: $(srcdir)/../libisc/isc_strerror.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT isc_strerror.o -MD -MP -MF "$(DEPDIR)/isc_strerror.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o isc_strerror.o `test -f '$(srcdir)/../libisc/isc_strerror.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/isc_strerror.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/isc_strerror.Tpo" "$(DEPDIR)/isc_strerror.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/isc_strerror.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT isc_strerror.o -MD -MP -MF "$(DEPDIR)/isc_strerror.Tpo" -c -o isc_strerror.o `test -f '$(srcdir)/../libisc/isc_strerror.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/isc_strerror.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/isc_strerror.Tpo" "$(DEPDIR)/isc_strerror.Po"; else rm -f "$(DEPDIR)/isc_strerror.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/isc_strerror.c' object='isc_strerror.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/isc_strerror.Po' tmpdepfile='$(DEPDIR)/isc_strerror.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o isc_strerror.o `test -f '$(srcdir)/../libisc/isc_strerror.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/isc_strerror.c
 
 isc_strerror.obj: $(srcdir)/../libisc/isc_strerror.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT isc_strerror.obj -MD -MP -MF "$(DEPDIR)/isc_strerror.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o isc_strerror.obj `if test -f '$(srcdir)/../libisc/isc_strerror.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/isc_strerror.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/isc_strerror.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/isc_strerror.Tpo" "$(DEPDIR)/isc_strerror.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/isc_strerror.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT isc_strerror.obj -MD -MP -MF "$(DEPDIR)/isc_strerror.Tpo" -c -o isc_strerror.obj `if test -f '$(srcdir)/../libisc/isc_strerror.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/isc_strerror.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/isc_strerror.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/isc_strerror.Tpo" "$(DEPDIR)/isc_strerror.Po"; else rm -f "$(DEPDIR)/isc_strerror.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/isc_strerror.c' object='isc_strerror.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/isc_strerror.Po' tmpdepfile='$(DEPDIR)/isc_strerror.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o isc_strerror.obj `if test -f '$(srcdir)/../libisc/isc_strerror.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/isc_strerror.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/isc_strerror.c'; fi`
 
 inet_ntop_.o: inet_ntop_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inet_ntop_.o -MD -MP -MF "$(DEPDIR)/inet_ntop_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o inet_ntop_.o `test -f 'inet_ntop_.c' || echo '$(srcdir)/'`inet_ntop_.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/inet_ntop_.Tpo" "$(DEPDIR)/inet_ntop_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/inet_ntop_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inet_ntop_.o -MD -MP -MF "$(DEPDIR)/inet_ntop_.Tpo" -c -o inet_ntop_.o `test -f 'inet_ntop_.c' || echo '$(srcdir)/'`inet_ntop_.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/inet_ntop_.Tpo" "$(DEPDIR)/inet_ntop_.Po"; else rm -f "$(DEPDIR)/inet_ntop_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='inet_ntop_.c' object='inet_ntop_.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/inet_ntop_.Po' tmpdepfile='$(DEPDIR)/inet_ntop_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inet_ntop_.o `test -f 'inet_ntop_.c' || echo '$(srcdir)/'`inet_ntop_.c
 
 inet_ntop_.obj: inet_ntop_.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inet_ntop_.obj -MD -MP -MF "$(DEPDIR)/inet_ntop_.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o inet_ntop_.obj `if test -f 'inet_ntop_.c'; then $(CYGPATH_W) 'inet_ntop_.c'; else $(CYGPATH_W) '$(srcdir)/inet_ntop_.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/inet_ntop_.Tpo" "$(DEPDIR)/inet_ntop_.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/inet_ntop_.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inet_ntop_.obj -MD -MP -MF "$(DEPDIR)/inet_ntop_.Tpo" -c -o inet_ntop_.obj `if test -f 'inet_ntop_.c'; then $(CYGPATH_W) 'inet_ntop_.c'; else $(CYGPATH_W) '$(srcdir)/inet_ntop_.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/inet_ntop_.Tpo" "$(DEPDIR)/inet_ntop_.Po"; else rm -f "$(DEPDIR)/inet_ntop_.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='inet_ntop_.c' object='inet_ntop_.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/inet_ntop_.Po' tmpdepfile='$(DEPDIR)/inet_ntop_.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inet_ntop_.obj `if test -f 'inet_ntop_.c'; then $(CYGPATH_W) 'inet_ntop_.c'; else $(CYGPATH_W) '$(srcdir)/inet_ntop_.c'; fi`
 
 inet_ntop.o: $(srcdir)/../libisc/inet_ntop.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inet_ntop.o -MD -MP -MF "$(DEPDIR)/inet_ntop.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o inet_ntop.o `test -f '$(srcdir)/../libisc/inet_ntop.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/inet_ntop.c; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/inet_ntop.Tpo" "$(DEPDIR)/inet_ntop.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/inet_ntop.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inet_ntop.o -MD -MP -MF "$(DEPDIR)/inet_ntop.Tpo" -c -o inet_ntop.o `test -f '$(srcdir)/../libisc/inet_ntop.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/inet_ntop.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/inet_ntop.Tpo" "$(DEPDIR)/inet_ntop.Po"; else rm -f "$(DEPDIR)/inet_ntop.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/inet_ntop.c' object='inet_ntop.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/inet_ntop.Po' tmpdepfile='$(DEPDIR)/inet_ntop.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inet_ntop.o `test -f '$(srcdir)/../libisc/inet_ntop.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/inet_ntop.c
 
 inet_ntop.obj: $(srcdir)/../libisc/inet_ntop.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inet_ntop.obj -MD -MP -MF "$(DEPDIR)/inet_ntop.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o inet_ntop.obj `if test -f '$(srcdir)/../libisc/inet_ntop.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/inet_ntop.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/inet_ntop.c'; fi`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/inet_ntop.Tpo" "$(DEPDIR)/inet_ntop.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/inet_ntop.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inet_ntop.obj -MD -MP -MF "$(DEPDIR)/inet_ntop.Tpo" -c -o inet_ntop.obj `if test -f '$(srcdir)/../libisc/inet_ntop.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/inet_ntop.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/inet_ntop.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/inet_ntop.Tpo" "$(DEPDIR)/inet_ntop.Po"; else rm -f "$(DEPDIR)/inet_ntop.Tpo"; exit 1; fi
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/inet_ntop.c' object='inet_ntop.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/inet_ntop.Po' tmpdepfile='$(DEPDIR)/inet_ntop.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inet_ntop.obj `if test -f '$(srcdir)/../libisc/inet_ntop.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/inet_ntop.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/inet_ntop.c'; fi`
+
+inet_pton_.o: inet_pton_.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inet_pton_.o -MD -MP -MF "$(DEPDIR)/inet_pton_.Tpo" -c -o inet_pton_.o `test -f 'inet_pton_.c' || echo '$(srcdir)/'`inet_pton_.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/inet_pton_.Tpo" "$(DEPDIR)/inet_pton_.Po"; else rm -f "$(DEPDIR)/inet_pton_.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='inet_pton_.c' object='inet_pton_.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inet_pton_.o `test -f 'inet_pton_.c' || echo '$(srcdir)/'`inet_pton_.c
+
+inet_pton_.obj: inet_pton_.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inet_pton_.obj -MD -MP -MF "$(DEPDIR)/inet_pton_.Tpo" -c -o inet_pton_.obj `if test -f 'inet_pton_.c'; then $(CYGPATH_W) 'inet_pton_.c'; else $(CYGPATH_W) '$(srcdir)/inet_pton_.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/inet_pton_.Tpo" "$(DEPDIR)/inet_pton_.Po"; else rm -f "$(DEPDIR)/inet_pton_.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='inet_pton_.c' object='inet_pton_.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inet_pton_.obj `if test -f 'inet_pton_.c'; then $(CYGPATH_W) 'inet_pton_.c'; else $(CYGPATH_W) '$(srcdir)/inet_pton_.c'; fi`
+
+inet_pton.o: $(srcdir)/../libisc/inet_pton.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inet_pton.o -MD -MP -MF "$(DEPDIR)/inet_pton.Tpo" -c -o inet_pton.o `test -f '$(srcdir)/../libisc/inet_pton.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/inet_pton.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/inet_pton.Tpo" "$(DEPDIR)/inet_pton.Po"; else rm -f "$(DEPDIR)/inet_pton.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/inet_pton.c' object='inet_pton.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inet_pton.o `test -f '$(srcdir)/../libisc/inet_pton.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/inet_pton.c
+
+inet_pton.obj: $(srcdir)/../libisc/inet_pton.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT inet_pton.obj -MD -MP -MF "$(DEPDIR)/inet_pton.Tpo" -c -o inet_pton.obj `if test -f '$(srcdir)/../libisc/inet_pton.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/inet_pton.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/inet_pton.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/inet_pton.Tpo" "$(DEPDIR)/inet_pton.Po"; else rm -f "$(DEPDIR)/inet_pton.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/inet_pton.c' object='inet_pton.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inet_pton.obj `if test -f '$(srcdir)/../libisc/inet_pton.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/inet_pton.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/inet_pton.c'; fi`
+
+netaddr_.o: netaddr_.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT netaddr_.o -MD -MP -MF "$(DEPDIR)/netaddr_.Tpo" -c -o netaddr_.o `test -f 'netaddr_.c' || echo '$(srcdir)/'`netaddr_.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/netaddr_.Tpo" "$(DEPDIR)/netaddr_.Po"; else rm -f "$(DEPDIR)/netaddr_.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='netaddr_.c' object='netaddr_.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netaddr_.o `test -f 'netaddr_.c' || echo '$(srcdir)/'`netaddr_.c
+
+netaddr_.obj: netaddr_.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT netaddr_.obj -MD -MP -MF "$(DEPDIR)/netaddr_.Tpo" -c -o netaddr_.obj `if test -f 'netaddr_.c'; then $(CYGPATH_W) 'netaddr_.c'; else $(CYGPATH_W) '$(srcdir)/netaddr_.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/netaddr_.Tpo" "$(DEPDIR)/netaddr_.Po"; else rm -f "$(DEPDIR)/netaddr_.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='netaddr_.c' object='netaddr_.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netaddr_.obj `if test -f 'netaddr_.c'; then $(CYGPATH_W) 'netaddr_.c'; else $(CYGPATH_W) '$(srcdir)/netaddr_.c'; fi`
+
+netaddr.o: $(srcdir)/../libisc/netaddr.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT netaddr.o -MD -MP -MF "$(DEPDIR)/netaddr.Tpo" -c -o netaddr.o `test -f '$(srcdir)/../libisc/netaddr.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/netaddr.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/netaddr.Tpo" "$(DEPDIR)/netaddr.Po"; else rm -f "$(DEPDIR)/netaddr.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/netaddr.c' object='netaddr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netaddr.o `test -f '$(srcdir)/../libisc/netaddr.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/netaddr.c
+
+netaddr.obj: $(srcdir)/../libisc/netaddr.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT netaddr.obj -MD -MP -MF "$(DEPDIR)/netaddr.Tpo" -c -o netaddr.obj `if test -f '$(srcdir)/../libisc/netaddr.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/netaddr.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/netaddr.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/netaddr.Tpo" "$(DEPDIR)/netaddr.Po"; else rm -f "$(DEPDIR)/netaddr.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/netaddr.c' object='netaddr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netaddr.obj `if test -f '$(srcdir)/../libisc/netaddr.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/netaddr.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/netaddr.c'; fi`
+
+sockaddr_.o: sockaddr_.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sockaddr_.o -MD -MP -MF "$(DEPDIR)/sockaddr_.Tpo" -c -o sockaddr_.o `test -f 'sockaddr_.c' || echo '$(srcdir)/'`sockaddr_.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/sockaddr_.Tpo" "$(DEPDIR)/sockaddr_.Po"; else rm -f "$(DEPDIR)/sockaddr_.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sockaddr_.c' object='sockaddr_.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sockaddr_.o `test -f 'sockaddr_.c' || echo '$(srcdir)/'`sockaddr_.c
+
+sockaddr_.obj: sockaddr_.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sockaddr_.obj -MD -MP -MF "$(DEPDIR)/sockaddr_.Tpo" -c -o sockaddr_.obj `if test -f 'sockaddr_.c'; then $(CYGPATH_W) 'sockaddr_.c'; else $(CYGPATH_W) '$(srcdir)/sockaddr_.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/sockaddr_.Tpo" "$(DEPDIR)/sockaddr_.Po"; else rm -f "$(DEPDIR)/sockaddr_.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sockaddr_.c' object='sockaddr_.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sockaddr_.obj `if test -f 'sockaddr_.c'; then $(CYGPATH_W) 'sockaddr_.c'; else $(CYGPATH_W) '$(srcdir)/sockaddr_.c'; fi`
+
+sockaddr.o: $(srcdir)/../libisc/sockaddr.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sockaddr.o -MD -MP -MF "$(DEPDIR)/sockaddr.Tpo" -c -o sockaddr.o `test -f '$(srcdir)/../libisc/sockaddr.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/sockaddr.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/sockaddr.Tpo" "$(DEPDIR)/sockaddr.Po"; else rm -f "$(DEPDIR)/sockaddr.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/sockaddr.c' object='sockaddr.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sockaddr.o `test -f '$(srcdir)/../libisc/sockaddr.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/sockaddr.c
+
+sockaddr.obj: $(srcdir)/../libisc/sockaddr.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sockaddr.obj -MD -MP -MF "$(DEPDIR)/sockaddr.Tpo" -c -o sockaddr.obj `if test -f '$(srcdir)/../libisc/sockaddr.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/sockaddr.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/sockaddr.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/sockaddr.Tpo" "$(DEPDIR)/sockaddr.Po"; else rm -f "$(DEPDIR)/sockaddr.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/sockaddr.c' object='sockaddr.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sockaddr.obj `if test -f '$(srcdir)/../libisc/sockaddr.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/sockaddr.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/sockaddr.c'; fi`
+
+netscope_.o: netscope_.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT netscope_.o -MD -MP -MF "$(DEPDIR)/netscope_.Tpo" -c -o netscope_.o `test -f 'netscope_.c' || echo '$(srcdir)/'`netscope_.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/netscope_.Tpo" "$(DEPDIR)/netscope_.Po"; else rm -f "$(DEPDIR)/netscope_.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='netscope_.c' object='netscope_.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netscope_.o `test -f 'netscope_.c' || echo '$(srcdir)/'`netscope_.c
+
+netscope_.obj: netscope_.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT netscope_.obj -MD -MP -MF "$(DEPDIR)/netscope_.Tpo" -c -o netscope_.obj `if test -f 'netscope_.c'; then $(CYGPATH_W) 'netscope_.c'; else $(CYGPATH_W) '$(srcdir)/netscope_.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/netscope_.Tpo" "$(DEPDIR)/netscope_.Po"; else rm -f "$(DEPDIR)/netscope_.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='netscope_.c' object='netscope_.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netscope_.obj `if test -f 'netscope_.c'; then $(CYGPATH_W) 'netscope_.c'; else $(CYGPATH_W) '$(srcdir)/netscope_.c'; fi`
+
+netscope.o: $(srcdir)/../libisc/netscope.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT netscope.o -MD -MP -MF "$(DEPDIR)/netscope.Tpo" -c -o netscope.o `test -f '$(srcdir)/../libisc/netscope.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/netscope.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/netscope.Tpo" "$(DEPDIR)/netscope.Po"; else rm -f "$(DEPDIR)/netscope.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/netscope.c' object='netscope.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netscope.o `test -f '$(srcdir)/../libisc/netscope.c' || echo '$(srcdir)/'`$(srcdir)/../libisc/netscope.c
+
+netscope.obj: $(srcdir)/../libisc/netscope.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT netscope.obj -MD -MP -MF "$(DEPDIR)/netscope.Tpo" -c -o netscope.obj `if test -f '$(srcdir)/../libisc/netscope.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/netscope.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/netscope.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/netscope.Tpo" "$(DEPDIR)/netscope.Po"; else rm -f "$(DEPDIR)/netscope.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$(srcdir)/../libisc/netscope.c' object='netscope.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o netscope.obj `if test -f '$(srcdir)/../libisc/netscope.c'; then $(CYGPATH_W) '$(srcdir)/../libisc/netscope.c'; else $(CYGPATH_W) '$(srcdir)/$(srcdir)/../libisc/netscope.c'; fi`
 a_md5encrypt_.c: a_md5encrypt.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/a_md5encrypt.c; then echo $(srcdir)/a_md5encrypt.c; else echo a_md5encrypt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 adjtime_.c: adjtime.c $(ANSI2KNR)
@@ -855,14 +823,10 @@ authreadkeys_.c: authreadkeys.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/authreadkeys.c; then echo $(srcdir)/authreadkeys.c; else echo authreadkeys.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 authusekey_.c: authusekey.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/authusekey.c; then echo $(srcdir)/authusekey.c; else echo authusekey.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-binio_.c: binio.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/binio.c; then echo $(srcdir)/binio.c; else echo binio.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 buftvtots_.c: buftvtots.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/buftvtots.c; then echo $(srcdir)/buftvtots.c; else echo buftvtots.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 caljulian_.c: caljulian.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/caljulian.c; then echo $(srcdir)/caljulian.c; else echo caljulian.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-calleapwhen_.c: calleapwhen.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/calleapwhen.c; then echo $(srcdir)/calleapwhen.c; else echo calleapwhen.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 caltontp_.c: caltontp.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/caltontp.c; then echo $(srcdir)/caltontp.c; else echo caltontp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 calyearstart_.c: calyearstart.c $(ANSI2KNR)
@@ -889,8 +853,6 @@ fptoms_.c: fptoms.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/fptoms.c; then echo $(srcdir)/fptoms.c; else echo fptoms.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 getopt_.c: getopt.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/getopt.c; then echo $(srcdir)/getopt.c; else echo getopt.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-gpstolfp_.c: gpstolfp.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/gpstolfp.c; then echo $(srcdir)/gpstolfp.c; else echo gpstolfp.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 hextoint_.c: hextoint.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/hextoint.c; then echo $(srcdir)/hextoint.c; else echo hextoint.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 hextolfp_.c: hextolfp.c $(ANSI2KNR)
@@ -899,10 +861,10 @@ humandate_.c: humandate.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/humandate.c; then echo $(srcdir)/humandate.c; else echo humandate.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 icom_.c: icom.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/icom.c; then echo $(srcdir)/icom.c; else echo icom.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-ieee754io_.c: ieee754io.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ieee754io.c; then echo $(srcdir)/ieee754io.c; else echo ieee754io.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 inet_ntop_.c: $(srcdir)/../libisc/inet_ntop.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/$(srcdir)/../libisc/inet_ntop.c; then echo $(srcdir)/$(srcdir)/../libisc/inet_ntop.c; else echo $(srcdir)/../libisc/inet_ntop.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
+inet_pton_.c: $(srcdir)/../libisc/inet_pton.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/$(srcdir)/../libisc/inet_pton.c; then echo $(srcdir)/$(srcdir)/../libisc/inet_pton.c; else echo $(srcdir)/../libisc/inet_pton.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 interfaceiter_.c: $(srcdir)/../libisc/interfaceiter.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/$(srcdir)/../libisc/interfaceiter.c; then echo $(srcdir)/$(srcdir)/../libisc/interfaceiter.c; else echo $(srcdir)/../libisc/interfaceiter.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 inttoa_.c: inttoa.c $(ANSI2KNR)
@@ -915,8 +877,6 @@ lib_.c: $(srcdir)/../libisc/lib.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/$(srcdir)/../libisc/lib.c; then echo $(srcdir)/$(srcdir)/../libisc/lib.c; else echo $(srcdir)/../libisc/lib.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 lib_strbuf_.c: lib_strbuf.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/lib_strbuf.c; then echo $(srcdir)/lib_strbuf.c; else echo lib_strbuf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-log_.c: log.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/log.c; then echo $(srcdir)/log.c; else echo log.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 machines_.c: machines.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/machines.c; then echo $(srcdir)/machines.c; else echo machines.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 md5c_.c: md5c.c $(ANSI2KNR)
@@ -925,8 +885,6 @@ mem_.c: $(srcdir)/../libisc/mem.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/$(srcdir)/../libisc/mem.c; then echo $(srcdir)/$(srcdir)/../libisc/mem.c; else echo $(srcdir)/../libisc/mem.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 memmove_.c: memmove.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/memmove.c; then echo $(srcdir)/memmove.c; else echo memmove.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-mfp_mul_.c: mfp_mul.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mfp_mul.c; then echo $(srcdir)/mfp_mul.c; else echo mfp_mul.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 mfptoa_.c: mfptoa.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/mfptoa.c; then echo $(srcdir)/mfptoa.c; else echo mfptoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 mfptoms_.c: mfptoms.c $(ANSI2KNR)
@@ -945,8 +903,14 @@ msyslog_.c: msyslog.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/msyslog.c; then echo $(srcdir)/msyslog.c; else echo msyslog.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 net_.c: $(srcdir)/../libisc/net.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/$(srcdir)/../libisc/net.c; then echo $(srcdir)/$(srcdir)/../libisc/net.c; else echo $(srcdir)/../libisc/net.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
+netaddr_.c: $(srcdir)/../libisc/netaddr.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/$(srcdir)/../libisc/netaddr.c; then echo $(srcdir)/$(srcdir)/../libisc/netaddr.c; else echo $(srcdir)/../libisc/netaddr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 netof_.c: netof.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/netof.c; then echo $(srcdir)/netof.c; else echo netof.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
+netscope_.c: $(srcdir)/../libisc/netscope.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/$(srcdir)/../libisc/netscope.c; then echo $(srcdir)/$(srcdir)/../libisc/netscope.c; else echo $(srcdir)/../libisc/netscope.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
+ntp_random_.c: ntp_random.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_random.c; then echo $(srcdir)/ntp_random.c; else echo ntp_random.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 ntp_rfc2553_.c: ntp_rfc2553.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ntp_rfc2553.c; then echo $(srcdir)/ntp_rfc2553.c; else echo ntp_rfc2553.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 numtoa_.c: numtoa.c $(ANSI2KNR)
@@ -957,16 +921,14 @@ octtoint_.c: octtoint.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/octtoint.c; then echo $(srcdir)/octtoint.c; else echo octtoint.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 prettydate_.c: prettydate.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/prettydate.c; then echo $(srcdir)/prettydate.c; else echo prettydate.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-random_.c: random.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/random.c; then echo $(srcdir)/random.c; else echo random.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-ranny_.c: ranny.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ranny.c; then echo $(srcdir)/ranny.c; else echo ranny.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 recvbuff_.c: recvbuff.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/recvbuff.c; then echo $(srcdir)/recvbuff.c; else echo recvbuff.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 refnumtoa_.c: refnumtoa.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refnumtoa.c; then echo $(srcdir)/refnumtoa.c; else echo refnumtoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 snprintf_.c: snprintf.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/snprintf.c; then echo $(srcdir)/snprintf.c; else echo snprintf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
+sockaddr_.c: $(srcdir)/../libisc/sockaddr.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/$(srcdir)/../libisc/sockaddr.c; then echo $(srcdir)/$(srcdir)/../libisc/sockaddr.c; else echo $(srcdir)/../libisc/sockaddr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 socktoa_.c: socktoa.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/socktoa.c; then echo $(srcdir)/socktoa.c; else echo socktoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 socktohost_.c: socktohost.c $(ANSI2KNR)
@@ -1001,43 +963,59 @@ utvtoa_.c: utvtoa.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/utvtoa.c; then echo $(srcdir)/utvtoa.c; else echo utvtoa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 ymd2yd_.c: ymd2yd.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/ymd2yd.c; then echo $(srcdir)/ymd2yd.c; else echo ymd2yd.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-a_md5encrypt_.$(OBJEXT) adjtime_.$(OBJEXT) adjtimex_.$(OBJEXT) \
-assertions_.$(OBJEXT) atoint_.$(OBJEXT) atolfp_.$(OBJEXT) \
-atouint_.$(OBJEXT) audio_.$(OBJEXT) authkeys_.$(OBJEXT) \
-authreadkeys_.$(OBJEXT) authusekey_.$(OBJEXT) binio_.$(OBJEXT) \
-buftvtots_.$(OBJEXT) caljulian_.$(OBJEXT) calleapwhen_.$(OBJEXT) \
-caltontp_.$(OBJEXT) calyearstart_.$(OBJEXT) clocktime_.$(OBJEXT) \
-clocktypes_.$(OBJEXT) decodenetnum_.$(OBJEXT) dofptoa_.$(OBJEXT) \
-dolfptoa_.$(OBJEXT) emalloc_.$(OBJEXT) error_.$(OBJEXT) \
-findconfig_.$(OBJEXT) fptoa_.$(OBJEXT) fptoms_.$(OBJEXT) \
-getopt_.$(OBJEXT) gpstolfp_.$(OBJEXT) hextoint_.$(OBJEXT) \
-hextolfp_.$(OBJEXT) humandate_.$(OBJEXT) icom_.$(OBJEXT) \
-ieee754io_.$(OBJEXT) inet_ntop_.$(OBJEXT) interfaceiter_.$(OBJEXT) \
-inttoa_.$(OBJEXT) iosignal_.$(OBJEXT) isc_strerror_.$(OBJEXT) \
-lib_.$(OBJEXT) lib_strbuf_.$(OBJEXT) log_.$(OBJEXT) machines_.$(OBJEXT) \
-md5c_.$(OBJEXT) mem_.$(OBJEXT) memmove_.$(OBJEXT) mfp_mul_.$(OBJEXT) \
-mfptoa_.$(OBJEXT) mfptoms_.$(OBJEXT) mktime_.$(OBJEXT) \
-modetoa_.$(OBJEXT) msgcat_.$(OBJEXT) mstolfp_.$(OBJEXT) \
-msutotsf_.$(OBJEXT) msyslog_.$(OBJEXT) net_.$(OBJEXT) netof_.$(OBJEXT) \
-ntp_rfc2553_.$(OBJEXT) numtoa_.$(OBJEXT) numtohost_.$(OBJEXT) \
-octtoint_.$(OBJEXT) prettydate_.$(OBJEXT) random_.$(OBJEXT) \
-ranny_.$(OBJEXT) recvbuff_.$(OBJEXT) refnumtoa_.$(OBJEXT) \
-snprintf_.$(OBJEXT) socktoa_.$(OBJEXT) socktohost_.$(OBJEXT) \
-statestr_.$(OBJEXT) strdup_.$(OBJEXT) strerror_.$(OBJEXT) \
-strstr_.$(OBJEXT) syssignal_.$(OBJEXT) systime_.$(OBJEXT) \
-systime_s_.$(OBJEXT) tsftomsu_.$(OBJEXT) tstotv_.$(OBJEXT) \
-tvtoa_.$(OBJEXT) tvtots_.$(OBJEXT) uglydate_.$(OBJEXT) \
-uinttoa_.$(OBJEXT) utvtoa_.$(OBJEXT) ymd2yd_.$(OBJEXT) : $(ANSI2KNR)
+a_md5encrypt_.$(OBJEXT) a_md5encrypt_.lo adjtime_.$(OBJEXT) \
+adjtime_.lo adjtimex_.$(OBJEXT) adjtimex_.lo assertions_.$(OBJEXT) \
+assertions_.lo atoint_.$(OBJEXT) atoint_.lo atolfp_.$(OBJEXT) \
+atolfp_.lo atouint_.$(OBJEXT) atouint_.lo audio_.$(OBJEXT) audio_.lo \
+authkeys_.$(OBJEXT) authkeys_.lo authreadkeys_.$(OBJEXT) \
+authreadkeys_.lo authusekey_.$(OBJEXT) authusekey_.lo \
+buftvtots_.$(OBJEXT) buftvtots_.lo caljulian_.$(OBJEXT) caljulian_.lo \
+caltontp_.$(OBJEXT) caltontp_.lo calyearstart_.$(OBJEXT) \
+calyearstart_.lo clocktime_.$(OBJEXT) clocktime_.lo \
+clocktypes_.$(OBJEXT) clocktypes_.lo decodenetnum_.$(OBJEXT) \
+decodenetnum_.lo dofptoa_.$(OBJEXT) dofptoa_.lo dolfptoa_.$(OBJEXT) \
+dolfptoa_.lo emalloc_.$(OBJEXT) emalloc_.lo error_.$(OBJEXT) error_.lo \
+findconfig_.$(OBJEXT) findconfig_.lo fptoa_.$(OBJEXT) fptoa_.lo \
+fptoms_.$(OBJEXT) fptoms_.lo getopt_.$(OBJEXT) getopt_.lo \
+hextoint_.$(OBJEXT) hextoint_.lo hextolfp_.$(OBJEXT) hextolfp_.lo \
+humandate_.$(OBJEXT) humandate_.lo icom_.$(OBJEXT) icom_.lo \
+inet_ntop_.$(OBJEXT) inet_ntop_.lo inet_pton_.$(OBJEXT) inet_pton_.lo \
+interfaceiter_.$(OBJEXT) interfaceiter_.lo inttoa_.$(OBJEXT) \
+inttoa_.lo iosignal_.$(OBJEXT) iosignal_.lo isc_strerror_.$(OBJEXT) \
+isc_strerror_.lo lib_.$(OBJEXT) lib_.lo lib_strbuf_.$(OBJEXT) \
+lib_strbuf_.lo machines_.$(OBJEXT) machines_.lo md5c_.$(OBJEXT) \
+md5c_.lo mem_.$(OBJEXT) mem_.lo memmove_.$(OBJEXT) memmove_.lo \
+mfptoa_.$(OBJEXT) mfptoa_.lo mfptoms_.$(OBJEXT) mfptoms_.lo \
+mktime_.$(OBJEXT) mktime_.lo modetoa_.$(OBJEXT) modetoa_.lo \
+msgcat_.$(OBJEXT) msgcat_.lo mstolfp_.$(OBJEXT) mstolfp_.lo \
+msutotsf_.$(OBJEXT) msutotsf_.lo msyslog_.$(OBJEXT) msyslog_.lo \
+net_.$(OBJEXT) net_.lo netaddr_.$(OBJEXT) netaddr_.lo netof_.$(OBJEXT) \
+netof_.lo netscope_.$(OBJEXT) netscope_.lo ntp_random_.$(OBJEXT) \
+ntp_random_.lo ntp_rfc2553_.$(OBJEXT) ntp_rfc2553_.lo \
+numtoa_.$(OBJEXT) numtoa_.lo numtohost_.$(OBJEXT) numtohost_.lo \
+octtoint_.$(OBJEXT) octtoint_.lo prettydate_.$(OBJEXT) prettydate_.lo \
+recvbuff_.$(OBJEXT) recvbuff_.lo refnumtoa_.$(OBJEXT) refnumtoa_.lo \
+snprintf_.$(OBJEXT) snprintf_.lo sockaddr_.$(OBJEXT) sockaddr_.lo \
+socktoa_.$(OBJEXT) socktoa_.lo socktohost_.$(OBJEXT) socktohost_.lo \
+statestr_.$(OBJEXT) statestr_.lo strdup_.$(OBJEXT) strdup_.lo \
+strerror_.$(OBJEXT) strerror_.lo strstr_.$(OBJEXT) strstr_.lo \
+syssignal_.$(OBJEXT) syssignal_.lo systime_.$(OBJEXT) systime_.lo \
+systime_s_.$(OBJEXT) systime_s_.lo tsftomsu_.$(OBJEXT) tsftomsu_.lo \
+tstotv_.$(OBJEXT) tstotv_.lo tvtoa_.$(OBJEXT) tvtoa_.lo \
+tvtots_.$(OBJEXT) tvtots_.lo uglydate_.$(OBJEXT) uglydate_.lo \
+uinttoa_.$(OBJEXT) uinttoa_.lo utvtoa_.$(OBJEXT) utvtoa_.lo \
+ymd2yd_.$(OBJEXT) ymd2yd_.lo : $(ANSI2KNR)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
-CTAGS = ctags
-CTAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -1046,6 +1024,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -1057,10 +1036,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	     $$tags $$unique
-
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -1083,10 +1063,6 @@ GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -1100,7 +1076,7 @@ distdir: $(DISTFILES)
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -1118,7 +1094,6 @@ distdir: $(DISTFILES)
 check-am: all-am
 check: check-am
 all-am: Makefile $(LIBRARIES) $(HEADERS)
-
 installdirs:
 install: install-am
 install-exec: install-exec-am
@@ -1131,7 +1106,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -1139,26 +1114,28 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
+clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
-
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -1176,12 +1153,12 @@ installcheck-am:
 maintainer-clean: maintainer-clean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
-
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr
+mostlyclean-am: mostlyclean-compile mostlyclean-generic mostlyclean-kr \
+	mostlyclean-libtool
 
 pdf: pdf-am
 
@@ -1194,15 +1171,16 @@ ps-am:
 uninstall-am: uninstall-info-am
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-noinstLIBRARIES ctags distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am info \
-	info-am install install-am install-data install-data-am \
-	install-exec install-exec-am install-info install-info-am \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-kr pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am
+	clean-libtool clean-noinstLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-kr \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+	uninstall-am uninstall-info-am
 
 
 ../include/des.h:
diff --git a/contrib/ntp/libntp/a_md5encrypt.c b/contrib/ntp/libntp/a_md5encrypt.c
index 42513ef..e1ea37c 100644
--- a/contrib/ntp/libntp/a_md5encrypt.c
+++ b/contrib/ntp/libntp/a_md5encrypt.c
@@ -100,5 +100,5 @@ addr2refid(struct sockaddr_storage *addr)
 	    sizeof(struct in6_addr));
 	MD5Final(digest, &md5);
 	memcpy(&addr_refid, digest, 4);
-	return (htonl(addr_refid));
+	return (addr_refid);
 }
diff --git a/contrib/ntp/libntp/adjtime.c b/contrib/ntp/libntp/adjtime.c
index f041450..a8e6580 100644
--- a/contrib/ntp/libntp/adjtime.c
+++ b/contrib/ntp/libntp/adjtime.c
@@ -249,19 +249,32 @@ _adjtime(
 /*
  * Emulate adjtime() using QNX ClockAdjust().
  * Chris Burghart <burghart@atd.ucar.edu>, 11/2001
+ * Miroslaw Pabich <miroslaw_pabich@o2.pl>, 09/2005
  *
- * This is a *very* simple implementation of adjtime() for QNX.  
- * ClockAdjust() is used to tweak the system clock by about +- 1/10 
- * of its current clock period per tick until the desired delta is 
- * achieved.
+ * This is an implementation of adjtime() for QNX.  
+ * ClockAdjust() is used to tweak the system clock for about
+ * 1 second period until the desired delta is achieved.
+ * Time correction slew is limited to reasonable value.
+ * Internal rounding and relative errors are reduced.
  */
-# include <math.h>
-# include <stdio.h>
 # include <sys/neutrino.h>
 # include <sys/time.h>
 
 # include <ntp_stdlib.h>
 
+/*
+ * Time correction slew limit. QNX is a hard real-time system,
+ * so don't adjust system clock too fast.
+ */
+#define CORR_SLEW_LIMIT     0.02  /* [s/s] */
+
+/*
+ * Period of system clock adjustment. It should be equal to adjtime
+ * execution period (1s). If slightly less than 1s (0.95-0.99), then olddelta
+ * residual error (introduced by execution period jitter) will be reduced.
+ */
+#define ADJUST_PERIOD       0.97  /* [s] */
+
 int 
 adjtime (struct timeval *delta, struct timeval *olddelta)
 {
@@ -269,10 +282,15 @@ adjtime (struct timeval *delta, struct timeval *olddelta)
     double delta_nsec_old;
     struct _clockadjust adj;
     struct _clockadjust oldadj;
+
     /*
      * How many nanoseconds are we adjusting?
      */
-    delta_nsec = delta->tv_sec * 1e9 + delta->tv_usec * 1000;
+    if (delta != NULL)
+	delta_nsec = 1e9 * (long)delta->tv_sec + 1e3 * delta->tv_usec;
+    else
+	delta_nsec = 0;
+
     /*
      * Build the adjust structure and call ClockAdjust()
      */
@@ -281,6 +299,17 @@ adjtime (struct timeval *delta, struct timeval *olddelta)
 	struct _clockperiod period;
 	long count;
 	long increment;
+	long increment_limit;
+	int isneg = 0;
+
+	/*
+	 * Convert to absolute value for future processing
+	 */
+	if (delta_nsec < 0)
+	{
+	    isneg = 1;
+	    delta_nsec = -delta_nsec;
+	}
 
 	/*
 	 * Get the current clock period (nanoseconds)
@@ -289,13 +318,34 @@ adjtime (struct timeval *delta, struct timeval *olddelta)
 	    return -1;
 
 	/*
-	 * Set the adjust increment to approximately 1/10 timer period per 
-	 * clock tick.
+	 * Compute count and nanoseconds increment
+	 */
+	count = 1e9 * ADJUST_PERIOD / period.nsec;
+	increment = delta_nsec / count + .5;
+	/* Reduce relative error */
+	if (count > increment + 1)
+	{
+	    increment = 1 + (long)((delta_nsec - 1) / count);
+	    count = delta_nsec / increment + .5;
+	}
+
+	/*
+	 * Limit the adjust increment to appropriate value
 	 */
-	count = 1 + (long)(fabs(10 * delta_nsec / period.nsec));
-	increment = (long)(delta_nsec / count);
+	increment_limit = CORR_SLEW_LIMIT * period.nsec;
+	if (increment > increment_limit)
+	{
+	    increment = increment_limit;
+	    count = delta_nsec / increment + .5;
+	    /* Reduce relative error */
+	    if (increment > count + 1)
+	    {
+		count =  1 + (long)((delta_nsec - 1) / increment);
+		increment = delta_nsec / count + .5;
+	    }
+	}
 
-	adj.tick_nsec_inc = increment;
+	adj.tick_nsec_inc = isneg ? -increment : increment;
 	adj.tick_count = count;
     }
     else
@@ -310,11 +360,24 @@ adjtime (struct timeval *delta, struct timeval *olddelta)
     /*
      * Build olddelta
      */
-    delta_nsec_old = oldadj.tick_count * oldadj.tick_nsec_inc;
-    olddelta->tv_sec = (int)(delta_nsec_old / 1e9);
-    olddelta->tv_usec = (int)((delta_nsec_old - 1.0e9 * olddelta->tv_sec) / 
-                              1000);
-	    
+    delta_nsec_old = (double)oldadj.tick_count * oldadj.tick_nsec_inc;
+    if (olddelta != NULL)
+    {
+	if (delta_nsec_old != 0)
+	{
+	    /* Reduce rounding error */
+	    delta_nsec_old += (delta_nsec_old < 0) ? -500 : 500;
+	    olddelta->tv_sec = delta_nsec_old / 1e9;
+	    olddelta->tv_usec = (long)(delta_nsec_old - 1e9
+				 * (long)olddelta->tv_sec) / 1000;
+	}
+	else
+	{
+	    olddelta->tv_sec = 0;
+	    olddelta->tv_usec = 0;
+	}
+    }
+
     return 0;
 }
 # else /* no special adjtime() needed */
diff --git a/contrib/ntp/libntp/audio.c b/contrib/ntp/libntp/audio.c
index 65a6063..8d2f7c2 100644
--- a/contrib/ntp/libntp/audio.c
+++ b/contrib/ntp/libntp/audio.c
@@ -238,9 +238,9 @@ audio_init(
 	audio_config_read(unit, &actl, &dname);
 	/* If we have values for cf_c_dev or cf_i_dev, use them. */
 	if (*cf_c_dev)
-		dname = cf_c_dev;
+		actl = cf_c_dev;
 	if (*cf_i_dev)
-		actl = cf_i_dev;
+		dname = cf_i_dev;
 #endif
 
 	/*
@@ -285,6 +285,15 @@ audio_init(
 		s_size.play_size, s_size.rec_size);
 # endif /* HAVE_STRUCT_SND_SIZE */
 
+# ifdef SNDCTL_DSP_SETFRAGMENT
+	{
+		int tmp = (16 << 16) + 6; /* 16 fragments, each 2^6 bytes */
+		if (ioctl(fd, SNDCTL_DSP_SETFRAGMENT, &tmp) == -1)
+		    printf("audio_init: SNDCTL_DSP_SETFRAGMENT: %s\n",
+			   strerror(errno));
+	}
+# endif /* SNDCTL_DSP_SETFRAGMENT */
+
 # ifdef AIOGFMT
 	if (ioctl(fd, AIOGFMT, &s_c_p) == -1)
 	    printf("audio_init: AIOGFMT: %s\n", strerror(errno));
@@ -304,7 +313,7 @@ audio_init(
 	if (*cf_agc) {
 		int i;
 
-		i = mixer_name(cf_agc, recmask);
+		i = mixer_name(cf_agc, devmask);
 		if (i >= 0)
 			agc = MIXER_WRITE(i);
 		else
@@ -372,11 +381,14 @@ audio_gain(
 	r = 0 ; /* setting to zero nicely mutes the channel */
 
 	l |= r << 8;
-	if (port == 2) {
-	  rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_LINE, &l);
-	} else {
-	  	rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_MIC, &l);
-	}
+        if ( cf_agc )
+          rval = ioctl(ctl_fd, agc, &l);
+        else
+	  if (port == 2) {
+	    rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_LINE, &l);
+	  } else {
+	    rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_MIC, &l);
+	  }
 	if (rval == -1) {
 		printf("audio_gain: agc write: %s\n", strerror(errno));
 		return (rval);
@@ -389,7 +401,10 @@ audio_gain(
 			printf("audio_gain: mongain %d/%d\n", mongain, l);
 # endif
 		l |= r << 8;
-		rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_VOLUME, &l);
+                if ( cf_monitor )
+                  rval = ioctl(ctl_fd, monitor, &l );
+                else 
+		  rval = ioctl(ctl_fd, SOUND_MIXER_WRITE_VOLUME, &l);
 		if (rval == -1) {
 			printf("audio_gain: mongain write: %s\n",
 			       strerror(errno));
diff --git a/contrib/ntp/libntp/binio.c b/contrib/ntp/libntp/binio.c
deleted file mode 100644
index bbaf06f..0000000
--- a/contrib/ntp/libntp/binio.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * /src/NTP/ntp-4/libntp/binio.c,v 4.2 1999/02/21 12:17:34 kardel RELEASE_19990228_A
- *
- * $Created: Sun Jul 20 12:55:33 1997 $
- *
- * Copyright (C) 1997, 1998 by Frank Kardel
- */
-
-#include "binio.h"
-
-long
-get_lsb_short(
-	unsigned char **bufpp
-	)
-{
-  long retval;
-
-  retval  = *((*bufpp)++);
-  retval |= *((*bufpp)++) << 8;
-
-  return (retval & 0x8000) ? (~0xFFFF | retval) : retval;
-}
-
-void
-put_lsb_short(
-	unsigned char **bufpp,
-	long val
-	)
-{
-  *((*bufpp)++) = (unsigned char) (val        & 0xFF);
-  *((*bufpp)++) = (unsigned char) ((val >> 8) & 0xFF);
-}
-
-long
-get_lsb_long(
-	unsigned char **bufpp
-	)
-{
-  long retval;
-
-  retval  = *((*bufpp)++);
-  retval |= *((*bufpp)++) << 8;
-  retval |= *((*bufpp)++) << 16;
-  retval |= *((*bufpp)++) << 24;
-
-  return retval;
-}
-
-void
-put_lsb_long(
-	unsigned char **bufpp,
-	long val
-	)
-{
-  *((*bufpp)++) = (unsigned char)(val         & 0xFF);
-  *((*bufpp)++) = (unsigned char)((val >> 8)  & 0xFF);
-  *((*bufpp)++) = (unsigned char)((val >> 16) & 0xFF);
-  *((*bufpp)++) = (unsigned char)((val >> 24) & 0xFF);
-}
-
-long
-get_msb_short(
-	unsigned char **bufpp
-	)
-{
-  long retval;
-
-  retval  = *((*bufpp)++) << 8;
-  retval |= *((*bufpp)++);
-
-  return (retval & 0x8000) ? (~0xFFFF | retval) : retval;
-}
-
-void
-put_msb_short(
-	unsigned char **bufpp,
-	long val
-	)
-{
-  *((*bufpp)++) = (unsigned char)((val >> 8) & 0xFF);
-  *((*bufpp)++) = (unsigned char)( val       & 0xFF);
-}
-
-long
-get_msb_long(
-	unsigned char **bufpp
-	)
-{
-  long retval;
-
-  retval  = *((*bufpp)++) << 24;
-  retval |= *((*bufpp)++) << 16;
-  retval |= *((*bufpp)++) << 8;
-  retval |= *((*bufpp)++);
-
-  return retval;
-}
-
-void
-put_msb_long(
-	unsigned char **bufpp,
-	long val
-	)
-{
-  *((*bufpp)++) = (unsigned char)((val >> 24) & 0xFF);
-  *((*bufpp)++) = (unsigned char)((val >> 16) & 0xFF);
-  *((*bufpp)++) = (unsigned char)((val >> 8 ) & 0xFF);
-  *((*bufpp)++) = (unsigned char)( val        & 0xFF);
-}
-
-/*
- * binio.c,v
- * Revision 4.2  1999/02/21 12:17:34  kardel
- * 4.91f reconcilation
- *
- * Revision 4.1  1998/06/28 16:47:50  kardel
- * added {get,put}_msb_{short,long} functions
- *
- * Revision 4.0  1998/04/10 19:46:16  kardel
- * Start 4.0 release version numbering
- *
- * Revision 1.1  1998/04/10 19:27:46  kardel
- * initial NTP VERSION 4 integration of PARSE with GPS166 binary support
- *
- * Revision 1.1  1997/10/06 21:05:46  kardel
- * new parse structure
- *
- */
diff --git a/contrib/ntp/libntp/buftvtots.c b/contrib/ntp/libntp/buftvtots.c
index 1944233..bfceb35 100644
--- a/contrib/ntp/libntp/buftvtots.c
+++ b/contrib/ntp/libntp/buftvtots.c
@@ -8,6 +8,7 @@
 #include "config.h"
 #endif
 #include "ntp_fp.h"
+#include "ntp_string.h"
 #include "ntp_unixtime.h"
 
 int
@@ -16,91 +17,19 @@ buftvtots(
 	l_fp *ts
 	)
 {
-	register const u_char *bp;
-	register u_long sec;
-	register u_long usec;
 	struct timeval tv;
 
-#ifdef WORDS_BIGENDIAN
-	bp = (const u_char *)bufp;
+	/*
+	 * copy to adhere to alignment restrictions
+	 */
+	memcpy(&tv, bufp, sizeof(tv));
 
-	sec = (u_long)*bp++ & 0xff;
-	sec <<= 8;
-	sec += (u_long)*bp++ & 0xff;
-	sec <<= 8;
-	sec += (u_long)*bp++ & 0xff;
-	sec <<= 8;
-	sec += (u_long)*bp++ & 0xff;
-
-	if (sizeof(tv.tv_sec) == 8) {
-		sec += (u_long)*bp++ & 0xff;
-		sec <<= 8;
-		sec += (u_long)*bp++ & 0xff;
-		sec <<= 8;
-		sec += (u_long)*bp++ & 0xff;
-		sec <<= 8;
-		sec += (u_long)*bp++ & 0xff;
-	}
-
-	usec = (u_long)*bp++ & 0xff;
-	usec <<= 8;
-	usec += (u_long)*bp++ & 0xff;
-	usec <<= 8;
-	usec += (u_long)*bp++ & 0xff;
-	usec <<= 8;
-	usec += (u_long)*bp++ & 0xff;
-
-	if (sizeof(tv.tv_usec) == 8) {
-		usec += (u_long)*bp++ & 0xff;
-		usec <<= 8;
-		usec += (u_long)*bp++ & 0xff;
-		usec <<= 8;
-		usec += (u_long)*bp++ & 0xff;
-		usec <<= 8;
-		usec += (u_long)*bp & 0xff;
-	}
-#else
-	bp = (const u_char *)bufp + 7;
-
-	usec = (u_long)*bp-- & 0xff;
-	usec <<= 8;
-	usec += (u_long)*bp-- & 0xff;
-	usec <<= 8;
-	usec += (u_long)*bp-- & 0xff;
-	usec <<= 8;
-	usec += (u_long)*bp-- & 0xff;
-
-	if (sizeof(tv.tv_usec) == 8) {
-		usec += (u_long)*bp-- & 0xff;
-		usec <<= 8;
-		usec += (u_long)*bp-- & 0xff;
-		usec <<= 8;
-		usec += (u_long)*bp-- & 0xff;
-		usec <<= 8;
-		usec += (u_long)*bp-- & 0xff;
-	}
-
-	sec = (u_long)*bp-- & 0xff;
-	sec <<= 8;
-	sec += (u_long)*bp-- & 0xff;
-	sec <<= 8;
-	sec += (u_long)*bp-- & 0xff;
-	sec <<= 8;
-	sec += (u_long)*bp-- & 0xff;
-
-	if (sizeof (tv.tv_sec) == 8) {
-		sec += (u_long)*bp-- & 0xff;
-		sec <<= 8;
-		sec += (u_long)*bp-- & 0xff;
-		sec <<= 8;
-		sec += (u_long)*bp-- & 0xff;
-		sec <<= 8;
-		sec += (u_long)*bp & 0xff;
-	}
-#endif
-	ts->l_ui = sec + (u_long)JAN_1970;
-	if (usec > 999999)
+	/*
+	 * and use it
+	 */
+	ts->l_ui = tv.tv_sec + (u_long)JAN_1970;
+	if (tv.tv_usec > 999999)
 	    return 0;
-	TVUTOTSF(usec, ts->l_uf);
+	TVUTOTSF(tv.tv_usec, ts->l_uf);
 	return 1;
 }
diff --git a/contrib/ntp/libntp/caljulian.c b/contrib/ntp/libntp/caljulian.c
index c3b5e67..71123df 100644
--- a/contrib/ntp/libntp/caljulian.c
+++ b/contrib/ntp/libntp/caljulian.c
@@ -6,7 +6,9 @@
 #include "ntp_types.h"
 #include "ntp_calendar.h"
 #include "ntp_stdlib.h"
+#include "ntp_fp.h"
 
+#if 0
 /*
  * calmonthtab - days-in-the-month table
  */
@@ -113,3 +115,32 @@ caljulian(
 	jt->monthday = (u_char) monthday;
 	}
 }
+#else
+
+/* Updated 2003-12-30 TMa
+
+   Uses common code with the *prettydate functions to convert an ntp
+   seconds count into a calendar date.
+   Will handle ntp epoch wraparound as long as the underlying os/library 
+   does so for the unix epoch, i.e. works after 2038.
+*/
+
+void
+caljulian(
+	u_long		  		ntptime,
+	register struct calendar	*jt
+	)
+{
+	struct tm *tm;
+
+	tm = ntp2unix_tm(ntptime, 0);
+
+	jt->hour = (u_char) tm->tm_hour;
+	jt->minute = (u_char) tm->tm_min;
+	jt->month = (u_char) (tm->tm_mon + 1);
+	jt->monthday = (u_char) tm->tm_mday;
+	jt->second = (u_char) tm->tm_sec;
+	jt->year = (u_short) (tm->tm_year + 1900);
+	jt->yearday = (u_short) (tm->tm_yday + 1);  /* Assumes tm_yday starts with day 0! */
+}
+#endif
diff --git a/contrib/ntp/libntp/calleapwhen.c b/contrib/ntp/libntp/calleapwhen.c
deleted file mode 100644
index c954901..0000000
--- a/contrib/ntp/libntp/calleapwhen.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * calleapwhen - determine the number of seconds to the next possible
- *		 leap occurance.
- */
-#include <sys/types.h>
-
-#include "ntp_types.h"
-#include "ntp_calendar.h"
-#include "ntp_stdlib.h"
-
-/*
- * calleaptab - leaps occur at the end of December and June
- */
-long calleaptab[10] = {
-	-(JAN+FEBLEAP)*SECSPERDAY,	/* leap previous to cycle */
-	(MAR+APR+MAY+JUN)*SECSPERDAY,	/* end of June */
-	(MAR+APR+MAY+JUN+JUL+AUG+SEP+OCT+NOV+DEC)*SECSPERDAY, /* end of Dec */
-	(MAR+APR+MAY+JUN)*SECSPERDAY + SECSPERYEAR,
-	(MAR+APR+MAY+JUN+JUL+AUG+SEP+OCT+NOV+DEC)*SECSPERDAY + SECSPERYEAR,
-	(MAR+APR+MAY+JUN)*SECSPERDAY + 2*SECSPERYEAR,
-	(MAR+APR+MAY+JUN+JUL+AUG+SEP+OCT+NOV+DEC)*SECSPERDAY + 2*SECSPERYEAR,
-	(MAR+APR+MAY+JUN)*SECSPERDAY + 3*SECSPERYEAR,
-	(MAR+APR+MAY+JUN+JUL+AUG+SEP+OCT+NOV+DEC)*SECSPERDAY + 3*SECSPERYEAR,
-	(MAR+APR+MAY+JUN+JUL+AUG+SEP+OCT+NOV+DEC+JAN+FEBLEAP+MAR+APR+MAY+JUN)
-	*SECSPERDAY + 3*SECSPERYEAR,	/* next after current cycle */
-};
-
-u_long
-calleapwhen(
-	u_long ntpdate
-	)
-{
-	register u_long dateincycle;
-	register int i;
-
-	/*
-	 * Find the offset from the start of the cycle
-	 */
-	dateincycle = ntpdate;
-	if (dateincycle >= MAR1988)
-	    dateincycle -= MAR1988;
-	else
-	    dateincycle -= MAR1900;
-
-	while (dateincycle >= SECSPERCYCLE)
-	    dateincycle -= SECSPERCYCLE;
-
-	/*
-	 * Find where we are with respect to the leap events.
-	 */
-	for (i = 1; i < 9; i++)
-	    if (dateincycle < (u_long)calleaptab[i])
-		break;
-	
-	/*
-	 * i points at the next leap.  Compute the last and the next.
-	 */
-	return (u_long)(calleaptab[i] - (long)dateincycle);
-}
diff --git a/contrib/ntp/libntp/clocktypes.c b/contrib/ntp/libntp/clocktypes.c
index 928851f..d7dc4ee 100644
--- a/contrib/ntp/libntp/clocktypes.c
+++ b/contrib/ntp/libntp/clocktypes.c
@@ -40,14 +40,14 @@ struct clktype clktypes[] = {
 	  "ATOM_LEITCH" },
 	{ REFCLK_MSF_EES,	"EES M201 MSF Receiver (14)",
 	  "MSF_EES" },
-	{ REFCLK_GPSTM_TRUE,	"TrueTime (old GPSTM driver) Receiver (15)",
-	  "GPSTM_TRUE" },
+	{ REFCLK_NONE,		"not used (15)",
+	  "NOT_USED" },
 	{ REFCLK_IRIG_BANCOMM,	"Bancomm GPS/IRIG Receiver (16)",
 	  "GPS_BANC" },
 	{ REFCLK_GPS_DATUM,	"Datum Precision Time System (17)",
 	  "GPS_DATUM" },
-	{ REFCLK_NIST_ACTS,	"NIST Automated Computer Time Service (18)",
-	  "ACTS_NIST" },
+	{ REFCLK_ACTS,		"Automated Computer Time Service (18)",
+	  "ACTS_MODEM" },
 	{ REFCLK_WWV_HEATH,	"Heath WWV/WWVH Receiver (19)",
 	  "WWV_HEATH" },
 	{ REFCLK_GPS_NMEA,	"Generic NMEA GPS Receiver (20)",
@@ -56,12 +56,12 @@ struct clktype clktypes[] = {
 	  "GPS_VME" },
 	{ REFCLK_ATOM_PPS,	"PPS Clock Discipline (22)",
 	  "PPS" },
-	{ REFCLK_PTB_ACTS,	"PTB Automated Computer Time Service (23)",
-	  "ACTS_PTB" },
-	{ REFCLK_USNO,		"Naval Observatory dialup (24)",
-	  "ACTS_USNO" },
-	{ REFCLK_TRUETIME,	"TrueTime (generic) Receivers (25)",
-	  "TRUETIME" },
+	{ REFCLK_NONE,		"not used (23)",
+	  "NOT_USED" },
+	{ REFCLK_NONE,		"not used (24)",
+	  "NOT_USED" },
+	{ REFCLK_NONE,		"not used (25)",
+	  "NOT_USED" },
 	{ REFCLK_GPS_HP,	"HP 58503A GPS Time & Frequency Receiver (26)",
 	  "GPS_HP" },
 	{ REFCLK_ARCRON_MSF,	"ARCRON MSF (and DCF77) Receiver (27)",
diff --git a/contrib/ntp/libntp/decodenetnum.c b/contrib/ntp/libntp/decodenetnum.c
index 4accf4a..746c855 100644
--- a/contrib/ntp/libntp/decodenetnum.c
+++ b/contrib/ntp/libntp/decodenetnum.c
@@ -5,7 +5,6 @@
 #include <ctype.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <netdb.h>
 
 #include "ntp_stdlib.h"
 
diff --git a/contrib/ntp/libntp/dolfptoa.c b/contrib/ntp/libntp/dolfptoa.c
index 7c92a30..f68679c 100644
--- a/contrib/ntp/libntp/dolfptoa.c
+++ b/contrib/ntp/libntp/dolfptoa.c
@@ -36,6 +36,14 @@ dolfptoa(
 	memset((char *) cbuf, 0, sizeof(cbuf));
 
 	/*
+	 * safeguard against sign extensions and other mishaps on 64 bit platforms
+	 * the code following is designed for and only for 32-bit inputs and
+	 * only 32-bit worth of input are supplied.
+         */
+	fpi &= 0xffffffff;
+	fpv &= 0xffffffff;
+
+	/*
 	 * Work on the integral part.  This is biased by what I know
 	 * compiles fairly well for a 68000.
 	 */
@@ -49,6 +57,7 @@ dolfptoa(
 			ltmp = lwork;
 			lwork /= lten;
 			ltmp -= (lwork << 3) + (lwork << 1);
+			if (cp < cbuf) abort(); /* rather die a horrible death than trash the memory */
 			*--cp = (u_char)ltmp;
 		} while (lwork & 0xffff0000);
 	}
@@ -61,6 +70,7 @@ dolfptoa(
 			stmp = swork;
 			swork = (u_short) (swork/sten);
 			stmp = (u_short)(stmp - ((swork<<3) + (swork<<1)));
+		        if (cp < cbuf) abort(); /* rather die a horrible death than trash the memory */
 			*--cp = (u_char)stmp;
 		} while (swork != 0);
 	}
@@ -110,6 +120,7 @@ dolfptoa(
 			*cpend++ = (u_char)work.l_ui;
 			if (work.l_uf == 0)
 			    break;
+			if (cpend > (cbuf + sizeof(cbuf))) abort(); /* rather die a horrible death than trash the memory */
 		}
 
 		/*
diff --git a/contrib/ntp/libntp/gpstolfp.c b/contrib/ntp/libntp/gpstolfp.c
deleted file mode 100644
index c424784..0000000
--- a/contrib/ntp/libntp/gpstolfp.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * /src/NTP/ntp-4/libntp/gpstolfp.c,v 4.3 1999/02/28 11:42:44 kardel RELEASE_19990228_A
- *
- * $Created: Sun Jun 28 16:30:38 1998 $
- *
- * Copyright (C) 1998 by Frank Kardel
- */
-#include "ntp_fp.h"
-
-#define GPSORIGIN	ULONG_CONST(2524953600)	/* NTP origin - GPS origin in seconds */
-#define SECSPERWEEK	(unsigned)(604800)	/* seconds per week - GPS tells us about weeks */
-#define GPSWRAP		990	/* assume week count less than this in the previous epoch */
-
-void
-gpstolfp(
-	 int weeks,
-	 int days,
-	 unsigned long  seconds,
-	 l_fp * lfp
-	 )
-{
-  if (weeks < GPSWRAP)
-    {
-      weeks += 1024;
-    }
-
-  lfp->l_ui = weeks * SECSPERWEEK + days * 86400 + seconds + GPSORIGIN; /* convert to NTP time */
-  lfp->l_uf = 0;
-}
-
-/*
- * gpstolfp.c,v
- * Revision 4.3  1999/02/28 11:42:44  kardel
- * (GPSWRAP): update GPS rollover to 990 weeks
- *
- * Revision 4.2  1998/07/11 10:05:25  kardel
- * Release 4.0.73d reconcilation
- *
- * Revision 4.1  1998/06/28 16:47:15  kardel
- * added gpstolfp() function
- */
diff --git a/contrib/ntp/libntp/humandate.c b/contrib/ntp/libntp/humandate.c
index 52f5af1..630c871 100644
--- a/contrib/ntp/libntp/humandate.c
+++ b/contrib/ntp/libntp/humandate.c
@@ -22,10 +22,8 @@ humandate(
 {
 	char *bp;
 	struct tm *tm;
-	time_t sec;
 
-	sec = ntptime - JAN_1970;
-	tm = localtime(&sec);
+	tm = ntp2unix_tm(ntptime, 1);
 
 	if (!tm)
 		return "--- --- -- ---- --:--:--";
@@ -48,8 +46,9 @@ humanlogtime(void)
 {
 	char *bp;
 	time_t cursec = time((time_t *) 0);
-	struct tm *tm = localtime(&cursec);
+	struct tm *tm;
 	
+	tm = localtime(&cursec);
 	if (!tm)
 		return "-- --- --:--:--";
 
diff --git a/contrib/ntp/libntp/icom.c b/contrib/ntp/libntp/icom.c
index 5c1a9a3..280667e 100644
--- a/contrib/ntp/libntp/icom.c
+++ b/contrib/ntp/libntp/icom.c
@@ -144,6 +144,7 @@ icom_init(
 	fd = open(device, O_RDWR, 0777);
 	if (fd < 0)
 		return (fd);
+
 	tcgetattr(fd, &ttyb);
 	ttyb.c_iflag = 0;	/* input modes */
 	ttyb.c_oflag = 0;	/* output modes */
diff --git a/contrib/ntp/libntp/ieee754io.c b/contrib/ntp/libntp/ieee754io.c
deleted file mode 100644
index 979fed9..0000000
--- a/contrib/ntp/libntp/ieee754io.c
+++ /dev/null
@@ -1,575 +0,0 @@
-/*
- * /src/NTP/ntp-4/libntp/ieee754io.c,v 4.8 1999/02/21 12:17:36 kardel RELEASE_19990228_A
- *
- * $Created: Sun Jul 13 09:12:02 1997 $
- *
- * Copyright (C) 1997, 1998 by Frank Kardel
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include "l_stdlib.h"
-#include "ntp_stdlib.h"
-#include "ntp_fp.h"
-#include "ieee754io.h"
-
-static unsigned char get_byte P((unsigned char *, offsets_t, int *));
-#ifdef __not_yet__
-static void put_byte P((unsigned char *, offsets_t, int *, unsigned char));
-#endif
-
-#ifdef LIBDEBUG
-
-#include "lib_strbuf.h"
-
-static char *
-fmt_blong(
-	  unsigned long val,
-	  int cnt
-	  )
-{
-  char *buf, *s;
-  int i = cnt;
-
-  val <<= 32 - cnt;
-  LIB_GETBUF(buf);
-  s = buf;
-  
-  while (i--)
-    {
-      if (val & 0x80000000)
-	{
-	  *s++ = '1';
-	}
-      else
-	{
-	  *s++ = '0';
-	}
-      val <<= 1;
-    }
-  *s = '\0';
-  return buf;
-}
-
-static char *
-fmt_flt(
-	unsigned int sign,
-	unsigned long mh,
-	unsigned long ml,
-	unsigned long ch
-	)
-{
-  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;
-}
-
-static char *
-fmt_hex(
-	unsigned char *bufp,
-	int length
-	)
-{
-  char *buf;
-  int i;
-
-  LIB_GETBUF(buf);
-  for (i = 0; i < length; i++)
-    {
-      sprintf(buf+i*2, "%02x", bufp[i]);
-    }
-  return buf;
-}
-
-#endif
-
-static unsigned char
-get_byte(
-	 unsigned char *bufp,
-	 offsets_t offset,
-	 int *fieldindex
-	 )
-{
-  unsigned char val;
-
-  val     = *(bufp + offset[*fieldindex]);
-#ifdef LIBDEBUG
-  if (debug > 4)
-    printf("fetchieee754: getbyte(0x%08x, %d) = 0x%02x\n", (unsigned int)(bufp)+offset[*fieldindex], *fieldindex, val);
-#endif
-  (*fieldindex)++;
-  return val;
-}
-
-#ifdef __not_yet__
-static void
-put_byte(
-	 unsigned char *bufp,
-	 offsets_t offsets,
-	 int *fieldindex,
-	 unsigned char val
-	 )
-{
-  *(bufp + offsets[*fieldindex]) = val;
-  (*fieldindex)++;
-}
-#endif
-
-/*
- * make conversions to and from external IEEE754 formats and internal
- * NTP FP format.
- */
-int
-fetch_ieee754(
-	      unsigned char **buffpp,
-	      int size,
-	      l_fp *lfpp,
-	      offsets_t offsets
-	      )
-{
-  unsigned char *bufp = *buffpp;
-  unsigned int sign;
-  unsigned int bias;
-  unsigned int maxexp;
-  int mbits;
-  u_long mantissa_low;
-  u_long mantissa_high;
-  u_long characteristic;
-  long exponent;
-#ifdef LIBDEBUG
-  int length;
-#endif
-  unsigned char val;
-  int fieldindex = 0;
-  
-  switch (size)
-    {
-    case IEEE_DOUBLE:
-#ifdef LIBDEBUG
-      length = 8;
-#endif
-      mbits  = 52;
-      bias   = 1023;
-      maxexp = 2047;
-      break;
-
-    case IEEE_SINGLE:
-#ifdef LIBDEBUG
-      length = 4;
-#endif
-      mbits  = 23;
-      bias   = 127;
-      maxexp = 255;
-      break;
-
-    default:
-      return IEEE_BADCALL;
-    }
-  
-  val = get_byte(bufp, offsets, &fieldindex); /* fetch sign byte & first part of characteristic */
-  
-  sign     = (val & 0x80) != 0;
-  characteristic = (val & 0x7F);
-
-  val = get_byte(bufp, offsets, &fieldindex); /* fetch rest of characteristic and start of mantissa */
-  
-  switch (size)
-    {
-    case IEEE_SINGLE:
-      characteristic <<= 1;
-      characteristic  |= (val & 0x80) != 0; /* grab last characteristic bit */
-
-      mantissa_high  = 0;
-
-      mantissa_low   = (val &0x7F) << 16;
-      mantissa_low  |= get_byte(bufp, offsets, &fieldindex) << 8;
-      mantissa_low  |= get_byte(bufp, offsets, &fieldindex);
-      break;
-      
-    case IEEE_DOUBLE:
-      characteristic <<= 4;
-      characteristic  |= (val & 0xF0) >> 4; /* grab lower characteristic bits */
-
-      mantissa_high  = (val & 0x0F) << 16;
-      mantissa_high |= 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  |= get_byte(bufp, offsets, &fieldindex);
-      break;
-      
-    default:
-      return IEEE_BADCALL;
-    }
-#ifdef LIBDEBUG
-  if (debug > 4)
-  {
-    double d;
-    float f;
-
-    if (size == IEEE_SINGLE)
-      {
-	int i;
-
-	for (i = 0; i < length; i++)
-	  {
-	    *((unsigned char *)(&f)+i) = *(*buffpp + offsets[i]);
-	  }
-	d = f;
-      }
-    else
-      {
-	int i;
-
-	for (i = 0; i < length; i++)
-	  {
-	    *((unsigned char *)(&d)+i) = *(*buffpp + offsets[i]);
-	  }
-      }
-    
-    printf("fetchieee754: FP: %s -> %s -> %e(=%s)\n", fmt_hex(*buffpp, length),
-	   fmt_flt(sign, mantissa_high, mantissa_low, characteristic),
-	   d, fmt_hex((unsigned char *)&d, length));
-  }
-#endif
-
-  *buffpp += fieldindex;
-  
-  /*
-   * detect funny numbers
-   */
-  if (characteristic == maxexp)
-    {
-      /*
-       * NaN or Infinity
-       */
-      if (mantissa_low || mantissa_high)
-	{
-	  /*
-	   * NaN
-	   */
-	  return IEEE_NAN;
-	}
-      else
-	{
-	  /*
-	   * +Inf or -Inf
-	   */
-	  return sign ? IEEE_NEGINFINITY : IEEE_POSINFINITY;
-	}
-    }
-  else
-    {
-      /*
-       * collect real numbers
-       */
-
-      L_CLR(lfpp);
-
-      /*
-       * check for overflows
-       */
-      exponent = characteristic - bias;
-
-      if (exponent > 31)	/* sorry - hardcoded */
-	{
-	  /*
-	   * overflow only in respect to NTP-FP representation
-	   */
-	  return sign ? IEEE_NEGOVERFLOW : IEEE_POSOVERFLOW;
-	}
-      else
-	{
-	  int frac_offset;	/* where the fraction starts */
-	  
-	  frac_offset = mbits - exponent;
-
-	  if (characteristic == 0) 
-	    {
-	      /*
-	       * de-normalized or tiny number - fits only as 0
-	       */
-	      return IEEE_OK;
-	    }
-	  else
-	    {
-	      /*
-	       * adjust for implied 1
-	       */
-	      if (mbits > 31)
-		mantissa_high |= 1 << (mbits - 32);
-	      else
-		mantissa_low  |= 1 << mbits;
-
-	      /*
-	       * take mantissa apart - if only all machine would support
-	       * 64 bit operations 8-(
-	       */
-	      if (frac_offset > mbits)
-		{
-		  lfpp->l_ui = 0; /* only fractional number */
-		  frac_offset -= mbits + 1; /* will now contain right shift count - 1*/
-		  if (mbits > 31)
-		    {
-		      lfpp->l_uf   = mantissa_high << (63 - mbits);
-		      lfpp->l_uf  |= mantissa_low  >> (mbits - 33);
-		      lfpp->l_uf >>= frac_offset;
-		    }
-		  else
-		    {
-		      lfpp->l_uf = mantissa_low >> frac_offset;
-		    }
-		}
-	      else
-		{
-		  if (frac_offset > 32)
-		    {
-		      /*
-		       * must split in high word
-		       */
-		      lfpp->l_ui  =  mantissa_high >> (frac_offset - 32);
-		      lfpp->l_uf  = (mantissa_high & ((1 << (frac_offset - 32)) - 1)) << (64 - frac_offset);
-		      lfpp->l_uf |=  mantissa_low  >> (frac_offset - 32);
-		    }
-		  else
-		    {
-		      /*
-		       * must split in low word
-		       */
-		      lfpp->l_ui  =  mantissa_high << (32 - frac_offset);
-		      lfpp->l_ui |= (mantissa_low >> frac_offset) & ((1 << (32 - frac_offset)) - 1);
-		      lfpp->l_uf  = (mantissa_low & ((1 << frac_offset) - 1)) << (32 - frac_offset);
-		    }
-		}
-	      
-	      /*
-	       * adjust for sign
-	       */
-	      if (sign)
-		{
-		  L_NEG(lfpp);
-		}
-	      
-	      return IEEE_OK;
-	    }
-	}
-    }
-}
-  
-int
-put_ieee754(
-	    unsigned char **bufpp,
-	    int size,
-	    l_fp *lfpp,
-	    offsets_t offsets
-	    )
-{
-  l_fp outlfp;
-#ifdef LIBDEBUG
-  unsigned int sign;
-  unsigned int bias;
-#endif
-/*unsigned int maxexp;*/
-  int mbits;
-  int msb;
-  u_long mantissa_low = 0;
-  u_long mantissa_high = 0;
-#ifdef LIBDEBUG
-  u_long characteristic = 0;
-  long exponent;
-#endif
-/*int length;*/
-  unsigned long mask;
-  
-  outlfp = *lfpp;
-
-  switch (size)
-    {
-    case IEEE_DOUBLE:
-    /*length = 8;*/
-      mbits  = 52;
-#ifdef LIBDEBUG
-      bias   = 1023;
-#endif
-    /*maxexp = 2047;*/
-      break;
-
-    case IEEE_SINGLE:
-    /*length = 4;*/
-      mbits  = 23;
-#ifdef LIBDEBUG
-      bias   = 127;
-#endif
-    /*maxexp = 255;*/
-      break;
-
-    default:
-      return IEEE_BADCALL;
-    }
-  
-  /*
-   * find sign
-   */
-  if (L_ISNEG(&outlfp))
-    {
-      L_NEG(&outlfp);
-#ifdef LIBDEBUG
-      sign = 1;
-#endif
-    }
-  else
-    {
-#ifdef LIBDEBUG
-      sign = 0;
-#endif
-    }
-
-  if (L_ISZERO(&outlfp))
-    {
-#ifdef LIBDEBUG
-      exponent = mantissa_high = mantissa_low = 0; /* true zero */
-#endif
-    }
-  else
-    {
-      /*
-       * find number of significant integer bits
-       */
-      mask = 0x80000000;
-      if (outlfp.l_ui)
-	{
-	  msb = 63;
-	  while (mask && ((outlfp.l_ui & mask) == 0))
-	    {
-	      mask >>= 1;
-	      msb--;
-	    }
-	}
-      else
-	{
-	  msb = 31;
-	  while (mask && ((outlfp.l_uf & mask) == 0))
-	    {
-	      mask >>= 1;
-	      msb--;
-	    }
-	}
-  
-      switch (size)
-	{
-	case IEEE_SINGLE:
-	  mantissa_high = 0;
-	  if (msb >= 32)
-	    {
-	      mantissa_low  = (outlfp.l_ui & ((1 << (msb - 32)) - 1)) << (mbits - (msb - 32));
-	      mantissa_low |=  outlfp.l_uf >> (mbits - (msb - 32));
-	    }
-	  else
-	    {
-	      mantissa_low  = (outlfp.l_uf << (mbits - msb)) & ((1 << mbits) - 1);
-	    }
-	  break;
-	  
-	case IEEE_DOUBLE:
-	  if (msb >= 32)
-	    {
-	      mantissa_high  = (outlfp.l_ui << (mbits - msb)) & ((1 << (mbits - 32)) - 1);
-	      mantissa_high |=  outlfp.l_uf >> (32 - (mbits - msb));
-	      mantissa_low   = (outlfp.l_ui & ((1 << (msb - mbits)) - 1)) << (32 - (msb - mbits));
-	      mantissa_low  |=  outlfp.l_uf >> (msb - mbits);
-	    }
-	  else
-	    {
-	      mantissa_high  = outlfp.l_uf << (mbits - 32 - msb);
-	      mantissa_low   = outlfp.l_uf << (mbits - 32);
-	    }
-	}
-
-#ifdef LIBDEBUG
-      exponent = msb - 32;
-      characteristic = exponent + bias;
-
-      if (debug > 4)
-	printf("FP: %s\n", fmt_flt(sign, mantissa_high, mantissa_low, characteristic));
-#endif
-    }
-  return IEEE_OK;
-}
-
-
-#if defined(DEBUG) && defined(LIBDEBUG)
-int main(
-	 int argc,
-	 char **argv
-	 )
-{
-  static offsets_t native_off = { 0, 1, 2, 3, 4, 5, 6, 7 };
-  double f = 1.0;
-  double *f_p = &f;
-  l_fp fp;
-  
-  if (argc == 2)
-    {
-      if (sscanf(argv[1], "%lf", &f) != 1)
-	{
-	  printf("cannot convert %s to a float\n", argv[1]);
-	  return 1;
-	}
-    }
-  
-  printf("double: %s %s\n", fmt_blong(*(unsigned long *)&f, 32), fmt_blong(*(unsigned long *)((char *)(&f)+4), 32));
-  printf("fetch from %f = %d\n", f, fetch_ieee754((void *)&f_p, IEEE_DOUBLE, &fp, native_off));
-  printf("fp [%s %s] = %s\n", fmt_blong(fp.l_ui, 32), fmt_blong(fp.l_uf, 32), mfptoa(fp.l_ui, fp.l_uf, 15));
-  f_p = &f;
-  put_ieee754((void *)&f_p, IEEE_DOUBLE, &fp, native_off);
-  
-  return 0;
-}
-
-#endif
-/*
- * ieee754io.c,v
- * Revision 4.8  1999/02/21 12:17:36  kardel
- * 4.91f reconcilation
- *
- * Revision 4.7  1999/02/21 11:26:03  kardel
- * renamed index to fieldindex to avoid index() name clash
- *
- * Revision 4.6  1998/11/15 20:27:52  kardel
- * Release 4.0.73e13 reconcilation
- *
- * Revision 4.5  1998/08/16 19:01:51  kardel
- * debug information only compile for LIBDEBUG case
- *
- * Revision 4.4  1998/08/09 09:39:28  kardel
- * Release 4.0.73e2 reconcilation
- *
- * Revision 4.3  1998/06/13 11:56:19  kardel
- * disabled putbute() for the time being
- *
- * Revision 4.2  1998/06/12 15:16:58  kardel
- * ansi2knr compatibility
- *
- * Revision 4.1  1998/05/24 07:59:56  kardel
- * conditional debug support
- *
- * Revision 4.0  1998/04/10 19:46:29  kardel
- * Start 4.0 release version numbering
- *
- * Revision 1.1  1998/04/10 19:27:46  kardel
- * initial NTP VERSION 4 integration of PARSE with GPS166 binary support
- *
- * Revision 1.1  1997/10/06 21:05:45  kardel
- * new parse structure
- *
- */
diff --git a/contrib/ntp/libntp/iosignal.c b/contrib/ntp/libntp/iosignal.c
index bcad890..19a6e96 100644
--- a/contrib/ntp/libntp/iosignal.c
+++ b/contrib/ntp/libntp/iosignal.c
@@ -3,12 +3,18 @@
  *		   was shamelessly stolen from ntpd.
  */
 
-#include "ntp_machine.h"
-#include "ntpd.h"
-#include "ntp_io.h"
-#include "ntp_if.h"
-#include "ntp_stdlib.h"
-#include "iosignal.h"
+/*
+ * [Bug 158]
+ * Do the #includes differently, as under some versions of Linux
+ * sys/param.h has a #undef CONFIG_PHONE line in it.
+ *
+ * As we have ~40 CONFIG_ variables, I don't feel like renaming them
+ * every time somebody adds a new macro to some system header.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include <stdio.h>
 #include <signal.h>
@@ -25,6 +31,19 @@
 # include <ifaddrs.h>
 #endif
 
+# ifdef __QNXNTO__
+#  include <fcntl.h>
+#  include <unix.h>
+#  define FNDELAY O_NDELAY
+# endif
+
+#include "ntp_machine.h"
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_if.h"
+#include "ntp_stdlib.h"
+#include "iosignal.h"
+
 #if defined(HAVE_SIGNALED_IO)
 static int sigio_block_count = 0;
 # if defined(HAVE_SIGACTION)
@@ -68,12 +87,6 @@ extern	void	input_handler	P((l_fp *));
 #  define USE_SIGIO
 # endif
 
-# ifdef __QNXNTO__
-#  include <fcntl.h>
-#  include <unix.h>
-#  define FNDELAY O_NDELAY
-# endif
-
 # if defined(USE_SIGIO) && defined(USE_SIGPOLL)
 #  if SIGIO == SIGPOLL
 #	define USE_SIGIO
diff --git a/contrib/ntp/libntp/lib_strbuf.h b/contrib/ntp/libntp/lib_strbuf.h
index 1a34034..5aa0eb0 100644
--- a/contrib/ntp/libntp/lib_strbuf.h
+++ b/contrib/ntp/libntp/lib_strbuf.h
@@ -7,7 +7,7 @@
 /*
  * Sizes of things
  */
-#define	LIB_NUMBUFS	20
+#define	LIB_NUMBUFS	200
 #define	LIB_BUFLENGTH	80
 
 /*
@@ -20,6 +20,7 @@
 		buf = &lib_stringbuf[lib_nextbuf][0]; \
 		if (++lib_nextbuf >= LIB_NUMBUFS) \
 			lib_nextbuf = 0; \
+		memset(buf, 0, LIB_BUFLENGTH); \
 	} while (0)
 
 extern char lib_stringbuf[LIB_NUMBUFS][LIB_BUFLENGTH];
diff --git a/contrib/ntp/libntp/log.c b/contrib/ntp/libntp/log.c
deleted file mode 100644
index 991b498..0000000
--- a/contrib/ntp/libntp/log.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/* Microsoft Developer Support Copyright (c) 1993 Microsoft Corporation. */
-
-/* Skip asynch rpc inclusion */
-#ifndef __RPCASYNC_H__
-#define __RPCASYNC_H__
-#endif
-
-#include <windows.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "messages.h"
-#include "log.h"
-
-#define PERR(bSuccess, api) {if(!(bSuccess)) printf("%s: Error %d from %s \
-    on line %d\n", __FILE__, GetLastError(), api, __LINE__);}
-
-
-/*********************************************************************
-* FUNCTION: addSourceToRegistry(LPSTR pszAppname, LPSTR pszMsgDLL)   *
-*                                                                    *
-* PURPOSE: Add a source name key, message DLL name value, and        *
-*          message type supported value to the registry              *
-*                                                                    *
-* INPUT: source name, path of message DLL                            *
-*                                                                    *
-* RETURNS: none                                                      *
-*********************************************************************/
-
-void addSourceToRegistry(LPSTR pszAppname, LPSTR pszMsgDLL)
-{
-  HKEY hk;                      /* registry key handle */
-  DWORD dwData;
-  BOOL bSuccess;
-  char   regarray[200];
-  char *lpregarray = regarray;
-
-  /* When an application uses the RegisterEventSource or OpenEventLog
-     function to get a handle of an event log, the event loggging service
-     searches for the specified source name in the registry. You can add a
-     new source name to the registry by opening a new registry subkey
-     under the Application key and adding registry values to the new
-     subkey. */
-
-  strcpy(lpregarray, "SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\");
-  strcat(lpregarray, pszAppname);
-
-  /* Create a new key for our application */
-  bSuccess = RegCreateKey(HKEY_LOCAL_MACHINE,lpregarray, &hk);
-  PERR(bSuccess == ERROR_SUCCESS, "RegCreateKey");
-
-  /* Add the Event-ID message-file name to the subkey. */
-  bSuccess = RegSetValueEx(hk,  /* subkey handle         */
-      "EventMessageFile",       /* value name            */
-      0,                        /* must be zero          */
-      REG_EXPAND_SZ,            /* value type            */
-      (LPBYTE) pszMsgDLL,       /* address of value data */
-      strlen(pszMsgDLL) + 1);   /* length of value data  */
-  PERR(bSuccess == ERROR_SUCCESS, "RegSetValueEx");
-
-  /* Set the supported types flags and addit to the subkey. */
-  dwData = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE |
-      EVENTLOG_INFORMATION_TYPE;
-  bSuccess = RegSetValueEx(hk,  /* subkey handle                */
-      "TypesSupported",         /* value name                   */
-      0,                        /* must be zero                 */
-      REG_DWORD,                /* value type                   */
-      (LPBYTE) &dwData,         /* address of value data        */
-      sizeof(DWORD));           /* length of value data         */
-  PERR(bSuccess == ERROR_SUCCESS, "RegSetValueEx");
-  RegCloseKey(hk);
-  return;
-}
-
-/*********************************************************************
-* FUNCTION: reportAnEvent(DWORD dwIdEvent, WORD cStrings,            *
-*                         LPTSTR *ppszStrings);                      *
-*                                                                    *
-* PURPOSE: add the event to the event log                            *
-*                                                                    *
-* INPUT: the event ID to report in the log, the number of insert     *
-*        strings, and an array of null-terminated insert strings     *
-*                                                                    *
-* RETURNS: none                                                      *
-*********************************************************************/
-
-void reportAnIEvent(DWORD dwIdEvent, WORD cStrings, LPTSTR *pszStrings)
-{
-  HANDLE hAppLog;
-  BOOL bSuccess;
-
-  /* Get a handle to the Application event log */
-  hAppLog = RegisterEventSource(NULL,   /* use local machine      */
-      "NTP");                   /* source name                 */
-  PERR(hAppLog, "RegisterEventSource");
-
-  /* Now report the event, which will add this event to the event log */
-  bSuccess = ReportEvent(hAppLog,       /* event-log handle            */
-      EVENTLOG_INFORMATION_TYPE,      /* event type                  */
-      0,                        /* category zero               */
-      dwIdEvent,                /* event ID                    */
-      NULL,                     /* no user SID                 */
-      cStrings,                 /* number of substitution strings     */
-      0,                        /* no binary data              */
-      pszStrings,               /* string array                */
-      NULL);                    /* address of data             */
-  PERR(bSuccess, "ReportEvent");
-  DeregisterEventSource(hAppLog);
-  return;
-}
-
-void reportAnWEvent(DWORD dwIdEvent, WORD cStrings, LPTSTR *pszStrings)
-{
-  HANDLE hAppLog;
-  BOOL bSuccess;
-
-  /* Get a handle to the Application event log */
-  hAppLog = RegisterEventSource(NULL,   /* use local machine      */
-      "NTP");                   /* source name                 */
-  PERR(hAppLog, "RegisterEventSource");
-
-  /* Now report the event, which will add this event to the event log */
-  bSuccess = ReportEvent(hAppLog,       /* event-log handle            */
-      EVENTLOG_WARNING_TYPE,      /* event type                  */
-      0,                        /* category zero               */
-      dwIdEvent,                /* event ID                    */
-      NULL,                     /* no user SID                 */
-      cStrings,                 /* number of substitution strings     */
-      0,                        /* no binary data              */
-      pszStrings,               /* string array                */
-      NULL);                    /* address of data             */
-  PERR(bSuccess, "ReportEvent");
-  DeregisterEventSource(hAppLog);
-  return;
-}
-
-void reportAnEEvent(DWORD dwIdEvent, WORD cStrings, LPTSTR *pszStrings)
-{
-  HANDLE hAppLog;
-  BOOL bSuccess;
-
-  /* Get a handle to the Application event log */
-  hAppLog = RegisterEventSource(NULL,   /* use local machine      */
-      "NTP");                   /* source name                 */
-  PERR(hAppLog, "RegisterEventSource");
-
-  /* Now report the event, which will add this event to the event log */
-  bSuccess = ReportEvent(hAppLog,       /* event-log handle            */
-      EVENTLOG_ERROR_TYPE,      /* event type                  */
-      0,                        /* category zero               */
-      dwIdEvent,                /* event ID                    */
-      NULL,                     /* no user SID                 */
-      cStrings,                 /* number of substitution strings     */
-      0,                        /* no binary data              */
-      pszStrings,               /* string array                */
-      NULL);                    /* address of data             */
-  PERR(bSuccess, "ReportEvent");
-  DeregisterEventSource(hAppLog);
-  return;
-}
diff --git a/contrib/ntp/libntp/log.h b/contrib/ntp/libntp/log.h
deleted file mode 100644
index 99d0e72..0000000
--- a/contrib/ntp/libntp/log.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * log.h - Used only under Windows NT by msyslog.c
- *
- */
-#ifndef WINNT_LOG_H
-#define WINNT_LOG_H
-
-#include <windows.h>
-
-/* function declarations */
-
-void addSourceToRegistry(LPSTR pszAppname, LPSTR pszMsgDLL);
-void reportAnIEvent(DWORD dwIdEvent, WORD cStrings, LPTSTR *pszStrings);
-void reportAnWEvent(DWORD dwIdEvent, WORD cStrings, LPTSTR *pszStrings);
-void reportAnEEvent(DWORD dwIdEvent, WORD cStrings, LPTSTR *pszStrings);
-
-#define MAX_MSG_LENGTH	1024
-#define MSG_ID_MASK		0x0000FFFF
-#define MAX_INSERT_STRS	8
-
-#endif /* WINNT_LOG_H */
diff --git a/contrib/ntp/libntp/machines.c b/contrib/ntp/libntp/machines.c
index 9e318bf..c8e4e07 100644
--- a/contrib/ntp/libntp/machines.c
+++ b/contrib/ntp/libntp/machines.c
@@ -454,6 +454,7 @@ ntp_set_tod(
 		 */
 		adjtv.tv_sec = adjtv.tv_usec = 0;
 		adjtime(&adjtv, NULL);
+		errno = 0;
 		rc = SETTIMEOFDAY(tvp, tzp);
 #ifdef DEBUG
 		if (debug) {
@@ -468,6 +469,7 @@ ntp_set_tod(
 		long tp = tvp->tv_sec;
 
 		set_tod_using = "stime";
+		errno = 0;
 		rc = stime(&tp); /* lie as bad as SysVR4 */
 #ifdef DEBUG
 		if (debug) {
@@ -498,10 +500,10 @@ getpass(const char * prompt)
 {
 	int c, i;
 	static char password[32];
-#ifdef DEBUG
+
 	fprintf(stderr, "%s", prompt);
 	fflush(stderr);
-#endif
+
 	for (i=0; i<sizeof(password)-1 && ((c=_getch())!='\n' && c!='\r'); i++) {
 		password[i] = (char) c;
 	}
diff --git a/contrib/ntp/libntp/mfp_mul.c b/contrib/ntp/libntp/mfp_mul.c
deleted file mode 100644
index 0c667f7..0000000
--- a/contrib/ntp/libntp/mfp_mul.c
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * /src/NTP/ntp-4/libntp/mfp_mul.c,v 4.3 1999/02/21 12:17:37 kardel RELEASE_19990228_A
- *
- * $Created: Sat Aug 16 20:35:08 1997 $
- *
- * Copyright (C) 1997, 1998 by Frank Kardel
- */
-#include <stdio.h>
-#include "ntp_stdlib.h"
-#include "ntp_types.h"
-#include "ntp_fp.h"
-
-#define LOW_MASK  (u_int32)((1<<(FRACTION_PREC/2))-1)
-#define HIGH_MASK (u_int32)(LOW_MASK << (FRACTION_PREC/2))
-
-void
-mfp_mul(
-	int32   *o_i,
-	u_int32 *o_f,
-	int32    a_i,
-	u_int32  a_f,
-	int32    b_i,
-	u_int32  b_f
-	)
-{
-  int32 i, j;
-  u_int32  f;
-  u_long a[4];			/* operand a */
-  u_long b[4];			/* operand b */
-  u_long  c[4];			/* result c */
-  
-  int neg = 0;
-
-  if (a_i < 0)			/* examine sign situation */
-    {
-      neg = 1;
-      M_NEG(a_i, a_f);
-    }
-
-  if (b_i < 0)			/* examine sign situation */
-    {
-      neg = !neg;
-      M_NEG(b_i, b_f);
-    }
-  
-  a[0] = a_f & LOW_MASK;	/* prepare a operand */
-  a[1] = (a_f & HIGH_MASK) >> (FRACTION_PREC/2);
-  a[2] = a_i & LOW_MASK;
-  a[3] = (a_i & HIGH_MASK) >> (FRACTION_PREC/2);
-  
-  b[0] = b_f & LOW_MASK;	/* prepare b operand */
-  b[1] = (b_f & HIGH_MASK) >> (FRACTION_PREC/2);
-  b[2] = b_i & LOW_MASK;
-  b[3] = (b_i & HIGH_MASK) >> (FRACTION_PREC/2);
-
-  c[0] = c[1] = c[2] = c[3] = 0;
-
-  for (i = 0; i < 4; i++)	/* we do assume 32 * 32 = 64 bit multiplication */
-    for (j = 0; j < 4; j++)
-      {
-	u_long result_low, result_high;
-	
-	result_low = (u_long)a[i] * (u_long)b[j];	/* partial product */
-
-	if ((i+j) & 1)		/* splits across two result registers */
-	  {
-	    result_high   = result_low >> (FRACTION_PREC/2);
-	    result_low  <<= FRACTION_PREC/2;
-	  }
-	else
-	  {			/* stays in a result register - except for overflows */
-	    result_high = 0;
-	  }
-	
-	if (((c[(i+j)/2] >> 1) + (result_low >> 1)) & (u_int32)((unsigned)1<<(FRACTION_PREC - 1)))
-	  result_high++;	/* propagate overflows */
-
-	c[(i+j)/2]   += result_low; /* add up partial products */
-
-	if (((c[(i+j+1)/2] >> 1) + (result_high >> 1)) & (u_int32)((unsigned)1<<(FRACTION_PREC - 1)))
-	  c[1+(i+j)/2]++;	/* propagate overflows */
-
-	c[(i+j+1)/2] += result_high;
-      }
-
-#ifdef DEBUG
-  if (debug > 6)
-    printf("mfp_mul: 0x%04lx%04lx%04lx%04lx * 0x%04lx%04lx%04lx%04lx = 0x%08lx%08lx%08lx%08lx\n",
-	 a[3], a[2], a[1], a[0], b[3], b[2], b[1], b[0], c[3], c[2], c[1], c[0]);
-#endif
-
-  if (c[3])			/* overflow */
-    {
-      i = ((unsigned)1 << (FRACTION_PREC-1)) - 1;
-      f = ~(unsigned)0;
-    }
-  else
-    {				/* take produkt - discarding extra precision */
-      i = c[2];
-      f = c[1];
-    }
-  
-  if (neg)			/* recover sign */
-    {
-      M_NEG(i, f);
-    }
-
-  *o_i = i;
-  *o_f = f;
-
-#ifdef DEBUG
-  if (debug > 6)
-    printf("mfp_mul: %s * %s => %s\n",
-	   mfptoa((u_long)a_i, a_f, 6),
-	   mfptoa((u_long)b_i, b_f, 6),
-	   mfptoa((u_long)i, f, 6));
-#endif
-}
-
-/*
- * mfp_mul.c,v
- * Revision 4.3  1999/02/21 12:17:37  kardel
- * 4.91f reconcilation
- *
- * Revision 4.2  1998/12/20 23:45:28  kardel
- * fix types and warnings
- *
- * Revision 4.1  1998/05/24 07:59:57  kardel
- * conditional debug support
- *
- * Revision 4.0  1998/04/10 19:46:38  kardel
- * Start 4.0 release version numbering
- *
- * Revision 1.1  1998/04/10 19:27:47  kardel
- * initial NTP VERSION 4 integration of PARSE with GPS166 binary support
- *
- * Revision 1.1  1997/10/06 21:05:46  kardel
- * new parse structure
- *
- */
diff --git a/contrib/ntp/libntp/mktime.c b/contrib/ntp/libntp/mktime.c
index 7f8290f..91be600 100644
--- a/contrib/ntp/libntp/mktime.c
+++ b/contrib/ntp/libntp/mktime.c
@@ -34,7 +34,6 @@
  * SUCH DAMAGE.  */
 
 /*static char *sccsid = "from: @(#)ctime.c	5.26 (Berkeley) 2/23/91";*/
-/*static char *rcsid = "mktime.c,v 1.1.1.3 1998/11/15 19:23:34 kardel RELEASE_19990228_A";*/
 
 /*
  * This implementation of mktime is lifted straight from the NetBSD (BSD 4.4)
@@ -62,7 +61,7 @@
 
 #include "ntp_machine.h"
 
-#if !HAVE_MKTIME || !HAVE_TIMEGM
+#if !defined(HAVE_MKTIME) || !defined(HAVE_TIMEGM)
 
 #ifndef DSTMINUTES
 #define DSTMINUTES 60
@@ -84,8 +83,6 @@
 #define TM_YEAR_BASE    1900
 #define isleap(y) ((((y) % 4) == 0 && ((y) % 100) != 0) || ((y) % 400) == 0)
 
-extern time_t	time P((time_t *));
-
 static int	mon_lengths[2][MONSPERYEAR] = {
 	{ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 },
 	{ 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }
@@ -260,7 +257,7 @@ time2(
 int mktime_bs;
 #endif /* !HAVE_MKTIME || !HAVE_TIMEGM */
 
-#if !HAVE_MKTIME
+#ifndef HAVE_MKTIME
 static time_t
 time1(
 	struct tm * tmp
@@ -287,7 +284,7 @@ mktime(
 }
 #endif /* !HAVE_MKTIME */
 
-#if !HAVE_TIMEGM
+#ifndef HAVE_TIMEGM
 time_t
 timegm(
 	struct tm * tmp
diff --git a/contrib/ntp/libntp/msyslog.c b/contrib/ntp/libntp/msyslog.c
index f0e8872..fe4d979 100644
--- a/contrib/ntp/libntp/msyslog.c
+++ b/contrib/ntp/libntp/msyslog.c
@@ -25,7 +25,6 @@
 
 #ifdef SYS_WINNT
 # include <stdarg.h>
-# include "..\ports\winnt\libntp\log.h"
 # include "..\ports\winnt\libntp\messages.h"
 #endif
 
diff --git a/contrib/ntp/libntp/random.c b/contrib/ntp/libntp/ntp_random.c
index 7136857..700b4ee 100644
--- a/contrib/ntp/libntp/random.c
+++ b/contrib/ntp/libntp/ntp_random.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/lib/libc/stdlib/random.c,v 1.4.2.2 1999/09/05 11:16:45 peter Exp $
  *
  */
 
@@ -48,6 +48,8 @@ static char sccsid[] = "@(#)random.c	8.2 (Berkeley) 5/19/95";
 #include <stdio.h>
 
 #include <ntp_types.h>
+#include <ntp_random.h>
+#include <ntp_unixtime.h>
 
 /*
  * random.c:
@@ -218,7 +220,6 @@ static long rand_sep = SEP_3;
 static long *end_ptr = &randtbl[DEG_3 + 1];
 
 static inline long good_rand P((long));
-long random P((void));
 
 static inline long
 good_rand (
@@ -265,7 +266,7 @@ good_rand (
  * for default usage relies on values produced by this routine.
  */
 void
-srandom(
+ntp_srandom(
 	unsigned long x
 	)
 {
@@ -280,7 +281,7 @@ srandom(
 		fptr = &state[rand_sep];
 		rptr = &state[0];
 		for (i = 0; i < 10 * rand_deg; i++)
-			(void)random();
+			(void)ntp_random();
 	}
 }
 
@@ -295,16 +296,18 @@ srandom(
  * state buffer are no longer derived from the LC algorithm applied to
  * a fixed seed.
  */
+#ifdef NEED_SRANDOMDEV
 void
-srandomdev( void )
+ntp_srandomdev( void )
 {
 	struct timeval tv;
 	unsigned long junk;	/* Purposely used uninitialized */
 
-	gettimeofday(&tv, NULL);
-	srandom(getpid() ^ tv.tv_sec ^ tv.tv_usec ^ junk);
+	GETTIMEOFDAY(&tv, NULL);
+	ntp_srandom(getpid() ^ tv.tv_sec ^ tv.tv_usec ^ junk);
 	return;
 }
+#endif
 
 /*
  * initstate:
@@ -330,7 +333,7 @@ srandomdev( void )
  * complain about mis-alignment, but you should disregard these messages.
  */
 char *
-initstate(
+ntp_initstate(
 	unsigned long seed,		/* seed for R.N.G. */
 	char *arg_state,		/* pointer to state array */
 	long n				/* # bytes of state info */
@@ -371,7 +374,7 @@ initstate(
 	}
 	state = (long *) (long_arg_state + 1); /* first location */
 	end_ptr = &state[rand_deg];	/* must set end_ptr before srandom */
-	srandom(seed);
+	ntp_srandom(seed);
 	if (rand_type == TYPE_0)
 		long_arg_state[0] = rand_type;
 	else
@@ -399,7 +402,7 @@ initstate(
  * complain about mis-alignment, but you should disregard these messages.
  */
 char *
-setstate(
+ntp_setstate(
 	char *arg_state			/* pointer to state array */
 	)
 {
@@ -453,7 +456,7 @@ setstate(
  * Returns a 31-bit random number.
  */
 long
-random( void )
+ntp_random( void )
 {
 	register long i;
 	register long *f, *r;
diff --git a/contrib/ntp/libntp/ntp_rfc2553.c b/contrib/ntp/libntp/ntp_rfc2553.c
index 2788630..017ef83 100644
--- a/contrib/ntp/libntp/ntp_rfc2553.c
+++ b/contrib/ntp/libntp/ntp_rfc2553.c
@@ -65,34 +65,23 @@
  * Compatability shims with the rfc2553 API to simplify ntp.
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include <sys/types.h>
 #include <ctype.h>
 #include <sys/socket.h>
-#include "ntp_rfc2553.h"
+#include <isc/net.h>
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
-#include <netdb.h>
+#include "ntp_rfc2553.h"
 
 #include "ntpd.h"
 #include "ntp_malloc.h"
 #include "ntp_stdlib.h"
 #include "ntp_string.h"
 
-#ifndef HAVE_IPV6
-
-#if defined(SYS_WINNT)
-/* XXX This is the preferred way, but for some reason the SunOS compiler
- * does not like it.
- */
-const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
-#else
-const struct in6_addr in6addr_any;
-#endif
+#ifndef ISC_PLATFORM_HAVEIPV6
 
 static char *ai_errlist[] = {
 	"Success",
@@ -112,7 +101,32 @@ static char *ai_errlist[] = {
 	"Unknown error", 				/* EAI_MAX        */
 };
 
-static	int ipv4_aton P((const char *, struct sockaddr_storage *));
+/*
+ * Local declaration
+ */
+int
+DNSlookup_name(
+	const char *name,
+	int ai_family,
+	struct hostent **Addresses
+);
+
+#ifndef SYS_WINNT
+/*
+ * Encapsulate gethostbyname to control the error code
+ */
+int
+DNSlookup_name(
+	const char *name,
+	int ai_family,
+	struct hostent **Addresses
+)
+{
+	*Addresses = gethostbyname(name);
+	return (h_errno);
+}
+#endif
+
 static	int do_nodename P((const char *nodename, struct addrinfo *ai,
     const struct addrinfo *hints));
 
@@ -121,45 +135,133 @@ getaddrinfo (const char *nodename, const char *servname,
 	const struct addrinfo *hints, struct addrinfo **res)
 {
 	int rval;
-	struct addrinfo *ai;
-	struct sockaddr_in *sockin;
+	struct servent *sp;
+	struct addrinfo *ai = NULL;
+	int port;
+	const char *proto = NULL;
+	int family, socktype, flags, protocol;
+
 
+	/*
+	 * If no name is provide just return an error
+	 */
+	if (nodename == NULL && servname == NULL)
+		return (EAI_NONAME);
+	
 	ai = calloc(sizeof(struct addrinfo), 1);
 	if (ai == NULL)
 		return (EAI_MEMORY);
 
-	if (nodename != NULL) {
-		rval = do_nodename(nodename, ai, hints);
-		if (rval != 0) {
-			freeaddrinfo(ai);
-			return (rval);
+	/*
+	 * Copy default values from hints, if available
+	 */
+	if (hints != NULL) {
+		ai->ai_flags = hints->ai_flags;
+		ai->ai_family = hints->ai_family;
+		ai->ai_socktype = hints->ai_socktype;
+		ai->ai_protocol = hints->ai_protocol;
+
+		family = hints->ai_family;
+		socktype = hints->ai_socktype;
+		protocol = hints->ai_protocol;
+		flags = hints->ai_flags;
+
+		switch (family) {
+		case AF_UNSPEC:
+			switch (hints->ai_socktype) {
+			case SOCK_STREAM:
+				proto = "tcp";
+				break;
+			case SOCK_DGRAM:
+				proto = "udp";
+				break;
+			}
+			break;
+		case AF_INET:
+		case AF_INET6:
+			switch (hints->ai_socktype) {
+			case 0:
+				break;
+			case SOCK_STREAM:
+				proto = "tcp";
+				break;
+			case SOCK_DGRAM:
+				proto = "udp";
+				break;
+			case SOCK_RAW:
+				break;
+			default:
+				return (EAI_SOCKTYPE);
+			}
+			break;
+#ifdef	AF_LOCAL
+		case AF_LOCAL:
+			switch (hints->ai_socktype) {
+			case 0:
+				break;
+			case SOCK_STREAM:
+				break;
+			case SOCK_DGRAM:
+				break;
+			default:
+				return (EAI_SOCKTYPE);
+			}
+			break;
+#endif
+		default:
+			return (EAI_FAMILY);
 		}
+	} else {
+		protocol = 0;
+		family = 0;
+		socktype = 0;
+		flags = 0;
 	}
-	if (nodename == NULL && hints != NULL) {
-		ai->ai_addr = calloc(sizeof(struct sockaddr_storage), 1);
-		if (ai->ai_addr == NULL) {
-			freeaddrinfo(ai);
-			return (EAI_MEMORY);
-		}
-		ai->ai_family = AF_INET;
-		ai->ai_addrlen = sizeof(struct sockaddr_storage);
-		sockin = (struct sockaddr_in *)ai->ai_addr;
-		sockin->sin_family = AF_INET;
-		sockin->sin_addr.s_addr = htonl(INADDR_ANY);
-#ifdef HAVE_SA_LEN_IN_STRUCT_SOCKADDR
-		ai->ai_addr->sa_len = SOCKLEN(ai->ai_addr);
-#endif
+
+	rval = do_nodename(nodename, ai, hints);
+	if (rval != 0) {
+		freeaddrinfo(ai);
+		return (rval);
 	}
+
+	/*
+	 * First, look up the service name (port) if it was
+	 * requested.  If the socket type wasn't specified, then
+	 * try and figure it out.
+	 */
 	if (servname != NULL) {
-		ai->ai_family = AF_INET;
-		ai->ai_socktype = SOCK_DGRAM;
-		if (strcmp(servname, "ntp") != 0) {
-			freeaddrinfo(ai);
-			return (EAI_SERVICE);
+		char *e;
+
+		port = strtol(servname, &e, 10);
+		if (*e == '\0') {
+			if (socktype == 0)
+				return (EAI_SOCKTYPE);
+			if (port < 0 || port > 65535)
+				return (EAI_SERVICE);
+			port = htons((unsigned short) port);
+		} else {
+			sp = getservbyname(servname, proto);
+			if (sp == NULL)
+				return (EAI_SERVICE);
+			port = sp->s_port;
+			if (socktype == 0) {
+				if (strcmp(sp->s_proto, "tcp") == 0)
+					socktype = SOCK_STREAM;
+				else if (strcmp(sp->s_proto, "udp") == 0)
+					socktype = SOCK_DGRAM;
+			}
 		}
-		sockin = (struct sockaddr_in *)ai->ai_addr;
-		sockin->sin_port = htons(NTP_PORT);
-	}
+	} else
+		port = 0;
+
+	/*
+	 *
+	 * Set up the port number
+	 */
+	if (ai->ai_family == AF_INET)
+		((struct sockaddr_in *)ai->ai_addr)->sin_port = (unsigned short) port;
+	else if (ai->ai_family == AF_INET6)
+		((struct sockaddr_in6 *)ai->ai_addr)->sin6_port = (unsigned short) port;
 	*res = ai;
 	return (0);
 }
@@ -168,10 +270,17 @@ void
 freeaddrinfo(struct addrinfo *ai)
 {
 	if (ai->ai_canonname != NULL)
+	{
 		free(ai->ai_canonname);
+		ai->ai_canonname = NULL;
+	}
 	if (ai->ai_addr != NULL)
+	{
 		free(ai->ai_addr);
+		ai->ai_addr = NULL;
+	}
 	free(ai);
+	ai = NULL;
 }
 
 int
@@ -179,6 +288,7 @@ getnameinfo (const struct sockaddr *sa, u_int salen, char *host,
 	size_t hostlen, char *serv, size_t servlen, int flags)
 {
 	struct hostent *hp;
+	int namelen;
 
 	if (sa->sa_family != AF_INET)
 		return (EAI_FAMILY);
@@ -191,9 +301,15 @@ getnameinfo (const struct sockaddr *sa, u_int salen, char *host,
 		else
 			return (EAI_FAIL);
 	}
-	if (host != NULL) {
-		strncpy(host, hp->h_name, hostlen);
-		host[hostlen] = '\0';
+	if (host != NULL && hostlen > 0) {
+		/*
+		 * Don't exceed buffer
+		 */
+		namelen = min(strlen(hp->h_name), hostlen - 1);
+		if (namelen > 0) {
+			strncpy(host, hp->h_name, namelen);
+			host[namelen] = '\0';
+		}
 	}
 	return (0);
 }
@@ -212,34 +328,99 @@ do_nodename(
 	struct addrinfo *ai,
 	const struct addrinfo *hints)
 {
-	struct hostent *hp;
+	struct hostent *hp = NULL;
 	struct sockaddr_in *sockin;
+	struct sockaddr_in6 *sockin6;
+	int errval;
 
 	ai->ai_addr = calloc(sizeof(struct sockaddr_storage), 1);
 	if (ai->ai_addr == NULL)
 		return (EAI_MEMORY);
 
-	if (hints != NULL && hints->ai_flags & AI_NUMERICHOST) {
-		if (ipv4_aton(nodename,
-		    (struct sockaddr_storage *)ai->ai_addr) == 1) {
-			ai->ai_family = AF_INET;
-			ai->ai_addrlen = sizeof(struct sockaddr_in);
+	/*
+	 * For an empty node name just use the wildcard.
+	 * NOTE: We need to assume that the address family is
+	 * set elsewhere so that we can set the appropriate wildcard
+	 */
+	if (nodename == NULL) {
+		ai->ai_addrlen = sizeof(struct sockaddr_storage);
+		if (ai->ai_family == AF_INET)
+		{
+			sockin = (struct sockaddr_in *)ai->ai_addr;
+			sockin->sin_family = (short) ai->ai_family;
+			sockin->sin_addr.s_addr = htonl(INADDR_ANY);
+		}
+		else
+		{
+			sockin6 = (struct sockaddr_in6 *)ai->ai_addr;
+			sockin6->sin6_family = (short) ai->ai_family;
+			/*
+			 * we have already zeroed out the address
+			 * so we don't actually need to do this
+			 * This assignment is causing problems so
+			 * we don't do what this would do.
+			 sockin6->sin6_addr = in6addr_any;
+			 */
+		}
+#ifdef HAVE_SA_LEN_IN_STRUCT_SOCKADDR
+		ai->ai_addr->sa_len = SOCKLEN(ai->ai_addr);
+#endif
+
+		return (0);
+	}
+
+	/*
+	 * See if we have an IPv6 address
+	 */
+	if(strchr(nodename, ':') != NULL) {
+		if (inet_pton(AF_INET6, nodename,
+		    &((struct sockaddr_in6 *)ai->ai_addr)->sin6_addr) == 1) {
+			((struct sockaddr_in6 *)ai->ai_addr)->sin6_family = AF_INET6;
+			ai->ai_family = AF_INET6;
+			ai->ai_addrlen = sizeof(struct sockaddr_in6);
 			return (0);
 		}
-		return (EAI_NONAME);
 	}
-	hp = gethostbyname(nodename);
+
+	/*
+	 * See if we have an IPv4 address
+	 */
+	if (inet_pton(AF_INET, nodename,
+	    &((struct sockaddr_in *)ai->ai_addr)->sin_addr) == 1) {
+		((struct sockaddr *)ai->ai_addr)->sa_family = AF_INET;
+		ai->ai_family = AF_INET;
+		ai->ai_addrlen = sizeof(struct sockaddr_in);
+		return (0);
+	}
+
+	/*
+	 * If the numeric host flag is set, don't attempt resolution
+	 */
+	if (hints != NULL && (hints->ai_flags & AI_NUMERICHOST))
+		return (EAI_NONAME);
+
+	/*
+	 * Look for a name
+	 */
+
+	errval = DNSlookup_name(nodename, AF_INET, &hp);
+
 	if (hp == NULL) {
-		if (h_errno == TRY_AGAIN)
+		if (errval == TRY_AGAIN || errval == EAI_AGAIN)
 			return (EAI_AGAIN);
-		else {
-			if (ipv4_aton(nodename,
-			    (struct sockaddr_storage *)ai->ai_addr) == 1) {
+		else if (errval == EAI_NONAME) {
+			if (inet_pton(AF_INET, nodename,
+			    &((struct sockaddr_in *)ai->ai_addr)->sin_addr) == 1) {
+				((struct sockaddr *)ai->ai_addr)->sa_family = AF_INET;
 				ai->ai_family = AF_INET;
 				ai->ai_addrlen = sizeof(struct sockaddr_in);
 				return (0);
 			}
-			return (EAI_FAIL);
+			return (errval);
+		}
+		else
+		{
+			return (errval);
 		}
 	}
 	ai->ai_family = hp->h_addrtype;
@@ -259,73 +440,4 @@ do_nodename(
 	return (0);
 }
 
-/*
- * ipv4_aton - return a net number (this is crude, but careful)
- */
-static int
-ipv4_aton(
-	const char *num,
-	struct sockaddr_storage *saddr
-	)
-{
-	const char *cp;
-	char *bp;
-	int i;
-	int temp;
-	char buf[80];		/* will core dump on really stupid stuff */
-	u_int32 netnum;
-	struct sockaddr_in *addr;
-
-	cp = num;
-	netnum = 0;
-	for (i = 0; i < 4; i++) {
-		bp = buf;
-		while (isdigit((int)*cp))
-			*bp++ = *cp++;
-		if (bp == buf)
-			break;
-
-		if (i < 3) {
-			if (*cp++ != '.')
-				break;
-		} else if (*cp != '\0')
-			break;
-
-		*bp = '\0';
-		temp = atoi(buf);
-		if (temp > 255)
-			break;
-		netnum <<= 8;
-		netnum += temp;
-#ifdef DEBUG
-		if (debug > 3)
-			printf("ipv4_aton %s step %d buf %s temp %d netnum %lu\n",
-			   num, i, buf, temp, (u_long)netnum);
-#endif
-	}
-
-	if (i < 4) {
-#ifdef DEBUG
-		if (debug > 3)
-			printf(
-				"ipv4_aton: \"%s\" invalid host number, line ignored\n",
-				num);
-#endif
-		return (0);
-	}
-
-	/*
-	 * make up socket address.	Clear it out for neatness.
-	 */
-	memset((void *)saddr, 0, sizeof(struct sockaddr_storage));
-	addr = (struct sockaddr_in *)saddr;
-	addr->sin_family = AF_INET;
-	addr->sin_port = htons(NTP_PORT);
-	addr->sin_addr.s_addr = htonl(netnum);
-#ifdef DEBUG
-	if (debug > 1)
-		printf("ipv4_aton given %s, got %s.\n", num, ntoa(saddr));
-#endif
-	return (1);
-}
-#endif /* !HAVE_IPV6 */
+#endif /* !ISC_PLATFORM_HAVEIPV6 */
diff --git a/contrib/ntp/libntp/numtohost.c b/contrib/ntp/libntp/numtohost.c
index 4e53092..dd51c5d 100644
--- a/contrib/ntp/libntp/numtohost.c
+++ b/contrib/ntp/libntp/numtohost.c
@@ -1,7 +1,6 @@
 /*
  * numtohost - convert network number to host name.
  */
-#include <netdb.h>
 
 #include "ntp_fp.h"
 #include "ntp_stdlib.h"
diff --git a/contrib/ntp/libntp/prettydate.c b/contrib/ntp/libntp/prettydate.c
index 9710c84..55adf64 100644
--- a/contrib/ntp/libntp/prettydate.c
+++ b/contrib/ntp/libntp/prettydate.c
@@ -17,6 +17,60 @@ static const char *days[] = {
   "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
 };
 
+/* Helper function to handle possible wraparound of the ntp epoch.
+
+   Works by assuming that the localtime/gmtime library functions 
+   have been updated so that they work
+*/
+
+#define MAX_EPOCH_NR 1000
+
+struct tm *
+ntp2unix_tm(
+	u_long ntp, int local
+	)
+{
+	time_t t, curr;
+	struct tm *tm;
+	int curr_year, epoch_nr;
+
+	/* First get the current year: */
+	curr = time(NULL);
+	tm = local ? localtime(&curr) : gmtime(&curr);
+	if (!tm) return NULL;
+
+	curr_year = 1900 + tm->tm_year;
+
+	/* Convert the ntp timestamp to a unix utc seconds count: */
+	t = (time_t) ntp - JAN_1970;
+
+	/* Check that the ntp timestamp is not before a 136 year window centered
+	   around the current year:
+
+	   Failsafe in case of an infinite loop:
+       Allow up to 1000 epochs of 136 years each!
+	*/
+    for (epoch_nr = 0; epoch_nr < MAX_EPOCH_NR; epoch_nr++) {
+		tm = local ? localtime(&t) : gmtime(&t);
+
+#if SIZEOF_TIME_T < 4
+# include "Bletch: sizeof(time_t) < 4!"
+#endif
+
+#if SIZEOF_TIME_T == 4
+		/* If 32 bits, then year is 1970-2038, so no sense looking */
+		epoch_nr = MAX_EPOCH_NR;
+#else	/* SIZEOF_TIME_T > 4 */
+		/* Check that the resulting year is in the correct epoch: */
+		if (1900 + tm->tm_year > curr_year - 68) break;
+
+		/* Epoch wraparound: Add 2^32 seconds! */
+		t += (time_t) 65536 << 16;
+#endif /* SIZEOF_TIME_T > 4 */
+	}
+	return tm;
+}
+
 char *
 prettydate(
 	l_fp *ts
@@ -29,15 +83,20 @@ prettydate(
 
 	LIB_GETBUF(bp);
 	
-	sec = ts->l_ui - JAN_1970;
+	sec = ts->l_ui;
 	msec = ts->l_uf / 4294967;	/* fract / (2 ** 32 / 1000) */
 
-	tm = localtime(&sec);
-
-	(void) sprintf(bp, "%08lx.%08lx  %s, %s %2d %4d %2d:%02d:%02d.%03lu",
+	tm = ntp2unix_tm(sec, 1);
+	if (!tm) {
+		(void) sprintf(bp, "%08lx.%08lx  --- --- -- ---- --:--:--",
+		       (u_long)ts->l_ui, (u_long)ts->l_uf);
+	}
+	else {
+		(void) sprintf(bp, "%08lx.%08lx  %s, %s %2d %4d %2d:%02d:%02d.%03lu",
 		       (u_long)ts->l_ui, (u_long)ts->l_uf, days[tm->tm_wday],
 		       months[tm->tm_mon], tm->tm_mday, 1900 + tm->tm_year,
 		       tm->tm_hour,tm->tm_min, tm->tm_sec, msec);
+	}
 	
 	return bp;
 }
@@ -54,15 +113,20 @@ gmprettydate(
 
 	LIB_GETBUF(bp);
 	
-	sec = ts->l_ui - JAN_1970;
+	sec = ts->l_ui;
 	msec = ts->l_uf / 4294967;	/* fract / (2 ** 32 / 1000) */
 
-	tm = gmtime(&sec);
-
-	(void) sprintf(bp, "%08lx.%08lx  %s, %s %2d %4d %2d:%02d:%02d.%03lu UTC",
+	tm = ntp2unix_tm(sec, 0);
+	if (!tm) {
+		(void) sprintf(bp, "%08lx.%08lx  --- --- -- ---- --:--:--",
+		       (u_long)ts->l_ui, (u_long)ts->l_uf);
+	}
+	else {
+		(void) sprintf(bp, "%08lx.%08lx  %s, %s %2d %4d %2d:%02d:%02d.%03lu",
 		       (u_long)ts->l_ui, (u_long)ts->l_uf, days[tm->tm_wday],
 		       months[tm->tm_mon], tm->tm_mday, 1900 + tm->tm_year,
 		       tm->tm_hour,tm->tm_min, tm->tm_sec, msec);
-	
+	}
+
 	return bp;
 }
diff --git a/contrib/ntp/libntp/ranny.c b/contrib/ntp/libntp/ranny.c
deleted file mode 100644
index fa555f5..0000000
--- a/contrib/ntp/libntp/ranny.c
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Random number generator is:
- *
- *	Copyright 1988 by Rayan S. Zachariassen, all rights reserved.
- *	This will be free software, but only when it is finished.
- *
- * Used in ntp by permission of the author.  If copyright is
- * annoying to you, read no further.  Instead, look up the reference,
- * write me an equivalent to this and send it back to me.
- */
-
-/*
- * Random number generator; see Knuth Vol 2. 2nd ed. p.27 (section 3.2.2)
- */
-#include "ntp_stdlib.h"
-
-extern	time_t	time		P((time_t *loc));
-
-/*
- * 55 random numbers, not all even.  Note we don't initialize ran_y
- * directly since I have had thoughts of putting this in an EPROM
- */
-static time_t ran_y[55];
-
-static time_t init_ran_y[55] = {
-	1860909544, 231033423, 437666411, 1349655137, 2014584962,
-	504613712, 656256107, 1246027206, 573713775, 643466871,
-	540235388, 1630565153, 443649364, 729302839, 1933991552,
-	944681982, 949111118, 406212522, 1065063137, 1712954727,
-	73280612, 787623973, 1874130997, 801658492, 73395958,
-	739165367, 596047144, 490055249, 1131094323, 662727104,
-	483614097, 844520219, 893760527, 921280508, 46691708,
-	760861842, 1425894220, 702947816, 2006889048, 1999607995,
-	1346414687, 399640789, 1482689501, 1790064052, 1128943628,
-	1269197405, 587262386, 2078054746, 1675409928, 1652325524,
-	1643525825, 1748690540, 292465849, 1370173174, 402865384
-};
-
-static int ran_j;
-static int ran_k;
-
-
-/*
- * ranp2 - return a random integer in the range 0 .. (1 << m) - 1
- */
-u_long
-ranp2(
-	int m
-	)
-{
-	time_t r;
-
-	ran_y[ran_k] += ran_y[ran_j];	/* overflow does a mod */
-	r = ran_y[ran_k];
-	if (ran_k-- == 0)
-	    ran_k = 54;
-	if (ran_j-- == 0)
-	    ran_j = 54;
-	return (u_long)(r & ((1 << m ) - 1));
-}
-
-/*
- * init_random - do initialization of random number routine
- */
-void
-init_random(void)
-{
-	register int i;
-	register time_t now;
-
-	ran_j = 23;
-	ran_k = 54;
-
-	/*
-	 * Randomize the seed array some more.  The time of day
-	 * should be initialized by now.
-	 */
-	now = time((time_t *)0) | 01;
-
-	for (i = 0; i < 55; ++i)
-	    ran_y[i] = now * init_ran_y[i];	/* overflow does a mod */
-}
diff --git a/contrib/ntp/libntp/recvbuff.c b/contrib/ntp/libntp/recvbuff.c
index 35c7e23..6665686 100644
--- a/contrib/ntp/libntp/recvbuff.c
+++ b/contrib/ntp/libntp/recvbuff.c
@@ -11,25 +11,33 @@
 #include "recvbuff.h"
 #include "iosignal.h"
 
+#include <isc/list.h>
 /*
  * Memory allocation
  */
-static u_long volatile full_recvbufs;		/* number of recvbufs on fulllist */
-static u_long volatile free_recvbufs;		/* number of recvbufs on freelist */
-static u_long volatile total_recvbufs;		/* total recvbufs currently in use */
+static u_long volatile full_recvbufs;	/* number of recvbufs on fulllist */
+static u_long volatile free_recvbufs;	/* number of recvbufs on freelist */
+static u_long volatile total_recvbufs;	/* total recvbufs currently in use */
 static u_long volatile lowater_adds;	/* number of times we have added memory */
+static u_long volatile buffer_shortfall;/* number of missed free receive buffers
+                                           between replenishments */
 
-static	struct recvbuf *volatile freelist;  /* free buffers */
-static	struct recvbuf *volatile fulllist;  /* lifo buffers with data */
-static	struct recvbuf *volatile beginlist; /* fifo buffers with data */
+static ISC_LIST(recvbuf_t)	full_recv_list;	/* Currently used recv buffers */
+static ISC_LIST(recvbuf_t)	free_recv_list;	/* Currently unused buffers */
 	
-#if defined(HAVE_IO_COMPLETION_PORT)
-static CRITICAL_SECTION RecvCritSection;
-# define RECV_BLOCK_IO()	EnterCriticalSection(&RecvCritSection)
-# define RECV_UNBLOCK_IO()	LeaveCriticalSection(&RecvCritSection)
+#if defined(SYS_WINNT)
+
+/*
+ * For Windows we need to set up a lock to manipulate the
+ * recv buffers to prevent corruption. We keep it lock for as
+ * short a time as possible
+ */
+static CRITICAL_SECTION RecvLock;
+# define LOCK()		EnterCriticalSection(&RecvLock)
+# define UNLOCK()	LeaveCriticalSection(&RecvLock)
 #else
-# define RECV_BLOCK_IO()	
-# define RECV_UNBLOCK_IO()	
+# define LOCK()	
+# define UNLOCK()	
 #endif
 
 u_long
@@ -41,13 +49,13 @@ free_recvbuffs (void)
 u_long
 full_recvbuffs (void)
 {
-	return free_recvbufs;
+	return full_recvbufs;
 }
 
 u_long
 total_recvbuffs (void)
 {
-	return free_recvbufs;
+	return total_recvbufs;
 }
 
 u_long
@@ -57,203 +65,182 @@ lowater_additions(void)
 }
 
 static void 
-initialise_buffer(struct recvbuf *buff)
+initialise_buffer(recvbuf_t *buff)
 {
-	memset((char *) buff, 0, sizeof(struct recvbuf));
+	memset((char *) buff, 0, sizeof(recvbuf_t));
 
-#if defined HAVE_IO_COMPLETION_PORT
-	buff->iocompletioninfo.overlapped.hEvent = CreateEvent(NULL, FALSE,FALSE, NULL);
+#if defined SYS_WINNT
 	buff->wsabuff.len = RX_BUFF_SIZE;
 	buff->wsabuff.buf = (char *) buff->recv_buffer;
 #endif
 }
 
 static void
-create_buffers(void)
+create_buffers(int nbufs)
 {
-	register struct recvbuf *buf;
-	int i;
-	buf = (struct recvbuf *)
-	    emalloc(RECV_INC*sizeof(struct recvbuf));
-	for (i = 0; i < RECV_INC; i++)
+	register recvbuf_t *bufp;
+	int i, abuf;
+
+	abuf = nbufs + buffer_shortfall;
+	buffer_shortfall = 0;
+
+	bufp = (recvbuf_t *) emalloc(abuf*sizeof(recvbuf_t));
+
+	for (i = 0; i < abuf; i++)
 	{
-		initialise_buffer(buf);
-		buf->next = (struct recvbuf *) freelist;
-		freelist = buf;
-		buf++;
+		memset((char *) bufp, 0, sizeof(recvbuf_t));
+		ISC_LIST_APPEND(free_recv_list, bufp, link);
+		bufp++;
+		free_recvbufs++;
+		total_recvbufs++;
 	}
-
-	free_recvbufs += RECV_INC;
-	total_recvbufs += RECV_INC;
 	lowater_adds++;
 }
 
 void
 init_recvbuff(int nbufs)
 {
-	register struct recvbuf *buf;
-	int i;
 
 	/*
 	 * Init buffer free list and stat counters
 	 */
-	freelist = 0;
-
-	buf = (struct recvbuf *)
-	    emalloc(nbufs*sizeof(struct recvbuf));
-	for (i = 0; i < nbufs; i++)
-	{
-		initialise_buffer(buf);
-		buf->next = (struct recvbuf *) freelist;
-		freelist = buf;
-		buf++;
-	}
-
-	fulllist = 0;
-	free_recvbufs = total_recvbufs = nbufs;
+	ISC_LIST_INIT(full_recv_list);
+	ISC_LIST_INIT(free_recv_list);
+	free_recvbufs = total_recvbufs = 0;
 	full_recvbufs = lowater_adds = 0;
 
-#if defined(HAVE_IO_COMPLETION_PORT)
-	InitializeCriticalSection(&RecvCritSection);
+	create_buffers(nbufs);
+
+#if defined(SYS_WINNT)
+	InitializeCriticalSection(&RecvLock);
 #endif
 
 }
 
-
 /*
- * getrecvbufs - get receive buffers which have data in them
- *
- * 
+ * freerecvbuf - make a single recvbuf available for reuse
  */
-
-struct recvbuf *
-getrecvbufs(void)
+void
+freerecvbuf(recvbuf_t *rb)
 {
-	struct recvbuf *rb = NULL; /* nothing has arrived */;
-
-	RECV_BLOCK_IO();
-	if (full_recvbufs == 0)
-	{
-#ifdef DEBUG
-		if (debug > 4)
-		    printf("getrecvbufs called, no action here\n");
-#endif
+	if (rb == NULL) {
+		msyslog(LOG_ERR, "freerecvbuff received NULL buffer");
+		return;
 	}
-	else {
 
-		/*
-		 * Get the fulllist chain and mark it empty
-		 */
-#ifdef DEBUG
-		if (debug > 4)
-		    printf("getrecvbufs returning %ld buffers\n", full_recvbufs);
+	LOCK();
+	(rb->used)--;
+	if (rb->used != 0)
+		msyslog(LOG_ERR, "******** freerecvbuff non-zero usage: %d *******", rb->used);
+	ISC_LIST_APPEND(free_recv_list, rb, link);
+#if defined SYS_WINNT
+	rb->wsabuff.len = RX_BUFF_SIZE;
+	rb->wsabuff.buf = (char *) rb->recv_buffer;
 #endif
-		rb = beginlist;
-		fulllist = 0;
-		full_recvbufs = 0;
-
-		/*
-		 * Check to see if we're below the low water mark.
-		 */
-		if (free_recvbufs <= RECV_LOWAT)
-		{
-			if (total_recvbufs >= RECV_TOOMANY)
-			    msyslog(LOG_ERR, "too many recvbufs allocated (%ld)",
-				    total_recvbufs);
-			else
-			{
-				create_buffers();
-			}
-		}
-	}
-	RECV_UNBLOCK_IO();
-
-	/*
-	 * Return the chain
-	 */
-	return rb;
+	free_recvbufs++;
+	UNLOCK();
 }
 
-/*
- * freerecvbuf - make a single recvbuf available for reuse
- */
+	
 void
-freerecvbuf(
-	struct recvbuf *rb
-	)
+add_full_recv_buffer(recvbuf_t *rb)
 {
-	RECV_BLOCK_IO();
-	BLOCKIO();
-	rb->next = (struct recvbuf *) freelist;
-	freelist = rb;
-	free_recvbufs++;
-	UNBLOCKIO();
-	RECV_UNBLOCK_IO();
+	if (rb == NULL) {
+		msyslog(LOG_ERR, "add_full_recv_buffer received NULL buffer");
+		return;
+	}
+	LOCK();
+	ISC_LIST_APPEND(full_recv_list, rb, link);
+	full_recvbufs++;
+	UNLOCK();
 }
 
-	
-void
-add_full_recv_buffer(
-	struct recvbuf *rb
-	)
+recvbuf_t *
+get_free_recv_buffer(void)
 {
-	RECV_BLOCK_IO();
-	if (full_recvbufs == 0)
+	recvbuf_t * buffer = NULL;
+	LOCK();
+	buffer = ISC_LIST_HEAD(free_recv_list);
+	if (buffer != NULL)
 	{
-		beginlist = rb;
-		rb->next = 0;
+		ISC_LIST_DEQUEUE(free_recv_list, buffer, link);
+		free_recvbufs--;
+		initialise_buffer(buffer);
+		(buffer->used)++;
 	}
 	else
 	{
-		rb->next = fulllist->next;
-		fulllist->next = rb;
+		buffer_shortfall++;
 	}
-	fulllist = rb;
-	full_recvbufs++;
-
-	RECV_UNBLOCK_IO();
+	UNLOCK();
+	return (buffer);
 }
 
-struct recvbuf *
-get_free_recv_buffer(void)
+#ifdef HAVE_IO_COMPLETION_PORT
+recvbuf_t *
+get_free_recv_buffer_alloc(void)
 {
-	struct recvbuf * buffer = NULL;
-	RECV_BLOCK_IO();
-	if (free_recvbufs <= RECV_LOWAT)
-		{
-			if (total_recvbufs >= RECV_TOOMANY) {
-			    msyslog(LOG_ERR, "too many recvbufs allocated (%ld)",
-				    total_recvbufs);
-			}
-			else
-			{
-				create_buffers();
-			}
-		}
-
-	if (free_recvbufs > 0)
+	recvbuf_t * buffer = get_free_recv_buffer();
+	if (buffer == NULL)
 	{
-		buffer = freelist;
-		freelist = buffer->next;
-		buffer->next = NULL;
-		--free_recvbufs;
+		create_buffers(RECV_INC);
+		buffer = get_free_recv_buffer();
 	}
-
-	RECV_UNBLOCK_IO();
-	return buffer;
+	return (buffer);
 }
+#endif
 
-struct recvbuf *
+recvbuf_t *
 get_full_recv_buffer(void)
 {
-	struct recvbuf * buffer = NULL;
-	RECV_BLOCK_IO();
-	if (full_recvbufs > 0) {
+	recvbuf_t *rbuf;
+	LOCK();
+	
+#ifdef HAVE_SIGNALED_IO
+	/*
+	 * make sure there are free buffers when we
+	 * wander off to do lengthy paket processing with
+	 * any buffer we grab from the full list.
+	 * 
+	 * fixes malloc() interrupted by SIGIO risk
+	 * (Bug 889)
+	 */
+	rbuf = ISC_LIST_HEAD(free_recv_list);
+	if (rbuf == NULL || buffer_shortfall > 0) {
+		/*
+		 * try to get us some more buffers
+		 */
+		create_buffers(RECV_INC);
+	}
+#endif
+
+	/*
+	 * try to grab a full buffer
+	 */
+	rbuf = ISC_LIST_HEAD(full_recv_list);
+	if (rbuf != NULL)
+	{
+		ISC_LIST_DEQUEUE(full_recv_list, rbuf, link);
 		--full_recvbufs;
-		buffer = beginlist;
-		beginlist = buffer->next;
-		buffer->next = NULL;
 	}
-	RECV_UNBLOCK_IO();
-	return buffer;
+	else
+	{
+		/*
+		 * Make sure we reset the full count to 0
+		 */
+		full_recvbufs = 0;
+	}
+	UNLOCK();
+	return (rbuf);
+}
+
+/*
+ * Checks to see if there are buffers to process
+ */
+isc_boolean_t has_full_recv_buffer(void)
+{
+	if (ISC_LIST_HEAD(full_recv_list) != NULL)
+		return (ISC_TRUE);
+	else
+		return (ISC_FALSE);
 }
diff --git a/contrib/ntp/libntp/socktoa.c b/contrib/ntp/libntp/socktoa.c
index 34de784..fb41b22 100644
--- a/contrib/ntp/libntp/socktoa.c
+++ b/contrib/ntp/libntp/socktoa.c
@@ -6,7 +6,6 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <netdb.h>
 #include <netinet/in.h>
 
 #include <arpa/inet.h>
@@ -31,10 +30,14 @@ socktoa(
 
 	LIB_GETBUF(buffer);
 
-	if (sock == NULL) printf("null");
+	if (sock == NULL)
+		strcpy(buffer, "null");
+	else
+	{
 
-	switch(sock->ss_family) {
+		switch(sock->ss_family) {
 
+		default:
 		case AF_INET :
 			inet_ntop(AF_INET, &GET_INADDR(*sock), buffer,
 			    LIB_BUFLENGTH);
@@ -43,6 +46,11 @@ socktoa(
 		case AF_INET6 :
 			inet_ntop(AF_INET6, &GET_INADDR6(*sock), buffer,
 			    LIB_BUFLENGTH);
+#if 0
+		default:
+			strcpy(buffer, "unknown");
+#endif
+		}
 	}
   	return buffer;
 }
diff --git a/contrib/ntp/libntp/socktohost.c b/contrib/ntp/libntp/socktohost.c
index 7a3b30f..7aafdc7 100644
--- a/contrib/ntp/libntp/socktohost.c
+++ b/contrib/ntp/libntp/socktohost.c
@@ -3,7 +3,6 @@
  */
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <netdb.h>
 #include <netinet/in.h>
 
 #include <arpa/inet.h>
diff --git a/contrib/ntp/libntp/statestr.c b/contrib/ntp/libntp/statestr.c
index 3acc5c9..85552b3 100644
--- a/contrib/ntp/libntp/statestr.c
+++ b/contrib/ntp/libntp/statestr.c
@@ -128,17 +128,19 @@ struct codestring crypto_codes[] = {
 	{ XEVNT_LEN & ~CRPT_EVENT,	"bad_field_format_or_length" },
 	{ XEVNT_TSP & ~CRPT_EVENT,	"bad_timestamp" },
 	{ XEVNT_FSP & ~CRPT_EVENT,	"bad_filestamp" },
-	{ XEVNT_PUB & ~CRPT_EVENT,	"bad_procedure_or_data" },
+	{ XEVNT_PUB & ~CRPT_EVENT,	"bad_or_missing_public_key" },
 	{ XEVNT_MD & ~CRPT_EVENT,	"unsupported_digest_type" },
 	{ XEVNT_KEY & ~CRPT_EVENT,	"unsupported_identity_type" },
 	{ XEVNT_SGL & ~CRPT_EVENT,	"bad_signature_length" },
 	{ XEVNT_SIG & ~CRPT_EVENT,	"signature_not_verified" },
-	{ XEVNT_VFY & ~CRPT_EVENT,	"certificate not verified" },
-	{ XEVNT_PER & ~CRPT_EVENT,	"certificate_expired" },
+	{ XEVNT_VFY & ~CRPT_EVENT,	"certificate_not_verified" },
+	{ XEVNT_PER & ~CRPT_EVENT,	"host certificate_expired" },
 	{ XEVNT_CKY & ~CRPT_EVENT,	"bad_or_missing_cookie" },
 	{ XEVNT_DAT & ~CRPT_EVENT,	"bad_or_missing_leapsecond_table" },
 	{ XEVNT_CRT & ~CRPT_EVENT,	"bad_or_missing_certificate" },	
-	{ XEVNT_ID & ~CRPT_EVENT,	"bad or missing identification" },
+	{ XEVNT_ID & ~CRPT_EVENT,	"bad_or_missing_group_key" },
+	{ XEVNT_ERR & ~CRPT_EVENT,	"protocol_error" },
+	{ XEVNT_SRV & ~CRPT_EVENT,	"server certificate expired" },
 	{ -1,				"crypto" }
 };
 #endif /* OPENSSL */
diff --git a/contrib/ntp/libntp/systime.c b/contrib/ntp/libntp/systime.c
index ac6aa98..4539b5f 100644
--- a/contrib/ntp/libntp/systime.c
+++ b/contrib/ntp/libntp/systime.c
@@ -9,9 +9,11 @@
 #include "ntp_syslog.h"
 #include "ntp_unixtime.h"
 #include "ntp_stdlib.h"
+#include "ntp_random.h"
+#include "ntpd.h"		/* for sys_precision */
 
 #ifdef SIM
-#include "ntpsim.h"
+# include "ntpsim.h"
 #endif /*SIM */
 
 #ifdef HAVE_SYS_PARAM_H
@@ -33,11 +35,15 @@
  * made to minimize errors by always rounding toward zero and amortizing
  * adjustment residues. By default the adjustment quantum is 1 us for
  * the usual Unix tickadj() system call, but this can be increased if
- * necessary by a configuration command. For instance, when the
+ * necessary by the tick configuration command. For instance, when the
  * adjtime() quantum is a clock tick for a 100-Hz clock, the quantum
  * should be 10 ms.
  */
-double	sys_tick = 1e-6;	/* tickadj() quantum (s) */
+#if defined RELIANTUNIX_CLOCK || defined SCO5_CLOCK
+double	sys_tick = 10e-3;	/* 10 ms tickadj() */
+#else
+double	sys_tick = 1e-6;	/* 1 us tickadj() */
+#endif
 double	sys_residual = 0;	/* adjustment residue (s) */
 
 #ifndef SIM
@@ -57,6 +63,8 @@ get_systime(
 
 	/*
 	 * Convert Unix clock from seconds and nanoseconds to seconds.
+	 * The bottom is only two bits down, so no need for fuzz.
+	 * Some systems don't have that level of precision, however...
 	 */
 # ifdef HAVE_CLOCK_GETTIME
 	clock_gettime(CLOCK_REALTIME, &ts);
@@ -71,6 +79,7 @@ get_systime(
 
 	/*
 	 * Convert Unix clock from seconds and microseconds to seconds.
+	 * Add in unbiased random fuzz beneath the microsecond.
 	 */
 	GETTIMEOFDAY(&tv, NULL);
 	now->l_i = tv.tv_sec + JAN_1970;
@@ -79,13 +88,22 @@ get_systime(
 #endif /* HAVE_CLOCK_GETTIME || HAVE_GETCLOCK */
 
 	/*
+	 * ntp_random() produces 31 bits (always nonnegative).
+	 * This bit is done only after the precision has been
+	 * determined.
+	 */
+	if (sys_precision != 0)
+		dtemp += (ntp_random() / FRAC - .5) / (1 <<
+		    -sys_precision);
+
+	/*
 	 * Renormalize to seconds past 1900 and fraction.
 	 */
 	dtemp += sys_residual;
 	if (dtemp >= 1) {
 		dtemp -= 1;
 		now->l_i++;
-	} else if (dtemp < -1) {
+	} else if (dtemp < 0) {
 		dtemp += 1;
 		now->l_i--;
 	}
@@ -135,10 +153,13 @@ adj_systime(
 	if (isneg) {
 		adjtv.tv_sec = -adjtv.tv_sec;
 		adjtv.tv_usec = -adjtv.tv_usec;
+		sys_residual = -sys_residual;
 	}
-	if (adjtime(&adjtv, &oadjtv) < 0) {
-		msyslog(LOG_ERR, "adj_systime: %m");
-		return (0);
+	if (adjtv.tv_sec != 0 || adjtv.tv_usec != 0) {
+		if (adjtime(&adjtv, &oadjtv) < 0) {
+			msyslog(LOG_ERR, "adj_systime: %m");
+			return (0);
+		}
 	}
 	return (1);
 }
@@ -173,11 +194,11 @@ step_systime(
 		    (double)adjtv.tv_sec) * 1e6 + .5);
 	}
 #if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_GETCLOCK)
-#ifdef HAVE_CLOCK_GETTIME
+# ifdef HAVE_CLOCK_GETTIME
 	(void) clock_gettime(CLOCK_REALTIME, &ts);
-#else
+# else
 	(void) getclock(TIMEOFDAY, &ts);
-#endif
+# endif
 	timetv.tv_sec = ts.tv_sec;
 	timetv.tv_usec = ts.tv_nsec / 1000;
 #else /*  not HAVE_GETCLOCK */
@@ -406,13 +427,8 @@ adj_systime(
 		adjtv.tv_usec = -adjtv.tv_usec;
 		sys_residual = -sys_residual;
 	}
-
-	/*
-	 * We went to all the trouble just to be sure the emulation is
-	 * precise. We now return to our regularly scheduled concert.
-	 */
-	ntp_node.clk_time -= adjtv.tv_sec + adjtv.tv_usec / 1e6;
-        return (1);
+	ntp_node.adj = now;
+	return (1);
 }
  
  
@@ -424,7 +440,12 @@ step_systime(
         double now		/* step adjustment (s) */
         )
 {
-	ntp_node.adj = now;
+#ifdef DEBUG
+	if (debug)
+		printf("step_systime: time %.6f adj %.6f\n",
+		   ntp_node.ntp_time, now);
+#endif
+	ntp_node.ntp_time += now;
 	return (1);
 }
author	roberto <roberto@FreeBSD.org>	2008-08-22 15:58:00 +0000
committer	roberto <roberto@FreeBSD.org>	2008-08-22 15:58:00 +0000
commit	b85c7169a740b2edf0106ad59fdaa1b0160f823c (patch)
tree	2b9fb7f64eacb322e95695e412c923e97ba33e88 /contrib/ntp/libntp
parent	1d197cfe9feac6bc29537d8e53c30b6435937b95 (diff)
parent	7a6072eb585696f8856cd498c3fd194cf49f14c6 (diff)
download	FreeBSD-src-b85c7169a740b2edf0106ad59fdaa1b0160f823c.zip FreeBSD-src-b85c7169a740b2edf0106ad59fdaa1b0160f823c.tar.gz