diff options
| author | kroeckx <kroeckx@0070b5ef-2f16-0410-befa-9a02bd1d6ddb> | 2010-07-13 18:32:56 +0000 |
|---|---|---|
| committer | kroeckx <kroeckx@0070b5ef-2f16-0410-befa-9a02bd1d6ddb> | 2010-07-13 18:32:56 +0000 |
| commit | 818aeca04330e786dbc73257bcd6e312fcd0aded (patch) | |
| tree | a180f176ddff3138211033a0215fd2b546f92e66 | |
| parent | 51af273f78e68e17542b37ed10ecb008e21e8250 (diff) | |
| download | ntp-818aeca04330e786dbc73257bcd6e312fcd0aded.tar.gz | |
New upstream version.
git-svn-id: svn://svn.debian.org/pkg-ntp/ntp/trunk@323 0070b5ef-2f16-0410-befa-9a02bd1d6ddb
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/autotools.patch | 6727 |
2 files changed, 2118 insertions, 4615 deletions
diff --git a/debian/changelog b/debian/changelog index 6031906..7a15b9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ntp (1:4.2.6.p1+dfsg-2) UNRELEASED; urgency=low +ntp (1:4.2.6.p2+dfsg-1) UNRELEASED; urgency=low [ Peter Eisentraut ] * Update command options section in ntp.conf(5) man page, drop "dynamic" @@ -9,6 +9,8 @@ ntp (1:4.2.6.p1+dfsg-2) UNRELEASED; urgency=low * Removed no longer needed build conflict against libreadline-dev [ Kurt Roeckx ] + * New upstream version. + - Fixes problem with ipv6 multicast (Closes: #584927) * Move dhcp exit hooks from /etc/dhcp3/dhclient-enter-hooks.d to /etc/dhcp/dhclient-enter-hooks.d. Add dpkg-maintscript-helper to maintainer scripts to move them, and add a Breaks on @@ -16,7 +18,7 @@ ntp (1:4.2.6.p1+dfsg-2) UNRELEASED; urgency=low * Remove ntp's Replaces on logcheck-database, we don't ship log logcheck entries anymore for ntp. - -- Kurt Roeckx <kurt@roeckx.be> Sat, 03 Jul 2010 18:08:41 +0200 + -- Kurt Roeckx <kurt@roeckx.be> Tue, 13 Jul 2010 20:16:18 +0200 ntp (1:4.2.6.p1+dfsg-1) unstable; urgency=low diff --git a/debian/patches/autotools.patch b/debian/patches/autotools.patch index 175eddc..08f409d 100644 --- a/debian/patches/autotools.patch +++ b/debian/patches/autotools.patch @@ -7,10 +7,10 @@ libtoolize --force autoreconf --force quilt refresh -Index: ntp-4.2.6p1+dfsg/ntpd/Makefile.in +Index: ntp-4.2.6.p2+dfsg/ntpd/Makefile.in =================================================================== ---- ntp-4.2.6p1+dfsg.orig/ntpd/Makefile.in 2010-04-09 08:11:13.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/ntpd/Makefile.in 2010-05-24 10:29:13.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/ntpd/Makefile.in 2010-07-09 02:21:34.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/ntpd/Makefile.in 2010-07-13 18:24:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -28,7 +28,7 @@ Index: ntp-4.2.6p1+dfsg/ntpd/Makefile.in $(top_srcdir)/m4/ntp_cacheversion.m4 \ $(top_srcdir)/m4/ntp_dir_sep.m4 \ $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ -@@ -86,15 +88,15 @@ +@@ -87,15 +89,15 @@ refclock_hpgps.$(OBJEXT) refclock_irig.$(OBJEXT) \ refclock_jjy.$(OBJEXT) refclock_jupiter.$(OBJEXT) \ refclock_leitch.$(OBJEXT) refclock_local.$(OBJEXT) \ @@ -53,7 +53,7 @@ Index: ntp-4.2.6p1+dfsg/ntpd/Makefile.in libntpd_a_OBJECTS = $(am_libntpd_a_OBJECTS) am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \ "$(DESTDIR)$(man1dir)" -@@ -196,7 +198,8 @@ +@@ -197,7 +199,8 @@ DCFD = @DCFD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -63,7 +63,7 @@ Index: ntp-4.2.6p1+dfsg/ntpd/Makefile.in ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -@@ -205,6 +208,7 @@ +@@ -206,6 +209,7 @@ EF_PROGS = @EF_PROGS@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -71,7 +71,7 @@ Index: ntp-4.2.6p1+dfsg/ntpd/Makefile.in GREP = @GREP@ HAVE_INLINE = @HAVE_INLINE@ INSTALL = @INSTALL@ -@@ -213,6 +217,7 @@ +@@ -214,6 +218,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LCRYPTO = @LCRYPTO@ @@ -79,7 +79,7 @@ Index: ntp-4.2.6p1+dfsg/ntpd/Makefile.in LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@ -@@ -221,6 +226,7 @@ +@@ -222,6 +227,7 @@ LIBPARSE = @LIBPARSE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -87,7 +87,7 @@ Index: ntp-4.2.6p1+dfsg/ntpd/Makefile.in LN_S = @LN_S@ LSCF = @LSCF@ LTLIBOBJS = @LTLIBOBJS@ -@@ -238,10 +244,15 @@ +@@ -239,10 +245,15 @@ MAKE_TICKADJ = @MAKE_TICKADJ@ MAKE_TIMETRIM = @MAKE_TIMETRIM@ MKDIR_P = @MKDIR_P@ @@ -103,7 +103,7 @@ Index: ntp-4.2.6p1+dfsg/ntpd/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -255,6 +266,7 @@ +@@ -256,6 +267,7 @@ PATH_SH = @PATH_SH@ PROPDELAY = @PROPDELAY@ RANLIB = @RANLIB@ @@ -111,7 +111,7 @@ Index: ntp-4.2.6p1+dfsg/ntpd/Makefile.in SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SNMP_CFLAGS = @SNMP_CFLAGS@ -@@ -270,6 +282,7 @@ +@@ -271,6 +283,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ @@ -119,7 +119,7 @@ Index: ntp-4.2.6p1+dfsg/ntpd/Makefile.in am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -300,6 +313,7 @@ +@@ -301,6 +314,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -127,7 +127,7 @@ Index: ntp-4.2.6p1+dfsg/ntpd/Makefile.in mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -@@ -463,7 +477,6 @@ +@@ -464,7 +478,6 @@ refclock_leitch.c \ refclock_local.c \ refclock_mx4200.c \ @@ -135,7 +135,7 @@ Index: ntp-4.2.6p1+dfsg/ntpd/Makefile.in refclock_nmea.c \ refclock_oncore.c \ refclock_palisade.c \ -@@ -496,9 +509,9 @@ +@@ -497,9 +510,9 @@ exit 1;; \ esac; \ done; \ @@ -147,7 +147,7 @@ Index: ntp-4.2.6p1+dfsg/ntpd/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -@@ -699,7 +712,6 @@ +@@ -700,7 +713,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refclock_leitch.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refclock_local.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refclock_mx4200.Po@am__quote@ @@ -155,10 +155,10 @@ Index: ntp-4.2.6p1+dfsg/ntpd/Makefile.in @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refclock_nmea.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refclock_oncore.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refclock_palisade.Po@am__quote@ -Index: ntp-4.2.6p1+dfsg/include/isc/Makefile.in +Index: ntp-4.2.6.p2+dfsg/include/isc/Makefile.in =================================================================== ---- ntp-4.2.6p1+dfsg.orig/include/isc/Makefile.in 2010-04-09 08:11:10.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/include/isc/Makefile.in 2010-05-24 10:29:12.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/include/isc/Makefile.in 2010-07-09 02:21:31.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/include/isc/Makefile.in 2010-07-13 18:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -176,7 +176,7 @@ Index: ntp-4.2.6p1+dfsg/include/isc/Makefile.in $(top_srcdir)/m4/ntp_cacheversion.m4 \ $(top_srcdir)/m4/ntp_dir_sep.m4 \ $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ -@@ -77,7 +79,8 @@ +@@ -78,7 +80,8 @@ DCFD = @DCFD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -186,7 +186,7 @@ Index: ntp-4.2.6p1+dfsg/include/isc/Makefile.in ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -@@ -86,6 +89,7 @@ +@@ -87,6 +90,7 @@ EF_PROGS = @EF_PROGS@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -194,7 +194,7 @@ Index: ntp-4.2.6p1+dfsg/include/isc/Makefile.in GREP = @GREP@ HAVE_INLINE = @HAVE_INLINE@ INSTALL = @INSTALL@ -@@ -94,6 +98,7 @@ +@@ -95,6 +99,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LCRYPTO = @LCRYPTO@ @@ -202,7 +202,7 @@ Index: ntp-4.2.6p1+dfsg/include/isc/Makefile.in LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@ -@@ -102,6 +107,7 @@ +@@ -103,6 +108,7 @@ LIBPARSE = @LIBPARSE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -210,7 +210,7 @@ Index: ntp-4.2.6p1+dfsg/include/isc/Makefile.in LN_S = @LN_S@ LSCF = @LSCF@ LTLIBOBJS = @LTLIBOBJS@ -@@ -119,10 +125,15 @@ +@@ -120,10 +126,15 @@ MAKE_TICKADJ = @MAKE_TICKADJ@ MAKE_TIMETRIM = @MAKE_TIMETRIM@ MKDIR_P = @MKDIR_P@ @@ -226,7 +226,7 @@ Index: ntp-4.2.6p1+dfsg/include/isc/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -136,6 +147,7 @@ +@@ -137,6 +148,7 @@ PATH_SH = @PATH_SH@ PROPDELAY = @PROPDELAY@ RANLIB = @RANLIB@ @@ -234,7 +234,7 @@ Index: ntp-4.2.6p1+dfsg/include/isc/Makefile.in SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SNMP_CFLAGS = @SNMP_CFLAGS@ -@@ -151,6 +163,7 @@ +@@ -152,6 +164,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ @@ -242,7 +242,7 @@ Index: ntp-4.2.6p1+dfsg/include/isc/Makefile.in am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -181,6 +194,7 @@ +@@ -182,6 +195,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -250,7 +250,7 @@ Index: ntp-4.2.6p1+dfsg/include/isc/Makefile.in mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -@@ -216,9 +230,9 @@ +@@ -217,9 +231,9 @@ exit 1;; \ esac; \ done; \ @@ -262,10 +262,10 @@ Index: ntp-4.2.6p1+dfsg/include/isc/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -Index: ntp-4.2.6p1+dfsg/include/Makefile.in +Index: ntp-4.2.6.p2+dfsg/include/Makefile.in =================================================================== ---- ntp-4.2.6p1+dfsg.orig/include/Makefile.in 2010-04-09 08:11:10.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/include/Makefile.in 2010-05-24 10:29:12.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/include/Makefile.in 2010-07-09 02:21:31.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/include/Makefile.in 2010-07-13 18:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -283,7 +283,7 @@ Index: ntp-4.2.6p1+dfsg/include/Makefile.in $(top_srcdir)/m4/ntp_cacheversion.m4 \ $(top_srcdir)/m4/ntp_dir_sep.m4 \ $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ -@@ -115,7 +117,8 @@ +@@ -116,7 +118,8 @@ DCFD = @DCFD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -293,7 +293,7 @@ Index: ntp-4.2.6p1+dfsg/include/Makefile.in ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -@@ -124,6 +127,7 @@ +@@ -125,6 +128,7 @@ EF_PROGS = @EF_PROGS@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -301,7 +301,7 @@ Index: ntp-4.2.6p1+dfsg/include/Makefile.in GREP = @GREP@ HAVE_INLINE = @HAVE_INLINE@ INSTALL = @INSTALL@ -@@ -132,6 +136,7 @@ +@@ -133,6 +137,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LCRYPTO = @LCRYPTO@ @@ -309,7 +309,7 @@ Index: ntp-4.2.6p1+dfsg/include/Makefile.in LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@ -@@ -140,6 +145,7 @@ +@@ -141,6 +146,7 @@ LIBPARSE = @LIBPARSE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -317,7 +317,7 @@ Index: ntp-4.2.6p1+dfsg/include/Makefile.in LN_S = @LN_S@ LSCF = @LSCF@ LTLIBOBJS = @LTLIBOBJS@ -@@ -157,10 +163,15 @@ +@@ -158,10 +164,15 @@ MAKE_TICKADJ = @MAKE_TICKADJ@ MAKE_TIMETRIM = @MAKE_TIMETRIM@ MKDIR_P = @MKDIR_P@ @@ -333,7 +333,7 @@ Index: ntp-4.2.6p1+dfsg/include/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -174,6 +185,7 @@ +@@ -175,6 +186,7 @@ PATH_SH = @PATH_SH@ PROPDELAY = @PROPDELAY@ RANLIB = @RANLIB@ @@ -341,7 +341,7 @@ Index: ntp-4.2.6p1+dfsg/include/Makefile.in SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SNMP_CFLAGS = @SNMP_CFLAGS@ -@@ -189,6 +201,7 @@ +@@ -190,6 +202,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ @@ -349,7 +349,7 @@ Index: ntp-4.2.6p1+dfsg/include/Makefile.in am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -219,6 +232,7 @@ +@@ -220,6 +233,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -357,7 +357,7 @@ Index: ntp-4.2.6p1+dfsg/include/Makefile.in mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -@@ -241,7 +255,6 @@ +@@ -242,7 +256,6 @@ EXTRA_DIST = autogen-version.def copyright.def debug-opt.def homerc.def version.def version.texi SUBDIRS = isc noinst_HEADERS = \ @@ -365,7 +365,7 @@ Index: ntp-4.2.6p1+dfsg/include/Makefile.in audio.h \ ascii.h \ audio.h \ -@@ -298,9 +311,6 @@ +@@ -299,9 +312,6 @@ recvbuff.h \ refclock_atom.h \ ssl_applink.c \ @@ -375,7 +375,7 @@ Index: ntp-4.2.6p1+dfsg/include/Makefile.in trimble.h \ $(NULL) -@@ -316,9 +326,9 @@ +@@ -317,9 +327,9 @@ exit 1;; \ esac; \ done; \ @@ -387,7 +387,7 @@ Index: ntp-4.2.6p1+dfsg/include/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -@@ -351,7 +361,7 @@ +@@ -352,7 +362,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -396,7 +396,7 @@ Index: ntp-4.2.6p1+dfsg/include/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -376,7 +386,7 @@ +@@ -377,7 +387,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): @@ -405,10 +405,10 @@ Index: ntp-4.2.6p1+dfsg/include/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -Index: ntp-4.2.6p1+dfsg/libntp/Makefile.in +Index: ntp-4.2.6.p2+dfsg/libntp/Makefile.in =================================================================== ---- ntp-4.2.6p1+dfsg.orig/libntp/Makefile.in 2010-04-09 08:11:12.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/libntp/Makefile.in 2010-05-24 10:29:13.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/libntp/Makefile.in 2010-07-09 02:21:32.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/libntp/Makefile.in 2010-07-13 18:24:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -426,7 +426,7 @@ Index: ntp-4.2.6p1+dfsg/libntp/Makefile.in $(top_srcdir)/m4/ntp_cacheversion.m4 \ $(top_srcdir)/m4/ntp_dir_sep.m4 \ $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ -@@ -57,12 +59,11 @@ +@@ -58,12 +60,11 @@ libntp_a_AR = $(AR) $(ARFLAGS) libntp_a_LIBADD = am__objects_1 = @@ -444,7 +444,7 @@ Index: ntp-4.2.6p1+dfsg/libntp/Makefile.in clocktypes.$(OBJEXT) decodenetnum.$(OBJEXT) dofptoa.$(OBJEXT) \ dolfptoa.$(OBJEXT) emalloc.$(OBJEXT) findconfig.$(OBJEXT) \ fptoa.$(OBJEXT) fptoms.$(OBJEXT) getopt.$(OBJEXT) \ -@@ -134,7 +135,8 @@ +@@ -135,7 +136,8 @@ DCFD = @DCFD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -454,7 +454,7 @@ Index: ntp-4.2.6p1+dfsg/libntp/Makefile.in ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -@@ -143,6 +145,7 @@ +@@ -144,6 +146,7 @@ EF_PROGS = @EF_PROGS@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -462,7 +462,7 @@ Index: ntp-4.2.6p1+dfsg/libntp/Makefile.in GREP = @GREP@ HAVE_INLINE = @HAVE_INLINE@ INSTALL = @INSTALL@ -@@ -151,6 +154,7 @@ +@@ -152,6 +155,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LCRYPTO = @LCRYPTO@ @@ -470,7 +470,7 @@ Index: ntp-4.2.6p1+dfsg/libntp/Makefile.in LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@ -@@ -159,6 +163,7 @@ +@@ -160,6 +164,7 @@ LIBPARSE = @LIBPARSE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -478,7 +478,7 @@ Index: ntp-4.2.6p1+dfsg/libntp/Makefile.in LN_S = @LN_S@ LSCF = @LSCF@ LTLIBOBJS = @LTLIBOBJS@ -@@ -176,10 +181,15 @@ +@@ -177,10 +182,15 @@ MAKE_TICKADJ = @MAKE_TICKADJ@ MAKE_TIMETRIM = @MAKE_TIMETRIM@ MKDIR_P = @MKDIR_P@ @@ -494,7 +494,7 @@ Index: ntp-4.2.6p1+dfsg/libntp/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -193,6 +203,7 @@ +@@ -194,6 +204,7 @@ PATH_SH = @PATH_SH@ PROPDELAY = @PROPDELAY@ RANLIB = @RANLIB@ @@ -502,7 +502,7 @@ Index: ntp-4.2.6p1+dfsg/libntp/Makefile.in SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SNMP_CFLAGS = @SNMP_CFLAGS@ -@@ -208,6 +219,7 @@ +@@ -209,6 +220,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ @@ -510,7 +510,7 @@ Index: ntp-4.2.6p1+dfsg/libntp/Makefile.in am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -238,6 +250,7 @@ +@@ -239,6 +251,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -518,7 +518,7 @@ Index: ntp-4.2.6p1+dfsg/libntp/Makefile.in mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -@@ -263,7 +276,6 @@ +@@ -264,7 +277,6 @@ EXTRA_LIBRARIES = libntpsim.a libntp_a_SRCS = \ a_md5encrypt.c \ @@ -526,7 +526,7 @@ Index: ntp-4.2.6p1+dfsg/libntp/Makefile.in atoint.c \ atolfp.c \ atouint.c \ -@@ -379,9 +391,9 @@ +@@ -380,9 +392,9 @@ exit 1;; \ esac; \ done; \ @@ -538,7 +538,7 @@ Index: ntp-4.2.6p1+dfsg/libntp/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -@@ -419,7 +431,6 @@ +@@ -420,7 +432,6 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/a_md5encrypt.Po@am__quote@ @@ -546,10 +546,10 @@ Index: ntp-4.2.6p1+dfsg/libntp/Makefile.in @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adjtimex.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assertions.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atoint.Po@am__quote@ -Index: ntp-4.2.6p1+dfsg/libparse/Makefile.in +Index: ntp-4.2.6.p2+dfsg/libparse/Makefile.in =================================================================== ---- ntp-4.2.6p1+dfsg.orig/libparse/Makefile.in 2010-04-09 08:11:13.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/libparse/Makefile.in 2010-05-24 10:29:13.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/libparse/Makefile.in 2010-07-09 02:21:33.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/libparse/Makefile.in 2010-07-13 18:24:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -567,7 +567,7 @@ Index: ntp-4.2.6p1+dfsg/libparse/Makefile.in $(top_srcdir)/m4/ntp_cacheversion.m4 \ $(top_srcdir)/m4/ntp_dir_sep.m4 \ $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ -@@ -64,20 +66,18 @@ +@@ -65,20 +67,18 @@ clk_rawdcf.$(OBJEXT) clk_trimtsip.$(OBJEXT) \ clk_dcf7000.$(OBJEXT) clk_trimtaip.$(OBJEXT) \ clk_rcc8000.$(OBJEXT) clk_hopf6021.$(OBJEXT) \ @@ -594,7 +594,7 @@ Index: ntp-4.2.6p1+dfsg/libparse/Makefile.in am_libparse_kernel_a_OBJECTS = libparse_kernel_a_OBJECTS = $(am_libparse_kernel_a_OBJECTS) PROGRAMS = $(noinst_PROGRAMS) -@@ -126,7 +126,8 @@ +@@ -127,7 +127,8 @@ DCFD = @DCFD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -604,7 +604,7 @@ Index: ntp-4.2.6p1+dfsg/libparse/Makefile.in ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -@@ -135,6 +136,7 @@ +@@ -136,6 +137,7 @@ EF_PROGS = @EF_PROGS@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -612,7 +612,7 @@ Index: ntp-4.2.6p1+dfsg/libparse/Makefile.in GREP = @GREP@ HAVE_INLINE = @HAVE_INLINE@ INSTALL = @INSTALL@ -@@ -143,6 +145,7 @@ +@@ -144,6 +146,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LCRYPTO = @LCRYPTO@ @@ -620,7 +620,7 @@ Index: ntp-4.2.6p1+dfsg/libparse/Makefile.in LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@ -@@ -151,6 +154,7 @@ +@@ -152,6 +155,7 @@ LIBPARSE = @LIBPARSE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -628,7 +628,7 @@ Index: ntp-4.2.6p1+dfsg/libparse/Makefile.in LN_S = @LN_S@ LSCF = @LSCF@ LTLIBOBJS = @LTLIBOBJS@ -@@ -168,10 +172,15 @@ +@@ -169,10 +173,15 @@ MAKE_TICKADJ = @MAKE_TICKADJ@ MAKE_TIMETRIM = @MAKE_TIMETRIM@ MKDIR_P = @MKDIR_P@ @@ -644,7 +644,7 @@ Index: ntp-4.2.6p1+dfsg/libparse/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -185,6 +194,7 @@ +@@ -186,6 +195,7 @@ PATH_SH = @PATH_SH@ PROPDELAY = @PROPDELAY@ RANLIB = @RANLIB@ @@ -652,7 +652,7 @@ Index: ntp-4.2.6p1+dfsg/libparse/Makefile.in SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SNMP_CFLAGS = @SNMP_CFLAGS@ -@@ -200,6 +210,7 @@ +@@ -201,6 +211,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ @@ -660,7 +660,7 @@ Index: ntp-4.2.6p1+dfsg/libparse/Makefile.in am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -230,6 +241,7 @@ +@@ -231,6 +242,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -668,7 +668,7 @@ Index: ntp-4.2.6p1+dfsg/libparse/Makefile.in mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -@@ -266,7 +278,6 @@ +@@ -267,7 +279,6 @@ clk_rcc8000.c \ clk_hopf6021.c \ clk_computime.c \ @@ -676,7 +676,7 @@ Index: ntp-4.2.6p1+dfsg/libparse/Makefile.in clk_varitext.c \ data_mbg.c \ info_trimble.c \ -@@ -291,7 +302,6 @@ +@@ -292,7 +303,6 @@ kclk_trimtaip.o \ kclk_trimtsip.o \ kclk_varitext.o \ @@ -684,7 +684,7 @@ Index: ntp-4.2.6p1+dfsg/libparse/Makefile.in kbinio.o \ kieee754io.o \ kmfp_mul.o \ -@@ -318,9 +328,9 @@ +@@ -319,9 +329,9 @@ exit 1;; \ esac; \ done; \ @@ -696,7 +696,7 @@ Index: ntp-4.2.6p1+dfsg/libparse/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -@@ -383,7 +393,6 @@ +@@ -384,7 +394,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_trimtaip.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_trimtsip.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clk_varitext.Po@am__quote@ @@ -704,10 +704,10 @@ Index: ntp-4.2.6p1+dfsg/libparse/Makefile.in @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data_mbg.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gpstolfp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ieee754io.Po@am__quote@ -Index: ntp-4.2.6p1+dfsg/ntpdate/Makefile.in +Index: ntp-4.2.6.p2+dfsg/ntpdate/Makefile.in =================================================================== ---- ntp-4.2.6p1+dfsg.orig/ntpdate/Makefile.in 2010-04-09 08:11:13.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/ntpdate/Makefile.in 2010-05-24 10:29:14.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/ntpdate/Makefile.in 2010-07-09 02:21:34.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/ntpdate/Makefile.in 2010-07-13 18:24:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -725,7 +725,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdate/Makefile.in $(top_srcdir)/m4/ntp_cacheversion.m4 \ $(top_srcdir)/m4/ntp_dir_sep.m4 \ $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ -@@ -108,7 +110,8 @@ +@@ -109,7 +111,8 @@ DCFD = @DCFD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -735,7 +735,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdate/Makefile.in ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -@@ -117,6 +120,7 @@ +@@ -118,6 +121,7 @@ EF_PROGS = @EF_PROGS@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -743,7 +743,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdate/Makefile.in GREP = @GREP@ HAVE_INLINE = @HAVE_INLINE@ INSTALL = @INSTALL@ -@@ -125,6 +129,7 @@ +@@ -126,6 +130,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LCRYPTO = @LCRYPTO@ @@ -751,7 +751,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdate/Makefile.in LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@ -@@ -133,6 +138,7 @@ +@@ -134,6 +139,7 @@ LIBPARSE = @LIBPARSE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -759,7 +759,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdate/Makefile.in LN_S = @LN_S@ LSCF = @LSCF@ LTLIBOBJS = @LTLIBOBJS@ -@@ -150,10 +156,15 @@ +@@ -151,10 +157,15 @@ MAKE_TICKADJ = @MAKE_TICKADJ@ MAKE_TIMETRIM = @MAKE_TIMETRIM@ MKDIR_P = @MKDIR_P@ @@ -775,7 +775,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdate/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -167,6 +178,7 @@ +@@ -168,6 +179,7 @@ PATH_SH = @PATH_SH@ PROPDELAY = @PROPDELAY@ RANLIB = @RANLIB@ @@ -783,7 +783,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdate/Makefile.in SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SNMP_CFLAGS = @SNMP_CFLAGS@ -@@ -182,6 +194,7 @@ +@@ -183,6 +195,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ @@ -791,7 +791,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdate/Makefile.in am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -212,6 +225,7 @@ +@@ -213,6 +226,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -799,7 +799,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdate/Makefile.in mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -@@ -258,9 +272,9 @@ +@@ -259,9 +273,9 @@ exit 1;; \ esac; \ done; \ @@ -811,10 +811,10 @@ Index: ntp-4.2.6p1+dfsg/ntpdate/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -Index: ntp-4.2.6p1+dfsg/scripts/Makefile.in +Index: ntp-4.2.6.p2+dfsg/scripts/Makefile.in =================================================================== ---- ntp-4.2.6p1+dfsg.orig/scripts/Makefile.in 2010-04-09 08:11:15.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/scripts/Makefile.in 2010-05-24 10:29:14.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/scripts/Makefile.in 2010-07-09 02:21:35.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/scripts/Makefile.in 2010-07-13 18:24:09.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -838,7 +838,7 @@ Index: ntp-4.2.6p1+dfsg/scripts/Makefile.in $(top_srcdir)/m4/ntp_cacheversion.m4 \ $(top_srcdir)/m4/ntp_dir_sep.m4 \ $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ -@@ -55,7 +57,7 @@ +@@ -56,7 +58,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = calc_tickadj checktime freq_adj html2man mkver \ @@ -847,7 +847,7 @@ Index: ntp-4.2.6p1+dfsg/scripts/Makefile.in CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ -@@ -102,7 +104,8 @@ +@@ -103,7 +105,8 @@ DCFD = @DCFD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -857,7 +857,7 @@ Index: ntp-4.2.6p1+dfsg/scripts/Makefile.in ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -@@ -111,6 +114,7 @@ +@@ -112,6 +115,7 @@ EF_PROGS = @EF_PROGS@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -865,7 +865,7 @@ Index: ntp-4.2.6p1+dfsg/scripts/Makefile.in GREP = @GREP@ HAVE_INLINE = @HAVE_INLINE@ INSTALL = @INSTALL@ -@@ -119,6 +123,7 @@ +@@ -120,6 +124,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LCRYPTO = @LCRYPTO@ @@ -873,7 +873,7 @@ Index: ntp-4.2.6p1+dfsg/scripts/Makefile.in LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@ -@@ -127,6 +132,7 @@ +@@ -128,6 +133,7 @@ LIBPARSE = @LIBPARSE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -881,7 +881,7 @@ Index: ntp-4.2.6p1+dfsg/scripts/Makefile.in LN_S = @LN_S@ LSCF = @LSCF@ LTLIBOBJS = @LTLIBOBJS@ -@@ -144,10 +150,15 @@ +@@ -145,10 +151,15 @@ MAKE_TICKADJ = @MAKE_TICKADJ@ MAKE_TIMETRIM = @MAKE_TIMETRIM@ MKDIR_P = @MKDIR_P@ @@ -897,7 +897,7 @@ Index: ntp-4.2.6p1+dfsg/scripts/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -161,6 +172,7 @@ +@@ -162,6 +173,7 @@ PATH_SH = @PATH_SH@ PROPDELAY = @PROPDELAY@ RANLIB = @RANLIB@ @@ -905,7 +905,7 @@ Index: ntp-4.2.6p1+dfsg/scripts/Makefile.in SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SNMP_CFLAGS = @SNMP_CFLAGS@ -@@ -176,6 +188,7 @@ +@@ -177,6 +189,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ @@ -913,7 +913,7 @@ Index: ntp-4.2.6p1+dfsg/scripts/Makefile.in am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -206,6 +219,7 @@ +@@ -207,6 +220,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -921,7 +921,7 @@ Index: ntp-4.2.6p1+dfsg/scripts/Makefile.in mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -@@ -232,7 +246,6 @@ +@@ -233,7 +247,6 @@ html2man \ mkver \ ntpsweep \ @@ -929,7 +929,7 @@ Index: ntp-4.2.6p1+dfsg/scripts/Makefile.in plot_summary \ summary \ $(NULL) -@@ -267,9 +280,9 @@ +@@ -268,9 +281,9 @@ exit 1;; \ esac; \ done; \ @@ -941,7 +941,7 @@ Index: ntp-4.2.6p1+dfsg/scripts/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -@@ -304,8 +317,6 @@ +@@ -305,8 +318,6 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ ntptrace: $(top_builddir)/config.status $(srcdir)/ntptrace.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ @@ -950,10 +950,10 @@ Index: ntp-4.2.6p1+dfsg/scripts/Makefile.in plot_summary: $(top_builddir)/config.status $(srcdir)/plot_summary.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ summary: $(top_builddir)/config.status $(srcdir)/summary.in -Index: ntp-4.2.6p1+dfsg/kernel/sys/Makefile.in +Index: ntp-4.2.6.p2+dfsg/kernel/sys/Makefile.in =================================================================== ---- ntp-4.2.6p1+dfsg.orig/kernel/sys/Makefile.in 2010-04-09 08:11:11.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/kernel/sys/Makefile.in 2010-05-24 10:29:13.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/kernel/sys/Makefile.in 2010-07-09 02:21:32.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/kernel/sys/Makefile.in 2010-07-13 18:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -971,7 +971,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/sys/Makefile.in $(top_srcdir)/m4/ntp_cacheversion.m4 \ $(top_srcdir)/m4/ntp_dir_sep.m4 \ $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ -@@ -77,7 +79,8 @@ +@@ -78,7 +80,8 @@ DCFD = @DCFD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -981,7 +981,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/sys/Makefile.in ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -@@ -86,6 +89,7 @@ +@@ -87,6 +90,7 @@ EF_PROGS = @EF_PROGS@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -989,7 +989,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/sys/Makefile.in GREP = @GREP@ HAVE_INLINE = @HAVE_INLINE@ INSTALL = @INSTALL@ -@@ -94,6 +98,7 @@ +@@ -95,6 +99,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LCRYPTO = @LCRYPTO@ @@ -997,7 +997,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/sys/Makefile.in LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@ -@@ -102,6 +107,7 @@ +@@ -103,6 +108,7 @@ LIBPARSE = @LIBPARSE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -1005,7 +1005,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/sys/Makefile.in LN_S = @LN_S@ LSCF = @LSCF@ LTLIBOBJS = @LTLIBOBJS@ -@@ -119,10 +125,15 @@ +@@ -120,10 +126,15 @@ MAKE_TICKADJ = @MAKE_TICKADJ@ MAKE_TIMETRIM = @MAKE_TIMETRIM@ MKDIR_P = @MKDIR_P@ @@ -1021,7 +1021,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/sys/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -136,6 +147,7 @@ +@@ -137,6 +148,7 @@ PATH_SH = @PATH_SH@ PROPDELAY = @PROPDELAY@ RANLIB = @RANLIB@ @@ -1029,7 +1029,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/sys/Makefile.in SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SNMP_CFLAGS = @SNMP_CFLAGS@ -@@ -151,6 +163,7 @@ +@@ -152,6 +164,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ @@ -1037,7 +1037,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/sys/Makefile.in am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -181,6 +194,7 @@ +@@ -182,6 +195,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -1045,7 +1045,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/sys/Makefile.in mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -@@ -219,9 +233,9 @@ +@@ -220,9 +234,9 @@ exit 1;; \ esac; \ done; \ @@ -1057,10 +1057,10 @@ Index: ntp-4.2.6p1+dfsg/kernel/sys/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -Index: ntp-4.2.6p1+dfsg/kernel/Makefile.in +Index: ntp-4.2.6.p2+dfsg/kernel/Makefile.in =================================================================== ---- ntp-4.2.6p1+dfsg.orig/kernel/Makefile.in 2010-04-09 08:11:11.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/kernel/Makefile.in 2010-05-24 10:29:12.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/kernel/Makefile.in 2010-07-09 02:21:31.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/kernel/Makefile.in 2010-07-13 18:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -1078,7 +1078,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/Makefile.in $(top_srcdir)/m4/ntp_cacheversion.m4 \ $(top_srcdir)/m4/ntp_dir_sep.m4 \ $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ -@@ -112,7 +114,8 @@ +@@ -113,7 +115,8 @@ DCFD = @DCFD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -1088,7 +1088,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/Makefile.in ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -@@ -121,6 +124,7 @@ +@@ -122,6 +125,7 @@ EF_PROGS = @EF_PROGS@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -1096,7 +1096,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/Makefile.in GREP = @GREP@ HAVE_INLINE = @HAVE_INLINE@ INSTALL = @INSTALL@ -@@ -129,6 +133,7 @@ +@@ -130,6 +134,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LCRYPTO = @LCRYPTO@ @@ -1104,7 +1104,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/Makefile.in LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@ -@@ -137,6 +142,7 @@ +@@ -138,6 +143,7 @@ LIBPARSE = @LIBPARSE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -1112,7 +1112,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/Makefile.in LN_S = @LN_S@ LSCF = @LSCF@ LTLIBOBJS = @LTLIBOBJS@ -@@ -154,10 +160,15 @@ +@@ -155,10 +161,15 @@ MAKE_TICKADJ = @MAKE_TICKADJ@ MAKE_TIMETRIM = @MAKE_TIMETRIM@ MKDIR_P = @MKDIR_P@ @@ -1128,7 +1128,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -171,6 +182,7 @@ +@@ -172,6 +183,7 @@ PATH_SH = @PATH_SH@ PROPDELAY = @PROPDELAY@ RANLIB = @RANLIB@ @@ -1136,7 +1136,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/Makefile.in SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SNMP_CFLAGS = @SNMP_CFLAGS@ -@@ -186,6 +198,7 @@ +@@ -187,6 +199,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ @@ -1144,7 +1144,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/Makefile.in am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -216,6 +229,7 @@ +@@ -217,6 +230,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -1152,7 +1152,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/Makefile.in mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -@@ -250,9 +264,9 @@ +@@ -251,9 +265,9 @@ exit 1;; \ esac; \ done; \ @@ -1164,7 +1164,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -@@ -285,7 +299,7 @@ +@@ -286,7 +300,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -1173,7 +1173,7 @@ Index: ntp-4.2.6p1+dfsg/kernel/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -310,7 +324,7 @@ +@@ -311,7 +325,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): @@ -1182,10 +1182,10 @@ Index: ntp-4.2.6p1+dfsg/kernel/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -Index: ntp-4.2.6p1+dfsg/ntpdc/Makefile.in +Index: ntp-4.2.6.p2+dfsg/ntpdc/Makefile.in =================================================================== ---- ntp-4.2.6p1+dfsg.orig/ntpdc/Makefile.in 2010-04-09 08:11:14.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/ntpdc/Makefile.in 2010-05-24 10:29:14.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/ntpdc/Makefile.in 2010-07-09 02:21:34.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/ntpdc/Makefile.in 2010-07-13 18:24:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -1203,7 +1203,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdc/Makefile.in $(top_srcdir)/m4/ntp_cacheversion.m4 \ $(top_srcdir)/m4/ntp_dir_sep.m4 \ $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ -@@ -137,7 +139,8 @@ +@@ -138,7 +140,8 @@ DCFD = @DCFD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -1213,7 +1213,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdc/Makefile.in ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -@@ -146,6 +149,7 @@ +@@ -147,6 +150,7 @@ EF_PROGS = @EF_PROGS@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -1221,7 +1221,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdc/Makefile.in GREP = @GREP@ HAVE_INLINE = @HAVE_INLINE@ INSTALL = @INSTALL@ -@@ -154,6 +158,7 @@ +@@ -155,6 +159,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LCRYPTO = @LCRYPTO@ @@ -1229,7 +1229,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdc/Makefile.in LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@ -@@ -162,6 +167,7 @@ +@@ -163,6 +168,7 @@ LIBPARSE = @LIBPARSE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -1237,7 +1237,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdc/Makefile.in LN_S = @LN_S@ LSCF = @LSCF@ LTLIBOBJS = @LTLIBOBJS@ -@@ -179,10 +185,15 @@ +@@ -180,10 +186,15 @@ MAKE_TICKADJ = @MAKE_TICKADJ@ MAKE_TIMETRIM = @MAKE_TIMETRIM@ MKDIR_P = @MKDIR_P@ @@ -1253,7 +1253,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdc/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -196,6 +207,7 @@ +@@ -197,6 +208,7 @@ PATH_SH = @PATH_SH@ PROPDELAY = @PROPDELAY@ RANLIB = @RANLIB@ @@ -1261,7 +1261,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdc/Makefile.in SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SNMP_CFLAGS = @SNMP_CFLAGS@ -@@ -211,6 +223,7 @@ +@@ -212,6 +224,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ @@ -1269,7 +1269,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdc/Makefile.in am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -241,6 +254,7 @@ +@@ -242,6 +255,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -1277,7 +1277,7 @@ Index: ntp-4.2.6p1+dfsg/ntpdc/Makefile.in mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -@@ -305,9 +319,9 @@ +@@ -306,9 +320,9 @@ exit 1;; \ esac; \ done; \ @@ -1289,10 +1289,10 @@ Index: ntp-4.2.6p1+dfsg/ntpdc/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -Index: ntp-4.2.6p1+dfsg/parseutil/Makefile.in +Index: ntp-4.2.6.p2+dfsg/parseutil/Makefile.in =================================================================== ---- ntp-4.2.6p1+dfsg.orig/parseutil/Makefile.in 2010-04-09 08:11:15.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/parseutil/Makefile.in 2010-05-24 10:29:14.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/parseutil/Makefile.in 2010-07-09 02:21:35.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/parseutil/Makefile.in 2010-07-13 18:24:09.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -1310,7 +1310,7 @@ Index: ntp-4.2.6p1+dfsg/parseutil/Makefile.in $(top_srcdir)/m4/ntp_cacheversion.m4 \ $(top_srcdir)/m4/ntp_dir_sep.m4 \ $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ -@@ -97,7 +99,8 @@ +@@ -98,7 +100,8 @@ DCFD = @DCFD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -1320,7 +1320,7 @@ Index: ntp-4.2.6p1+dfsg/parseutil/Makefile.in ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -@@ -106,6 +109,7 @@ +@@ -107,6 +110,7 @@ EF_PROGS = @EF_PROGS@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -1328,7 +1328,7 @@ Index: ntp-4.2.6p1+dfsg/parseutil/Makefile.in GREP = @GREP@ HAVE_INLINE = @HAVE_INLINE@ INSTALL = @INSTALL@ -@@ -114,6 +118,7 @@ +@@ -115,6 +119,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LCRYPTO = @LCRYPTO@ @@ -1336,7 +1336,7 @@ Index: ntp-4.2.6p1+dfsg/parseutil/Makefile.in LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@ -@@ -122,6 +127,7 @@ +@@ -123,6 +128,7 @@ LIBPARSE = @LIBPARSE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -1344,7 +1344,7 @@ Index: ntp-4.2.6p1+dfsg/parseutil/Makefile.in LN_S = @LN_S@ LSCF = @LSCF@ LTLIBOBJS = @LTLIBOBJS@ -@@ -139,10 +145,15 @@ +@@ -140,10 +146,15 @@ MAKE_TICKADJ = @MAKE_TICKADJ@ MAKE_TIMETRIM = @MAKE_TIMETRIM@ MKDIR_P = @MKDIR_P@ @@ -1360,7 +1360,7 @@ Index: ntp-4.2.6p1+dfsg/parseutil/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -156,6 +167,7 @@ +@@ -157,6 +168,7 @@ PATH_SH = @PATH_SH@ PROPDELAY = @PROPDELAY@ RANLIB = @RANLIB@ @@ -1368,7 +1368,7 @@ Index: ntp-4.2.6p1+dfsg/parseutil/Makefile.in SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SNMP_CFLAGS = @SNMP_CFLAGS@ -@@ -171,6 +183,7 @@ +@@ -172,6 +184,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ @@ -1376,7 +1376,7 @@ Index: ntp-4.2.6p1+dfsg/parseutil/Makefile.in am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -201,6 +214,7 @@ +@@ -202,6 +215,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -1384,7 +1384,7 @@ Index: ntp-4.2.6p1+dfsg/parseutil/Makefile.in mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -@@ -243,9 +257,9 @@ +@@ -244,9 +258,9 @@ exit 1;; \ esac; \ done; \ @@ -1396,10 +1396,10 @@ Index: ntp-4.2.6p1+dfsg/parseutil/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -Index: ntp-4.2.6p1+dfsg/clockstuff/Makefile.in +Index: ntp-4.2.6.p2+dfsg/clockstuff/Makefile.in =================================================================== ---- ntp-4.2.6p1+dfsg.orig/clockstuff/Makefile.in 2010-04-09 08:11:10.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/clockstuff/Makefile.in 2010-05-24 10:29:12.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/clockstuff/Makefile.in 2010-07-09 02:21:31.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/clockstuff/Makefile.in 2010-07-13 18:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -1417,7 +1417,7 @@ Index: ntp-4.2.6p1+dfsg/clockstuff/Makefile.in $(top_srcdir)/m4/ntp_cacheversion.m4 \ $(top_srcdir)/m4/ntp_dir_sep.m4 \ $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ -@@ -100,7 +102,8 @@ +@@ -101,7 +103,8 @@ DCFD = @DCFD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -1427,7 +1427,7 @@ Index: ntp-4.2.6p1+dfsg/clockstuff/Makefile.in ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -@@ -109,6 +112,7 @@ +@@ -110,6 +113,7 @@ EF_PROGS = @EF_PROGS@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -1435,7 +1435,7 @@ Index: ntp-4.2.6p1+dfsg/clockstuff/Makefile.in GREP = @GREP@ HAVE_INLINE = @HAVE_INLINE@ INSTALL = @INSTALL@ -@@ -117,6 +121,7 @@ +@@ -118,6 +122,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LCRYPTO = @LCRYPTO@ @@ -1443,7 +1443,7 @@ Index: ntp-4.2.6p1+dfsg/clockstuff/Makefile.in LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@ -@@ -125,6 +130,7 @@ +@@ -126,6 +131,7 @@ LIBPARSE = @LIBPARSE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -1451,7 +1451,7 @@ Index: ntp-4.2.6p1+dfsg/clockstuff/Makefile.in LN_S = @LN_S@ LSCF = @LSCF@ LTLIBOBJS = @LTLIBOBJS@ -@@ -142,10 +148,15 @@ +@@ -143,10 +149,15 @@ MAKE_TICKADJ = @MAKE_TICKADJ@ MAKE_TIMETRIM = @MAKE_TIMETRIM@ MKDIR_P = @MKDIR_P@ @@ -1467,7 +1467,7 @@ Index: ntp-4.2.6p1+dfsg/clockstuff/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -159,6 +170,7 @@ +@@ -160,6 +171,7 @@ PATH_SH = @PATH_SH@ PROPDELAY = @PROPDELAY@ RANLIB = @RANLIB@ @@ -1475,7 +1475,7 @@ Index: ntp-4.2.6p1+dfsg/clockstuff/Makefile.in SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SNMP_CFLAGS = @SNMP_CFLAGS@ -@@ -174,6 +186,7 @@ +@@ -175,6 +187,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ @@ -1483,7 +1483,7 @@ Index: ntp-4.2.6p1+dfsg/clockstuff/Makefile.in am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -204,6 +217,7 @@ +@@ -205,6 +218,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -1491,7 +1491,7 @@ Index: ntp-4.2.6p1+dfsg/clockstuff/Makefile.in mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -@@ -247,9 +261,9 @@ +@@ -248,9 +262,9 @@ exit 1;; \ esac; \ done; \ @@ -1503,10 +1503,10 @@ Index: ntp-4.2.6p1+dfsg/clockstuff/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -Index: ntp-4.2.6p1+dfsg/adjtimed/Makefile.in +Index: ntp-4.2.6.p2+dfsg/adjtimed/Makefile.in =================================================================== ---- ntp-4.2.6p1+dfsg.orig/adjtimed/Makefile.in 2010-04-09 08:11:10.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/adjtimed/Makefile.in 2010-05-24 10:29:12.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/adjtimed/Makefile.in 2010-07-09 02:21:31.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/adjtimed/Makefile.in 2010-07-13 18:24:07.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -1524,7 +1524,7 @@ Index: ntp-4.2.6p1+dfsg/adjtimed/Makefile.in $(top_srcdir)/m4/ntp_cacheversion.m4 \ $(top_srcdir)/m4/ntp_dir_sep.m4 \ $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ -@@ -100,7 +102,8 @@ +@@ -101,7 +103,8 @@ DCFD = @DCFD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -1534,7 +1534,7 @@ Index: ntp-4.2.6p1+dfsg/adjtimed/Makefile.in ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -@@ -109,6 +112,7 @@ +@@ -110,6 +113,7 @@ EF_PROGS = @EF_PROGS@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -1542,7 +1542,7 @@ Index: ntp-4.2.6p1+dfsg/adjtimed/Makefile.in GREP = @GREP@ HAVE_INLINE = @HAVE_INLINE@ INSTALL = @INSTALL@ -@@ -117,6 +121,7 @@ +@@ -118,6 +122,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LCRYPTO = @LCRYPTO@ @@ -1550,7 +1550,7 @@ Index: ntp-4.2.6p1+dfsg/adjtimed/Makefile.in LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@ -@@ -125,6 +130,7 @@ +@@ -126,6 +131,7 @@ LIBPARSE = @LIBPARSE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -1558,7 +1558,7 @@ Index: ntp-4.2.6p1+dfsg/adjtimed/Makefile.in LN_S = @LN_S@ LSCF = @LSCF@ LTLIBOBJS = @LTLIBOBJS@ -@@ -142,10 +148,15 @@ +@@ -143,10 +149,15 @@ MAKE_TICKADJ = @MAKE_TICKADJ@ MAKE_TIMETRIM = @MAKE_TIMETRIM@ MKDIR_P = @MKDIR_P@ @@ -1574,7 +1574,7 @@ Index: ntp-4.2.6p1+dfsg/adjtimed/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -159,6 +170,7 @@ +@@ -160,6 +171,7 @@ PATH_SH = @PATH_SH@ PROPDELAY = @PROPDELAY@ RANLIB = @RANLIB@ @@ -1582,7 +1582,7 @@ Index: ntp-4.2.6p1+dfsg/adjtimed/Makefile.in SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SNMP_CFLAGS = @SNMP_CFLAGS@ -@@ -174,6 +186,7 @@ +@@ -175,6 +187,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ @@ -1590,7 +1590,7 @@ Index: ntp-4.2.6p1+dfsg/adjtimed/Makefile.in am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -204,6 +217,7 @@ +@@ -205,6 +218,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -1598,7 +1598,7 @@ Index: ntp-4.2.6p1+dfsg/adjtimed/Makefile.in mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -@@ -242,9 +256,9 @@ +@@ -243,9 +257,9 @@ exit 1;; \ esac; \ done; \ @@ -1610,10 +1610,10 @@ Index: ntp-4.2.6p1+dfsg/adjtimed/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -Index: ntp-4.2.6p1+dfsg/ntpq/Makefile.in +Index: ntp-4.2.6.p2+dfsg/ntpq/Makefile.in =================================================================== ---- ntp-4.2.6p1+dfsg.orig/ntpq/Makefile.in 2010-04-09 08:11:14.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/ntpq/Makefile.in 2010-05-24 10:29:14.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/ntpq/Makefile.in 2010-07-09 02:21:35.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/ntpq/Makefile.in 2010-07-13 18:24:09.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -1631,7 +1631,7 @@ Index: ntp-4.2.6p1+dfsg/ntpq/Makefile.in $(top_srcdir)/m4/ntp_cacheversion.m4 \ $(top_srcdir)/m4/ntp_dir_sep.m4 \ $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ -@@ -140,7 +142,8 @@ +@@ -141,7 +143,8 @@ DCFD = @DCFD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -1641,7 +1641,7 @@ Index: ntp-4.2.6p1+dfsg/ntpq/Makefile.in ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -@@ -149,6 +152,7 @@ +@@ -150,6 +153,7 @@ EF_PROGS = @EF_PROGS@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -1649,7 +1649,7 @@ Index: ntp-4.2.6p1+dfsg/ntpq/Makefile.in GREP = @GREP@ HAVE_INLINE = @HAVE_INLINE@ INSTALL = @INSTALL@ -@@ -157,6 +161,7 @@ +@@ -158,6 +162,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LCRYPTO = @LCRYPTO@ @@ -1657,7 +1657,7 @@ Index: ntp-4.2.6p1+dfsg/ntpq/Makefile.in LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@ -@@ -165,6 +170,7 @@ +@@ -166,6 +171,7 @@ LIBPARSE = @LIBPARSE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -1665,7 +1665,7 @@ Index: ntp-4.2.6p1+dfsg/ntpq/Makefile.in LN_S = @LN_S@ LSCF = @LSCF@ LTLIBOBJS = @LTLIBOBJS@ -@@ -182,10 +188,15 @@ +@@ -183,10 +189,15 @@ MAKE_TICKADJ = @MAKE_TICKADJ@ MAKE_TIMETRIM = @MAKE_TIMETRIM@ MKDIR_P = @MKDIR_P@ @@ -1681,7 +1681,7 @@ Index: ntp-4.2.6p1+dfsg/ntpq/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -199,6 +210,7 @@ +@@ -200,6 +211,7 @@ PATH_SH = @PATH_SH@ PROPDELAY = @PROPDELAY@ RANLIB = @RANLIB@ @@ -1689,7 +1689,7 @@ Index: ntp-4.2.6p1+dfsg/ntpq/Makefile.in SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SNMP_CFLAGS = @SNMP_CFLAGS@ -@@ -214,6 +226,7 @@ +@@ -215,6 +227,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ @@ -1697,7 +1697,7 @@ Index: ntp-4.2.6p1+dfsg/ntpq/Makefile.in am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -244,6 +257,7 @@ +@@ -245,6 +258,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -1705,7 +1705,7 @@ Index: ntp-4.2.6p1+dfsg/ntpq/Makefile.in mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -@@ -306,9 +320,9 @@ +@@ -307,9 +321,9 @@ exit 1;; \ esac; \ done; \ @@ -1717,10 +1717,10 @@ Index: ntp-4.2.6p1+dfsg/ntpq/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -Index: ntp-4.2.6p1+dfsg/configure +Index: ntp-4.2.6.p2+dfsg/configure =================================================================== ---- ntp-4.2.6p1+dfsg.orig/configure 2010-04-09 08:11:19.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/configure 2010-05-24 10:29:08.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/configure 2010-07-09 02:21:39.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/configure 2010-07-13 18:24:03.000000000 +0000 @@ -530,22 +530,22 @@ # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} @@ -15679,7 +15679,7 @@ Index: ntp-4.2.6p1+dfsg/configure eval as_val=\$$as_ac_Header if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF -@@ -18774,196 +17505,158 @@ +@@ -18774,196 +17505,123 @@ done @@ -15703,21 +15703,9 @@ Index: ntp-4.2.6p1+dfsg/configure _ACEOF fi -+ - done - -+ ;; -+esac -+for ac_header in sys/stat.h sys/stream.h -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF - +-done +- +- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : @@ -15729,7 +15717,6 @@ Index: ntp-4.2.6p1+dfsg/configure -#include <stdarg.h> -#include <string.h> -#include <float.h> -+fi -int -main () @@ -15739,7 +15726,9 @@ Index: ntp-4.2.6p1+dfsg/configure - ; - return 0; -} -+for ac_header in sys/stropts.h sys/sysctl.h sys/syssgi.h sys/systune.h ++ ;; ++esac ++for ac_header in sys/stat.h sys/stream.h sys/stropts.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -15763,54 +15752,54 @@ Index: ntp-4.2.6p1+dfsg/configure -#include <string.h> +done -+for ac_header in sys/termios.h sys/time.h sys/signal.h ++# sys/sysctl.h depends on sys/param.h on OpenBSD - Bug 1576 ++for ac_header in sys/sysctl.h +do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : ++ ac_fn_c_check_header_compile "$LINENO" "sys/sysctl.h" "ac_cv_header_sys_sysctl_h" "#if defined HAVE_SYS_PARAM_H ++# include <sys/param.h> ++#endif ++" ++if test "x$ac_cv_header_sys_sysctl_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++#define HAVE_SYS_SYSCTL_H 1 _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - +- -else - ac_cv_header_stdc=no - fi +-fi -rm -f conftest* --fi -+done + fi -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -#include <stdlib.h> -+#if HAVE_SYS_TIME_H -+# include <sys/time.h> -+#endif -+#if HAVE_ERRNO_H -+# include <errno.h> -+#endif -+#include <sys/timepps.h> -+#ifdef PPS_API_VERS_1 -+yes -+#endif ++done ++for ac_header in sys/syssgi.h sys/systune.h ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : -- + -else - ac_cv_header_stdc=no --fi + fi -rm -f conftest* -- + -fi -- ++done + -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : @@ -15829,16 +15818,8 @@ Index: ntp-4.2.6p1+dfsg/configure - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -+ $EGREP "yes" >/dev/null 2>&1; then : -+ for ac_header in sys/timepps.h -+do : -+ ac_fn_c_check_header_compile "$LINENO" "sys/timepps.h" "ac_cv_header_sys_timepps_h" "#if HAVE_SYS_TIME_H -+# include <sys/time.h> -+#endif -+#if HAVE_ERRNO_H -+# include <errno.h> - #endif - +-#endif +- -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () @@ -15850,34 +15831,28 @@ Index: ntp-4.2.6p1+dfsg/configure - return 2; - return 0; -} -+" -+if test "x$ac_cv_header_sys_timepps_h" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_SYS_TIMEPPS_H 1 - _ACEOF +-_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - +- -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - +-fi +- -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then -+done - +- -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - - fi -+rm -f conftest* - +- +-fi +- -for ac_header in bstring.h -+for ac_header in sys/timers.h sys/tpro.h sys/types.h sys/wait.h ++for ac_header in sys/termios.h sys/time.h sys/signal.h do : - ac_fn_c_check_header_mongrel "$LINENO" "bstring.h" "ac_cv_header_bstring_h" "$ac_includes_default" -if test "x$ac_cv_header_bstring_h" = x""yes; then : @@ -15899,76 +15874,85 @@ Index: ntp-4.2.6p1+dfsg/configure - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DNSServiceRegister in -ldns_sd" >&5 -$as_echo_n "checking for DNSServiceRegister in -ldns_sd... " >&6; } -if test "${ac_cv_lib_dns_sd_DNSServiceRegister+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 -+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -+if test "${ac_cv_header_time+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldns_sd $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -+#include <sys/types.h> -+#include <sys/time.h> -+#include <time.h> ++#if HAVE_SYS_TIME_H ++# include <sys/time.h> ++#endif ++#if HAVE_ERRNO_H ++# include <errno.h> ++#endif ++#include <sys/timepps.h> ++#ifdef PPS_API_VERS_1 ++yes ++#endif -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" --#endif ++_ACEOF ++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | ++ $EGREP "yes" >/dev/null 2>&1; then : ++ for ac_header in sys/timepps.h ++do : ++ ac_fn_c_check_header_compile "$LINENO" "sys/timepps.h" "ac_cv_header_sys_timepps_h" "#if HAVE_SYS_TIME_H ++# include <sys/time.h> + #endif -char DNSServiceRegister (); - int - main () - { +-int +-main () +-{ -return DNSServiceRegister (); -+if ((struct tm *) 0) -+return 0; - ; - return 0; - } +- ; +- return 0; +-} ++#if HAVE_ERRNO_H ++# include <errno.h> ++#endif ++ ++" ++if test "x$ac_cv_header_sys_timepps_h" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_SYS_TIMEPPS_H 1 _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_dns_sd_DNSServiceRegister=yes -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_header_time=yes - else +-else - ac_cv_lib_dns_sd_DNSServiceRegister=no -+ ac_cv_header_time=no - fi +-fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dns_sd_DNSServiceRegister" >&5 -$as_echo "$ac_cv_lib_dns_sd_DNSServiceRegister" >&6; } -if test "x$ac_cv_lib_dns_sd_DNSServiceRegister" = x""yes; then : -- + -$as_echo "#define HAVE_DNSREGISTRATION 1" >>confdefs.h -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 -+$as_echo "$ac_cv_header_time" >&6; } -+if test $ac_cv_header_time = yes; then ++done -fi -+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h fi ++rm -f conftest* - -case "$ac_cv_lib_dns_sd_DNSServiceRegister" in - yes) LIBS="-ldns_sd $LIBS" ;; -esac -for ac_header in errno.h fcntl.h ieeefp.h kvm.h math.h -+case "$host" in -+*-convex-*) -+ for ac_header in /sys/sync/queue.h /sys/sync/sema.h ++for ac_header in sys/timers.h sys/tpro.h sys/types.h sys/wait.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -@@ -18977,24 +17670,9 @@ +@@ -18977,38 +17635,44 @@ done @@ -15976,31 +15960,46 @@ Index: ntp-4.2.6p1+dfsg/configure -for ac_header in md5.h -do : - ac_fn_c_check_header_compile "$LINENO" "md5.h" "ac_cv_header_md5_h" "#if HAVE_SYS_TYPES_H --#include <sys/types.h> ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 ++$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } ++if test "${ac_cv_header_time+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ + #include <sys/types.h> -#endif -- ++#include <sys/time.h> ++#include <time.h> + -" -if test "x$ac_cv_header_md5_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_MD5_H 1 --_ACEOF -- --fi ++int ++main () ++{ ++if ((struct tm *) 0) ++return 0; ++ ; ++ return 0; ++} + _ACEOF - ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_header_time=yes ++else ++ ac_cv_header_time=no + fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 ++$as_echo "$ac_cv_header_time" >&6; } ++if test $ac_cv_header_time = yes; then + -done - -for ac_header in memory.h netdb.h poll.h -+ ;; -+*-*-bsdi*) -+ for ac_header in machine/inline.h sys/pcl720.h sys/i8253.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -@@ -19008,216 +17686,333 @@ - - done - --for ac_header in sched.h sgtty.h stdlib.h string.h termio.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -16009,27 +16008,51 @@ Index: ntp-4.2.6p1+dfsg/configure - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF -- --fi -- ++$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h + + fi + -done +- +-for ac_header in sched.h sgtty.h stdlib.h string.h termio.h ++case "$host" in ++*-convex-*) ++ for ac_header in /sys/sync/queue.h /sys/sync/sema.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +@@ -19022,7 +17686,9 @@ + + done + +-for ac_header in termios.h timepps.h timex.h unistd.h ++ ;; ++*-*-bsdi*) ++ for ac_header in machine/inline.h sys/pcl720.h sys/i8253.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +@@ -19036,188 +17702,333 @@ + + done + + ;; +esac --for ac_header in termios.h timepps.h timex.h unistd.h -+case "$host" in + case "$host" in +- *-*-aix*) +- for ac_header in utmpx.h + *-*-*linux*) + for ac_func in __adjtimex __ntp_gettime do : -- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" --eval as_val=\$$as_ac_Header +- ac_fn_c_check_header_mongrel "$LINENO" "utmpx.h" "ac_cv_header_utmpx_h" "$ac_includes_default" +-if test "x$ac_cv_header_utmpx_h" = x""yes; then : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : ++ if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-#define HAVE_UTMPX_H 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -16037,6 +16060,12 @@ Index: ntp-4.2.6p1+dfsg/configure - done +- case "$ac_cv_header_utmpx_h" in +- yes) ;; +- *) for ac_header in utmp.h +-do : +- ac_fn_c_check_header_mongrel "$LINENO" "utmp.h" "ac_cv_header_utmp_h" "$ac_includes_default" +-if test "x$ac_cv_header_utmp_h" = x""yes; then : + ;; +esac +case "$ac_cv_func___adjtimex" in @@ -16051,15 +16080,7 @@ Index: ntp-4.2.6p1+dfsg/configure +LIBS="-lelf $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - --case "$host" in -- *-*-aix*) -- for ac_header in utmpx.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "utmpx.h" "ac_cv_header_utmpx_h" "$ac_includes_default" --if test "x$ac_cv_header_utmpx_h" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_UTMPX_H 1 ++ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -16074,22 +16095,12 @@ Index: ntp-4.2.6p1+dfsg/configure + ; + return 0; +} - _ACEOF -- ++_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_elf_nlist=yes +else + ac_cv_lib_elf_nlist=no - fi -- --done -- -- case "$ac_cv_header_utmpx_h" in -- yes) ;; -- *) for ac_header in utmp.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "utmp.h" "ac_cv_header_utmp_h" "$ac_includes_default" --if test "x$ac_cv_header_utmp_h" = x""yes; then : ++fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS @@ -16102,9 +16113,10 @@ Index: ntp-4.2.6p1+dfsg/configure +#define HAVE_LIBELF 1 _ACEOF +-fi + LIBS="-lelf $LIBS" + - fi ++fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lkvm" >&5 +$as_echo_n "checking for main in -lkvm... " >&6; } +if test "${ac_cv_lib_kvm_main+set}" = set; then : @@ -16141,11 +16153,11 @@ Index: ntp-4.2.6p1+dfsg/configure + ac_cv_lib_kvm_main=yes +else + ac_cv_lib_kvm_main=no -+fi + fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS - fi ++fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_main" >&5 +$as_echo "$ac_cv_lib_kvm_main" >&6; } +if test "x$ac_cv_lib_kvm_main" = x""yes; then : @@ -16346,33 +16358,19 @@ Index: ntp-4.2.6p1+dfsg/configure done -for ac_header in net/if6.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "net/if6.h" "ac_cv_header_net_if6_h" "$ac_includes_default" --if test "x$ac_cv_header_net_if6_h" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_NET_IF6_H 1 --_ACEOF -- --fi -- --done - --for ac_header in net/route.h ++ +for ac_header in sys/resource.h do : -- ac_fn_c_check_header_compile "$LINENO" "net/route.h" "ac_cv_header_net_route_h" " --#include <sys/types.h> --#include <sys/socket.h> --#include <net/if.h> +- ac_fn_c_check_header_mongrel "$LINENO" "net/if6.h" "ac_cv_header_net_if6_h" "$ac_includes_default" +-if test "x$ac_cv_header_net_if6_h" = x""yes; then : + ac_fn_c_check_header_compile "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "#if HAVE_SYS_TIME_H +# include <sys/time.h> +#endif - - " --if test "x$ac_cv_header_net_route_h" = x""yes; then : ++ ++" +if test "x$ac_cv_header_sys_resource_h" = x""yes; then : cat >>confdefs.h <<_ACEOF --#define HAVE_NET_ROUTE_H 1 +-#define HAVE_NET_IF6_H 1 +#define HAVE_SYS_RESOURCE_H 1 _ACEOF @@ -16380,25 +16378,26 @@ Index: ntp-4.2.6p1+dfsg/configure done --for ac_header in netinet/in_system.h netinet/in_systm.h +-for ac_header in net/route.h + +for ac_header in sys/shm.h do : -- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` --ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" --eval as_val=\$$as_ac_Header -- if test "x$as_val" = x""yes; then : +- ac_fn_c_check_header_compile "$LINENO" "net/route.h" "ac_cv_header_net_route_h" " +-#include <sys/types.h> +-#include <sys/socket.h> +-#include <net/if.h> + ac_fn_c_check_header_compile "$LINENO" "sys/shm.h" "ac_cv_header_sys_shm_h" "#if HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +#if HAVE_SYS_IPC_H +# include <sys/ipc.h> +#endif -+ -+" + + " +-if test "x$ac_cv_header_net_route_h" = x""yes; then : +if test "x$ac_cv_header_sys_shm_h" = x""yes; then : cat >>confdefs.h <<_ACEOF --#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +-#define HAVE_NET_ROUTE_H 1 +#define HAVE_SYS_SHM_H 1 _ACEOF @@ -16406,12 +16405,14 @@ Index: ntp-4.2.6p1+dfsg/configure done --for ac_header in netinet/in.h +-for ac_header in netinet/in_system.h netinet/in_systm.h + +for ac_header in sys/timex.h do : -- ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default" --if test "x$ac_cv_header_netinet_in_h" = x""yes; then : +- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +-eval as_val=\$$as_ac_Header +- if test "x$as_val" = x""yes; then : + ac_fn_c_check_header_compile "$LINENO" "sys/timex.h" "ac_cv_header_sys_timex_h" "#if HAVE_SYS_TIME_H +# include <sys/time.h> +#endif @@ -16419,7 +16420,7 @@ Index: ntp-4.2.6p1+dfsg/configure +" +if test "x$ac_cv_header_sys_timex_h" = x""yes; then : cat >>confdefs.h <<_ACEOF --#define HAVE_NETINET_IN_H 1 +-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_SYS_TIMEX_H 1 _ACEOF @@ -16427,8 +16428,19 @@ Index: ntp-4.2.6p1+dfsg/configure done +-for ac_header in netinet/in.h +-do : +- ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default" +-if test "x$ac_cv_header_netinet_in_h" = x""yes; then : +- cat >>confdefs.h <<_ACEOF +-#define HAVE_NETINET_IN_H 1 +-_ACEOF + +-fi +- +-done +- -for ac_header in netinet/ip.h -+ +for ac_header in resolv.h do : - ac_fn_c_check_header_compile "$LINENO" "netinet/ip.h" "ac_cv_header_netinet_ip_h" "#if HAVE_SYS_TYPES_H @@ -16453,7 +16465,7 @@ Index: ntp-4.2.6p1+dfsg/configure _ACEOF fi -@@ -19225,2288 +18020,2298 @@ +@@ -19225,3454 +18036,2873 @@ done @@ -16747,20 +16759,8 @@ Index: ntp-4.2.6p1+dfsg/configure +else + ac_cv_c_bigendian=no fi -- --done -- --# HMS: Check sys/proc.h and sys/resource.h after some others --for ac_header in sys/ppstime.h --do : -- ac_fn_c_check_header_mongrel "$LINENO" "sys/ppstime.h" "ac_cv_header_sys_ppstime_h" "$ac_includes_default" --if test "x$ac_cv_header_sys_ppstime_h" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_PPSTIME_H 1 --_ACEOF -- +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi ++fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi + if test $ac_cv_c_bigendian = unknown; then @@ -16777,14 +16777,13 @@ Index: ntp-4.2.6p1+dfsg/configure + bogus endian macros + #endif --case "$ac_cv_header_sched_h" in -- yes) ;; -- *) for ac_header in sys/sched.h +-# HMS: Check sys/proc.h and sys/resource.h after some others +-for ac_header in sys/ppstime.h -do : -- ac_fn_c_check_header_mongrel "$LINENO" "sys/sched.h" "ac_cv_header_sys_sched_h" "$ac_includes_default" --if test "x$ac_cv_header_sys_sched_h" = x""yes; then : +- ac_fn_c_check_header_mongrel "$LINENO" "sys/ppstime.h" "ac_cv_header_sys_ppstime_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_ppstime_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_SCHED_H 1 +-#define HAVE_SYS_PPSTIME_H 1 + ; + return 0; +} @@ -16796,6 +16795,8 @@ Index: ntp-4.2.6p1+dfsg/configure +#include <limits.h> -fi +- +-done +int +main () +{ @@ -16803,26 +16804,24 @@ Index: ntp-4.2.6p1+dfsg/configure + not big endian + #endif --done -- ;; --esac --case "$host" in -- *-*-sco*) -- for ac_header in sys/sio.h +-case "$ac_cv_header_sched_h" in +- yes) ;; +- *) for ac_header in sys/sched.h -do : -- ac_fn_c_check_header_mongrel "$LINENO" "sys/sio.h" "ac_cv_header_sys_sio_h" "$ac_includes_default" --if test "x$ac_cv_header_sys_sio_h" = x""yes; then : +- ac_fn_c_check_header_mongrel "$LINENO" "sys/sched.h" "ac_cv_header_sys_sched_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_sched_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_SIO_H 1 +-#define HAVE_SYS_SCHED_H 1 + ; + return 0; +} _ACEOF +- +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_bigendian=yes +else + ac_cv_c_bigendian=no -+fi + fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -16849,6 +16848,17 @@ Index: ntp-4.2.6p1+dfsg/configure + } + extern int foo; +-done +- ;; +-esac +-case "$host" in +- *-*-sco*) +- for ac_header in sys/sio.h +-do : +- ac_fn_c_check_header_mongrel "$LINENO" "sys/sio.h" "ac_cv_header_sys_sio_h" "$ac_includes_default" +-if test "x$ac_cv_header_sys_sio_h" = x""yes; then : +- cat >>confdefs.h <<_ACEOF +-#define HAVE_SYS_SIO_H 1 +int +main () +{ @@ -16856,7 +16866,8 @@ Index: ntp-4.2.6p1+dfsg/configure + ; + return 0; +} -+_ACEOF + _ACEOF +- +if ac_fn_c_try_compile "$LINENO"; then : + if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then + ac_cv_c_bigendian=yes @@ -16945,7 +16956,8 @@ Index: ntp-4.2.6p1+dfsg/configure + as_fn_error "unknown endianness + presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; + esac -+ + +-fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 +$as_echo_n "checking return type of signal handlers... " >&6; } +if test "${ac_cv_type_signal+set}" = set; then : @@ -16956,6 +16968,7 @@ Index: ntp-4.2.6p1+dfsg/configure +#include <sys/types.h> +#include <signal.h> +-done +int +main () +{ @@ -16968,20 +16981,15 @@ Index: ntp-4.2.6p1+dfsg/configure + ac_cv_type_signal=int +else + ac_cv_type_signal=void - fi ++fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 +$as_echo "$ac_cv_type_signal" >&6; } --done -+cat >>confdefs.h <<_ACEOF -+#define RETSIGTYPE $ac_cv_type_signal -+_ACEOF - - ;; -esac --for ac_header in sys/stat.h sys/stream.h +-for ac_header in sys/stat.h sys/stream.h sys/stropts.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -16989,10 +16997,26 @@ Index: ntp-4.2.6p1+dfsg/configure - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+ ++cat >>confdefs.h <<_ACEOF ++#define RETSIGTYPE $ac_cv_type_signal + _ACEOF + +-fi + +-done +ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" +if test "x$ac_cv_type_off_t" = x""yes; then : -+ + +-# sys/sysctl.h depends on sys/param.h on OpenBSD - Bug 1576 +-for ac_header in sys/sysctl.h +-do : +- ac_fn_c_check_header_compile "$LINENO" "sys/sysctl.h" "ac_cv_header_sys_sysctl_h" "#if defined HAVE_SYS_PARAM_H +-# include <sys/param.h> +-#endif +-" +-if test "x$ac_cv_header_sys_sysctl_h" = x""yes; then : +- cat >>confdefs.h <<_ACEOF +-#define HAVE_SYS_SYSCTL_H 1 +else + +cat >>confdefs.h <<_ACEOF @@ -17002,10 +17026,8 @@ Index: ntp-4.2.6p1+dfsg/configure fi -done -+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -+if test "x$ac_cv_type_size_t" = x""yes; then : - --for ac_header in sys/stropts.h sys/sysctl.h sys/syssgi.h sys/systune.h +- +-for ac_header in sys/syssgi.h sys/systune.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -17013,6 +17035,9 @@ Index: ntp-4.2.6p1+dfsg/configure - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" ++if test "x$ac_cv_type_size_t" = x""yes; then : ++ +else + +cat >>confdefs.h <<_ACEOF @@ -17223,10 +17248,10 @@ Index: ntp-4.2.6p1+dfsg/configure - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -- + -fi -done - +- - ;; -esac -case "$ac_cv_func___adjtimex" in @@ -17336,52 +17361,19 @@ Index: ntp-4.2.6p1+dfsg/configure -if test "x$ac_cv_lib_kvm_main" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBKVM 1 --_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_u_int64_t" >&5 +$as_echo "$ac_cv_type_u_int64_t" >&6; } +if test $ac_cv_type_u_int64_t = yes; then - -- LIBS="-lkvm $LIBS" ++ +$as_echo "#define HAVE_TYPE_U_INT64_T 1" >>confdefs.h - - fi -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nlist in -lld" >&5 --$as_echo_n "checking for nlist in -lld... " >&6; } --if test "${ac_cv_lib_ld_nlist+set}" = set; then : ++ ++fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a fallback value for HZ" >&5 +$as_echo_n "checking for a fallback value for HZ... " >&6; } +if test "${ac_cv_var_default_hz+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lld $LIBS" --cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- --/* Override any GCC internal prototype to avoid an error. -- Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ --#ifdef __cplusplus --extern "C" --#endif --char nlist (); --int --main () --{ --return nlist (); -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_ld_nlist=yes --else -- ac_cv_lib_ld_nlist=no --fi --rm -f core conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS ++ $as_echo_n "(cached) " >&6 ++else + ac_cv_var_default_hz=100 +case "$host" in + alpha*-dec-osf4*|alpha*-dec-osf5*) @@ -17391,12 +17383,7 @@ Index: ntp-4.2.6p1+dfsg/configure + ac_cv_var_default_hz=256 + ;; +esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ld_nlist" >&5 --$as_echo "$ac_cv_lib_ld_nlist" >&6; } --if test "x$ac_cv_lib_ld_nlist" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_LIBLD 1 ++fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_default_hz" >&5 +$as_echo "$ac_cv_var_default_hz" >&6; } + @@ -17404,7 +17391,7 @@ Index: ntp-4.2.6p1+dfsg/configure +#define DEFAULT_HZ $ac_cv_var_default_hz _ACEOF -- LIBS="-lld $LIBS" +- LIBS="-lkvm $LIBS" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need to override the system's value for HZ" >&5 +$as_echo_n "checking if we need to override the system's value for HZ... " >&6; } @@ -17430,14 +17417,14 @@ Index: ntp-4.2.6p1+dfsg/configure + ;; +esac fi +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nlist in -lld" >&5 +-$as_echo_n "checking for nlist in -lld... " >&6; } +-if test "${ac_cv_lib_ld_nlist+set}" = set; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_override_hz" >&5 +$as_echo "$ac_cv_var_override_hz" >&6; } +case "$ac_cv_var_override_hz" in + yes) - -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nlist in -lmld" >&5 --$as_echo_n "checking for nlist in -lmld... " >&6; } --if test "${ac_cv_lib_mld_nlist+set}" = set; then : ++ +$as_echo "#define OVERRIDE_HZ 1" >>confdefs.h + + ;; @@ -17451,7 +17438,7 @@ Index: ntp-4.2.6p1+dfsg/configure $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lmld $LIBS" +-LIBS="-lld $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17477,152 +17464,158 @@ Index: ntp-4.2.6p1+dfsg/configure } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : -- ac_cv_lib_mld_nlist=yes +- ac_cv_lib_ld_nlist=yes +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_struct_rt_msghdr=yes else -- ac_cv_lib_mld_nlist=no +- ac_cv_lib_ld_nlist=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + ac_cv_struct_rt_msghdr=no fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mld_nlist" >&5 --$as_echo "$ac_cv_lib_mld_nlist" >&6; } --if test "x$ac_cv_lib_mld_nlist" = x""yes; then : +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ld_nlist" >&5 +-$as_echo "$ac_cv_lib_ld_nlist" >&6; } +-if test "x$ac_cv_lib_ld_nlist" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define HAVE_LIBMLD 1 +-#define HAVE_LIBLD 1 -_ACEOF - -- LIBS="-lmld $LIBS" +- LIBS="-lld $LIBS" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_rt_msghdr" >&5 +$as_echo "$ac_cv_struct_rt_msghdr" >&6; } -- ac_fn_c_check_header_mongrel "$LINENO" "nlist.h" "ac_cv_header_nlist_h" "$ac_includes_default" --if test "x$ac_cv_header_nlist_h" = x""yes; then : -- --$as_echo "#define NLIST_STRUCT 1" >>confdefs.h -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for n_un in struct nlist" >&5 --$as_echo_n "checking for n_un in struct nlist... " >&6; } --if test "${ac_cv_struct_nlist_n_un+set}" = set; then : +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nlist in -lmld" >&5 +-$as_echo_n "checking for nlist in -lmld... " >&6; } +-if test "${ac_cv_lib_mld_nlist+set}" = set; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct rtattr" >&5 +$as_echo_n "checking for struct rtattr... " >&6; } +if test "${ac_cv_struct_rtattr+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lmld $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ --#include <nlist.h> -+ + +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char nlist (); +#include <stddef.h> +#include <linux/rtnetlink.h> int main () { --struct nlist n; n.n_un.n_name = 0; +-return nlist (); +struct rtattr p; ; return 0; } _ACEOF - if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_struct_nlist_n_un=yes +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_mld_nlist=yes ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_struct_rtattr=yes else -- ac_cv_struct_nlist_n_un=no +- ac_cv_lib_mld_nlist=no + ac_cv_struct_rtattr=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_nlist_n_un" >&5 --$as_echo "$ac_cv_struct_nlist_n_un" >&6; } -- if test $ac_cv_struct_nlist_n_un = yes; then +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mld_nlist" >&5 +-$as_echo "$ac_cv_lib_mld_nlist" >&6; } +-if test "x$ac_cv_lib_mld_nlist" = x""yes; then : +- cat >>confdefs.h <<_ACEOF +-#define HAVE_LIBMLD 1 +-_ACEOF +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_rtattr" >&5 +$as_echo "$ac_cv_struct_rtattr" >&6; } --$as_echo "#define NLIST_NAME_UNION 1" >>confdefs.h +- LIBS="-lmld $LIBS" +if test $ac_cv_struct_rt_msghdr = yes -o $ac_cv_struct_rtattr = yes; then -- fi +-fi +$as_echo "#define HAS_ROUTING_SOCKET 1" >>confdefs.h --fi +- ac_fn_c_check_header_mongrel "$LINENO" "nlist.h" "ac_cv_header_nlist_h" "$ac_includes_default" +-if test "x$ac_cv_header_nlist_h" = x""yes; then : + if test $ac_cv_struct_rtattr = yes; then -- ;; --esac +-$as_echo "#define NLIST_STRUCT 1" >>confdefs.h +$as_echo "#define HAVE_RTNETLINK 1" >>confdefs.h +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for n_un in struct nlist" >&5 +-$as_echo_n "checking for n_un in struct nlist... " >&6; } +-if test "${ac_cv_struct_nlist_n_un+set}" = set; then : + fi +fi - --for ac_header in sys/proc.h --do : -- ac_fn_c_check_header_compile "$LINENO" "sys/proc.h" "ac_cv_header_sys_proc_h" "#if HAVE_SYS_TYPES_H --# include <sys/types.h> --#endif --#if HAVE_SYS_TIME_H --# include <sys/time.h> --#endif ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking struct sigaction for sa_sigaction" >&5 +$as_echo_n "checking struct sigaction for sa_sigaction... " >&6; } +if test "${ac_cv_struct_sigaction_has_sa_sigaction+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else - --" --if test "x$ac_cv_header_sys_proc_h" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_PROC_H 1 + $as_echo_n "(cached) " >&6 + else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ + /* end confdefs.h. */ +-#include <nlist.h> +#include <signal.h> -+int -+main () -+{ + int + main () + { +-struct nlist n; n.n_un.n_name = 0; +struct sigaction act; act.sa_sigaction = 0; -+ ; -+ return 0; -+} + ; + return 0; + } _ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_struct_nlist_n_un=yes + ac_cv_struct_sigaction_has_sa_sigaction=yes -+else + else +- ac_cv_struct_nlist_n_un=no + ac_cv_struct_sigaction_has_sa_sigaction=no - ++ fi + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_nlist_n_un" >&5 +-$as_echo "$ac_cv_struct_nlist_n_un" >&6; } +- if test $ac_cv_struct_nlist_n_un = yes; then - --done -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-$as_echo "#define NLIST_NAME_UNION 1" >>confdefs.h +- fi --for ac_header in sys/resource.h --do : -- ac_fn_c_check_header_compile "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "#if HAVE_SYS_TIME_H --# include <sys/time.h> --#endif -+fi + fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_sigaction_has_sa_sigaction" >&5 +$as_echo "$ac_cv_struct_sigaction_has_sa_sigaction" >&6; } +if test $ac_cv_struct_sigaction_has_sa_sigaction = yes; then --" --if test "x$ac_cv_header_sys_resource_h" = x""yes; then : -- cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_RESOURCE_H 1 --_ACEOF +- ;; +-esac +$as_echo "#define HAVE_SA_SIGACTION_IN_STRUCT_SIGACTION 1" >>confdefs.h - fi ++fi --done -- +-for ac_header in sys/proc.h +-do : +- ac_fn_c_check_header_compile "$LINENO" "sys/proc.h" "ac_cv_header_sys_proc_h" "#if HAVE_SYS_TYPES_H +-# include <sys/types.h> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct ppsclockev" >&5 +$as_echo_n "checking for struct ppsclockev... " >&6; } +if test "${ac_cv_struct_ppsclockev+set}" = set; then : @@ -17630,31 +17623,26 @@ Index: ntp-4.2.6p1+dfsg/configure +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - --for ac_header in sys/shm.h --do : -- ac_fn_c_check_header_compile "$LINENO" "sys/shm.h" "ac_cv_header_sys_shm_h" "#if HAVE_SYS_TYPES_H --# include <sys/types.h> ++ +#include <sys/types.h> +#ifdef HAVE_SYS_TERMIOS_H +# include <sys/termios.h> #endif --#if HAVE_SYS_IPC_H --# include <sys/ipc.h> +-#if HAVE_SYS_TIME_H +#ifdef HAVE_SYS_TIME_H -+# include <sys/time.h> -+#endif + # include <sys/time.h> + #endif +#ifdef HAVE_SYS_PPSCLOCK_H +# include <sys/ppsclock.h> - #endif ++#endif +int +main () +{ -" --if test "x$ac_cv_header_sys_shm_h" = x""yes; then : +-if test "x$ac_cv_header_sys_proc_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_SHM_H 1 +-#define HAVE_SYS_PROC_H 1 +extern struct ppsclockev *pce; +return pce->serial; + ; @@ -17678,9 +17666,9 @@ Index: ntp-4.2.6p1+dfsg/configure +fi --for ac_header in sys/timex.h +-for ac_header in sys/resource.h -do : -- ac_fn_c_check_header_compile "$LINENO" "sys/timex.h" "ac_cv_header_sys_timex_h" "#if HAVE_SYS_TIME_H +- ac_fn_c_check_header_compile "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "#if HAVE_SYS_TIME_H -# include <sys/time.h> -#endif +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5 @@ -17690,15 +17678,15 @@ Index: ntp-4.2.6p1+dfsg/configure +else -" --if test "x$ac_cv_header_sys_timex_h" = x""yes; then : +-if test "x$ac_cv_header_sys_resource_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define HAVE_SYS_TIMEX_H 1 +-#define HAVE_SYS_RESOURCE_H 1 -_ACEOF -- --fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +-fi +- -done + #ifdef HAVE_SYS_TYPES_H + # include <sys/types.h> @@ -17714,23 +17702,20 @@ Index: ntp-4.2.6p1+dfsg/configure +main () +{ --for ac_header in resolv.h +-for ac_header in sys/shm.h -do : -- ac_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" "#if HAVE_SYS_TYPES_H --#include <sys/types.h> --#endif --#if HAVE_NETINET_IN_H --#include <netinet/in.h> +- ac_fn_c_check_header_compile "$LINENO" "sys/shm.h" "ac_cv_header_sys_shm_h" "#if HAVE_SYS_TYPES_H +-# include <sys/types.h> -#endif --#if HAVE_ARPA_NAMESER_H --#include <arpa/nameser.h> +-#if HAVE_SYS_IPC_H +-# include <sys/ipc.h> -#endif + struct sockaddr_storage n; -" --if test "x$ac_cv_header_resolv_h" = x""yes; then : +-if test "x$ac_cv_header_sys_shm_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define HAVE_RESOLV_H 1 +-#define HAVE_SYS_SHM_H 1 + ; + return 0; +} @@ -17750,24 +17735,32 @@ Index: ntp-4.2.6p1+dfsg/configure +$as_echo "$ntp_cv_sockaddr_storage" >&6; } +case "$ntp_cv_sockaddr_storage" in + yes) -+ + +-for ac_header in sys/timex.h +-do : +- ac_fn_c_check_header_compile "$LINENO" "sys/timex.h" "ac_cv_header_sys_timex_h" "#if HAVE_SYS_TIME_H +-# include <sys/time.h> +-#endif +$as_echo "#define HAVE_STRUCT_SOCKADDR_STORAGE 1" >>confdefs.h --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for basic volatile support" >&5 --$as_echo_n "checking for basic volatile support... " >&6; } --if test "${ac_cv_c_volatile+set}" = set; then : +-" +-if test "x$ac_cv_header_sys_timex_h" = x""yes; then : +- cat >>confdefs.h <<_ACEOF +-#define HAVE_SYS_TIMEX_H 1 +-_ACEOF +esac -+ + +-fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage.ss_family" >&5 +$as_echo_n "checking for sockaddr_storage.ss_family... " >&6; } +if test "${ntp_cv_have_ss_family+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ ++ $as_echo_n "(cached) " >&6 ++else +-done ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ + #ifdef HAVE_SYS_TYPES_H + # include <sys/types.h> + #endif @@ -17777,14 +17770,79 @@ Index: ntp-4.2.6p1+dfsg/configure + #ifdef HAVE_NETINET_IN_H + # include <netinet/in.h> + #endif + ++int ++main () ++{ + +-for ac_header in resolv.h +-do : +- ac_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" "#if HAVE_SYS_TYPES_H +-#include <sys/types.h> +-#endif +-#if HAVE_NETINET_IN_H +-#include <netinet/in.h> +-#endif +-#if HAVE_ARPA_NAMESER_H +-#include <arpa/nameser.h> +-#endif ++ struct sockaddr_storage s; ++ s.ss_family = 1; + +-" +-if test "x$ac_cv_header_resolv_h" = x""yes; then : +- cat >>confdefs.h <<_ACEOF +-#define HAVE_RESOLV_H 1 ++ ; ++ return 0; ++} + _ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : ++ ntp_cv_have_ss_family="yes" ++else ++ ntp_cv_have_ss_family="no" + + fi ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-done + ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_have_ss_family" >&5 ++$as_echo "$ntp_cv_have_ss_family" >&6; } + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for basic volatile support" >&5 +-$as_echo_n "checking for basic volatile support... " >&6; } +-if test "${ac_cv_c_volatile+set}" = set; then : ++case "$ntp_cv_have_ss_family" in ++ no) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage.__ss_family" >&5 ++$as_echo_n "checking for sockaddr_storage.__ss_family... " >&6; } ++if test "${ntp_cv_have___ss_family+set}" = set; then : + $as_echo_n "(cached) " >&6 + else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++ #ifdef HAVE_SYS_TYPES_H ++ # include <sys/types.h> ++ #endif ++ #ifdef HAVE_SYS_SOCKET_H ++ # include <sys/socket.h> ++ #endif ++ #ifdef HAVE_NETINET_IN_H ++ # include <netinet/in.h> ++ #endif + int main () { -volatile int x; -+ struct sockaddr_storage s; -+ s.ss_family = 1; ++ struct sockaddr_storage s; ++ s.__ss_family = 1; + ; return 0; @@ -17792,15 +17850,16 @@ Index: ntp-4.2.6p1+dfsg/configure _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_volatile=yes -+ ntp_cv_have_ss_family="yes" ++ ntp_cv_have___ss_family="yes" else - ac_cv_c_volatile=no -+ ntp_cv_have_ss_family="no" ++ ntp_cv_have___ss_family="no" + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi ++ + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5 -$as_echo "$ac_cv_c_volatile" >&6; } -case "$ac_cv_c_volatile" in @@ -17808,37 +17867,41 @@ Index: ntp-4.2.6p1+dfsg/configure - ;; - *) -$as_echo "#define volatile /**/" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_have___ss_family" >&5 ++$as_echo "$ntp_cv_have___ss_family" >&6; } ++ case "$ntp_cv_have___ss_family" in ++ yes) - ;; --esac -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_have_ss_family" >&5 -+$as_echo "$ntp_cv_have_ss_family" >&6; } ++$as_echo "#define HAVE___SS_FAMILY_IN_SS 1" >>confdefs.h ++ ++ esac + esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if test "${ac_cv_c_const+set}" = set; then : -+case "$ntp_cv_have_ss_family" in -+ no) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage.__ss_family" >&5 -+$as_echo_n "checking for sockaddr_storage.__ss_family... " >&6; } -+if test "${ntp_cv_have___ss_family+set}" = set; then : ++ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage.ss_len" >&5 ++$as_echo_n "checking for sockaddr_storage.ss_len... " >&6; } ++if test "${ntp_cv_have_ss_len+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -+ #ifdef HAVE_SYS_TYPES_H -+ # include <sys/types.h> -+ #endif -+ #ifdef HAVE_SYS_SOCKET_H -+ # include <sys/socket.h> -+ #endif -+ #ifdef HAVE_NETINET_IN_H -+ # include <netinet/in.h> -+ #endif ++ #ifdef HAVE_SYS_TYPES_H ++ # include <sys/types.h> ++ #endif ++ #ifdef HAVE_SYS_SOCKET_H ++ # include <sys/socket.h> ++ #endif ++ #ifdef HAVE_NETINET_IN_H ++ # include <netinet/in.h> ++ #endif + int main () @@ -17892,8 +17955,8 @@ Index: ntp-4.2.6p1+dfsg/configure - } - return !cs[0] && !zero.x; -#endif -+ struct sockaddr_storage s; -+ s.__ss_family = 1; ++ struct sockaddr_storage s; ++ s.ss_len = 1; ; return 0; @@ -17901,10 +17964,10 @@ Index: ntp-4.2.6p1+dfsg/configure _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_const=yes -+ ntp_cv_have___ss_family="yes" ++ ntp_cv_have_ss_len="yes" else - ac_cv_c_const=no -+ ntp_cv_have___ss_family="no" ++ ntp_cv_have_ss_len="no" + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -17916,24 +17979,17 @@ Index: ntp-4.2.6p1+dfsg/configure -$as_echo "#define const /**/" >>confdefs.h fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_have___ss_family" >&5 -+$as_echo "$ntp_cv_have___ss_family" >&6; } -+ case "$ntp_cv_have___ss_family" in -+ yes) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_have_ss_len" >&5 ++$as_echo "$ntp_cv_have_ss_len" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -$as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then : -+$as_echo "#define HAVE___SS_FAMILY_IN_SS 1" >>confdefs.h -+ -+ esac -+esac -+ -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage.ss_len" >&5 -+$as_echo_n "checking for sockaddr_storage.ss_len... " >&6; } -+if test "${ntp_cv_have_ss_len+set}" = set; then : ++case "$ntp_cv_have_ss_len" in ++ no) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage.__ss_len" >&5 ++$as_echo_n "checking for sockaddr_storage.__ss_len... " >&6; } ++if test "${ntp_cv_have___ss_len+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_cv_c_bigendian=unknown @@ -17944,9 +18000,11 @@ Index: ntp-4.2.6p1+dfsg/configure - not a universal capable compiler - #endif - typedef int dummy; -- + -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ - # Check for potential -arch flags. It is not universal unless - # there are at least two -arch flags with different values. @@ -17974,20 +18032,18 @@ Index: ntp-4.2.6p1+dfsg/configure - if test $ac_cv_c_bigendian = unknown; then - # See if sys/param.h defines the BYTE_ORDER macro. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -#include <sys/types.h> - #include <sys/param.h> -+ -+ #ifdef HAVE_SYS_TYPES_H -+ # include <sys/types.h> -+ #endif -+ #ifdef HAVE_SYS_SOCKET_H -+ # include <sys/socket.h> -+ #endif -+ #ifdef HAVE_NETINET_IN_H -+ # include <netinet/in.h> -+ #endif ++ #ifdef HAVE_SYS_TYPES_H ++ # include <sys/types.h> ++ #endif ++ #ifdef HAVE_SYS_SOCKET_H ++ # include <sys/socket.h> ++ #endif ++ #ifdef HAVE_NETINET_IN_H ++ # include <netinet/in.h> ++ #endif int main () @@ -17998,8 +18054,8 @@ Index: ntp-4.2.6p1+dfsg/configure - bogus endian macros - #endif + -+ struct sockaddr_storage s; -+ s.ss_len = 1; ++ struct sockaddr_storage s; ++ s.__ss_len = 1; ; return 0; @@ -18008,41 +18064,43 @@ Index: ntp-4.2.6p1+dfsg/configure if ac_fn_c_try_compile "$LINENO"; then : - # It does; now see whether it defined to BIG_ENDIAN or not. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <sys/types.h> -- #include <sys/param.h> -+ ntp_cv_have_ss_len="yes" ++ ntp_cv_have___ss_len="yes" +else -+ ntp_cv_have_ss_len="no" ++ ntp_cv_have___ss_len="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + +fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_have_ss_len" >&5 -+$as_echo "$ntp_cv_have_ss_len" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_have___ss_len" >&5 ++$as_echo "$ntp_cv_have___ss_len" >&6; } ++ case "$ntp_cv_have___ss_len" in ++ yes) + -+case "$ntp_cv_have_ss_len" in -+ no) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage.__ss_len" >&5 -+$as_echo_n "checking for sockaddr_storage.__ss_len... " >&6; } -+if test "${ntp_cv_have___ss_len+set}" = set; then : ++$as_echo "#define HAVE___SS_LEN_IN_SS 1" >>confdefs.h ++ ++ esac ++esac ++ ++ ++ ++# ++# Look for in_port_t. ++# ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for in_port_t" >&5 ++$as_echo_n "checking for in_port_t... " >&6; } ++if test "${isc_cv_have_in_port_t+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +-#include <sys/types.h> +- #include <sys/param.h> + -+ #ifdef HAVE_SYS_TYPES_H -+ # include <sys/types.h> -+ #endif -+ #ifdef HAVE_SYS_SOCKET_H -+ # include <sys/socket.h> -+ #endif -+ #ifdef HAVE_NETINET_IN_H -+ # include <netinet/in.h> -+ #endif ++ #include <sys/types.h> ++ #include <netinet/in.h> int main () @@ -18051,8 +18109,8 @@ Index: ntp-4.2.6p1+dfsg/configure - not big endian - #endif + -+ struct sockaddr_storage s; -+ s.__ss_len = 1; ++ in_port_t port = 25; ++ return (0); ; return 0; @@ -18060,10 +18118,10 @@ Index: ntp-4.2.6p1+dfsg/configure _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_bigendian=yes -+ ntp_cv_have___ss_len="yes" ++ isc_cv_have_in_port_t=yes else - ac_cv_c_bigendian=no -+ ntp_cv_have___ss_len="no" ++ isc_cv_have_in_port_t=no + fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -18077,10 +18135,10 @@ Index: ntp-4.2.6p1+dfsg/configure - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <limits.h> -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_have___ss_len" >&5 -+$as_echo "$ntp_cv_have___ss_len" >&6; } -+ case "$ntp_cv_have___ss_len" in -+ yes) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $isc_cv_have_in_port_t" >&5 ++$as_echo "$isc_cv_have_in_port_t" >&6; } ++case "$isc_cv_have_in_port_t" in ++ no) -int -main () @@ -18088,7 +18146,7 @@ Index: ntp-4.2.6p1+dfsg/configure -#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) - bogus endian macros - #endif -+$as_echo "#define HAVE___SS_LEN_IN_SS 1" >>confdefs.h ++$as_echo "#define ISC_PLATFORM_NEEDPORTT 1" >>confdefs.h - ; - return 0; @@ -18097,52 +18155,47 @@ Index: ntp-4.2.6p1+dfsg/configure -if ac_fn_c_try_compile "$LINENO"; then : - # It does; now see whether it defined to _BIG_ENDIAN or not. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ esac +esac + -+ -+ -+# -+# Look for in_port_t. -+# -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for in_port_t" >&5 -+$as_echo_n "checking for in_port_t... " >&6; } -+if test "${isc_cv_have_in_port_t+set}" = set; then : ++case "$ac_cv_header_machine_soundcard_h$ac_cv_header_sys_soundcard_h" in ++ *yes*) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct snd_size" >&5 ++$as_echo_n "checking for struct snd_size... " >&6; } ++if test "${ac_cv_struct_snd_size+set}" = set; then : + $as_echo_n "(cached) " >&6 +else -+ -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <limits.h> -+ -+ #include <sys/types.h> -+ #include <netinet/in.h> ++#ifdef HAVE_MACHINE_SOUNDCARD_H ++# include <machine/soundcard.h> ++#endif ++#ifdef HAVE_SYS_SOUNDCARD_H ++# include <sys/soundcard.h> ++#endif int main () { -#ifndef _BIG_ENDIAN - not big endian - #endif -+ -+ in_port_t port = 25; -+ return (0); ++extern struct snd_size *ss; ++return ss->rec_size; ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_bigendian=yes -+ isc_cv_have_in_port_t=yes ++ ac_cv_struct_snd_size=yes else - ac_cv_c_bigendian=no -+ isc_cv_have_in_port_t=no -+ ++ ac_cv_struct_snd_size=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + -+ fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi @@ -18151,20 +18204,19 @@ Index: ntp-4.2.6p1+dfsg/configure - if test "$cross_compiling" = yes; then : - # Try to guess by grepping values from an object file. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $isc_cv_have_in_port_t" >&5 -+$as_echo "$isc_cv_have_in_port_t" >&6; } -+case "$isc_cv_have_in_port_t" in -+ no) -+ -+$as_echo "#define ISC_PLATFORM_NEEDPORTT 1" >>confdefs.h -+ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_snd_size" >&5 ++$as_echo "$ac_cv_struct_snd_size" >&6; } ++ case "$ac_cv_struct_snd_size" in ++ yes) ++$as_echo "#define HAVE_STRUCT_SND_SIZE 1" >>confdefs.h ++ ;; ++ esac ++ ;; +esac + -+case "$ac_cv_header_machine_soundcard_h$ac_cv_header_sys_soundcard_h" in -+ *yes*) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct snd_size" >&5 -+$as_echo_n "checking for struct snd_size... " >&6; } -+if test "${ac_cv_struct_snd_size+set}" = set; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking struct clockinfo for hz" >&5 ++$as_echo_n "checking struct clockinfo for hz... " >&6; } ++if test "${ac_cv_struct_clockinfo_has_hz+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18185,19 +18237,14 @@ Index: ntp-4.2.6p1+dfsg/configure - } - extern int foo; -+#ifdef HAVE_MACHINE_SOUNDCARD_H -+# include <machine/soundcard.h> -+#endif -+#ifdef HAVE_SYS_SOUNDCARD_H -+# include <sys/soundcard.h> -+#endif ++#include <sys/time.h> int main () { -return use_ascii (foo) == use_ebcdic (foo); + -+extern struct snd_size *ss; -+return ss->rec_size; ++extern struct clockinfo *pc; ++return pc->hz; ; return 0; } @@ -18214,26 +18261,24 @@ Index: ntp-4.2.6p1+dfsg/configure - ac_cv_c_bigendian=unknown - fi - fi -+ ac_cv_struct_snd_size=yes ++ ac_cv_struct_clockinfo_has_hz=yes +else -+ ac_cv_struct_snd_size=no ++ ac_cv_struct_clockinfo_has_hz=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_snd_size" >&5 -+$as_echo "$ac_cv_struct_snd_size" >&6; } -+ case "$ac_cv_struct_snd_size" in -+ yes) -+$as_echo "#define HAVE_STRUCT_SND_SIZE 1" >>confdefs.h -+ ;; -+ esac -+ ;; -+esac ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_clockinfo_has_hz" >&5 ++$as_echo "$ac_cv_struct_clockinfo_has_hz" >&6; } ++if test $ac_cv_struct_clockinfo_has_hz = yes; then + -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking struct clockinfo for hz" >&5 -+$as_echo_n "checking struct clockinfo for hz... " >&6; } -+if test "${ac_cv_struct_clockinfo_has_hz+set}" = set; then : ++$as_echo "#define HAVE_HZ_IN_STRUCT_CLOCKINFO 1" >>confdefs.h ++ ++fi ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking struct clockinfo for tickadj" >&5 ++$as_echo_n "checking struct clockinfo for tickadj... " >&6; } ++if test "${ac_cv_struct_clockinfo_has_tickadj+set}" = set; then : + $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18255,7 +18300,7 @@ Index: ntp-4.2.6p1+dfsg/configure - return u.c[sizeof (long int) - 1] == 1; - +extern struct clockinfo *pc; -+return pc->hz; ++return pc->tickadj; ; return 0; } @@ -18263,13 +18308,13 @@ Index: ntp-4.2.6p1+dfsg/configure -if ac_fn_c_try_run "$LINENO"; then : - ac_cv_c_bigendian=no +if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_struct_clockinfo_has_hz=yes ++ ac_cv_struct_clockinfo_has_tickadj=yes else - ac_cv_c_bigendian=yes -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -+ ac_cv_struct_clockinfo_has_hz=no ++ ac_cv_struct_clockinfo_has_tickadj=no fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -18284,12 +18329,12 @@ Index: ntp-4.2.6p1+dfsg/configure - no) - ;; #( - universal) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_clockinfo_has_hz" >&5 -+$as_echo "$ac_cv_struct_clockinfo_has_hz" >&6; } -+if test $ac_cv_struct_clockinfo_has_hz = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_clockinfo_has_tickadj" >&5 ++$as_echo "$ac_cv_struct_clockinfo_has_tickadj" >&6; } ++if test $ac_cv_struct_clockinfo_has_tickadj = yes; then -$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h -+$as_echo "#define HAVE_HZ_IN_STRUCT_CLOCKINFO 1" >>confdefs.h ++$as_echo "#define HAVE_TICKADJ_IN_STRUCT_CLOCKINFO 1" >>confdefs.h - ;; #( - *) @@ -18301,9 +18346,9 @@ Index: ntp-4.2.6p1+dfsg/configure -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 -$as_echo_n "checking return type of signal handlers... " >&6; } -if test "${ac_cv_type_signal+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking struct clockinfo for tickadj" >&5 -+$as_echo_n "checking struct clockinfo for tickadj... " >&6; } -+if test "${ac_cv_struct_clockinfo_has_tickadj+set}" = set; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec" >&5 ++$as_echo_n "checking for struct timespec... " >&6; } ++if test "${ac_cv_struct_timespec+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18312,46 +18357,51 @@ Index: ntp-4.2.6p1+dfsg/configure -#include <signal.h> +#include <sys/time.h> ++/* Under SunOS, timespec is in sys/timepps.h, which needs errno.h and FRAC */ ++#ifdef HAVE_ERRNO_H ++# include <errno.h> ++#endif ++#ifdef HAVE_SYS_TIMEPPS_H ++# define FRAC 4294967296 ++# include <sys/timepps.h> ++#endif int main () { -return *(signal (0, 0)) (0) == 1; -+ -+extern struct clockinfo *pc; -+return pc->tickadj; ++struct timespec n; ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_type_signal=int -+ ac_cv_struct_clockinfo_has_tickadj=yes ++ ac_cv_struct_timespec=yes else - ac_cv_type_signal=void -+ ac_cv_struct_clockinfo_has_tickadj=no ++ ac_cv_struct_timespec=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 -$as_echo "$ac_cv_type_signal" >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_clockinfo_has_tickadj" >&5 -+$as_echo "$ac_cv_struct_clockinfo_has_tickadj" >&6; } -+if test $ac_cv_struct_clockinfo_has_tickadj = yes; then - +- -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal -_ACEOF -+$as_echo "#define HAVE_TICKADJ_IN_STRUCT_CLOCKINFO 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_timespec" >&5 ++$as_echo "$ac_cv_struct_timespec" >&6; } ++if test $ac_cv_struct_timespec = yes; then -+fi ++$as_echo "#define HAVE_STRUCT_TIMESPEC 1" >>confdefs.h -ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" -if test "x$ac_cv_type_off_t" = x""yes; then : -- -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec" >&5 -+$as_echo_n "checking for struct timespec... " >&6; } -+if test "${ac_cv_struct_timespec+set}" = set; then : ++fi + ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct ntptimeval" >&5 ++$as_echo_n "checking for struct ntptimeval... " >&6; } ++if test "${ac_cv_struct_ntptimeval+set}" = set; then : + $as_echo_n "(cached) " >&6 else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18360,18 +18410,11 @@ Index: ntp-4.2.6p1+dfsg/configure -cat >>confdefs.h <<_ACEOF -#define off_t long int +#include <sys/time.h> -+/* Under SunOS, timespec is in sys/timepps.h, which needs errno.h and FRAC */ -+#ifdef HAVE_ERRNO_H -+# include <errno.h> -+#endif -+#ifdef HAVE_SYS_TIMEPPS_H -+# define FRAC 4294967296 -+# include <sys/timepps.h> -+#endif ++#include <sys/timex.h> +int +main () +{ -+struct timespec n; ++struct ntptimeval n; + ; + return 0; +} @@ -18383,93 +18426,27 @@ Index: ntp-4.2.6p1+dfsg/configure -if test "x$ac_cv_type_size_t" = x""yes; then : - +if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_struct_timespec=yes - else -- --cat >>confdefs.h <<_ACEOF --#define size_t unsigned int --_ACEOF -- -+ ac_cv_struct_timespec=no - fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_timespec" >&5 -+$as_echo "$ac_cv_struct_timespec" >&6; } -+if test $ac_cv_struct_timespec = yes; then - --ac_fn_c_check_type "$LINENO" "time_t" "ac_cv_type_time_t" "$ac_includes_default" --if test "x$ac_cv_type_time_t" = x""yes; then : -- --else -- --cat >>confdefs.h <<_ACEOF --#define time_t long --_ACEOF -+$as_echo "#define HAVE_STRUCT_TIMESPEC 1" >>confdefs.h - - fi - --# The cast to long int works around a bug in the HP C Compiler --# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects --# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. --# This bug is HP SR number 8606223364. --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 --$as_echo_n "checking size of time_t... " >&6; } --if test "${ac_cv_sizeof_time_t+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct ntptimeval" >&5 -+$as_echo_n "checking for struct ntptimeval... " >&6; } -+if test "${ac_cv_struct_ntptimeval+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" "$ac_includes_default"; then : -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - -+#include <sys/time.h> -+#include <sys/timex.h> -+int -+main () -+{ -+struct ntptimeval n; -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_struct_ntptimeval=yes else -- if test "$ac_cv_type_time_t" = yes; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 --$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ as_fn_set_status 77 --as_fn_error "cannot compute sizeof (time_t) --See \`config.log' for more details." "$LINENO" 5; }; } -- else -- ac_cv_sizeof_time_t=0 -- fi + ac_cv_struct_ntptimeval=no - fi -- ++fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5 --$as_echo "$ac_cv_sizeof_time_t" >&6; } -- -- ++fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_ntptimeval" >&5 +$as_echo "$ac_cv_struct_ntptimeval" >&6; } +if test $ac_cv_struct_ntptimeval = yes; then -cat >>confdefs.h <<_ACEOF --#define SIZEOF_TIME_T $ac_cv_sizeof_time_t +-#define size_t unsigned int -_ACEOF +$as_echo "#define HAVE_STRUCT_NTPTIMEVAL 1" >>confdefs.h -+fi + fi --ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default" --if test "x$ac_cv_type_uintptr_t" = x""yes; then : +-ac_fn_c_check_type "$LINENO" "time_t" "ac_cv_type_time_t" "$ac_includes_default" +-if test "x$ac_cv_type_time_t" = x""yes; then : +- +-else +ac_fn_c_check_member "$LINENO" "struct ntptimeval" "time.tv_nsec" "ac_cv_member_struct_ntptimeval_time_tv_nsec" "#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#else @@ -18488,64 +18465,73 @@ Index: ntp-4.2.6p1+dfsg/configure +if test "x$ac_cv_member_struct_ntptimeval_time_tv_nsec" = x""yes; then : cat >>confdefs.h <<_ACEOF --#define HAVE_UINTPTR_T 1 +-#define time_t long +#define HAVE_STRUCT_NTPTIMEVAL_TIME_TV_NSEC 1 _ACEOF - ++ fi - -- -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 --$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } --if test "${ac_cv_struct_tm+set}" = set; then : +-# The cast to long int works around a bug in the HP C Compiler +-# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +-# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +-# This bug is HP SR number 8606223364. +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 +-$as_echo_n "checking size of time_t... " >&6; } +-if test "${ac_cv_sizeof_time_t+set}" = set; then : ++ +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +$as_echo_n "checking for inline... " >&6; } +if test "${ac_cv_c_inline+set}" = set; then : $as_echo_n "(cached) " >&6 else +- if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" "$ac_includes_default"; then : + ac_cv_c_inline=no +for ac_kw in inline __inline__ __inline; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include <sys/types.h> --#include <time.h> ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ +#ifndef __cplusplus +typedef int foo_t; +static $ac_kw foo_t static_foo () {return 0; } +$ac_kw foo_t foo () {return 0; } +#endif --int --main () --{ --struct tm tm; -- int *p = &tm.tm_sec; -- return !p; -- ; -- return 0; --} - _ACEOF - if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_struct_tm=time.h -else -- ac_cv_struct_tm=sys/time.h +- if test "$ac_cv_type_time_t" = yes; then +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-{ as_fn_set_status 77 +-as_fn_error "cannot compute sizeof (time_t) +-See \`config.log' for more details." "$LINENO" 5; }; } +- else +- ac_cv_sizeof_time_t=0 +- fi ++_ACEOF ++if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_c_inline=$ac_kw fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + test "$ac_cv_c_inline" != no && break +done -+ + fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 --$as_echo "$ac_cv_struct_tm" >&6; } --if test $ac_cv_struct_tm = sys/time.h; then +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5 +-$as_echo "$ac_cv_sizeof_time_t" >&6; } +- +- +- +-cat >>confdefs.h <<_ACEOF +-#define SIZEOF_TIME_T $ac_cv_sizeof_time_t +-_ACEOF +- +- +-ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default" +-if test "x$ac_cv_type_uintptr_t" = x""yes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +$as_echo "$ac_cv_c_inline" >&6; } --$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h +-cat >>confdefs.h <<_ACEOF +-#define HAVE_UINTPTR_T 1 +case $ac_cv_c_inline in + inline | yes) ;; + *) @@ -18557,25 +18543,25 @@ Index: ntp-4.2.6p1+dfsg/configure +#ifndef __cplusplus +#define inline $ac_val +#endif -+_ACEOF + _ACEOF + ;; +esac --fi +-fi +case "$ac_cv_c_inline" in + '') + ;; + *) --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for u_int8_t" >&5 --$as_echo_n "checking for u_int8_t... " >&6; } --if test "${ac_cv_type_u_int8_t+set}" = set; then : +$as_echo "#define HAVE_INLINE 1" >>confdefs.h -+ -+ + + +esac -+ + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5 +-$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; } +-if test "${ac_cv_struct_tm+set}" = set; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5 +$as_echo_n "checking whether char is unsigned... " >&6; } +if test "${ac_cv_c_char_unsigned+set}" = set; then : @@ -18584,11 +18570,15 @@ Index: ntp-4.2.6p1+dfsg/configure cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <sys/types.h> +-#include <time.h> +- +$ac_includes_default int main () { --u_int8_t len = 42; return 0; +-struct tm tm; +- int *p = &tm.tm_sec; +- return !p; +static int test_array [1 - 2 * !(((char) -1) < 0)]; +test_array [0] = 0 + @@ -18597,20 +18587,19 @@ Index: ntp-4.2.6p1+dfsg/configure } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_type_u_int8_t=yes +- ac_cv_struct_tm=time.h + ac_cv_c_char_unsigned=no else -- ac_cv_type_u_int8_t=no +- ac_cv_struct_tm=sys/time.h + ac_cv_c_char_unsigned=yes fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_u_int8_t" >&5 --$as_echo "$ac_cv_type_u_int8_t" >&6; } --if test $ac_cv_type_u_int8_t = yes; then +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5 +-$as_echo "$ac_cv_struct_tm" >&6; } +-if test $ac_cv_struct_tm = sys/time.h; then - --$as_echo "#define HAVE_TYPE_U_INT8_T 1" >>confdefs.h +-$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_char_unsigned" >&5 +$as_echo "$ac_cv_c_char_unsigned" >&6; } +if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then @@ -18618,9 +18607,10 @@ Index: ntp-4.2.6p1+dfsg/configure fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for u_int64_t" >&5 --$as_echo_n "checking for u_int64_t... " >&6; } --if test "${ac_cv_type_u_int64_t+set}" = set; then : +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for u_int8_t" >&5 +-$as_echo_n "checking for u_int8_t... " >&6; } +-if test "${ac_cv_type_u_int8_t+set}" = set; then : + # The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -18636,17 +18626,17 @@ Index: ntp-4.2.6p1+dfsg/configure -int -main () -{ --u_int64_t len = 42; return 0; +-u_int8_t len = 42; return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_type_u_int64_t=yes +- ac_cv_type_u_int8_t=yes + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (signed char))" "ac_cv_sizeof_signed_char" "$ac_includes_default"; then : + else -- ac_cv_type_u_int64_t=no +- ac_cv_type_u_int8_t=no + if test "$ac_cv_type_signed_char" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -18660,16 +18650,70 @@ Index: ntp-4.2.6p1+dfsg/configure -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_u_int8_t" >&5 +-$as_echo "$ac_cv_type_u_int8_t" >&6; } +-if test $ac_cv_type_u_int8_t = yes; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_signed_char" >&5 ++$as_echo "$ac_cv_sizeof_signed_char" >&6; } + +-$as_echo "#define HAVE_TYPE_U_INT8_T 1" >>confdefs.h + +-fi + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for u_int64_t" >&5 +-$as_echo_n "checking for u_int64_t... " >&6; } +-if test "${ac_cv_type_u_int64_t+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <sys/types.h> +-int +-main () +-{ +-u_int64_t len = 42; return 0; +- ; +- return 0; +-} ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char + _ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_type_u_int64_t=yes +-else +- ac_cv_type_u_int64_t=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_u_int64_t" >&5 -$as_echo "$ac_cv_type_u_int64_t" >&6; } -if test $ac_cv_type_u_int64_t = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_signed_char" >&5 -+$as_echo "$ac_cv_sizeof_signed_char" >&6; } -$as_echo "#define HAVE_TYPE_U_INT64_T 1" >>confdefs.h ++# The cast to long int works around a bug in the HP C Compiler ++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects ++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. ++# This bug is HP SR number 8606223364. ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 ++$as_echo_n "checking size of int... " >&6; } ++if test "${ac_cv_sizeof_int+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : + ++else ++ if test "$ac_cv_type_int" = yes; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++{ as_fn_set_status 77 ++as_fn_error "cannot compute sizeof (int) ++See \`config.log' for more details." "$LINENO" 5; }; } ++ else ++ ac_cv_sizeof_int=0 ++ fi + fi --fi -- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a fallback value for HZ" >&5 -$as_echo_n "checking for a fallback value for HZ... " >&6; } -if test "${ac_cv_var_default_hz+set}" = set; then : @@ -18684,13 +18728,17 @@ Index: ntp-4.2.6p1+dfsg/configure - ac_cv_var_default_hz=256 - ;; -esac --fi + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_default_hz" >&5 -$as_echo "$ac_cv_var_default_hz" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 ++$as_echo "$ac_cv_sizeof_int" >&6; } ++ ++ cat >>confdefs.h <<_ACEOF -#define DEFAULT_HZ $ac_cv_var_default_hz -+#define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char ++#define SIZEOF_INT $ac_cv_sizeof_int _ACEOF @@ -18701,9 +18749,9 @@ Index: ntp-4.2.6p1+dfsg/configure +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 -+$as_echo_n "checking size of int... " >&6; } -+if test "${ac_cv_sizeof_int+set}" = set; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 ++$as_echo_n "checking size of long... " >&6; } ++if test "${ac_cv_sizeof_long+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_cv_var_override_hz=no @@ -18724,33 +18772,36 @@ Index: ntp-4.2.6p1+dfsg/configure - ac_cv_var_override_hz=yes - ;; -esac --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_override_hz" >&5 --$as_echo "$ac_cv_var_override_hz" >&6; } --case "$ac_cv_var_override_hz" in -- yes) -- --$as_echo "#define OVERRIDE_HZ 1" >>confdefs.h -+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : - -- ;; --esac ++ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : ++ +else -+ if test "$ac_cv_type_int" = yes; then ++ if test "$ac_cv_type_long" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ as_fn_set_status 77 -+as_fn_error "cannot compute sizeof (int) ++as_fn_error "cannot compute sizeof (long) +See \`config.log' for more details." "$LINENO" 5; }; } + else -+ ac_cv_sizeof_int=0 ++ ac_cv_sizeof_long=0 + fi -+fi + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_override_hz" >&5 +-$as_echo "$ac_cv_var_override_hz" >&6; } +-case "$ac_cv_var_override_hz" in +- yes) +-$as_echo "#define OVERRIDE_HZ 1" >>confdefs.h +fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 -+$as_echo "$ac_cv_sizeof_int" >&6; } ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 ++$as_echo "$ac_cv_sizeof_long" >&6; } +- ;; +-esac + + ++cat >>confdefs.h <<_ACEOF ++#define SIZEOF_LONG $ac_cv_sizeof_long ++_ACEOF -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct rt_msghdr" >&5 -$as_echo_n "checking for struct rt_msghdr... " >&6; } @@ -18771,8 +18822,12 @@ Index: ntp-4.2.6p1+dfsg/configure - ; - return 0; -} ++ ++ac_fn_c_check_type "$LINENO" "s_char" "ac_cv_type_s_char" "$ac_includes_default" ++if test "x$ac_cv_type_s_char" = x""yes; then : ++ +cat >>confdefs.h <<_ACEOF -+#define SIZEOF_INT $ac_cv_sizeof_int ++#define HAVE_S_CHAR 1 _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_struct_rt_msghdr=yes @@ -18780,123 +18835,29 @@ Index: ntp-4.2.6p1+dfsg/configure - ac_cv_struct_rt_msghdr=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ --fi + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_rt_msghdr" >&5 -$as_echo "$ac_cv_struct_rt_msghdr" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct rtattr" >&5 -$as_echo_n "checking for struct rtattr... " >&6; } -if test "${ac_cv_struct_rtattr+set}" = set; then : -+# The cast to long int works around a bug in the HP C Compiler -+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+# This bug is HP SR number 8606223364. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 -+$as_echo_n "checking size of long... " >&6; } -+if test "${ac_cv_sizeof_long+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -+ if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : - --#include <stddef.h> --#include <linux/rtnetlink.h> --int --main () --{ --struct rtattr p; -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_struct_rtattr=yes - else -- ac_cv_struct_rtattr=no -+ if test "$ac_cv_type_long" = yes; then -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ as_fn_set_status 77 -+as_fn_error "cannot compute sizeof (long) -+See \`config.log' for more details." "$LINENO" 5; }; } -+ else -+ ac_cv_sizeof_long=0 -+ fi - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_rtattr" >&5 --$as_echo "$ac_cv_struct_rtattr" >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -+$as_echo "$ac_cv_sizeof_long" >&6; } - --if test $ac_cv_struct_rt_msghdr = yes -o $ac_cv_struct_rtattr = yes; then - --$as_echo "#define HAS_ROUTING_SOCKET 1" >>confdefs.h - -- if test $ac_cv_struct_rtattr = yes; then -+cat >>confdefs.h <<_ACEOF -+#define SIZEOF_LONG $ac_cv_sizeof_long -+_ACEOF - --$as_echo "#define HAVE_RTNETLINK 1" >>confdefs.h - -- fi --fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking struct sigaction for sa_sigaction" >&5 --$as_echo_n "checking struct sigaction for sa_sigaction... " >&6; } --if test "${ac_cv_struct_sigaction_has_sa_sigaction+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -+ac_fn_c_check_type "$LINENO" "s_char" "ac_cv_type_s_char" "$ac_includes_default" -+if test "x$ac_cv_type_s_char" = x""yes; then : - -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <signal.h> --int --main () --{ --struct sigaction act; act.sa_sigaction = 0; -- ; -- return 0; --} -+cat >>confdefs.h <<_ACEOF -+#define HAVE_S_CHAR 1 - _ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_struct_sigaction_has_sa_sigaction=yes --else -- ac_cv_struct_sigaction_has_sa_sigaction=no -+ - - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - +case "$ac_cv_c_char_unsigned$ac_cv_sizeof_signed_char$ac_cv_type_s_char" in + *yes) + # We have a typedef for s_char. Might as well believe it... + ;; + no0no) + # We have signed chars, can't say 'signed char', no s_char typedef. - --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_sigaction_has_sa_sigaction" >&5 --$as_echo "$ac_cv_struct_sigaction_has_sa_sigaction" >&6; } --if test $ac_cv_struct_sigaction_has_sa_sigaction = yes; then ++ +$as_echo "#define NEED_S_CHAR_TYPEDEF 1" >>confdefs.h - --$as_echo "#define HAVE_SA_SIGACTION_IN_STRUCT_SIGACTION 1" >>confdefs.h ++ + ;; + no1no) + # We have signed chars, can say 'signed char', no s_char typedef. + $as_echo "#define NEED_S_CHAR_TYPEDEF 1" >>confdefs.h - --fi ++ + ;; + yes0no) + # We have unsigned chars, can't say 'signed char', no s_char typedef. @@ -18905,10 +18866,7 @@ Index: ntp-4.2.6p1+dfsg/configure + yes1no) + # We have unsigned chars, can say 'signed char', no s_char typedef. + $as_echo "#define NEED_S_CHAR_TYPEDEF 1" >>confdefs.h - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct ppsclockev" >&5 --$as_echo_n "checking for struct ppsclockev... " >&6; } --if test "${ac_cv_struct_ppsclockev+set}" = set; then : ++ + ;; +esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 @@ -18918,73 +18876,54 @@ Index: ntp-4.2.6p1+dfsg/configure else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -- - #include <sys/types.h> --#ifdef HAVE_SYS_TERMIOS_H --# include <sys/termios.h> --#endif --#ifdef HAVE_SYS_TIME_H --# include <sys/time.h> --#endif --#ifdef HAVE_SYS_PPSCLOCK_H --# include <sys/ppsclock.h> --#endif ++#include <sys/types.h> + +-#include <stddef.h> +-#include <linux/rtnetlink.h> -int -main () -{ - --extern struct ppsclockev *pce; --return pce->serial; +-struct rtattr p; - ; - return 0; -} _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_struct_ppsclockev=yes +- ac_cv_struct_rtattr=yes +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "uid_t" >/dev/null 2>&1; then : + ac_cv_type_uid_t=yes else -- ac_cv_struct_ppsclockev=no +- ac_cv_struct_rtattr=no + ac_cv_type_uid_t=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest* fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_ppsclockev" >&5 --$as_echo "$ac_cv_struct_ppsclockev" >&6; } --if test $ac_cv_struct_ppsclockev = yes; then +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_rtattr" >&5 +-$as_echo "$ac_cv_struct_rtattr" >&6; } +- +-if test $ac_cv_struct_rt_msghdr = yes -o $ac_cv_struct_rtattr = yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 +$as_echo "$ac_cv_type_uid_t" >&6; } +if test $ac_cv_type_uid_t = no; then --$as_echo "#define HAVE_STRUCT_PPSCLOCKEV 1" >>confdefs.h +-$as_echo "#define HAS_ROUTING_SOCKET 1" >>confdefs.h +$as_echo "#define uid_t int" >>confdefs.h --fi +- if test $ac_cv_struct_rtattr = yes; then --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5 --$as_echo_n "checking for struct sockaddr_storage... " >&6; } --if test "${ntp_cv_sockaddr_storage+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else +-$as_echo "#define HAVE_RTNETLINK 1" >>confdefs.h +$as_echo "#define gid_t int" >>confdefs.h -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -+fi - -- #ifdef HAVE_SYS_TYPES_H -- # include <sys/types.h> -- #endif -- #ifdef HAVE_SYS_SOCKET_H -- # include <sys/socket.h> -- #endif -- #ifdef HAVE_NETINET_IN_H -- # include <netinet/in.h> -- #endif +- fi + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking struct sigaction for sa_sigaction" >&5 +-$as_echo_n "checking struct sigaction for sa_sigaction... " >&6; } +-if test "${ac_cv_struct_sigaction_has_sa_sigaction+set}" = set; then : ++ +case "$host" in + *-*-aix[456]*) + # (prr) aix 4.1 doesn't have clock_settime, but in aix 4.3 it's a stub @@ -18997,11 +18936,14 @@ Index: ntp-4.2.6p1+dfsg/configure + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 +$as_echo_n "checking for library containing clock_gettime... " >&6; } +if test "${ac_cv_search_clock_gettime+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else + $as_echo_n "(cached) " >&6 + else +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ + /* end confdefs.h. */ +-#include <signal.h> + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC @@ -19013,16 +18955,28 @@ Index: ntp-4.2.6p1+dfsg/configure int main () { -- -- struct sockaddr_storage n; -- +-struct sigaction act; act.sa_sigaction = 0; +return clock_gettime (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : -- ntp_cv_sockaddr_storage="yes" +- ac_cv_struct_sigaction_has_sa_sigaction=yes +-else +- ac_cv_struct_sigaction_has_sa_sigaction=no +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +- +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_sigaction_has_sa_sigaction" >&5 +-$as_echo "$ac_cv_struct_sigaction_has_sa_sigaction" >&6; } +-if test $ac_cv_struct_sigaction_has_sa_sigaction = yes; then +- +-$as_echo "#define HAVE_SA_SIGACTION_IN_STRUCT_SIGACTION 1" >>confdefs.h +- +for ac_lib in '' rt; do + if test -z "$ac_lib"; then + ac_res="none required" @@ -19037,12 +18991,17 @@ Index: ntp-4.2.6p1+dfsg/configure + conftest$ac_exeext + if test "${ac_cv_search_clock_gettime+set}" = set; then : + break -+fi + fi +done +if test "${ac_cv_search_clock_gettime+set}" = set; then : -+ + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct ppsclockev" >&5 +-$as_echo_n "checking for struct ppsclockev... " >&6; } +-if test "${ac_cv_struct_ppsclockev+set}" = set; then : +- $as_echo_n "(cached) " >&6 else -- ntp_cv_sockaddr_storage="no" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ + ac_cv_search_clock_gettime=no +fi +rm conftest.$ac_ext @@ -19054,9 +19013,26 @@ Index: ntp-4.2.6p1+dfsg/configure +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-#include <sys/types.h> +-#ifdef HAVE_SYS_TERMIOS_H +-# include <sys/termios.h> +-#endif +-#ifdef HAVE_SYS_TIME_H +-# include <sys/time.h> +-#endif +-#ifdef HAVE_SYS_PPSCLOCK_H +-# include <sys/ppsclock.h> +-#endif +-int +-main () +-{ ++fi +-extern struct ppsclockev *pce; +-return pce->serial; +- ; +- return 0; +-} + for ac_func in clock_gettime clock_settime +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -19065,19 +19041,23 @@ Index: ntp-4.2.6p1+dfsg/configure + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF + _ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_struct_ppsclockev=yes +-else +- ac_cv_struct_ppsclockev=no +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_sockaddr_storage" >&5 --$as_echo "$ntp_cv_sockaddr_storage" >&6; } --case "$ntp_cv_sockaddr_storage" in -- yes) -- --$as_echo "#define HAVE_STRUCT_SOCKADDR_STORAGE 1" >>confdefs.h +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_ppsclockev" >&5 +-$as_echo "$ac_cv_struct_ppsclockev" >&6; } +-if test $ac_cv_struct_ppsclockev = yes; then +done +-$as_echo "#define HAVE_STRUCT_PPSCLOCKEV 1" >>confdefs.h + ;; - esac ++esac +for ac_func in daemon +do : + ac_fn_c_check_func "$LINENO" "daemon" "ac_cv_func_daemon" @@ -19086,16 +19066,9 @@ Index: ntp-4.2.6p1+dfsg/configure +#define HAVE_DAEMON 1 +_ACEOF --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage.ss_family" >&5 --$as_echo_n "checking for sockaddr_storage.ss_family... " >&6; } --if test "${ntp_cv_have_ss_family+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -+fi + fi +done - -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ ++ +for ac_func in finite +do : + ac_fn_c_check_func "$LINENO" "finite" "ac_cv_func_finite" @@ -19104,16 +19077,11 @@ Index: ntp-4.2.6p1+dfsg/configure +#define HAVE_FINITE 1 +_ACEOF -- #ifdef HAVE_SYS_TYPES_H -- # include <sys/types.h> -- #endif -- #ifdef HAVE_SYS_SOCKET_H -- # include <sys/socket.h> -- #endif -- #ifdef HAVE_NETINET_IN_H -- # include <netinet/in.h> -- #endif -+else +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5 +-$as_echo_n "checking for struct sockaddr_storage... " >&6; } +-if test "${ntp_cv_sockaddr_storage+set}" = set; then : +- $as_echo_n "(cached) " >&6 + else + for ac_func in isfinite +do : + ac_fn_c_check_func "$LINENO" "isfinite" "ac_cv_func_isfinite" @@ -19122,20 +19090,31 @@ Index: ntp-4.2.6p1+dfsg/configure +#define HAVE_ISFINITE 1 +_ACEOF +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isfinite with <math.h>" >&5 +$as_echo_n "checking for isfinite with <math.h>... " >&6; } + _libs=$LIBS + LIBS="$LIBS -lm" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ + /* end confdefs.h. */ +- +- #ifdef HAVE_SYS_TYPES_H +- # include <sys/types.h> +- #endif +- #ifdef HAVE_SYS_SOCKET_H +- # include <sys/socket.h> +- #endif +- #ifdef HAVE_NETINET_IN_H +- # include <netinet/in.h> +- #endif +- +#include <math.h> int main () { - -- struct sockaddr_storage s; -- s.ss_family = 1; +- struct sockaddr_storage n; - +float f = 0.0; isfinite(f) ; @@ -19143,14 +19122,14 @@ Index: ntp-4.2.6p1+dfsg/configure } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : -- ntp_cv_have_ss_family="yes" +- ntp_cv_sockaddr_storage="yes" +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + $as_echo "#define HAVE_ISFINITE 1" >>confdefs.h + else -- ntp_cv_have_ss_family="no" +- ntp_cv_sockaddr_storage="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi @@ -19175,36 +19154,26 @@ Index: ntp-4.2.6p1+dfsg/configure +_ACEOF fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_have_ss_family" >&5 --$as_echo "$ntp_cv_have_ss_family" >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_sockaddr_storage" >&5 +-$as_echo "$ntp_cv_sockaddr_storage" >&6; } +-case "$ntp_cv_sockaddr_storage" in +- yes) +done --case "$ntp_cv_have_ss_family" in -- no) -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage.__ss_family" >&5 --$as_echo_n "checking for sockaddr_storage.__ss_family... " >&6; } --if test "${ntp_cv_have___ss_family+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+ +-$as_echo "#define HAVE_STRUCT_SOCKADDR_STORAGE 1" >>confdefs.h + +-esac +# Check whether --enable-getifaddrs was given. +if test "${enable_getifaddrs+set}" = set; then : + enableval=$enable_getifaddrs; want_getifaddrs="$enableval" - else ++else + want_getifaddrs="yes" +fi -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ - -- #ifdef HAVE_SYS_TYPES_H -- # include <sys/types.h> -- #endif -- #ifdef HAVE_SYS_SOCKET_H -- # include <sys/socket.h> -- #endif -- #ifdef HAVE_NETINET_IN_H -- # include <netinet/in.h> -- #endif +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage.ss_family" >&5 +-$as_echo_n "checking for sockaddr_storage.ss_family... " >&6; } +-if test "${ntp_cv_have_ss_family+set}" = set; then : ++ +case $want_getifaddrs in +yes|glibc) +# @@ -19236,13 +19205,25 @@ Index: ntp-4.2.6p1+dfsg/configure + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs in -linet6" >&5 +$as_echo_n "checking for getifaddrs in -linet6... " >&6; } +if test "${ac_cv_lib_inet6_getifaddrs+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else + $as_echo_n "(cached) " >&6 + else +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_check_lib_save_LIBS=$LIBS +LIBS="-linet6 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ + /* end confdefs.h. */ +- #ifdef HAVE_SYS_TYPES_H +- # include <sys/types.h> +- #endif +- #ifdef HAVE_SYS_SOCKET_H +- # include <sys/socket.h> +- #endif +- #ifdef HAVE_NETINET_IN_H +- # include <netinet/in.h> +- #endif +- +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ @@ -19254,8 +19235,8 @@ Index: ntp-4.2.6p1+dfsg/configure main () { - -- struct sockaddr_storage s; -- s.__ss_family = 1; +- struct sockaddr_storage s; +- s.ss_family = 1; - +return getifaddrs (); ; @@ -19263,11 +19244,11 @@ Index: ntp-4.2.6p1+dfsg/configure } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : -- ntp_cv_have___ss_family="yes" +- ntp_cv_have_ss_family="yes" +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_inet6_getifaddrs=yes else -- ntp_cv_have___ss_family="no" +- ntp_cv_have_ss_family="no" - + ac_cv_lib_inet6_getifaddrs=no fi @@ -19278,23 +19259,26 @@ Index: ntp-4.2.6p1+dfsg/configure + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_have___ss_family" >&5 --$as_echo "$ntp_cv_have___ss_family" >&6; } -- case "$ntp_cv_have___ss_family" in -- yes) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_have_ss_family" >&5 +-$as_echo "$ntp_cv_have_ss_family" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_getifaddrs" >&5 +$as_echo "$ac_cv_lib_inet6_getifaddrs" >&6; } +if test "x$ac_cv_lib_inet6_getifaddrs" = x""yes; then : + LIBS="$LIBS -linet6" + $as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h --$as_echo "#define HAVE___SS_FAMILY_IN_SS 1" >>confdefs.h -+else +-case "$ntp_cv_have_ss_family" in +- no) +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage.__ss_family" >&5 +-$as_echo_n "checking for sockaddr_storage.__ss_family... " >&6; } +-if test "${ntp_cv_have___ss_family+set}" = set; then : +- $as_echo_n "(cached) " >&6 + else + LIBS=${save_LIBS} +fi -- esac --esac +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ + fi + ;; +*) @@ -19306,9 +19290,18 @@ Index: ntp-4.2.6p1+dfsg/configure +#define HAVE_GETIFADDRS 1 +_ACEOF +- #ifdef HAVE_SYS_TYPES_H +- # include <sys/types.h> +- #endif +- #ifdef HAVE_SYS_SOCKET_H +- # include <sys/socket.h> +- #endif +- #ifdef HAVE_NETINET_IN_H +- # include <netinet/in.h> +- #endif +fi +done - ++ + ;; +esac +;; @@ -19316,34 +19309,18 @@ Index: ntp-4.2.6p1+dfsg/configure +;; +esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage.ss_len" >&5 --$as_echo_n "checking for sockaddr_storage.ss_len... " >&6; } --if test "${ntp_cv_have_ss_len+set}" = set; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking type of socklen arg for getsockname()" >&5 +$as_echo_n "checking type of socklen arg for getsockname()... " >&6; } +if test "${ac_cv_func_getsockname_arg2+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++ $as_echo_n "(cached) " >&6 ++else + if test "${ac_cv_func_getsockname_socklen_type+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + for ac_cv_func_getsockname_arg2 in 'struct sockaddr *' 'void *'; do + for ac_cv_func_getsockname_socklen_type in 'socklen_t' 'size_t' 'unsigned int' 'int'; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -- -- #ifdef HAVE_SYS_TYPES_H -- # include <sys/types.h> -- #endif -- #ifdef HAVE_SYS_SOCKET_H -- # include <sys/socket.h> -- #endif -- #ifdef HAVE_NETINET_IN_H -- # include <netinet/in.h> -- #endif -- ++/* end confdefs.h. */ +#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif @@ -19355,18 +19332,18 @@ Index: ntp-4.2.6p1+dfsg/configure main () { -- struct sockaddr_storage s; -- s.ss_len = 1; +- struct sockaddr_storage s; +- s.__ss_family = 1; - ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : -- ntp_cv_have_ss_len="yes" +- ntp_cv_have___ss_family="yes" + ac_not_found=no ; break 2 else -- ntp_cv_have_ss_len="no" +- ntp_cv_have___ss_family="no" - + ac_not_found=yes fi @@ -19377,37 +19354,24 @@ Index: ntp-4.2.6p1+dfsg/configure +fi fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_have_ss_len" >&5 --$as_echo "$ntp_cv_have_ss_len" >&6; } +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_have___ss_family" >&5 +-$as_echo "$ntp_cv_have___ss_family" >&6; } +- case "$ntp_cv_have___ss_family" in +- yes) +if test "$ac_not_found" = yes; then + ac_cv_func_getsockname_socklen_type='socklen_t' +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getsockname_socklen_type" >&5 +$as_echo "$ac_cv_func_getsockname_socklen_type" >&6; } --case "$ntp_cv_have_ss_len" in -- no) -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage.__ss_len" >&5 --$as_echo_n "checking for sockaddr_storage.__ss_len... " >&6; } --if test "${ntp_cv_have___ss_len+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else +-$as_echo "#define HAVE___SS_FAMILY_IN_SS 1" >>confdefs.h +cat >>confdefs.h <<_ACEOF +#define GETSOCKNAME_SOCKLEN_TYPE $ac_cv_func_getsockname_socklen_type +_ACEOF -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ +- esac +-esac -- #ifdef HAVE_SYS_TYPES_H -- # include <sys/types.h> -- #endif -- #ifdef HAVE_SYS_SOCKET_H -- # include <sys/socket.h> -- #endif -- #ifdef HAVE_NETINET_IN_H -- # include <netinet/in.h> -- #endif +for ac_func in getrusage +do : + ac_fn_c_check_func "$LINENO" "getrusage" "ac_cv_func_getrusage" @@ -19415,34 +19379,40 @@ Index: ntp-4.2.6p1+dfsg/configure + cat >>confdefs.h <<_ACEOF +#define HAVE_GETRUSAGE 1 +_ACEOF - --int --main () --{ ++ +fi +done -- struct sockaddr_storage s; -- s.__ss_len = 1; +ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" +if test "x$ac_cv_func_gettimeofday" = x""yes; then : -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ntp_cv_have___ss_len="yes" +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage.ss_len" >&5 +-$as_echo_n "checking for sockaddr_storage.ss_len... " >&6; } +-if test "${ntp_cv_have_ss_len+set}" = set; then : +- $as_echo_n "(cached) " >&6 else -- ntp_cv_have___ss_len="no" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +- #ifdef HAVE_SYS_TYPES_H +- # include <sys/types.h> +- #endif +- #ifdef HAVE_SYS_SOCKET_H +- # include <sys/socket.h> +- #endif +- #ifdef HAVE_NETINET_IN_H +- # include <netinet/in.h> +- #endif +case "$host" in + *-*-mpeix*) ac_cv_func_gettimeofday=yes + ;; +esac - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++fi +-int +-main () +-{ +case "$host" in + *-pc-cygwin*) + ;; @@ -19454,62 +19424,74 @@ Index: ntp-4.2.6p1+dfsg/configure +#define HAVE_GETUID 1 +_ACEOF - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_have___ss_len" >&5 --$as_echo "$ntp_cv_have___ss_len" >&6; } -- case "$ntp_cv_have___ss_len" in -- yes) -- --$as_echo "#define HAVE___SS_LEN_IN_SS 1" >>confdefs.h +- struct sockaddr_storage s; +- s.ss_len = 1; ++fi +done -- esac +- ; +- return 0; +-} + ;; - esac ++esac +for ac_func in hstrerror +do : + ac_fn_c_check_func "$LINENO" "hstrerror" "ac_cv_func_hstrerror" +if test "x$ac_cv_func_hstrerror" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_HSTRERROR 1 -+_ACEOF + _ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ntp_cv_have_ss_len="yes" +-else +- ntp_cv_have_ss_len="no" -+fi + fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done - # --# Look for in_port_t. ++# +# Check for if_nametoindex() for IPv6 scoped addresses support - # --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for in_port_t" >&5 --$as_echo_n "checking for in_port_t... " >&6; } --if test "${isc_cv_have_in_port_t+set}" = set; then : -- $as_echo_n "(cached) " >&6 ++# +ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex" +if test "x$ac_cv_func_if_nametoindex" = x""yes; then : + ac_cv_have_if_nametoindex=yes - else ++else + ac_cv_have_if_nametoindex=no -+fi + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_have_ss_len" >&5 +-$as_echo "$ntp_cv_have_ss_len" >&6; } -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-case "$ntp_cv_have_ss_len" in +case $ac_cv_have_if_nametoindex in -+ no) + no) +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sockaddr_storage.__ss_len" >&5 +-$as_echo_n "checking for sockaddr_storage.__ss_len... " >&6; } +-if test "${ntp_cv_have___ss_len+set}" = set; then : + case "$host" in + *-hp-hpux*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nametoindex in -lipv6" >&5 +$as_echo_n "checking for if_nametoindex in -lipv6... " >&6; } +if test "${ac_cv_lib_ipv6_if_nametoindex+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else + $as_echo_n "(cached) " >&6 + else +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_check_lib_save_LIBS=$LIBS +LIBS="-lipv6 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -- #include <sys/types.h> -- #include <netinet/in.h> +- #ifdef HAVE_SYS_TYPES_H +- # include <sys/types.h> +- #endif +- #ifdef HAVE_SYS_SOCKET_H +- # include <sys/socket.h> +- #endif +- #ifdef HAVE_NETINET_IN_H +- # include <netinet/in.h> +- #endif - +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC @@ -19522,8 +19504,8 @@ Index: ntp-4.2.6p1+dfsg/configure main () { - -- in_port_t port = 25; -- return (0); +- struct sockaddr_storage s; +- s.__ss_len = 1; - +return if_nametoindex (); ; @@ -19531,11 +19513,11 @@ Index: ntp-4.2.6p1+dfsg/configure } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : -- isc_cv_have_in_port_t=yes +- ntp_cv_have___ss_len="yes" +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ipv6_if_nametoindex=yes else -- isc_cv_have_in_port_t=no +- ntp_cv_have___ss_len="no" - + ac_cv_lib_ipv6_if_nametoindex=no fi @@ -19552,65 +19534,72 @@ Index: ntp-4.2.6p1+dfsg/configure + ac_cv_have_if_nametoindex=yes + LIBS="-lipv6 $LIBS" fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $isc_cv_have_in_port_t" >&5 --$as_echo "$isc_cv_have_in_port_t" >&6; } --case "$isc_cv_have_in_port_t" in -- no) +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_have___ss_len" >&5 +-$as_echo "$ntp_cv_have___ss_len" >&6; } +- case "$ntp_cv_have___ss_len" in +- yes) +- +-$as_echo "#define HAVE___SS_LEN_IN_SS 1" >>confdefs.h --$as_echo "#define ISC_PLATFORM_NEEDPORTT 1" >>confdefs.h +- esac + ;; + esac -+esac + esac +case $ac_cv_have_if_nametoindex in + yes) -+ + +$as_echo "#define ISC_PLATFORM_HAVEIFNAMETOINDEX 1" >>confdefs.h + ;; - esac ++esac --case "$ac_cv_header_machine_soundcard_h$ac_cv_header_sys_soundcard_h" in -- *yes*) -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct snd_size" >&5 --$as_echo_n "checking for struct snd_size... " >&6; } --if test "${ac_cv_struct_snd_size+set}" = set; then : +-# +-# Look for in_port_t. +-# +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for in_port_t" >&5 +-$as_echo_n "checking for in_port_t... " >&6; } +-if test "${isc_cv_have_in_port_t+set}" = set; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5 +$as_echo_n "checking for library containing inet_ntop... " >&6; } +if test "${ac_cv_search_inet_ntop+set}" = set; then : $as_echo_n "(cached) " >&6 else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ --#ifdef HAVE_MACHINE_SOUNDCARD_H --# include <machine/soundcard.h> --#endif --#ifdef HAVE_SYS_SOUNDCARD_H --# include <sys/soundcard.h> +- #include <sys/types.h> +- #include <netinet/in.h> +- +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" - #endif ++#endif +char inet_ntop (); int main () { - --extern struct snd_size *ss; --return ss->rec_size; +- in_port_t port = 25; +- return (0); +- +return inet_ntop (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : -- ac_cv_struct_snd_size=yes +- isc_cv_have_in_port_t=yes -else -- ac_cv_struct_snd_size=no +- isc_cv_have_in_port_t=no +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +for ac_lib in '' resolv; do + if test -z "$ac_lib"; then + ac_res="none required" @@ -19620,14 +19609,73 @@ Index: ntp-4.2.6p1+dfsg/configure + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_inet_ntop=$ac_res - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- ++fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_inet_ntop+set}" = set; then : + break ++fi ++done ++if test "${ac_cv_search_inet_ntop+set}" = set; then : + ++else ++ ac_cv_search_inet_ntop=no fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $isc_cv_have_in_port_t" >&5 +-$as_echo "$isc_cv_have_in_port_t" >&6; } +-case "$isc_cv_have_in_port_t" in +- no) ++rm conftest.$ac_ext ++LIBS=$ac_func_search_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntop" >&5 ++$as_echo "$ac_cv_search_inet_ntop" >&6; } ++ac_res=$ac_cv_search_inet_ntop ++if test "$ac_res" != no; then : ++ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +-$as_echo "#define ISC_PLATFORM_NEEDPORTT 1" >>confdefs.h ++fi + +-esac ++ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" ++if test "x$ac_cv_func_inet_ntop" = x""yes; then : + +-case "$ac_cv_header_machine_soundcard_h$ac_cv_header_sys_soundcard_h" in +- *yes*) +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct snd_size" >&5 +-$as_echo_n "checking for struct snd_size... " >&6; } +-if test "${ac_cv_struct_snd_size+set}" = set; then : +- $as_echo_n "(cached) " >&6 + else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ + +-#ifdef HAVE_MACHINE_SOUNDCARD_H +-# include <machine/soundcard.h> +-#endif +-#ifdef HAVE_SYS_SOUNDCARD_H +-# include <sys/soundcard.h> +-#endif +-int +-main () +-{ ++$as_echo "#define ISC_PLATFORM_NEEDNTOP 1" >>confdefs.h + +-extern struct snd_size *ss; +-return ss->rec_size; +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- ac_cv_struct_snd_size=yes +-else +- ac_cv_struct_snd_size=no + fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +-fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_snd_size" >&5 -$as_echo "$ac_cv_struct_snd_size" >&6; } - case "$ac_cv_struct_snd_size" in @@ -19637,12 +19685,14 @@ Index: ntp-4.2.6p1+dfsg/configure - esac - ;; -esac -- ++ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton" ++if test "x$ac_cv_func_inet_pton" = x""yes; then : + -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking struct clockinfo for hz" >&5 -$as_echo_n "checking struct clockinfo for hz... " >&6; } -if test "${ac_cv_struct_clockinfo_has_hz+set}" = set; then : - $as_echo_n "(cached) " >&6 --else + else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - @@ -19650,8 +19700,6 @@ Index: ntp-4.2.6p1+dfsg/configure -int -main () -{ -+done -+if test "${ac_cv_search_inet_ntop+set}" = set; then : -extern struct clockinfo *pc; -return pc->hz; @@ -19661,27 +19709,30 @@ Index: ntp-4.2.6p1+dfsg/configure -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_struct_clockinfo_has_hz=yes - else +-else - ac_cv_struct_clockinfo_has_hz=no -+ ac_cv_search_inet_ntop=no - fi +-fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- -+rm conftest.$ac_ext -+LIBS=$ac_func_search_save_LIBS ++$as_echo "#define ISC_PLATFORM_NEEDPTON 1" >>confdefs.h + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_clockinfo_has_hz" >&5 -$as_echo "$ac_cv_struct_clockinfo_has_hz" >&6; } -if test $ac_cv_struct_clockinfo_has_hz = yes; then -- + -$as_echo "#define HAVE_HZ_IN_STRUCT_CLOCKINFO 1" >>confdefs.h -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_ntop" >&5 -+$as_echo "$ac_cv_search_inet_ntop" >&6; } -+ac_res=$ac_cv_search_inet_ntop -+if test "$ac_res" != no; then : -+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" ++case "$ac_cv_header_kvm_h" in ++ yes) ++ for ac_func in kvm_open ++do : ++ ac_fn_c_check_func "$LINENO" "kvm_open" "ac_cv_func_kvm_open" ++if test "x$ac_cv_func_kvm_open" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_KVM_OPEN 1 ++_ACEOF fi ++done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking struct clockinfo for tickadj" >&5 -$as_echo_n "checking struct clockinfo for tickadj... " >&6; } @@ -19690,36 +19741,67 @@ Index: ntp-4.2.6p1+dfsg/configure -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -- ++ ;; ++esac ++for ac_func in memcpy memmove memset ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++eval as_val=\$$as_ac_var ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF + -#include <sys/time.h> -int -main () -{ -+ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" -+if test "x$ac_cv_func_inet_ntop" = x""yes; then : ++fi ++done -extern struct clockinfo *pc; -return pc->tickadj; - ; - return 0; -} --_ACEOF ++case "$host" in ++ *-*-sco3.2v5.0.*) ++ # Just stubs. Idiots. ++ ;; ++ *) for ac_func in mkstemp ++do : ++ ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp" ++if test "x$ac_cv_func_mkstemp" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_MKSTEMP 1 + _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_struct_clockinfo_has_tickadj=yes - else +-else - ac_cv_struct_clockinfo_has_tickadj=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- --fi + + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_clockinfo_has_tickadj" >&5 -$as_echo "$ac_cv_struct_clockinfo_has_tickadj" >&6; } -if test $ac_cv_struct_clockinfo_has_tickadj = yes; then ++done -$as_echo "#define HAVE_TICKADJ_IN_STRUCT_CLOCKINFO 1" >>confdefs.h -+$as_echo "#define ISC_PLATFORM_NEEDNTOP 1" >>confdefs.h ++ ;; ++esac ++for ac_func in mktime ++do : ++ ac_fn_c_check_func "$LINENO" "mktime" "ac_cv_func_mktime" ++if test "x$ac_cv_func_mktime" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_MKTIME 1 ++_ACEOF fi ++done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec" >&5 -$as_echo_n "checking for struct timespec... " >&6; } @@ -19728,9 +19810,7 @@ Index: ntp-4.2.6p1+dfsg/configure -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -+ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton" -+if test "x$ac_cv_func_inet_pton" = x""yes; then : - +- -#include <sys/time.h> -/* Under SunOS, timespec is in sys/timepps.h, which needs errno.h and FRAC */ -#ifdef HAVE_ERRNO_H @@ -19747,22 +19827,67 @@ Index: ntp-4.2.6p1+dfsg/configure - ; - return 0; -} --_ACEOF ++case "$host" in ++ *-*-aix[456]*) ++ # Just a stub. Idiots. ++ ;; ++ *-*-irix[45]*) ++ # Just a stub in "old" Irix. Idiots. ++ ;; ++ *-*-*linux*) ++ # there, but more trouble than it is worth for now (resolver problems) ++ ;; ++ *-*-qnx*) ++ # Apparently there but not working in QNX. Idiots? ++ ;; ++ *-*-sco3.2v5.0.*) ++ # Just a stub. Idiots. ++ ;; ++ alpha*-dec-osf4*|alpha*-dec-osf5*) ++ # mlockall is there, as a #define calling memlk via <sys/mman.h> ++ # Not easy to test for - cheat. ++ for ac_func in memlk ++do : ++ ac_fn_c_check_func "$LINENO" "memlk" "ac_cv_func_memlk" ++if test "x$ac_cv_func_memlk" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_MEMLK 1 + _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_struct_timespec=yes - else +-else - ac_cv_struct_timespec=no --fi ++ ac_cv_func_mlockall='yes' + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi ++done ++ ++ for ac_func in mlockall ++do : ++ ac_fn_c_check_func "$LINENO" "mlockall" "ac_cv_func_mlockall" ++if test "x$ac_cv_func_mlockall" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_MLOCKALL 1 ++_ACEOF ++ + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_timespec" >&5 -$as_echo "$ac_cv_struct_timespec" >&6; } -if test $ac_cv_struct_timespec = yes; then ++done -$as_echo "#define HAVE_STRUCT_TIMESPEC 1" >>confdefs.h -+$as_echo "#define ISC_PLATFORM_NEEDPTON 1" >>confdefs.h ++ ;; ++ *) for ac_func in mlockall ++do : ++ ac_fn_c_check_func "$LINENO" "mlockall" "ac_cv_func_mlockall" ++if test "x$ac_cv_func_mlockall" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_MLOCKALL 1 ++_ACEOF fi ++done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct ntptimeval" >&5 -$as_echo_n "checking for struct ntptimeval... " >&6; } @@ -19781,14 +19906,16 @@ Index: ntp-4.2.6p1+dfsg/configure - ; - return 0; -} -+case "$ac_cv_header_kvm_h" in -+ yes) -+ for ac_func in kvm_open ++ ;; ++esac ++for ac_func in nice nlist +do : -+ ac_fn_c_check_func "$LINENO" "kvm_open" "ac_cv_func_kvm_open" -+if test "x$ac_cv_func_kvm_open" = x""yes; then : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++eval as_val=\$$as_ac_var ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF -+#define HAVE_KVM_OPEN 1 ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_struct_ntptimeval=yes @@ -19796,12 +19923,27 @@ Index: ntp-4.2.6p1+dfsg/configure - ac_cv_struct_ntptimeval=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --fi ++ + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_ntptimeval" >&5 -$as_echo "$ac_cv_struct_ntptimeval" >&6; } -if test $ac_cv_struct_ntptimeval = yes; then -- ++done + -$as_echo "#define HAVE_STRUCT_NTPTIMEVAL 1" >>confdefs.h ++case "$host" in ++ *-*-solaris2.6) ++ # Broken... ++ ;; ++ *) for ac_func in ntp_adjtime ntp_gettime ++do : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++eval as_val=\$$as_ac_var ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++_ACEOF fi +done @@ -19827,7 +19969,7 @@ Index: ntp-4.2.6p1+dfsg/configure -#define HAVE_STRUCT_NTPTIMEVAL_TIME_TV_NSEC 1 + ;; +esac -+for ac_func in memcpy memmove memset ++for ac_func in plock pututline pututxline readlink recvmsg rtprio +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -19841,7 +19983,21 @@ Index: ntp-4.2.6p1+dfsg/configure fi +done -- ++case "$host" in ++ *-*-aix[456]*) ++ # Just a stub in AIX 4. Idiots. ++ ;; ++ *-*-solaris2.5*) ++ # Just stubs in solaris2.5. Idiots. ++ ;; ++ *) for ac_func in sched_setscheduler ++do : ++ ac_fn_c_check_func "$LINENO" "sched_setscheduler" "ac_cv_func_sched_setscheduler" ++if test "x$ac_cv_func_sched_setscheduler" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_SCHED_SETSCHEDULER 1 ++_ACEOF + -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then : @@ -19856,25 +20012,36 @@ Index: ntp-4.2.6p1+dfsg/configure -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } -#endif -- -+case "$host" in -+ *-*-sco3.2v5.0.*) -+ # Just stubs. Idiots. ++fi ++done + + ;; -+ *) for ac_func in mkstemp ++esac ++for ac_func in setlinebuf setpgid setpriority setsid +do : -+ ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp" -+if test "x$ac_cv_func_mkstemp" = x""yes; then : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++eval as_val=\$$as_ac_var ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF -+#define HAVE_MKSTEMP 1 ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_inline=$ac_kw --fi ++ + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - test "$ac_cv_c_inline" != no && break --done + done ++for ac_func in setrlimit ++do : ++ ac_fn_c_check_func "$LINENO" "setrlimit" "ac_cv_func_setrlimit" ++if test "x$ac_cv_func_setrlimit" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_SETRLIMIT 1 ++_ACEOF ++ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } @@ -19891,30 +20058,32 @@ Index: ntp-4.2.6p1+dfsg/configure -#ifndef __cplusplus -#define inline $ac_val -#endif --_ACEOF - ;; - esac -+for ac_func in mktime ++for ac_func in settimeofday +do : -+ ac_fn_c_check_func "$LINENO" "mktime" "ac_cv_func_mktime" -+if test "x$ac_cv_func_mktime" = x""yes; then : ++ ac_fn_c_check_func "$LINENO" "settimeofday" "ac_cv_func_settimeofday" ++if test "x$ac_cv_func_settimeofday" = x""yes; then : + cat >>confdefs.h <<_ACEOF -+#define HAVE_MKTIME 1 -+_ACEOF ++#define HAVE_SETTIMEOFDAY 1 + _ACEOF +- ;; +-esac -+fi -+done ++else -case "$ac_cv_c_inline" in - '') -- ;; ++case "$host" in ++ *-*-mpeix*) ac_cv_func_settimeofday=yes + ;; - *) - -$as_echo "#define HAVE_INLINE 1" >>confdefs.h - - --esac -- + esac ++fi ++done + -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5 -$as_echo_n "checking whether char is unsigned... " >&6; } -if test "${ac_cv_c_char_unsigned+set}" = set; then : @@ -19932,31 +20101,14 @@ Index: ntp-4.2.6p1+dfsg/configure - ; - return 0; -} -+case "$host" in -+ *-*-aix[456]*) -+ # Just a stub. Idiots. -+ ;; -+ *-*-irix[45]*) -+ # Just a stub in "old" Irix. Idiots. -+ ;; -+ *-*-*linux*) -+ # there, but more trouble than it is worth for now (resolver problems) -+ ;; -+ *-*-qnx*) -+ # Apparently there but not working in QNX. Idiots? -+ ;; -+ *-*-sco3.2v5.0.*) -+ # Just a stub. Idiots. -+ ;; -+ alpha*-dec-osf4*|alpha*-dec-osf5*) -+ # mlockall is there, as a #define calling memlk via <sys/mman.h> -+ # Not easy to test for - cheat. -+ for ac_func in memlk ++for ac_func in setvbuf sigaction +do : -+ ac_fn_c_check_func "$LINENO" "memlk" "ac_cv_func_memlk" -+if test "x$ac_cv_func_memlk" = x""yes; then : ++ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" ++eval as_val=\$$as_ac_var ++ if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF -+#define HAVE_MEMLK 1 ++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_char_unsigned=no @@ -19964,15 +20116,13 @@ Index: ntp-4.2.6p1+dfsg/configure - ac_cv_c_char_unsigned=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_cv_func_mlockall='yes' - fi +-fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_char_unsigned" >&5 -$as_echo "$ac_cv_c_char_unsigned" >&6; } -if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then - $as_echo "#define __CHAR_UNSIGNED__ 1" >>confdefs.h -+done --fi + fi - # The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. @@ -19983,13 +20133,7 @@ Index: ntp-4.2.6p1+dfsg/configure - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (signed char))" "ac_cv_sizeof_signed_char" "$ac_includes_default"; then : -+ for ac_func in mlockall -+do : -+ ac_fn_c_check_func "$LINENO" "mlockall" "ac_cv_func_mlockall" -+if test "x$ac_cv_func_mlockall" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_MLOCKALL 1 -+_ACEOF ++done -else - if test "$ac_cv_type_signed_char" = yes; then @@ -20001,26 +20145,8 @@ Index: ntp-4.2.6p1+dfsg/configure - else - ac_cv_sizeof_signed_char=0 - fi - fi -+done -+ -+ ;; -+ *) for ac_func in mlockall -+do : -+ ac_fn_c_check_func "$LINENO" "mlockall" "ac_cv_func_mlockall" -+if test "x$ac_cv_func_mlockall" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_MLOCKALL 1 -+_ACEOF - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_signed_char" >&5 --$as_echo "$ac_cv_sizeof_signed_char" >&6; } -+done - -+ ;; -+esac -+for ac_func in nice nlist +-fi ++for ac_func in sigvec sigset sigsuspend stime strchr sysconf sysctl +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -20030,16 +20156,16 @@ Index: ntp-4.2.6p1+dfsg/configure +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -+fi + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_signed_char" >&5 +-$as_echo "$ac_cv_sizeof_signed_char" >&6; } +- +- +done -cat >>confdefs.h <<_ACEOF -#define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char -+case "$host" in -+ *-*-solaris2.6) -+ # Broken... -+ ;; -+ *) for ac_func in ntp_adjtime ntp_gettime ++for ac_func in snprintf strdup strerror strstr +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -20062,18 +20188,7 @@ Index: ntp-4.2.6p1+dfsg/configure - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : -+ ;; -+esac -+for ac_func in plock pututline pututxline readlink recvmsg rtprio -+do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+eval as_val=\$$as_ac_var -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF - +- -else - if test "$ac_cv_type_int" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 @@ -20084,32 +20199,38 @@ Index: ntp-4.2.6p1+dfsg/configure - else - ac_cv_sizeof_int=0 - fi - fi -+done -+ -+case "$host" in -+ *-*-aix[456]*) -+ # Just a stub in AIX 4. Idiots. -+ ;; -+ *-*-solaris2.5*) -+ # Just stubs in solaris2.5. Idiots. -+ ;; -+ *) for ac_func in sched_setscheduler +-fi ++for ac_func in timegm +do : -+ ac_fn_c_check_func "$LINENO" "sched_setscheduler" "ac_cv_func_sched_setscheduler" -+if test "x$ac_cv_func_sched_setscheduler" = x""yes; then : ++ ac_fn_c_check_func "$LINENO" "timegm" "ac_cv_func_timegm" ++if test "x$ac_cv_func_timegm" = x""yes; then : + cat >>confdefs.h <<_ACEOF -+#define HAVE_SCHED_SETSCHEDULER 1 ++#define HAVE_TIMEGM 1 +_ACEOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 -$as_echo "$ac_cv_sizeof_int" >&6; } +- +- +done +-cat >>confdefs.h <<_ACEOF +-#define SIZEOF_INT $ac_cv_sizeof_int ++case "$host" in ++ *-*-aix[456]*) ++ # Just stubs. Idiots. + ;; -+esac -+for ac_func in setlinebuf setpgid setpriority setsid ++ *-*-netbsd1*) ++ # Just stubs. Idiots. ++ ;; ++ *-*-netbsdelf1*) ++ # Just stubs. Idiots. ++ ;; ++ *-*-openbsd*) ++ # Just stubs. Idiots. ++ ;; ++ *) for ac_func in timer_create timer_settime +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -20117,19 +20238,6 @@ Index: ntp-4.2.6p1+dfsg/configure + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF - -+fi -+done - --cat >>confdefs.h <<_ACEOF --#define SIZEOF_INT $ac_cv_sizeof_int -+for ac_func in setrlimit -+do : -+ ac_fn_c_check_func "$LINENO" "setrlimit" "ac_cv_func_setrlimit" -+if test "x$ac_cv_func_setrlimit" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_SETRLIMIT 1 _ACEOF +fi @@ -20145,15 +20253,21 @@ Index: ntp-4.2.6p1+dfsg/configure - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : -+for ac_func in settimeofday ++ ;; ++esac ++case "$host" in ++ *-pc-cygwin*) ++ # I have no idea... ++ ;; ++ *) for ac_func in umask +do : -+ ac_fn_c_check_func "$LINENO" "settimeofday" "ac_cv_func_settimeofday" -+if test "x$ac_cv_func_settimeofday" = x""yes; then : ++ ac_fn_c_check_func "$LINENO" "umask" "ac_cv_func_umask" ++if test "x$ac_cv_func_umask" = x""yes; then : + cat >>confdefs.h <<_ACEOF -+#define HAVE_SETTIMEOFDAY 1 ++#define HAVE_UMASK 1 +_ACEOF - else +-else - if test "$ac_cv_type_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} @@ -20163,22 +20277,15 @@ Index: ntp-4.2.6p1+dfsg/configure - else - ac_cv_sizeof_long=0 - fi --fi - -+case "$host" in -+ *-*-mpeix*) ac_cv_func_settimeofday=yes -+ ;; -+esac fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 --$as_echo "$ac_cv_sizeof_long" >&6; } -- -- +done --cat >>confdefs.h <<_ACEOF --#define SIZEOF_LONG $ac_cv_sizeof_long -+for ac_func in setvbuf sigaction +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 +-$as_echo "$ac_cv_sizeof_long" >&6; } ++ ;; ++esac ++for ac_func in uname updwtmp updwtmpx vsnprintf vsprintf +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -20186,30 +20293,70 @@ Index: ntp-4.2.6p1+dfsg/configure + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF ++_ACEOF +fi +done -- + +-cat >>confdefs.h <<_ACEOF +-#define SIZEOF_LONG $ac_cv_sizeof_long +-_ACEOF ++### + ++# http://bugs.ntp.org/737 ++case "$ac_cv_func_recvmsg" in ++ yes) ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need extra help to define struct iovec" >&5 ++$as_echo_n "checking if we need extra help to define struct iovec... " >&6; } ++ if test "${ac_cv_struct_iovec_help+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ for ac_cv_struct_iovec_help in '0' '1'; do ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++#ifdef HAVE_SYS_TYPES_H ++#include <sys/types.h> ++#endif ++#ifdef HAVE_SYS_SOCKET_H ++#include <sys/socket.h> ++#endif ++#if $ac_cv_struct_iovec_help ++#include <sys/uio.h> ++#endif + ++void foo(); ++void foo() { ++ ssize_t x; ++ int s = 0; ++ struct iovec iov; ++ struct msghdr mh; ++ int flags = 0; + -ac_fn_c_check_type "$LINENO" "s_char" "ac_cv_type_s_char" "$ac_includes_default" -if test "x$ac_cv_type_s_char" = x""yes; then : -- ++ mh.msg_iov = &iov; ++ x = recvmsg(s, &mh, flags); ++} ++int ++main () ++{ + -cat >>confdefs.h <<_ACEOF -#define HAVE_S_CHAR 1 -+for ac_func in sigvec sigset sigsuspend stime strchr sysconf sysctl -+do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+eval as_val=\$$as_ac_var -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++ ; ++ return 0; ++} _ACEOF - - +- ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_worked=yes ; break 1 ++else ++ ac_worked=no fi -+done ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ++ done -case "$ac_cv_c_char_unsigned$ac_cv_sizeof_signed_char$ac_cv_type_s_char" in - *yes) @@ -20217,14 +20364,25 @@ Index: ntp-4.2.6p1+dfsg/configure - ;; - no0no) - # We have signed chars, can't say 'signed char', no s_char typedef. -- ++fi ++ case "$ac_worked$ac_cv_struct_iovec_help" in ++ yes1) + -$as_echo "#define NEED_S_CHAR_TYPEDEF 1" >>confdefs.h -- -- ;; ++$as_echo "#define HAVE_SYS_UIO_H 1" >>confdefs.h + ++ ans=yes ++ ;; ++ *) ans=no ++ esac ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ans" >&5 ++$as_echo "$ans" >&6; } + ;; - no1no) - # We have signed chars, can say 'signed char', no s_char typedef. - $as_echo "#define NEED_S_CHAR_TYPEDEF 1" >>confdefs.h -- ++esac + - ;; - yes0no) - # We have unsigned chars, can't say 'signed char', no s_char typedef. @@ -20233,34 +20391,48 @@ Index: ntp-4.2.6p1+dfsg/configure - yes1no) - # We have unsigned chars, can say 'signed char', no s_char typedef. - $as_echo "#define NEED_S_CHAR_TYPEDEF 1" >>confdefs.h -- -- ;; --esac ++case "$host" in ++ *-*-sunos4*) ++ ++$as_echo "#define SPRINTF_CHAR 1" >>confdefs.h + + ;; + esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 -$as_echo_n "checking for uid_t in sys/types.h... " >&6; } -if test "${ac_cv_type_uid_t+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ ++ ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking number of arguments to gettimeofday()" >&5 ++$as_echo_n "checking number of arguments to gettimeofday()... " >&6; } ++if test "${ac_cv_func_Xettimeofday_nargs+set}" = set; then : + $as_echo_n "(cached) " >&6 + else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ -#include <sys/types.h> -- -+for ac_func in snprintf strdup strerror strstr -+do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+eval as_val=\$$as_ac_var -+ if test "x$as_val" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 ++#include <sys/time.h> ++int ++main () ++{ + ++gettimeofday((struct timeval*)0,(struct timezone*)0); ++settimeofday((struct timeval*)0,(struct timezone*)0); ++ ++ ; ++ return 0; ++} _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1; then : - ac_cv_type_uid_t=yes --else ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_func_Xettimeofday_nargs=2 + else - ac_cv_type_uid_t=no --fi ++ ac_cv_func_Xettimeofday_nargs=1 + fi -rm -f conftest* ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 @@ -20269,55 +20441,60 @@ Index: ntp-4.2.6p1+dfsg/configure - -$as_echo "#define uid_t int" >>confdefs.h - -+done ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_Xettimeofday_nargs" >&5 ++$as_echo "$ac_cv_func_Xettimeofday_nargs" >&6; } ++if test $ac_cv_func_Xettimeofday_nargs = 1; then -$as_echo "#define gid_t int" >>confdefs.h -+for ac_func in timegm -+do : -+ ac_fn_c_check_func "$LINENO" "timegm" "ac_cv_func_timegm" -+if test "x$ac_cv_func_timegm" = x""yes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_TIMEGM 1 -+_ACEOF ++$as_echo "#define SYSV_TIMEOFDAY 1" >>confdefs.h fi -- -+done - case "$host" in - *-*-aix[456]*) +- +-case "$host" in +- *-*-aix[456]*) - # (prr) aix 4.1 doesn't have clock_settime, but in aix 4.3 it's a stub - # (returning ENOSYS). I didn't check 4.2. If, in the future, - # IBM pulls its thumbs out long enough to implement clock_settime, - # this conditional will need to change. Maybe use AC_TRY_RUN - # instead to try to set the time to itself and check errno. -+ # Just stubs. Idiots. - ;; +- ;; - *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing clock_gettime" >&5 -$as_echo_n "checking for library containing clock_gettime... " >&6; } -if test "${ac_cv_search_clock_gettime+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking number of arguments taken by setpgrp()" >&5 ++$as_echo_n "checking number of arguments taken by setpgrp()... " >&6; } ++if test "${ac_cv_func_setpgrp_nargs+set}" = set; then : + $as_echo_n "(cached) " >&6 + else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -- ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" --#endif ++#ifdef HAVE_SYS_TYPES_H ++# include <sys/types.h> + #endif -char clock_gettime (); --int --main () --{ ++#ifdef HAVE_UNISTD_H ++# include <unistd.h> ++#endif ++ + int + main () + { -return clock_gettime (); -- ; -- return 0; --} --_ACEOF ++setpgrp(0,0); + ; + return 0; + } + _ACEOF -for ac_lib in '' rt; do - if test -z "$ac_lib"; then - ac_res="none required" @@ -20336,72 +20513,71 @@ Index: ntp-4.2.6p1+dfsg/configure -done -if test "${ac_cv_search_clock_gettime+set}" = set; then : - --else ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_func_setpgrp_nargs=2 + else - ac_cv_search_clock_gettime=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS --fi ++ ac_cv_func_setpgrp_nargs=0 + fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_clock_gettime" >&5 -$as_echo "$ac_cv_search_clock_gettime" >&6; } -ac_res=$ac_cv_search_clock_gettime -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -- --fi -- ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_setpgrp_nargs" >&5 ++$as_echo "$ac_cv_func_setpgrp_nargs" >&6; } ++if test $ac_cv_func_setpgrp_nargs = 0; then + - for ac_func in clock_gettime clock_settime -+ *-*-netbsd1*) -+ # Just stubs. Idiots. -+ ;; -+ *-*-netbsdelf1*) -+ # Just stubs. Idiots. -+ ;; -+ *-*-openbsd*) -+ # Just stubs. Idiots. -+ ;; -+ *) for ac_func in timer_create timer_settime - do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` - ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -@@ -21521,2805 +20326,2093 @@ +-do : +- as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +-eval as_val=\$$as_ac_var +- if test "x$as_val" = x""yes; then : +- cat >>confdefs.h <<_ACEOF +-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +-_ACEOF ++$as_echo "#define HAVE_SETPGRP_0 1" >>confdefs.h - ;; - esac + fi +-done + +- ;; +-esac -for ac_func in daemon -+case "$host" in -+ *-pc-cygwin*) -+ # I have no idea... -+ ;; -+ *) for ac_func in umask - do : +-do : - ac_fn_c_check_func "$LINENO" "daemon" "ac_cv_func_daemon" -if test "x$ac_cv_func_daemon" = x""yes; then : -+ ac_fn_c_check_func "$LINENO" "umask" "ac_cv_func_umask" -+if test "x$ac_cv_func_umask" = x""yes; then : - cat >>confdefs.h <<_ACEOF +- cat >>confdefs.h <<_ACEOF -#define HAVE_DAEMON 1 -+#define HAVE_UMASK 1 - _ACEOF +-_ACEOF ++save_CFLAGS=$CFLAGS ++CFLAGS="$CFLAGS -I$srcdir/include" - fi - done +-fi +-done ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking argument pointer type of qsort()'s compare function and base" >&5 ++$as_echo_n "checking argument pointer type of qsort()'s compare function and base... " >&6; } ++if test "${ac_cv_func_qsort_argtype+set}" = set; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ -for ac_func in finite -+ ;; -+esac -+for ac_func in uname updwtmp updwtmpx vsnprintf vsprintf - do : +-do : - ac_fn_c_check_func "$LINENO" "finite" "ac_cv_func_finite" -if test "x$ac_cv_func_finite" = x""yes; then : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+eval as_val=\$$as_ac_var -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF +- cat >>confdefs.h <<_ACEOF -#define HAVE_FINITE 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF +-_ACEOF ++#include "l_stdlib.h" -else - for ac_func in isfinite @@ -20411,55 +20587,27 @@ Index: ntp-4.2.6p1+dfsg/configure - cat >>confdefs.h <<_ACEOF -#define HAVE_ISFINITE 1 -_ACEOF -+fi -+done ++extern void *base; ++extern sortfunc (const void *, const void *); ++int sortfunc(a, b) ++ const void *a; ++ const void *b; { return 0; } -+ -+### -+ -+# http://bugs.ntp.org/737 -+case "$ac_cv_func_recvmsg" in -+ yes) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need extra help to define struct iovec" >&5 -+$as_echo_n "checking if we need extra help to define struct iovec... " >&6; } -+ if test "${ac_cv_struct_iovec_help+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else +-else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for isfinite with <math.h>" >&5 -$as_echo_n "checking for isfinite with <math.h>... " >&6; } - _libs=$LIBS - LIBS="$LIBS -lm" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ for ac_cv_struct_iovec_help in '0' '1'; do -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +-/* end confdefs.h. */ -#include <math.h> -+#ifdef HAVE_SYS_TYPES_H -+#include <sys/types.h> -+#endif -+#ifdef HAVE_SYS_SOCKET_H -+#include <sys/socket.h> -+#endif -+#if $ac_cv_struct_iovec_help -+#include <sys/uio.h> -+#endif -+ -+void foo(); -+void foo() { -+ ssize_t x; -+ int s = 0; -+ struct iovec iov; -+ struct msghdr mh; -+ int flags = 0; -+ -+ mh.msg_iov = &iov; -+ x = recvmsg(s, &mh, flags); -+} int main () { -float f = 0.0; isfinite(f) + ++qsort(base, 2, sizeof(char *), sortfunc); ++ ; return 0; } @@ -20470,7 +20618,7 @@ Index: ntp-4.2.6p1+dfsg/configure - $as_echo "#define HAVE_ISFINITE 1" >>confdefs.h - +if ac_fn_c_try_compile "$LINENO"; then : -+ ac_worked=yes ; break 1 ++ ac_cv_func_qsort_argtype=void else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } @@ -20478,13 +20626,10 @@ Index: ntp-4.2.6p1+dfsg/configure -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS=$_libs -+ ac_worked=no - fi +-fi -done -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ done - - fi +- +-fi -done - -for ac_func in getbootfile getclock getdtablesize @@ -20497,30 +20642,24 @@ Index: ntp-4.2.6p1+dfsg/configure -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - --fi ++ ac_cv_func_qsort_argtype=char + fi -done -+ case "$ac_worked$ac_cv_struct_iovec_help" in -+ yes1) - -+$as_echo "#define HAVE_SYS_UIO_H 1" >>confdefs.h +- ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Check whether --enable-getifaddrs was given. -if test "${enable_getifaddrs+set}" = set; then : - enableval=$enable_getifaddrs; want_getifaddrs="$enableval" -else - want_getifaddrs="yes" --fi -+ ans=yes -+ ;; -+ *) ans=no -+ esac -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ans" >&5 -+$as_echo "$ans" >&6; } -+ ;; -+esac + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_qsort_argtype" >&5 ++$as_echo "$ac_cv_func_qsort_argtype" >&6; } ++case "$ac_cv_func_qsort_argtype" in ++ void) -+case "$host" in -+ *-*-sunos4*) ++$as_echo "#define QSORT_USES_VOID_P 1" >>confdefs.h -case $want_getifaddrs in -yes|glibc) @@ -20543,12 +20682,12 @@ Index: ntp-4.2.6p1+dfsg/configure - cat >>confdefs.h <<_ACEOF -#define HAVE_GETIFADDRS 1 -_ACEOF -+$as_echo "#define SPRINTF_CHAR 1" >>confdefs.h ++ ;; ++esac -fi -done -+ ;; -+esac ++CFLAGS=$save_CFLAGS - else - save_LIBS="$LIBS" @@ -20556,9 +20695,9 @@ Index: ntp-4.2.6p1+dfsg/configure - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getifaddrs in -linet6" >&5 -$as_echo_n "checking for getifaddrs in -linet6... " >&6; } -if test "${ac_cv_lib_inet6_getifaddrs+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking number of arguments to gettimeofday()" >&5 -+$as_echo_n "checking number of arguments to gettimeofday()... " >&6; } -+if test "${ac_cv_func_Xettimeofday_nargs+set}" = set; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need to declare 'errno'" >&5 ++$as_echo_n "checking if we need to declare 'errno'... " >&6; } ++if test "${ac_cv_decl_errno+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS @@ -20572,47 +20711,41 @@ Index: ntp-4.2.6p1+dfsg/configure - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" --#endif ++#ifdef HAVE_ERRNO_H ++#include <errno.h> + #endif -char getifaddrs (); -+#include <sys/time.h> int main () { -return getifaddrs (); -+ -+gettimeofday((struct timeval*)0,(struct timezone*)0); -+settimeofday((struct timeval*)0,(struct timezone*)0); -+ ++errno = 0; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_inet6_getifaddrs=yes -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_func_Xettimeofday_nargs=2 - else +-else - ac_cv_lib_inet6_getifaddrs=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -+ ac_cv_func_Xettimeofday_nargs=1 - fi +-fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_getifaddrs" >&5 -$as_echo "$ac_cv_lib_inet6_getifaddrs" >&6; } -if test "x$ac_cv_lib_inet6_getifaddrs" = x""yes; then : - LIBS="$LIBS -linet6" - $as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - --else +- ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_decl_errno=no + else - LIBS=${save_LIBS} ++ ac_cv_decl_errno=yes fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_Xettimeofday_nargs" >&5 -+$as_echo "$ac_cv_func_Xettimeofday_nargs" >&6; } -+if test $ac_cv_func_Xettimeofday_nargs = 1; then - +- - fi - ;; -*) @@ -20623,8 +20756,8 @@ Index: ntp-4.2.6p1+dfsg/configure - cat >>confdefs.h <<_ACEOF -#define HAVE_GETIFADDRS 1 -_ACEOF -+$as_echo "#define SYSV_TIMEOFDAY 1" >>confdefs.h - +- ++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -done - @@ -20633,7 +20766,13 @@ Index: ntp-4.2.6p1+dfsg/configure -;; -no) -;; --esac ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_errno" >&5 ++$as_echo "$ac_cv_decl_errno" >&6; } ++case "$ac_cv_decl_errno" in ++ yes) ++$as_echo "#define DECL_ERRNO 1" >>confdefs.h ++ ;; + esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking type of socklen arg for getsockname()" >&5 -$as_echo_n "checking type of socklen arg for getsockname()... " >&6; } @@ -20641,9 +20780,9 @@ Index: ntp-4.2.6p1+dfsg/configure - $as_echo_n "(cached) " >&6 -else - if test "${ac_cv_func_getsockname_socklen_type+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking number of arguments taken by setpgrp()" >&5 -+$as_echo_n "checking number of arguments taken by setpgrp()... " >&6; } -+if test "${ac_cv_func_setpgrp_nargs+set}" = set; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we may declare 'h_errno'" >&5 ++$as_echo_n "checking if we may declare 'h_errno'... " >&6; } ++if test "${ac_cv_decl_h_errno+set}" = set; then : $as_echo_n "(cached) " >&6 else - for ac_cv_func_getsockname_arg2 in 'struct sockaddr *' 'void *'; do @@ -20651,59 +20790,57 @@ Index: ntp-4.2.6p1+dfsg/configure - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -+ - #ifdef HAVE_SYS_TYPES_H --#include <sys/types.h> -+# include <sys/types.h> +-#ifdef HAVE_SYS_TYPES_H + #include <sys/types.h> ++#ifdef HAVE_NETINET_IN_H ++#include <netinet/in.h> #endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> -+#ifdef HAVE_UNISTD_H -+# include <unistd.h> ++#ifdef HAVE_ARPA_NAMESER_H ++#include <arpa/nameser.h> ++#endif ++#ifdef HAVE_NETDB_H ++#include <netdb.h> ++#endif ++#ifdef HAVE_RESOLV_H ++#include <resolv.h> #endif -extern getsockname (int, $ac_cv_func_getsockname_arg2, $ac_cv_func_getsockname_socklen_type *); -+ int main () { - -+setpgrp(0,0); ++extern int h_errno; ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - ac_not_found=no ; break 2 -+ ac_cv_func_setpgrp_nargs=2 ++ ac_cv_decl_h_errno=yes else - ac_not_found=yes -+ ac_cv_func_setpgrp_nargs=0 ++ ac_cv_decl_h_errno=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done - done - - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_setpgrp_nargs" >&5 -+$as_echo "$ac_cv_func_setpgrp_nargs" >&6; } -+if test $ac_cv_func_setpgrp_nargs = 0; then - +- +-fi +- -fi -if test "$ac_not_found" = yes; then - ac_cv_func_getsockname_socklen_type='socklen_t' -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getsockname_socklen_type" >&5 -$as_echo "$ac_cv_func_getsockname_socklen_type" >&6; } -+$as_echo "#define HAVE_SETPGRP_0 1" >>confdefs.h - +- -cat >>confdefs.h <<_ACEOF -#define GETSOCKNAME_SOCKLEN_TYPE $ac_cv_func_getsockname_socklen_type -_ACEOF -+fi - -+save_CFLAGS=$CFLAGS -+CFLAGS="$CFLAGS -I$srcdir/include" - +- +- -for ac_func in getrusage -do : - ac_fn_c_check_func "$LINENO" "getrusage" "ac_cv_func_getrusage" @@ -20711,38 +20848,21 @@ Index: ntp-4.2.6p1+dfsg/configure - cat >>confdefs.h <<_ACEOF -#define HAVE_GETRUSAGE 1 -_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking argument pointer type of qsort()'s compare function and base" >&5 -+$as_echo_n "checking argument pointer type of qsort()'s compare function and base... " >&6; } -+if test "${ac_cv_func_qsort_argtype+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - +- -fi -done -+#include "l_stdlib.h" - +- -ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" -if test "x$ac_cv_func_gettimeofday" = x""yes; then : -+extern void *base; -+extern sortfunc (const void *, const void *); -+int sortfunc(a, b) -+ const void *a; -+ const void *b; { return 0; } - +- -else -+int -+main () -+{ - +- -case "$host" in - *-*-mpeix*) ac_cv_func_gettimeofday=yes - ;; -esac -fi -+qsort(base, 2, sizeof(char *), sortfunc); - +- -case "$host" in - *-pc-cygwin*) - ;; @@ -20752,27 +20872,18 @@ Index: ntp-4.2.6p1+dfsg/configure -if test "x$ac_cv_func_getuid" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETUID 1 -+ ; -+ return 0; -+} - _ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_func_qsort_argtype=void -+else -+ ac_cv_func_qsort_argtype=char -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - +-_ACEOF +- fi -done -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_qsort_argtype" >&5 -+$as_echo "$ac_cv_func_qsort_argtype" >&6; } -+case "$ac_cv_func_qsort_argtype" in -+ void) -+ -+$as_echo "#define QSORT_USES_VOID_P 1" >>confdefs.h - - ;; +- +- ;; ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_h_errno" >&5 ++$as_echo "$ac_cv_decl_h_errno" >&6; } ++case "$ac_cv_decl_h_errno" in ++ yes) ++$as_echo "#define DECL_H_ERRNO 1" >>confdefs.h ++ ;; esac -for ac_func in hstrerror -do : @@ -20781,7 +20892,7 @@ Index: ntp-4.2.6p1+dfsg/configure - cat >>confdefs.h <<_ACEOF -#define HAVE_HSTRERROR 1 -_ACEOF - +- -fi -done - @@ -20795,7 +20906,6 @@ Index: ntp-4.2.6p1+dfsg/configure -else - ac_cv_have_if_nametoindex=no -fi -+CFLAGS=$save_CFLAGS -case $ac_cv_have_if_nametoindex in - no) @@ -20804,9 +20914,9 @@ Index: ntp-4.2.6p1+dfsg/configure - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nametoindex in -lipv6" >&5 -$as_echo_n "checking for if_nametoindex in -lipv6... " >&6; } -if test "${ac_cv_lib_ipv6_if_nametoindex+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need to declare 'errno'" >&5 -+$as_echo_n "checking if we need to declare 'errno'... " >&6; } -+if test "${ac_cv_decl_errno+set}" = set; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if declaring 'char *sys_errlist[]' is ok" >&5 ++$as_echo_n "checking if declaring 'char *sys_errlist[]' is ok... " >&6; } ++if test "${ac_cv_decl_sys_errlist+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_check_lib_save_LIBS=$LIBS @@ -20820,6 +20930,7 @@ Index: ntp-4.2.6p1+dfsg/configure - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" ++#include <stdio.h> +#ifdef HAVE_ERRNO_H +#include <errno.h> #endif @@ -20828,7 +20939,8 @@ Index: ntp-4.2.6p1+dfsg/configure main () { -return if_nametoindex (); -+errno = 0; ++extern char *sys_errlist[]; ++ ; return 0; } @@ -20836,14 +20948,14 @@ Index: ntp-4.2.6p1+dfsg/configure -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ipv6_if_nametoindex=yes +if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_decl_errno=no ++ ac_cv_decl_sys_errlist=yes else - ac_cv_lib_ipv6_if_nametoindex=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -+ ac_cv_decl_errno=yes ++ ac_cv_decl_sys_errlist=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipv6_if_nametoindex" >&5 -$as_echo "$ac_cv_lib_ipv6_if_nametoindex" >&6; } @@ -20857,55 +20969,49 @@ Index: ntp-4.2.6p1+dfsg/configure - esac -esac -case $ac_cv_have_if_nametoindex in -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_errno" >&5 -+$as_echo "$ac_cv_decl_errno" >&6; } -+case "$ac_cv_decl_errno" in ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_sys_errlist" >&5 ++$as_echo "$ac_cv_decl_sys_errlist" >&6; } ++case "$ac_cv_decl_sys_errlist" in yes) - -$as_echo "#define ISC_PLATFORM_HAVEIFNAMETOINDEX 1" >>confdefs.h - - ;; -+$as_echo "#define DECL_ERRNO 1" >>confdefs.h ++$as_echo "#define CHAR_SYS_ERRLIST 1" >>confdefs.h + ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5 -$as_echo_n "checking for library containing inet_ntop... " >&6; } -if test "${ac_cv_search_inet_ntop+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we may declare 'h_errno'" >&5 -+$as_echo_n "checking if we may declare 'h_errno'... " >&6; } -+if test "${ac_cv_decl_h_errno+set}" = set; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if declaring 'syscall()' is ok" >&5 ++$as_echo_n "checking if declaring 'syscall()' is ok... " >&6; } ++if test "${ac_cv_decl_syscall+set}" = set; then : $as_echo_n "(cached) " >&6 else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -- + -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -+#include <sys/types.h> -+#ifdef HAVE_NETINET_IN_H -+#include <netinet/in.h> -+#endif -+#ifdef HAVE_ARPA_NAMESER_H -+#include <arpa/nameser.h> -+#endif -+#ifdef HAVE_NETDB_H -+#include <netdb.h> -+#endif -+#ifdef HAVE_RESOLV_H -+#include <resolv.h> ++#ifdef HAVE_SYS_TYPES_H ++# include <sys/types.h> #endif -char inet_ntop (); ++#ifdef HAVE_UNISTD_H ++# include <unistd.h> ++#endif ++ int main () { -return inet_ntop (); -+extern int h_errno; ++extern int syscall (int, ...); ; return 0; } @@ -20919,52 +21025,20 @@ Index: ntp-4.2.6p1+dfsg/configure - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_inet_ntop=$ac_res -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_decl_h_errno=yes -+else -+ ac_cv_decl_h_errno=no - fi +-fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if test "${ac_cv_search_inet_ntop+set}" = set; then : - break -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi +-fi -done -if test "${ac_cv_search_inet_ntop+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_h_errno" >&5 -+$as_echo "$ac_cv_decl_h_errno" >&6; } -+case "$ac_cv_decl_h_errno" in -+ yes) -+$as_echo "#define DECL_H_ERRNO 1" >>confdefs.h -+ ;; -+esac - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if declaring 'char *sys_errlist[]' is ok" >&5 -+$as_echo_n "checking if declaring 'char *sys_errlist[]' is ok... " >&6; } -+if test "${ac_cv_decl_sys_errlist+set}" = set; then : -+ $as_echo_n "(cached) " >&6 +- ++if ac_fn_c_try_compile "$LINENO"; then : ++ ac_cv_decl_syscall=yes else - ac_cv_search_inet_ntop=no -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <stdio.h> -+#ifdef HAVE_ERRNO_H -+#include <errno.h> -+#endif -+int -+main () -+{ -+extern char *sys_errlist[]; -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_decl_sys_errlist=yes -+else -+ ac_cv_decl_sys_errlist=no ++ ac_cv_decl_syscall=no fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS @@ -20975,47 +21049,6 @@ Index: ntp-4.2.6p1+dfsg/configure -ac_res=$ac_cv_search_inet_ntop -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_sys_errlist" >&5 -+$as_echo "$ac_cv_decl_sys_errlist" >&6; } -+case "$ac_cv_decl_sys_errlist" in -+ yes) -+$as_echo "#define CHAR_SYS_ERRLIST 1" >>confdefs.h -+ ;; -+esac - --fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if declaring 'syscall()' is ok" >&5 -+$as_echo_n "checking if declaring 'syscall()' is ok... " >&6; } -+if test "${ac_cv_decl_syscall+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ - --ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" --if test "x$ac_cv_func_inet_ntop" = x""yes; then : -+#ifdef HAVE_SYS_TYPES_H -+# include <sys/types.h> -+#endif -+#ifdef HAVE_UNISTD_H -+# include <unistd.h> -+#endif - -+int -+main () -+{ -+extern int syscall (int, ...); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_decl_syscall=yes - else -+ ac_cv_decl_syscall=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_syscall" >&5 +$as_echo "$ac_cv_decl_syscall" >&6; } +case "$ac_cv_decl_syscall" in @@ -21024,26 +21057,35 @@ Index: ntp-4.2.6p1+dfsg/configure + ;; +esac --$as_echo "#define ISC_PLATFORM_NEEDNTOP 1" >>confdefs.h +-fi +case "$host" in + *-*-aix4.3.*) --fi +-ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" +-if test "x$ac_cv_func_inet_ntop" = x""yes; then : +$as_echo "#define DECL_HSTRERROR_0 1" >>confdefs.h + # Needed for XLC under AIX 4.3.2 + ;; + *-*-mpeix*) +-else ++$as_echo "#define DECL_ADJTIME_0 1" >>confdefs.h + +-$as_echo "#define ISC_PLATFORM_NEEDNTOP 1" >>confdefs.h + +-fi ++$as_echo "#define DECL_INET_NTOA_0 1" >>confdefs.h + -ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton" -if test "x$ac_cv_func_inet_pton" = x""yes; then : -+$as_echo "#define DECL_ADJTIME_0 1" >>confdefs.h -else ++$as_echo "#define DECL_MKTEMP_0 1" >>confdefs.h -$as_echo "#define ISC_PLATFORM_NEEDPTON 1" >>confdefs.h -+$as_echo "#define DECL_INET_NTOA_0 1" >>confdefs.h -fi ++$as_echo "#define DECL_SELECT_0 1" >>confdefs.h -case "$ac_cv_header_kvm_h" in - yes) @@ -21054,12 +21096,18 @@ Index: ntp-4.2.6p1+dfsg/configure - cat >>confdefs.h <<_ACEOF -#define HAVE_KVM_OPEN 1 -_ACEOF -+$as_echo "#define DECL_MKTEMP_0 1" >>confdefs.h -fi -done ++$as_echo "#define DECL_SETITIMER_0 1" >>confdefs.h ++ ++ ++$as_echo "#define DECL_SYSLOG_0 1" >>confdefs.h ++ ++ ++$as_echo "#define DECL_TIMEOFDAY_0 1" >>confdefs.h -- ;; + ;; -esac -for ac_func in memcpy memmove memset -do : @@ -21070,10 +21118,11 @@ Index: ntp-4.2.6p1+dfsg/configure - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -+$as_echo "#define DECL_SELECT_0 1" >>confdefs.h ++ *-*-osf[45]*) -fi -done ++$as_echo "#define DECL_PLOCK_0 1" >>confdefs.h -case "$host" in - *-*-sco3.2v5.0.*) @@ -21086,15 +21135,10 @@ Index: ntp-4.2.6p1+dfsg/configure - cat >>confdefs.h <<_ACEOF -#define HAVE_MKSTEMP 1 -_ACEOF -+$as_echo "#define DECL_SETITIMER_0 1" >>confdefs.h -+ -+ -+$as_echo "#define DECL_SYSLOG_0 1" >>confdefs.h -fi -done -+ -+$as_echo "#define DECL_TIMEOFDAY_0 1" >>confdefs.h ++$as_echo "#define DECL_STIME_1 1" >>confdefs.h ;; -esac @@ -21105,14 +21149,11 @@ Index: ntp-4.2.6p1+dfsg/configure - cat >>confdefs.h <<_ACEOF -#define HAVE_MKTIME 1 -_ACEOF -+ *-*-osf[45]*) ++ *-*-qnx*) -fi -done -+$as_echo "#define DECL_PLOCK_0 1" >>confdefs.h -+ -+ -+$as_echo "#define DECL_STIME_1 1" >>confdefs.h ++$as_echo "#define DECL_ADJTIME_0 1" >>confdefs.h -case "$host" in - *-*-aix[456]*) @@ -21123,16 +21164,13 @@ Index: ntp-4.2.6p1+dfsg/configure - ;; - *-*-*linux*) - # there, but more trouble than it is worth for now (resolver problems) - ;; - *-*-qnx*) -- # Apparently there but not working in QNX. Idiots? - ;; +- *-*-qnx*) +- # Apparently there but not working in QNX. Idiots? + ;; - *-*-sco3.2v5.0.*) - # Just a stub. Idiots. -+ -+$as_echo "#define DECL_ADJTIME_0 1" >>confdefs.h -+ - ;; +- ;; - alpha*-dec-osf4*|alpha*-dec-osf5*) - # mlockall is there, as a #define calling memlk via <sys/mman.h> - # Not easy to test for - cheat. @@ -21342,6 +21380,12 @@ Index: ntp-4.2.6p1+dfsg/configure -fi -done +$as_echo "#define DECL_TIME_0 1" >>confdefs.h ++ ++ ++$as_echo "#define DECL_TIMEOFDAY_0 1" >>confdefs.h ++ ++ ++$as_echo "#define DECL_TOLOWER_0 1" >>confdefs.h -case "$host" in - *-*-aix[456]*) @@ -21355,7 +21399,7 @@ Index: ntp-4.2.6p1+dfsg/configure - ;; - *-*-openbsd*) - # Just stubs. Idiots. -- ;; + ;; - *) for ac_func in timer_create timer_settime -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -21365,10 +21409,11 @@ Index: ntp-4.2.6p1+dfsg/configure - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF ++ *-*-solaris2*) -fi -done -+$as_echo "#define DECL_TIMEOFDAY_0 1" >>confdefs.h ++$as_echo "#define DECL_MKSTEMP_0 1" >>confdefs.h - ;; -esac @@ -21386,8 +21431,15 @@ Index: ntp-4.2.6p1+dfsg/configure -fi -done -+$as_echo "#define DECL_TOLOWER_0 1" >>confdefs.h ++$as_echo "#define DECL_SETPRIORITY_1 1" >>confdefs.h ++ ++ case "$host" in ++ *-*-solaris2.4) ++ ++$as_echo "#define DECL_TIMEOFDAY_0 1" >>confdefs.h ++ ;; ++ esac ;; -esac -for ac_func in uname updwtmp updwtmpx vsnprintf vsprintf @@ -21399,15 +21451,15 @@ Index: ntp-4.2.6p1+dfsg/configure - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF -+ *-*-solaris2*) ++ *-*-sunos4*) -fi -done -+$as_echo "#define DECL_MKSTEMP_0 1" >>confdefs.h ++$as_echo "#define DECL_ADJTIME_0 1" >>confdefs.h -### -+$as_echo "#define DECL_SETPRIORITY_1 1" >>confdefs.h ++$as_echo "#define DECL_BCOPY_0 1" >>confdefs.h -# http://bugs.ntp.org/737 -case "$ac_cv_func_recvmsg" in @@ -21429,8 +21481,6 @@ Index: ntp-4.2.6p1+dfsg/configure -#if $ac_cv_struct_iovec_help -#include <sys/uio.h> -#endif -+ case "$host" in -+ *-*-solaris2.4) -void foo(); -void foo() { @@ -21439,7 +21489,7 @@ Index: ntp-4.2.6p1+dfsg/configure - struct iovec iov; - struct msghdr mh; - int flags = 0; -+$as_echo "#define DECL_TIMEOFDAY_0 1" >>confdefs.h ++$as_echo "#define DECL_BZERO_0 1" >>confdefs.h - mh.msg_iov = &iov; - x = recvmsg(s, &mh, flags); @@ -21447,10 +21497,6 @@ Index: ntp-4.2.6p1+dfsg/configure -int -main () -{ -+ ;; -+ esac -+ ;; -+ *-*-sunos4*) - ; - return 0; @@ -21463,57 +21509,19 @@ Index: ntp-4.2.6p1+dfsg/configure -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -+$as_echo "#define DECL_ADJTIME_0 1" >>confdefs.h ++$as_echo "#define DECL_IOCTL_0 1" >>confdefs.h -fi - case "$ac_worked$ac_cv_struct_iovec_help" in - yes1) -$as_echo "#define HAVE_SYS_UIO_H 1" >>confdefs.h -+$as_echo "#define DECL_BCOPY_0 1" >>confdefs.h -+ -+ -+$as_echo "#define DECL_BZERO_0 1" >>confdefs.h -+ -+ -+$as_echo "#define DECL_IOCTL_0 1" >>confdefs.h -+ -+ +$as_echo "#define DECL_IPC_0 1" >>confdefs.h -+ -+ -+$as_echo "#define DECL_MEMMOVE_0 1" >>confdefs.h -+ -+ -+$as_echo "#define DECL_MKTEMP_0 1" >>confdefs.h -+ -+ -+$as_echo "#define DECL_MKSTEMP_0 1" >>confdefs.h -+ -+ -+$as_echo "#define DECL_RENAME_0 1" >>confdefs.h -+ -+ -+$as_echo "#define DECL_SELECT_0 1" >>confdefs.h -+ -+ -+$as_echo "#define DECL_SETITIMER_0 1" >>confdefs.h -+ -+ -+$as_echo "#define DECL_SETPRIORITY_0 1" >>confdefs.h -+ -+ -+$as_echo "#define DECL_SIGVEC_0 1" >>confdefs.h -+ -+ case "`basename $ac_cv_prog_CC`" in -+ acc*) ;; -+ *) -+$as_echo "#define DECL_STDIO_0 1" >>confdefs.h - ans=yes - ;; +- ;; - *) ans=no - esac +- esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ans" >&5 -$as_echo "$ans" >&6; } - ;; @@ -21521,30 +21529,13 @@ Index: ntp-4.2.6p1+dfsg/configure -case "$host" in - *-*-sunos4*) -+$as_echo "#define DECL_STRTOL_0 1" >>confdefs.h ++$as_echo "#define DECL_MEMMOVE_0 1" >>confdefs.h -$as_echo "#define SPRINTF_CHAR 1" >>confdefs.h -+ -+$as_echo "#define DECL_SYSLOG_0 1" >>confdefs.h -+ -+ -+$as_echo "#define DECL_TIME_0 1" >>confdefs.h -+ -+ -+$as_echo "#define DECL_TIMEOFDAY_0 1" >>confdefs.h -+ -+ -+$as_echo "#define DECL_TOLOWER_0 1" >>confdefs.h -+ -+ -+$as_echo "#define DECL_TOUPPER_0 1" >>confdefs.h -+ -+ -+$as_echo "#define DECL_STRERROR_0 1" >>confdefs.h - ;; +- ;; -esac -+ *-*-ultrix4*) ++$as_echo "#define DECL_MKTEMP_0 1" >>confdefs.h -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking number of arguments to gettimeofday()" >&5 -$as_echo_n "checking number of arguments to gettimeofday()... " >&6; } @@ -21557,10 +21548,10 @@ Index: ntp-4.2.6p1+dfsg/configure -int -main () -{ -+$as_echo "#define DECL_ADJTIME_0 1" >>confdefs.h -gettimeofday((struct timeval*)0,(struct timezone*)0); -settimeofday((struct timeval*)0,(struct timezone*)0); ++$as_echo "#define DECL_MKSTEMP_0 1" >>confdefs.h - ; - return 0; @@ -21572,17 +21563,17 @@ Index: ntp-4.2.6p1+dfsg/configure - ac_cv_func_Xettimeofday_nargs=1 -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+$as_echo "#define DECL_BZERO_0 1" >>confdefs.h -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_Xettimeofday_nargs" >&5 -$as_echo "$ac_cv_func_Xettimeofday_nargs" >&6; } -if test $ac_cv_func_Xettimeofday_nargs = 1; then ++$as_echo "#define DECL_RENAME_0 1" >>confdefs.h -$as_echo "#define SYSV_TIMEOFDAY 1" >>confdefs.h -+$as_echo "#define DECL_CFSETISPEED_0 1" >>confdefs.h -fi ++$as_echo "#define DECL_SELECT_0 1" >>confdefs.h -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking number of arguments taken by setpgrp()" >&5 -$as_echo_n "checking number of arguments taken by setpgrp()... " >&6; } @@ -21591,7 +21582,6 @@ Index: ntp-4.2.6p1+dfsg/configure -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -+$as_echo "#define DECL_IOCTL_0 1" >>confdefs.h -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> @@ -21599,6 +21589,7 @@ Index: ntp-4.2.6p1+dfsg/configure -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif ++$as_echo "#define DECL_SETITIMER_0 1" >>confdefs.h -int -main () @@ -21614,21 +21605,24 @@ Index: ntp-4.2.6p1+dfsg/configure - ac_cv_func_setpgrp_nargs=0 -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+$as_echo "#define DECL_IPC_0 1" >>confdefs.h -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_setpgrp_nargs" >&5 -$as_echo "$ac_cv_func_setpgrp_nargs" >&6; } -if test $ac_cv_func_setpgrp_nargs = 0; then ++$as_echo "#define DECL_SETPRIORITY_0 1" >>confdefs.h -$as_echo "#define HAVE_SETPGRP_0 1" >>confdefs.h -+$as_echo "#define DECL_MKTEMP_0 1" >>confdefs.h -fi ++$as_echo "#define DECL_SIGVEC_0 1" >>confdefs.h -save_CFLAGS=$CFLAGS -CFLAGS="$CFLAGS -I$srcdir/include" -+$as_echo "#define DECL_NLIST_0 1" >>confdefs.h ++ case "`basename $ac_cv_prog_CC`" in ++ acc*) ;; ++ *) ++$as_echo "#define DECL_STDIO_0 1" >>confdefs.h -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking argument pointer type of qsort()'s compare function and base" >&5 -$as_echo_n "checking argument pointer type of qsort()'s compare function and base... " >&6; } @@ -21637,9 +21631,11 @@ Index: ntp-4.2.6p1+dfsg/configure -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ ++ ;; ++ esac -#include "l_stdlib.h" -+$as_echo "#define DECL_PLOCK_0 1" >>confdefs.h ++$as_echo "#define DECL_STRTOL_0 1" >>confdefs.h -extern void *base; -extern sortfunc (const void *, const void *); @@ -21650,7 +21646,7 @@ Index: ntp-4.2.6p1+dfsg/configure -int -main () -{ -+$as_echo "#define DECL_SELECT_0 1" >>confdefs.h ++$as_echo "#define DECL_SYSLOG_0 1" >>confdefs.h -qsort(base, 2, sizeof(char *), sortfunc); @@ -21664,7 +21660,7 @@ Index: ntp-4.2.6p1+dfsg/configure - ac_cv_func_qsort_argtype=char -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+$as_echo "#define DECL_SETITIMER_0 1" >>confdefs.h ++$as_echo "#define DECL_TIME_0 1" >>confdefs.h -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_qsort_argtype" >&5 @@ -21673,37 +21669,29 @@ Index: ntp-4.2.6p1+dfsg/configure - void) -$as_echo "#define QSORT_USES_VOID_P 1" >>confdefs.h -+$as_echo "#define DECL_SETPRIORITY_0 1" >>confdefs.h ++$as_echo "#define DECL_TIMEOFDAY_0 1" >>confdefs.h + + -+$as_echo "#define DECL_STIME_0 1" >>confdefs.h ++$as_echo "#define DECL_TOLOWER_0 1" >>confdefs.h + + -+$as_echo "#define DECL_SYSLOG_0 1" >>confdefs.h ++$as_echo "#define DECL_TOUPPER_0 1" >>confdefs.h + + -+$as_echo "#define DECL_TIMEOFDAY_0 1" >>confdefs.h ++$as_echo "#define DECL_STRERROR_0 1" >>confdefs.h ;; - esac +-esac ++ *-*-ultrix4*) -CFLAGS=$save_CFLAGS -+case "$host" in -+ *-*-sco3.2*) ++$as_echo "#define DECL_ADJTIME_0 1" >>confdefs.h -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need to declare 'errno'" >&5 -$as_echo_n "checking if we need to declare 'errno'... " >&6; } -if test "${ac_cv_decl_errno+set}" = set; then : -+$as_echo "#define TERMIOS_NEEDS__SVID3 1" >>confdefs.h -+ -+ ;; -+esac -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need extra room for SO_RCVBUF" >&5 -+$as_echo_n "checking if we need extra room for SO_RCVBUF... " >&6; } -+if test "${ac_cv_var_rcvbuf_slop+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef HAVE_ERRNO_H @@ -21723,34 +21711,20 @@ Index: ntp-4.2.6p1+dfsg/configure - ac_cv_decl_errno=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ans=no -+case "$host" in -+ *-*-hpux[567]*) -+ ans=yes -+ ;; -+esac -+ac_cv_var_rcvbuf_slop=$ans - fi +-fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_errno" >&5 -$as_echo "$ac_cv_decl_errno" >&6; } -case "$ac_cv_decl_errno" in -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_rcvbuf_slop" >&5 -+$as_echo "$ac_cv_var_rcvbuf_slop" >&6; } -+case "$ac_cv_var_rcvbuf_slop" in - yes) +- yes) -$as_echo "#define DECL_ERRNO 1" >>confdefs.h -+$as_echo "#define NEED_RCVBUF_SLOP 1" >>confdefs.h - ;; - esac - +- ;; +-esac +- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we may declare 'h_errno'" >&5 -$as_echo_n "checking if we may declare 'h_errno'... " >&6; } -if test "${ac_cv_decl_h_errno+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we will open the broadcast socket" >&5 -+$as_echo_n "checking if we will open the broadcast socket... " >&6; } -+if test "${ac_cv_var_open_bcast_socket+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/types.h> @@ -21780,34 +21754,20 @@ Index: ntp-4.2.6p1+dfsg/configure - ac_cv_decl_h_errno=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ans=yes -+case "$host" in -+ *-*-domainos) -+ ans=no -+ ;; -+esac -+ac_cv_var_open_bcast_socket=$ans - fi +-fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_h_errno" >&5 -$as_echo "$ac_cv_decl_h_errno" >&6; } -case "$ac_cv_decl_h_errno" in -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_open_bcast_socket" >&5 -+$as_echo "$ac_cv_var_open_bcast_socket" >&6; } -+case "$ac_cv_var_open_bcast_socket" in - yes) +- yes) -$as_echo "#define DECL_H_ERRNO 1" >>confdefs.h -+$as_echo "#define OPEN_BCAST_SOCKET 1" >>confdefs.h - ;; - esac - +- ;; +-esac +- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if declaring 'char *sys_errlist[]' is ok" >&5 -$as_echo_n "checking if declaring 'char *sys_errlist[]' is ok... " >&6; } -if test "${ac_cv_decl_sys_errlist+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we want the HPUX version of FindConfig()" >&5 -+$as_echo_n "checking if we want the HPUX version of FindConfig()... " >&6; } -+if test "${ac_cv_var_hpux_findconfig+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <stdio.h> @@ -21829,34 +21789,20 @@ Index: ntp-4.2.6p1+dfsg/configure - ac_cv_decl_sys_errlist=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ans=no -+case "$host" in -+ *-*-hpux*) -+ ans=yes -+ ;; -+esac -+ac_cv_var_hpux_findconfig=$ans - fi +-fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_sys_errlist" >&5 -$as_echo "$ac_cv_decl_sys_errlist" >&6; } -case "$ac_cv_decl_sys_errlist" in -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_hpux_findconfig" >&5 -+$as_echo "$ac_cv_var_hpux_findconfig" >&6; } -+case "$ac_cv_var_hpux_findconfig" in - yes) +- yes) -$as_echo "#define CHAR_SYS_ERRLIST 1" >>confdefs.h -+$as_echo "#define NEED_HPUX_FINDCONFIG 1" >>confdefs.h - ;; - esac - +- ;; +-esac +- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if declaring 'syscall()' is ok" >&5 -$as_echo_n "checking if declaring 'syscall()' is ok... " >&6; } -if test "${ac_cv_decl_syscall+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if process groups are set with -pid" >&5 -+$as_echo_n "checking if process groups are set with -pid... " >&6; } -+if test "${ac_cv_arg_setpgrp_negpid+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - @@ -21881,40 +21827,15 @@ Index: ntp-4.2.6p1+dfsg/configure - ac_cv_decl_syscall=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ case "$host" in -+ *-*-hpux[567]*) -+ ans=no -+ ;; -+ *-*-hpux*) -+ ans=yes -+ ;; -+ *-*-*linux*) -+ ans=yes -+ ;; -+ *-*-sunos3*) -+ ans=yes -+ ;; -+ *-*-ultrix2*) -+ ans=yes -+ ;; -+ *) -+ ans=no -+ ;; -+esac -+ac_cv_arg_setpgrp_negpid=$ans - fi +-fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_decl_syscall" >&5 -$as_echo "$ac_cv_decl_syscall" >&6; } -case "$ac_cv_decl_syscall" in -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_arg_setpgrp_negpid" >&5 -+$as_echo "$ac_cv_arg_setpgrp_negpid" >&6; } -+case "$ac_cv_arg_setpgrp_negpid" in - yes) +- yes) -$as_echo "#define DECL_SYSCALL 1" >>confdefs.h -+$as_echo "#define UDP_BACKWARDS_SETOWN 1" >>confdefs.h - ;; - esac - +- ;; +-esac +- -case "$host" in - *-*-aix4.3.*) - @@ -21934,66 +21855,16 @@ Index: ntp-4.2.6p1+dfsg/configure - -$as_echo "#define DECL_SELECT_0 1" >>confdefs.h - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need a ctty for F_SETOWN" >&5 -+$as_echo_n "checking if we need a ctty for F_SETOWN... " >&6; } -+if test "${ntp_cv_func_ctty_for_f_setown+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else - +- -$as_echo "#define DECL_SETITIMER_0 1" >>confdefs.h -+ case "$host" in -+ *-*-bsdi23*) -+ ans=yes -+ ;; -+ *-*-freebsd*) -+ ans=yes -+ ;; -+ # NetBSD versions prior to 3.99.8 require a CTTY for F_SETOWN, -+ # while later versions will fail a ioctl(TIOCSCTTY, 0) call in -+ # some cases and so should not have USE_FSETOWNCTTY. "netbsd" -+ # in $host may be followed by "aout", "ecoff", or "elf". -+ *-*-netbsd*a-z3.0-8*|*-*-netbsd*a-z0-2.*|*-*-netbsd*a-z3.99.0-7) -+ ans=yes -+ ;; -+ *-*-netbsd3.0-8*|*-*-netbsd0-2.*|*-*-netbsd3.99.0-7) -+ ans=yes -+ ;; -+ *-*-openbsd*) -+ ans=yes -+ ;; -+ *-*-osf*) -+ ans=yes -+ ;; -+ *-*-darwin*) -+ ans=yes -+ ;; -+ *) -+ ans=no -+ esac -+ ntp_cv_func_ctty_for_f_setown=$ans - - +- +- -$as_echo "#define DECL_SYSLOG_0 1" >>confdefs.h -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_func_ctty_for_f_setown" >&5 -+$as_echo "$ntp_cv_func_ctty_for_f_setown" >&6; } -+case "$ntp_cv_func_ctty_for_f_setown" in -+ yes) - -+$as_echo "#define USE_FSETOWNCTTY 1" >>confdefs.h +- -$as_echo "#define DECL_TIMEOFDAY_0 1" >>confdefs.h -+esac - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the OS fails to clear cached routes when more specific routes become available" >&5 -+$as_echo_n "checking if the OS fails to clear cached routes when more specific routes become available... " >&6; } -+if test "${ac_cv_os_routeupdates+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case "$host" in -+ *-*-netbsd*) -+ ans=yes - ;; +- +- ;; - *-*-osf[45]*) - -$as_echo "#define DECL_PLOCK_0 1" >>confdefs.h @@ -22001,221 +21872,112 @@ Index: ntp-4.2.6p1+dfsg/configure - -$as_echo "#define DECL_STIME_1 1" >>confdefs.h - -+ *) ans=no - ;; +- ;; - *-*-qnx*) - -$as_echo "#define DECL_ADJTIME_0 1" >>confdefs.h -+esac -+ac_cv_os_routeupdates=$ans -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_routeupdates" >&5 -+$as_echo "$ac_cv_os_routeupdates" >&6; } -+case "$ac_cv_os_routeupdates" in -+ yes) -+$as_echo "#define OS_MISSES_SPECIFIC_ROUTE_UPDATES 1" >>confdefs.h -+ ;; -+esac - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the OS needs the wildcard socket set to REUSEADDR for binding interface addresses" >&5 -+$as_echo_n "checking if the OS needs the wildcard socket set to REUSEADDR for binding interface addresses... " >&6; } -+if test "${ac_cv_os_wildcardreuse+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case "$host" in -+ *-*-*linux*) -+ ans=yes - ;; +- +- ;; - *-*-riscos4*) - -$as_echo "#define DECL_ADJTIME_0 1" >>confdefs.h -- -- ++$as_echo "#define DECL_BZERO_0 1" >>confdefs.h + + -$as_echo "#define DECL_BZERO_0 1" >>confdefs.h -- -- --$as_echo "#define DECL_IOCTL_0 1" >>confdefs.h -- -- --$as_echo "#define DECL_IPC_0 1" >>confdefs.h -- -- ++$as_echo "#define DECL_CFSETISPEED_0 1" >>confdefs.h + + + $as_echo "#define DECL_IOCTL_0 1" >>confdefs.h +@@ -22681,13 +20911,13 @@ + $as_echo "#define DECL_IPC_0 1" >>confdefs.h + + -$as_echo "#define DECL_MEMMOVE_0 1" >>confdefs.h -- -- ++$as_echo "#define DECL_MKTEMP_0 1" >>confdefs.h + + -$as_echo "#define DECL_MKTEMP_0 1" >>confdefs.h -- -- ++$as_echo "#define DECL_NLIST_0 1" >>confdefs.h + + -$as_echo "#define DECL_RENAME_0 1" >>confdefs.h -- -- --$as_echo "#define DECL_SELECT_0 1" >>confdefs.h -- -- --$as_echo "#define DECL_SETITIMER_0 1" >>confdefs.h -- -- --$as_echo "#define DECL_SETPRIORITY_0 1" >>confdefs.h -- -- ++$as_echo "#define DECL_PLOCK_0 1" >>confdefs.h + + + $as_echo "#define DECL_SELECT_0 1" >>confdefs.h +@@ -22699,203 +20929,66 @@ + $as_echo "#define DECL_SETPRIORITY_0 1" >>confdefs.h + + -$as_echo "#define DECL_STDIO_0 1" >>confdefs.h - - -$as_echo "#define DECL_STRTOL_0 1" >>confdefs.h ++$as_echo "#define DECL_STIME_0 1" >>confdefs.h + + + $as_echo "#define DECL_SYSLOG_0 1" >>confdefs.h + + +-$as_echo "#define DECL_TIME_0 1" >>confdefs.h - - --$as_echo "#define DECL_SYSLOG_0 1" >>confdefs.h -- -- --$as_echo "#define DECL_TIME_0 1" >>confdefs.h + $as_echo "#define DECL_TIMEOFDAY_0 1" >>confdefs.h + - +-$as_echo "#define DECL_TOLOWER_0 1" >>confdefs.h - --$as_echo "#define DECL_TIMEOFDAY_0 1" >>confdefs.h + ;; +- *-*-solaris2*) - -+ *) ans=no -+ ;; -+esac -+ac_cv_os_wildcardreuse=$ans -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_wildcardreuse" >&5 -+$as_echo "$ac_cv_os_wildcardreuse" >&6; } -+case "$ac_cv_os_wildcardreuse" in -+ yes) -+$as_echo "#define OS_NEEDS_REUSEADDR_FOR_IFADDRBIND 1" >>confdefs.h -+ ;; +-$as_echo "#define DECL_MKSTEMP_0 1" >>confdefs.h +esac --$as_echo "#define DECL_TOLOWER_0 1" >>confdefs.h -+ntp_warning='GRONK' -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we'll use clock_settime or settimeofday or stime" >&5 -+$as_echo_n "checking if we'll use clock_settime or settimeofday or stime... " >&6; } -+case "$ac_cv_func_clock_settime$ac_cv_func_settimeofday$ac_cv_func_stime" in -+ yes*) -+ ntp_warning='' -+ ans='clock_settime()' -+ ;; -+ noyes*) -+ ntp_warning='But clock_settime() would be better (if we had it)' -+ ans='settimeofday()' -+ ;; -+ nonoyes) -+ ntp_warning='Which is the worst of the three' -+ ans='stime()' -+ ;; -+ *) -+ case "$build" in -+ $host) ntp_warning='Which leaves us with nothing to use!' -+ ans=none -+ ;; -+esac -+esac -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ans" >&5 -+$as_echo "$ans" >&6; } -+case "$ntp_warning" in -+ '') ;; -+ *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** $ntp_warning ***" >&5 -+$as_echo "$as_me: WARNING: *** $ntp_warning ***" >&2;} ++case "$host" in ++ *-*-sco3.2*) + +-$as_echo "#define DECL_SETPRIORITY_1 1" >>confdefs.h ++$as_echo "#define TERMIOS_NEEDS__SVID3 1" >>confdefs.h + +- case "$host" in +- *-*-solaris2.4) + ;; +esac -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have a losing syscall()" >&5 -+$as_echo_n "checking if we have a losing syscall()... " >&6; } -+if test "${ac_cv_var_syscall_bug+set}" = set; then : +-$as_echo "#define DECL_TIMEOFDAY_0 1" >>confdefs.h ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need extra room for SO_RCVBUF" >&5 ++$as_echo_n "checking if we need extra room for SO_RCVBUF... " >&6; } ++if test "${ac_cv_var_rcvbuf_slop+set}" = set; then : + $as_echo_n "(cached) " >&6 +else -+ case "$host" in -+ *-*-solaris2.4*) ++ ans=no ++case "$host" in ++ *-*-hpux[567]*) + ans=yes - ;; -- *-*-solaris2*) -+ *) ans=no + ;; +esac -+ac_cv_var_syscall_bug=$ans ++ac_cv_var_rcvbuf_slop=$ans +fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_syscall_bug" >&5 -+$as_echo "$ac_cv_var_syscall_bug" >&6; } -+case "$ac_cv_var_syscall_bug" in ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_rcvbuf_slop" >&5 ++$as_echo "$ac_cv_var_rcvbuf_slop" >&6; } ++case "$ac_cv_var_rcvbuf_slop" in + yes) -+$as_echo "#define SYSCALL_BUG 1" >>confdefs.h ++$as_echo "#define NEED_RCVBUF_SLOP 1" >>confdefs.h + ;; +esac --$as_echo "#define DECL_MKSTEMP_0 1" >>confdefs.h -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIGIO" >&5 -+$as_echo_n "checking for SIGIO... " >&6; } -+if test "${ac_cv_hdr_def_sigio+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <signal.h> -+#ifdef SIGIO -+ yes -+#endif - -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "yes" >/dev/null 2>&1; then : -+ ac_cv_hdr_def_sigio=yes -+else -+ ac_cv_hdr_def_sigio=no -+fi -+rm -f conftest* - --$as_echo "#define DECL_SETPRIORITY_1 1" >>confdefs.h -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_hdr_def_sigio" >&5 -+$as_echo "$ac_cv_hdr_def_sigio" >&6; } - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we want to use signalled IO" >&5 -+$as_echo_n "checking if we want to use signalled IO... " >&6; } -+if test "${ac_cv_var_signalled_io+set}" = set; then : +- ;; +- esac ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we will open the broadcast socket" >&5 ++$as_echo_n "checking if we will open the broadcast socket... " >&6; } ++if test "${ac_cv_var_open_bcast_socket+set}" = set; then : + $as_echo_n "(cached) " >&6 +else -+ ans=no -+case "$ac_cv_hdr_def_sigio" in -+ yes) -+ ans=yes - case "$host" in -- *-*-solaris2.4) -- --$as_echo "#define DECL_TIMEOFDAY_0 1" >>confdefs.h -- -+ alpha*-dec-osf4*|alpha*-dec-osf5*) -+ ans=no -+ ;; -+ *-convex-*) -+ ans=no -+ ;; -+ *-dec-*) -+ ans=no -+ ;; -+ *-pc-cygwin*) -+ ans=no -+ ;; -+ *-sni-sysv*) -+ ans=no -+ ;; -+ *-univel-sysv*) -+ ans=no -+ ;; -+ *-*-irix6*) -+ ans=no -+ ;; -+ *-*-freebsd*) -+ ans=no -+ ;; -+ *-*-*linux*) -+ ans=no -+ ;; -+ *-*-unicosmp*) -+ ans=no -+ ;; -+ *-*-kfreebsd*) -+ ans=no - ;; - esac ++ ans=yes ++case "$host" in ++ *-*-domainos) ++ ans=no ;; - *-*-sunos4*) - @@ -22223,65 +21985,14 @@ Index: ntp-4.2.6p1+dfsg/configure - - -$as_echo "#define DECL_BCOPY_0 1" >>confdefs.h -+esac -+ac_cv_var_signalled_io=$ans -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_signalled_io" >&5 -+$as_echo "$ac_cv_var_signalled_io" >&6; } -+case "$ac_cv_var_signalled_io" in -+ yes) -+$as_echo "#define HAVE_SIGNALED_IO 1" >>confdefs.h -+ ;; -+esac - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIGPOLL" >&5 -+$as_echo_n "checking for SIGPOLL... " >&6; } -+if test "${ac_cv_hdr_def_sigpoll+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <signal.h> -+#ifdef SIGPOLL -+ yes -+#endif - +- +- -$as_echo "#define DECL_BZERO_0 1" >>confdefs.h -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "yes" >/dev/null 2>&1; then : -+ ac_cv_hdr_def_sigpoll=yes -+else -+ ac_cv_hdr_def_sigpoll=no -+fi -+rm -f conftest* - -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_hdr_def_sigpoll" >&5 -+$as_echo "$ac_cv_hdr_def_sigpoll" >&6; } - +- +- -$as_echo "#define DECL_IOCTL_0 1" >>confdefs.h -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIGSYS" >&5 -+$as_echo_n "checking for SIGSYS... " >&6; } -+if test "${ac_cv_hdr_def_sigsys+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <signal.h> -+#ifdef SIGSYS -+ yes -+#endif - -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "yes" >/dev/null 2>&1; then : -+ ac_cv_hdr_def_sigsys=yes -+else -+ ac_cv_hdr_def_sigsys=no -+fi -+rm -f conftest* - +- +- -$as_echo "#define DECL_IPC_0 1" >>confdefs.h - - @@ -22390,2272 +22101,62 @@ Index: ntp-4.2.6p1+dfsg/configure - - ;; -esac -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_hdr_def_sigsys" >&5 -+$as_echo "$ac_cv_hdr_def_sigsys" >&6; } - +- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need extra room for SO_RCVBUF" >&5 -$as_echo_n "checking if we need extra room for SO_RCVBUF... " >&6; } -if test "${ac_cv_var_rcvbuf_slop+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can use SIGPOLL for UDP I/O" >&5 -+$as_echo_n "checking if we can use SIGPOLL for UDP I/O... " >&6; } -+if test "${ac_cv_var_use_udp_sigpoll+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ans=no +- $as_echo_n "(cached) " >&6 +-else +- ans=no -case "$host" in - *-*-hpux[567]*) - ans=yes -+case "$ac_cv_hdr_def_sigpoll" in -+ yes) -+ case "$host" in -+ mips-sgi-irix*) -+ ans=no -+ ;; -+ vax-dec-bsd) -+ ans=no -+ ;; -+ *-pc-cygwin*) -+ ans=no -+ ;; -+ *-sni-sysv*) -+ ans=no -+ ;; -+ *-*-aix[456]*) -+ ans=no -+ ;; -+ *-*-hpux*) -+ ans=no -+ ;; -+ *-*-*linux*) -+ ans=no -+ ;; -+ *-*-osf*) -+ ans=no -+ ;; -+ *-*-qnx*) -+ ans=no -+ ;; -+ *-*-sunos*) -+ ans=no -+ ;; -+ *-*-solaris*) -+ ans=no -+ ;; -+ *-*-ultrix*) -+ ans=no -+ ;; -+ *-*-unicosmp*) -+ ans=no -+ ;; -+ *-*-kfreebsd*) -+ ans=no -+ ;; -+ *) ans=yes -+ ;; -+ esac - ;; - esac +- ;; +-esac -ac_cv_var_rcvbuf_slop=$ans -+ac_cv_var_use_udp_sigpoll=$ans - fi +-fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_rcvbuf_slop" >&5 -$as_echo "$ac_cv_var_rcvbuf_slop" >&6; } -case "$ac_cv_var_rcvbuf_slop" in -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_use_udp_sigpoll" >&5 -+$as_echo "$ac_cv_var_use_udp_sigpoll" >&6; } -+case "$ac_cv_var_use_udp_sigpoll" in - yes) +- yes) -$as_echo "#define NEED_RCVBUF_SLOP 1" >>confdefs.h -+$as_echo "#define USE_UDP_SIGPOLL 1" >>confdefs.h - ;; - esac - +- ;; +-esac +- -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we will open the broadcast socket" >&5 -$as_echo_n "checking if we will open the broadcast socket... " >&6; } -if test "${ac_cv_var_open_bcast_socket+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can use SIGPOLL for TTY I/O" >&5 -+$as_echo_n "checking if we can use SIGPOLL for TTY I/O... " >&6; } -+if test "${ac_cv_var_use_tty_sigpoll+set}" = set; then : - $as_echo_n "(cached) " >&6 - else +- $as_echo_n "(cached) " >&6 +-else - ans=yes -case "$host" in - *-*-domainos) - ans=no -+ ans=no -+case "$ac_cv_hdr_def_sigpoll" in -+ yes) -+ case "$host" in -+ mips-sgi-irix*) -+ ans=no -+ ;; -+ vax-dec-bsd) -+ ans=no -+ ;; -+ *-pc-cygwin*) -+ ans=no -+ ;; -+ *-sni-sysv*) -+ ans=no -+ ;; -+ *-*-aix[456]*) -+ ans=no -+ ;; -+ *-*-hpux*) -+ ans=no -+ ;; -+ *-*-*linux*) -+ ans=no -+ ;; -+ *-*-osf*) -+ ans=no -+ ;; -+ *-*-sunos*) -+ ans=no -+ ;; -+ *-*-ultrix*) -+ ans=no -+ ;; -+ *-*-qnx*) -+ ans=no -+ ;; -+ *-*-unicosmp*) -+ ans=no -+ ;; -+ *-*-kfreebsd*) -+ ans=no -+ ;; -+ *) ans=yes -+ ;; -+ esac - ;; - esac +- ;; +-esac -ac_cv_var_open_bcast_socket=$ans -+ac_cv_var_use_tty_sigpoll=$ans - fi +-fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_open_bcast_socket" >&5 -$as_echo "$ac_cv_var_open_bcast_socket" >&6; } -case "$ac_cv_var_open_bcast_socket" in -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_use_tty_sigpoll" >&5 -+$as_echo "$ac_cv_var_use_tty_sigpoll" >&6; } -+case "$ac_cv_var_use_tty_sigpoll" in - yes) --$as_echo "#define OPEN_BCAST_SOCKET 1" >>confdefs.h -+$as_echo "#define USE_TTY_SIGPOLL 1" >>confdefs.h - ;; - esac - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we want the HPUX version of FindConfig()" >&5 --$as_echo_n "checking if we want the HPUX version of FindConfig()... " >&6; } --if test "${ac_cv_var_hpux_findconfig+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+case "$ac_cv_header_sys_sio_h" in -+ yes) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sio.h for TIOCDCDTIMESTAMP" >&5 -+$as_echo_n "checking sys/sio.h for TIOCDCDTIMESTAMP... " >&6; } -+if test "${ac_cv_hdr_def_tiocdcdtimestamp+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <sys/sio.h> -+#ifdef TIOCDCDTIMESTAMP -+ yes -+#endif -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "yes" >/dev/null 2>&1; then : -+ ac_cv_hdr_def_tiocdcdtimestamp=yes -+else -+ ac_cv_hdr_def_tiocdcdtimestamp=no -+fi -+rm -f conftest* -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_hdr_def_tiocdcdtimestamp" >&5 -+$as_echo "$ac_cv_hdr_def_tiocdcdtimestamp" >&6; } -+ ;; -+esac -+ -+case "$ac_cv_hdr_def_tiocdcdtimestamp" in -+ yes) -+ ac_cv_var_oncore_ok=yes -+ ;; -+esac -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if nlist() values might require extra indirection" >&5 -+$as_echo_n "checking if nlist() values might require extra indirection... " >&6; } -+if test "${ac_cv_var_nlist_extra_indirection+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - ans=no - case "$host" in -- *-*-hpux*) -+ *-*-aix*) - ans=yes - ;; - esac --ac_cv_var_hpux_findconfig=$ans -+ac_cv_var_nlist_extra_indirection=$ans - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_hpux_findconfig" >&5 --$as_echo "$ac_cv_var_hpux_findconfig" >&6; } --case "$ac_cv_var_hpux_findconfig" in -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_nlist_extra_indirection" >&5 -+$as_echo "$ac_cv_var_nlist_extra_indirection" >&6; } -+case "$ac_cv_var_nlist_extra_indirection" in - yes) --$as_echo "#define NEED_HPUX_FINDCONFIG 1" >>confdefs.h -+$as_echo "#define NLIST_EXTRA_INDIRECTION 1" >>confdefs.h - ;; - esac - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if process groups are set with -pid" >&5 --$as_echo_n "checking if process groups are set with -pid... " >&6; } --if test "${ac_cv_arg_setpgrp_negpid+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a minimum recommended value of tickadj" >&5 -+$as_echo_n "checking for a minimum recommended value of tickadj... " >&6; } -+if test "${ac_cv_var_min_rec_tickadj+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- case "$host" in -- *-*-hpux[567]*) -- ans=no -+ ans=no -+case "$host" in -+ *-*-aix*) -+ ans=40 - ;; -- *-*-hpux*) -+esac -+ac_cv_var_min_rec_tickadj=$ans -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_min_rec_tickadj" >&5 -+$as_echo "$ac_cv_var_min_rec_tickadj" >&6; } -+case "$ac_cv_var_min_rec_tickadj" in -+ ''|no) ;; -+ *) -+cat >>confdefs.h <<_ACEOF -+#define MIN_REC_TICKADJ $ac_cv_var_min_rec_tickadj -+_ACEOF -+ ;; -+esac -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the TTY code permits PARENB and IGNPAR" >&5 -+$as_echo_n "checking if the TTY code permits PARENB and IGNPAR... " >&6; } -+if test "${ac_cv_var_no_parenb_ignpar+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ans=no -+case "$host" in -+ i?86-*-*linux*) - ans=yes - ;; -- *-*-*linux*) -+ mips-sgi-irix*) - ans=yes - ;; -- *-*-sunos3*) -- ans=yes -+ i?86-*-freebsd[123].*) - ;; -- *-*-ultrix2*) -+ i?86-*-freebsd*) - ans=yes - ;; -- *) -- ans=no -+ *-*-unicosmp*) -+ ans=yes - ;; - esac --ac_cv_arg_setpgrp_negpid=$ans -+ac_cv_var_no_parenb_ignpar=$ans - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_arg_setpgrp_negpid" >&5 --$as_echo "$ac_cv_arg_setpgrp_negpid" >&6; } --case "$ac_cv_arg_setpgrp_negpid" in -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_no_parenb_ignpar" >&5 -+$as_echo "$ac_cv_var_no_parenb_ignpar" >&6; } -+case "$ac_cv_var_no_parenb_ignpar" in - yes) --$as_echo "#define UDP_BACKWARDS_SETOWN 1" >>confdefs.h -+$as_echo "#define NO_PARENB_IGNPAR 1" >>confdefs.h - ;; - esac - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need a ctty for F_SETOWN" >&5 --$as_echo_n "checking if we need a ctty for F_SETOWN... " >&6; } --if test "${ntp_cv_func_ctty_for_f_setown+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're including ntpd debugging code" >&5 -+$as_echo_n "checking if we're including ntpd debugging code... " >&6; } -+# Check whether --enable-debugging was given. -+if test "${enable_debugging+set}" = set; then : -+ enableval=$enable_debugging; ntp_ok=$enableval - else -+ ntp_ok=yes -+fi - -- case "$host" in -- *-*-bsdi23*) -- ans=yes -- ;; -- *-*-freebsd*) -- ans=yes -- ;; -- # NetBSD versions prior to 3.99.8 require a CTTY for F_SETOWN, -- # while later versions will fail a ioctl(TIOCSCTTY, 0) call in -- # some cases and so should not have USE_FSETOWNCTTY. "netbsd" -- # in $host may be followed by "aout", "ecoff", or "elf". -- *-*-netbsd*a-z3.0-8*|*-*-netbsd*a-z0-2.*|*-*-netbsd*a-z3.99.0-7) -- ans=yes -- ;; -- *-*-netbsd3.0-8*|*-*-netbsd0-2.*|*-*-netbsd3.99.0-7) -- ans=yes -- ;; -- *-*-openbsd*) -- ans=yes -- ;; -- *-*-osf*) -- ans=yes -- ;; -- *-*-darwin*) -- ans=yes -- ;; -- *) -- ans=no -- esac -- ntp_cv_func_ctty_for_f_setown=$ans -+if test "$ntp_ok" = "yes"; then - -+$as_echo "#define DEBUG 1" >>confdefs.h - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_func_ctty_for_f_setown" >&5 --$as_echo "$ntp_cv_func_ctty_for_f_setown" >&6; } --case "$ntp_cv_func_ctty_for_f_setown" in - yes) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 -+$as_echo "$ntp_ok" >&6; } - --$as_echo "#define USE_FSETOWNCTTY 1" >>confdefs.h -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we including processing time debugging code" >&5 -+$as_echo_n "checking if we including processing time debugging code... " >&6; } -+# Check whether --enable-debug-timing was given. -+if test "${enable_debug_timing+set}" = set; then : -+ enableval=$enable_debug_timing; ntp_ok=$enableval -+else -+ ntp_ok=no -+fi - --esac -+if test "$ntp_ok" = "yes"; then - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the OS fails to clear cached routes when more specific routes become available" >&5 --$as_echo_n "checking if the OS fails to clear cached routes when more specific routes become available... " >&6; } --if test "${ac_cv_os_routeupdates+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+$as_echo "#define DEBUG_TIMING 1" >>confdefs.h -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 -+$as_echo "$ntp_ok" >&6; } -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a the number of minutes in a DST adjustment" >&5 -+$as_echo_n "checking for a the number of minutes in a DST adjustment... " >&6; } -+# Check whether --enable-dst_minutes was given. -+if test "${enable_dst_minutes+set}" = set; then : -+ enableval=$enable_dst_minutes; ans=$enableval - else -- case "$host" in -- *-*-netbsd*) -- ans=yes -- ;; -- *) ans=no -- ;; --esac --ac_cv_os_routeupdates=$ans -+ ans=60 -+ - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_routeupdates" >&5 --$as_echo "$ac_cv_os_routeupdates" >&6; } --case "$ac_cv_os_routeupdates" in -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define DSTMINUTES $ans -+_ACEOF -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ans" >&5 -+$as_echo "$ans" >&6; } -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ntpd will retry permanent DNS failures" >&5 -+$as_echo_n "checking if ntpd will retry permanent DNS failures... " >&6; } -+# Check whether --enable-ignore-dns-errors was given. -+if test "${enable_ignore_dns_errors+set}" = set; then : -+ enableval=$enable_ignore_dns_errors; ans=$enableval -+else -+ ans=no -+ -+fi -+ -+case "$ans" in - yes) --$as_echo "#define OS_MISSES_SPECIFIC_ROUTE_UPDATES 1" >>confdefs.h -- ;; -+ -+$as_echo "#define IGNORE_DNS_ERRORS 1" >>confdefs.h -+ - esac -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ans" >&5 -+$as_echo "$ans" >&6; } - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the OS needs the wildcard socket set to REUSEADDR for binding interface addresses" >&5 --$as_echo_n "checking if the OS needs the wildcard socket set to REUSEADDR for binding interface addresses... " >&6; } --if test "${ac_cv_os_wildcardreuse+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ntpd will use the deferred DNS lookup path" >&5 -+$as_echo_n "checking if ntpd will use the deferred DNS lookup path... " >&6; } -+# Check whether --enable-force-defer-DNS was given. -+if test "${enable_force_defer_DNS+set}" = set; then : -+ enableval=$enable_force_defer_DNS; ans=$enableval - else -- case "$host" in -- *-*-*linux*) -- ans=yes -- ;; -- *) ans=no -- ;; --esac --ac_cv_os_wildcardreuse=$ans -+ ans=no -+ - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_wildcardreuse" >&5 --$as_echo "$ac_cv_os_wildcardreuse" >&6; } --case "$ac_cv_os_wildcardreuse" in -+ -+case "$ans" in - yes) --$as_echo "#define OS_NEEDS_REUSEADDR_FOR_IFADDRBIND 1" >>confdefs.h +-$as_echo "#define OPEN_BCAST_SOCKET 1" >>confdefs.h - ;; -+ -+$as_echo "#define FORCE_DEFER_DNS 1" >>confdefs.h -+ - esac -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ans" >&5 -+$as_echo "$ans" >&6; } - --ntp_warning='GRONK' --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we'll use clock_settime or settimeofday or stime" >&5 --$as_echo_n "checking if we'll use clock_settime or settimeofday or stime... " >&6; } --case "$ac_cv_func_clock_settime$ac_cv_func_settimeofday$ac_cv_func_stime" in -- yes*) -- ntp_warning='' -- ans='clock_settime()' -- ;; -- noyes*) -- ntp_warning='But clock_settime() would be better (if we had it)' -- ans='settimeofday()' -- ;; -- nonoyes) -- ntp_warning='Which is the worst of the three' -- ans='stime()' -- ;; -- *) -- case "$build" in -- $host) ntp_warning='Which leaves us with nothing to use!' -- ans=none -- ;; -esac --esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ans" >&5 --$as_echo "$ans" >&6; } --case "$ntp_warning" in -- '') ;; -- *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** $ntp_warning ***" >&5 --$as_echo "$as_me: WARNING: *** $ntp_warning ***" >&2;} -- ;; -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have the tty_clk line discipline/streams module" >&5 -+$as_echo_n "checking if we have the tty_clk line discipline/streams module... " >&6; } -+if test "${ac_cv_var_tty_clk+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ case "$ac_cv_header_sys_clkdefs_h$ac_cv_hdr_def_tiocdcdtimestamp" in -+ *yes*) ac_cv_var_tty_clk=yes ;; -+ *) ac_cv_var_tty_clk=no ;; -+ esac ++esac ++ac_cv_var_open_bcast_socket=$ans +fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tty_clk" >&5 -+$as_echo "$ac_cv_var_tty_clk" >&6; } -+case "$ac_cv_var_tty_clk" in ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_open_bcast_socket" >&5 ++$as_echo "$ac_cv_var_open_bcast_socket" >&6; } ++case "$ac_cv_var_open_bcast_socket" in + yes) -+$as_echo "#define TTYCLK 1" >>confdefs.h ++$as_echo "#define OPEN_BCAST_SOCKET 1" >>confdefs.h + ;; - esac - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have a losing syscall()" >&5 --$as_echo_n "checking if we have a losing syscall()... " >&6; } --if test "${ac_cv_var_syscall_bug+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the ppsclock streams module" >&5 -+$as_echo_n "checking for the ppsclock streams module... " >&6; } -+if test "${ac_cv_var_ppsclock+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- case "$host" in -- *-*-solaris2.4*) -- ans=yes -- ;; -- *) ans=no -- ;; --esac --ac_cv_var_syscall_bug=$ans -+ ac_cv_var_ppsclock=$ac_cv_struct_ppsclockev - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_syscall_bug" >&5 --$as_echo "$ac_cv_var_syscall_bug" >&6; } --case "$ac_cv_var_syscall_bug" in -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_ppsclock" >&5 -+$as_echo "$ac_cv_var_ppsclock" >&6; } -+case "$ac_cv_var_ppsclock" in - yes) --$as_echo "#define SYSCALL_BUG 1" >>confdefs.h -+$as_echo "#define PPS 1" >>confdefs.h - ;; - esac - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIGIO" >&5 --$as_echo_n "checking for SIGIO... " >&6; } --if test "${ac_cv_hdr_def_sigio+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for multicast IP support" >&5 -+$as_echo_n "checking for multicast IP support... " >&6; } -+if test "${ntp_cv_multicast+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ -+ ntp_cv_multicast=no -+ case "$host" in -+ i386-sequent-sysv4) -+ ;; -+ *) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include <signal.h> --#ifdef SIGIO -- yes --#endif - -+ #ifdef HAVE_NETINET_IN_H -+ #include <netinet/in.h> -+ #endif -+ -+int -+main () -+{ -+ -+ struct ip_mreq ipmr; -+ ipmr.imr_interface.s_addr = 0; -+ -+ -+ ; -+ return 0; -+} - _ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "yes" >/dev/null 2>&1; then : -- ac_cv_hdr_def_sigio=yes --else -- ac_cv_hdr_def_sigio=no -+if ac_fn_c_try_compile "$LINENO"; then : -+ ntp_cv_multicast=yes - fi --rm -f conftest* -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ esac -+ - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_hdr_def_sigio" >&5 --$as_echo "$ac_cv_hdr_def_sigio" >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_multicast" >&5 -+$as_echo "$ntp_cv_multicast" >&6; } - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we want to use signalled IO" >&5 --$as_echo_n "checking if we want to use signalled IO... " >&6; } --if test "${ac_cv_var_signalled_io+set}" = set; then : -+case "$ntp_cv_multicast" in -+ yes) -+ -+$as_echo "#define MCAST 1" >>confdefs.h -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking arg type needed for setsockopt() IP*_MULTICAST_LOOP" >&5 -+$as_echo_n "checking arg type needed for setsockopt() IP*_MULTICAST_LOOP... " >&6; } -+if test "${ntp_cv_typeof_ip_multicast_loop+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- ans=no --case "$ac_cv_hdr_def_sigio" in -- yes) -- ans=yes -- case "$host" in -- alpha*-dec-osf4*|alpha*-dec-osf5*) -- ans=no -- ;; -- *-convex-*) -- ans=no -- ;; -- *-dec-*) -- ans=no -- ;; -- *-pc-cygwin*) -- ans=no -- ;; -- *-sni-sysv*) -- ans=no -- ;; -- *-univel-sysv*) -- ans=no -- ;; -- *-*-irix6*) -- ans=no -- ;; -- *-*-freebsd*) -- ans=no -- ;; -- *-*-*linux*) -- ans=no -- ;; -- *-*-unicosmp*) -- ans=no -- ;; -- *-*-kfreebsd*) -- ans=no -- ;; -- esac -- ;; --esac --ac_cv_var_signalled_io=$ans -+ -+ case "$host" in -+ *-*-netbsd*|*-*-*linux*) -+ ntp_cv_typeof_ip_multicast_loop=u_int -+ ;; -+ *-*-winnt*) -+ ntp_cv_typeof_ip_multicast_loop=BOOL -+ ;; -+ *) -+ ntp_cv_typeof_ip_multicast_loop=u_char -+ esac -+ -+ - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_signalled_io" >&5 --$as_echo "$ac_cv_var_signalled_io" >&6; } --case "$ac_cv_var_signalled_io" in -- yes) --$as_echo "#define HAVE_SIGNALED_IO 1" >>confdefs.h -- ;; -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_typeof_ip_multicast_loop" >&5 -+$as_echo "$ntp_cv_typeof_ip_multicast_loop" >&6; } -+ -+cat >>confdefs.h <<_ACEOF -+#define TYPEOF_IP_MULTICAST_LOOP $ntp_cv_typeof_ip_multicast_loop -+_ACEOF -+ - esac - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIGPOLL" >&5 --$as_echo_n "checking for SIGPOLL... " >&6; } --if test "${ac_cv_hdr_def_sigpoll+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking availability of ntp_{adj,get}time()" >&5 -+$as_echo_n "checking availability of ntp_{adj,get}time()... " >&6; } -+if test "${ac_cv_var_ntp_syscalls+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ ac_cv_var_ntp_syscalls=no -+ case "$ac_cv_func_ntp_adjtime$ac_cv_func_ntp_gettime$ac_cv_func___adjtimex" in -+ yesyes*) -+ ac_cv_var_ntp_syscalls=libc -+ ;; -+ *yes) -+ ac_cv_var_ntp_syscalls=inline -+ ;; -+ *) cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include <signal.h> --#ifdef SIGPOLL -- yes -+#include <sys/syscall.h> -+#if defined(SYS_ntp_gettime) && defined(SYS_ntp_adjtime) -+ yes - #endif - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then : -- ac_cv_hdr_def_sigpoll=yes --else -- ac_cv_hdr_def_sigpoll=no -+ ac_cv_var_ntp_syscalls=kernel - fi - rm -f conftest* - -+ ;; -+ esac - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_hdr_def_sigpoll" >&5 --$as_echo "$ac_cv_hdr_def_sigpoll" >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_ntp_syscalls" >&5 -+$as_echo "$ac_cv_var_ntp_syscalls" >&6; } -+case "$ac_cv_var_ntp_syscalls" in -+ libc) - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIGSYS" >&5 --$as_echo_n "checking for SIGSYS... " >&6; } --if test "${ac_cv_hdr_def_sigsys+set}" = set; then : -+$as_echo "#define NTP_SYSCALLS_LIBC 1" >>confdefs.h -+ -+ ;; -+ kernel) -+ -+$as_echo "#define NTP_SYSCALLS_STD 1" >>confdefs.h -+ -+ ;; -+ *) -+ ;; +esac -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if sys/timex.h has STA_FLL" >&5 -+$as_echo_n "checking if sys/timex.h has STA_FLL... " >&6; } -+if test "${ac_cv_var_sta_fll+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include <signal.h> --#ifdef SIGSYS -- yes -+#include <sys/timex.h> -+#ifdef STA_FLL -+ yes - #endif - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then : -- ac_cv_hdr_def_sigsys=yes -+ ac_cv_var_sta_fll=yes - else -- ac_cv_hdr_def_sigsys=no -+ ac_cv_var_sta_fll=no - fi - rm -f conftest* - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_hdr_def_sigsys" >&5 --$as_echo "$ac_cv_hdr_def_sigsys" >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_sta_fll" >&5 -+$as_echo "$ac_cv_var_sta_fll" >&6; } - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can use SIGPOLL for UDP I/O" >&5 --$as_echo_n "checking if we can use SIGPOLL for UDP I/O... " >&6; } --if test "${ac_cv_var_use_udp_sigpoll+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have kernel PLL support" >&5 -+$as_echo_n "checking if we have kernel PLL support... " >&6; } -+if test "${ac_cv_var_kernel_pll+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- ans=no --case "$ac_cv_hdr_def_sigpoll" in -- yes) -- case "$host" in -- mips-sgi-irix*) -- ans=no -- ;; -- vax-dec-bsd) -- ans=no -- ;; -- *-pc-cygwin*) -- ans=no -- ;; -- *-sni-sysv*) -- ans=no -- ;; -- *-*-aix[456]*) -- ans=no -- ;; -- *-*-hpux*) -- ans=no -- ;; -- *-*-*linux*) -- ans=no -- ;; -- *-*-osf*) -- ans=no -- ;; -- *-*-qnx*) -- ans=no -- ;; -- *-*-sunos*) -- ans=no -- ;; -- *-*-solaris*) -- ans=no -- ;; -- *-*-ultrix*) -- ans=no -- ;; -- *-*-unicosmp*) -- ans=no -- ;; -- *-*-kfreebsd*) -- ans=no -- ;; -- *) ans=yes -- ;; -- esac -+ case "$ac_cv_header_sys_timex_h$ac_cv_struct_ntptimeval$ac_cv_var_sta_fll$ac_cv_var_ntp_syscalls" in -+ *no*) -+ ac_cv_var_kernel_pll=no -+ ;; -+ *) ac_cv_var_kernel_pll=yes - ;; - esac --ac_cv_var_use_udp_sigpoll=$ans - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_use_udp_sigpoll" >&5 --$as_echo "$ac_cv_var_use_udp_sigpoll" >&6; } --case "$ac_cv_var_use_udp_sigpoll" in -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_kernel_pll" >&5 -+$as_echo "$ac_cv_var_kernel_pll" >&6; } -+case "$ac_cv_var_kernel_pll" in - yes) --$as_echo "#define USE_UDP_SIGPOLL 1" >>confdefs.h -- ;; -+ -+$as_echo "#define KERNEL_PLL 1" >>confdefs.h -+ -+ ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can use SIGPOLL for TTY I/O" >&5 --$as_echo_n "checking if we can use SIGPOLL for TTY I/O... " >&6; } --if test "${ac_cv_var_use_tty_sigpoll+set}" = set; then : -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if SIOCGIFCONF returns buffer size in the buffer" >&5 -+$as_echo_n "checking if SIOCGIFCONF returns buffer size in the buffer... " >&6; } -+if test "${ac_cv_var_size_returned_in_buffer+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ans=no --case "$ac_cv_hdr_def_sigpoll" in -- yes) -- case "$host" in -- mips-sgi-irix*) -- ans=no -- ;; -- vax-dec-bsd) -- ans=no -- ;; -- *-pc-cygwin*) -- ans=no -- ;; -- *-sni-sysv*) -- ans=no -- ;; -- *-*-aix[456]*) -- ans=no -- ;; -- *-*-hpux*) -- ans=no -- ;; -- *-*-*linux*) -- ans=no -- ;; -- *-*-osf*) -- ans=no -- ;; -- *-*-sunos*) -- ans=no -- ;; -- *-*-ultrix*) -- ans=no -- ;; -- *-*-qnx*) -- ans=no -- ;; -- *-*-unicosmp*) -- ans=no -- ;; -- *-*-kfreebsd*) -- ans=no -- ;; -- *) ans=yes -- ;; -- esac -- ;; --esac --ac_cv_var_use_tty_sigpoll=$ans -+ case "$host" in -+ *-fujitsu-uxp*) -+ ans=yes -+ ;; -+ *-ncr-sysv4*) -+ ans=yes -+ ;; -+ *-univel-sysv*) -+ ans=yes -+ ;; -+ esac -+ ac_cv_var_size_returned_in_buffer=$ans - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_use_tty_sigpoll" >&5 --$as_echo "$ac_cv_var_use_tty_sigpoll" >&6; } --case "$ac_cv_var_use_tty_sigpoll" in -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_size_returned_in_buffer" >&5 -+$as_echo "$ac_cv_var_size_returned_in_buffer" >&6; } -+case "$ac_cv_var_size_returned_in_buffer" in - yes) --$as_echo "#define USE_TTY_SIGPOLL 1" >>confdefs.h -+$as_echo "#define SIZE_RETURNED_IN_BUFFER 1" >>confdefs.h - ;; - esac - --case "$ac_cv_header_sys_sio_h" in -- yes) -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking sys/sio.h for TIOCDCDTIMESTAMP" >&5 --$as_echo_n "checking sys/sio.h for TIOCDCDTIMESTAMP... " >&6; } --if test "${ac_cv_hdr_def_tiocdcdtimestamp+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+ -+# Check for ioctls TIOCGPPSEV -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ioctl TIOCGPPSEV" >&5 -+$as_echo_n "checking ioctl TIOCGPPSEV... " >&6; } -+if test "$ac_cv_header_termios_h" = "yes"; then -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ --#include <sys/sio.h> --#ifdef TIOCDCDTIMESTAMP -- yes -+#include <termios.h> -+#ifdef TIOCGPPSEV -+ yes - #endif - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then : -- ac_cv_hdr_def_tiocdcdtimestamp=yes -+ ntp_ok=yes - else -- ac_cv_hdr_def_tiocdcdtimestamp=no -+ ntp_ok=no - fi - rm -f conftest* - -+else -+ntp_ok=no - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_hdr_def_tiocdcdtimestamp" >&5 --$as_echo "$ac_cv_hdr_def_tiocdcdtimestamp" >&6; } -- ;; --esac -+if test "$ntp_ok" = "yes"; then -+ -+$as_echo "#define HAVE_TIOCGPPSEV 1" >>confdefs.h - --case "$ac_cv_hdr_def_tiocdcdtimestamp" in -- yes) - ac_cv_var_oncore_ok=yes -- ;; --esac -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 -+$as_echo "$ntp_ok" >&6; } - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if nlist() values might require extra indirection" >&5 --$as_echo_n "checking if nlist() values might require extra indirection... " >&6; } --if test "${ac_cv_var_nlist_extra_indirection+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+# Check for ioctls TIOCSPPS -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ioctl TIOCSPPS" >&5 -+$as_echo_n "checking ioctl TIOCSPPS... " >&6; } -+if test "$ac_cv_header_termios_h" = "yes"; then -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <termios.h> -+#ifdef TIOCSPPS -+ yes -+#endif -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "yes" >/dev/null 2>&1; then : -+ ntp_ok=yes - else -- ans=no --case "$host" in -- *-*-aix*) -- ans=yes -- ;; --esac --ac_cv_var_nlist_extra_indirection=$ans -+ ntp_ok=no - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_nlist_extra_indirection" >&5 --$as_echo "$ac_cv_var_nlist_extra_indirection" >&6; } --case "$ac_cv_var_nlist_extra_indirection" in -- yes) --$as_echo "#define NLIST_EXTRA_INDIRECTION 1" >>confdefs.h -- ;; --esac -+rm -f conftest* - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a minimum recommended value of tickadj" >&5 --$as_echo_n "checking for a minimum recommended value of tickadj... " >&6; } --if test "${ac_cv_var_min_rec_tickadj+set}" = set; then : -- $as_echo_n "(cached) " >&6 - else -- ans=no --case "$host" in -- *-*-aix*) -- ans=40 -- ;; --esac --ac_cv_var_min_rec_tickadj=$ans --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_min_rec_tickadj" >&5 --$as_echo "$ac_cv_var_min_rec_tickadj" >&6; } --case "$ac_cv_var_min_rec_tickadj" in -- ''|no) ;; -- *) --cat >>confdefs.h <<_ACEOF --#define MIN_REC_TICKADJ $ac_cv_var_min_rec_tickadj --_ACEOF -- ;; --esac -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the TTY code permits PARENB and IGNPAR" >&5 --$as_echo_n "checking if the TTY code permits PARENB and IGNPAR... " >&6; } --if test "${ac_cv_var_no_parenb_ignpar+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- ans=no --case "$host" in -- i?86-*-*linux*) -- ans=yes -- ;; -- mips-sgi-irix*) -- ans=yes -- ;; -- i?86-*-freebsd[123].*) -- ;; -- i?86-*-freebsd*) -- ans=yes -- ;; -- *-*-unicosmp*) -- ans=yes -- ;; --esac --ac_cv_var_no_parenb_ignpar=$ans --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_no_parenb_ignpar" >&5 --$as_echo "$ac_cv_var_no_parenb_ignpar" >&6; } --case "$ac_cv_var_no_parenb_ignpar" in -- yes) --$as_echo "#define NO_PARENB_IGNPAR 1" >>confdefs.h -- ;; --esac -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're including ntpd debugging code" >&5 --$as_echo_n "checking if we're including ntpd debugging code... " >&6; } --# Check whether --enable-debugging was given. --if test "${enable_debugging+set}" = set; then : -- enableval=$enable_debugging; ntp_ok=$enableval --else -- ntp_ok=yes -+ ntp_ok=no - fi - - if test "$ntp_ok" = "yes"; then - --$as_echo "#define DEBUG 1" >>confdefs.h -+$as_echo "#define HAVE_TIOCSPPS 1" >>confdefs.h - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 - $as_echo "$ntp_ok" >&6; } - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we including processing time debugging code" >&5 --$as_echo_n "checking if we including processing time debugging code... " >&6; } --# Check whether --enable-debug-timing was given. --if test "${enable_debug_timing+set}" = set; then : -- enableval=$enable_debug_timing; ntp_ok=$enableval -+# Check for ioctls CIOGETEV -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ioctl CIOGETEV" >&5 -+$as_echo_n "checking ioctl CIOGETEV... " >&6; } -+if test "$ac_cv_header_sys_ppsclock_h" = "yes"; then -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <sys/ppsclock.h> -+#ifdef CIOGETEV -+ yes -+#endif -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "yes" >/dev/null 2>&1; then : -+ ntp_ok=yes - else - ntp_ok=no - fi -+rm -f conftest* - -+else -+ntp_ok=no -+fi - if test "$ntp_ok" = "yes"; then -+ ac_cv_var_oncore_ok=yes - --$as_echo "#define DEBUG_TIMING 1" >>confdefs.h -+$as_echo "#define HAVE_CIOGETEV 1" >>confdefs.h - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 - $as_echo "$ntp_ok" >&6; } - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a the number of minutes in a DST adjustment" >&5 --$as_echo_n "checking for a the number of minutes in a DST adjustment... " >&6; } --# Check whether --enable-dst_minutes was given. --if test "${enable_dst_minutes+set}" = set; then : -- enableval=$enable_dst_minutes; ans=$enableval --else -- ans=60 - --fi -+# ATOM/PPSAPI stuff. - -+# ATOM used to require struct timespec, but that's been fixed now. - --cat >>confdefs.h <<_ACEOF --#define DSTMINUTES $ans --_ACEOF -+# case "$ac_cv_struct_timespec" in -+# 'yes') -+# ac_cv_var_atom_ok=yes -+# ;; -+# esac -+ac_cv_var_atom_ok=yes - --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ans" >&5 --$as_echo "$ans" >&6; } -+# Check for header timepps.h, if found then we have PPS API (Draft RFC) stuff. - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ntpd will retry permanent DNS failures" >&5 --$as_echo_n "checking if ntpd will retry permanent DNS failures... " >&6; } --# Check whether --enable-ignore-dns-errors was given. --if test "${enable_ignore_dns_errors+set}" = set; then : -- enableval=$enable_ignore_dns_errors; ans=$enableval --else -- ans=no -+# The PPSAPI headers need "inline" ($ac_cv_c_inline='inline') - --fi -+# The PPSAPI needs struct timespec. - --case "$ans" in -- yes) -+# The PPSAPI also needs a timepps header. - --$as_echo "#define IGNORE_DNS_ERRORS 1" >>confdefs.h -+case "$ac_cv_c_inline$ac_cv_struct_timespec" in -+ inlineyes) -+ case "$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h$host_os" in -+ *yes* | *sunos* | *solaris* | *sco* | *netbsd* ) -+ -+$as_echo "#define HAVE_PPSAPI 1" >>confdefs.h - -+ ac_cv_var_jupiter_ok=yes -+ ac_cv_var_oncore_ok=yes -+ ac_cv_var_parse_ok=yes -+ ac_cv_var_ripe_ncc_ok=yes -+ ;; -+ esac -+ ;; - esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ans" >&5 --$as_echo "$ans" >&6; } - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ntpd will use the deferred DNS lookup path" >&5 --$as_echo_n "checking if ntpd will use the deferred DNS lookup path... " >&6; } --# Check whether --enable-force-defer-DNS was given. --if test "${enable_force_defer_DNS+set}" = set; then : -- enableval=$enable_force_defer_DNS; ans=$enableval --else -- ans=no -+# Check for ioctls TIOCGSERIAL, TIOCSSERIAL, ASYNC_PPS_CD_POS, ASYNC_PPS_CD_NEG -+ac_fn_c_check_header_mongrel "$LINENO" "linux/serial.h" "ac_cv_header_linux_serial_h" "$ac_includes_default" -+if test "x$ac_cv_header_linux_serial_h" = x""yes; then : - - fi - --case "$ans" in -- yes) - --$as_echo "#define FORCE_DEFER_DNS 1" >>confdefs.h -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ioctl TIOCGSERIAL, TIOCSSERIAL, ASYNC_PPS_CD_POS, ASYNC_PPS_CD_NEG" >&5 -+$as_echo_n "checking ioctl TIOCGSERIAL, TIOCSSERIAL, ASYNC_PPS_CD_POS, ASYNC_PPS_CD_NEG... " >&6; } -+case "$ac_cv_header_sys_ppsclock_h$ac_cv_header_linux_serial_h" in -+ yesyes) -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <sys/time.h> -+typedef int u_int; - --esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ans" >&5 --$as_echo "$ans" >&6; } -+#include <sys/ppsclock.h> -+#include <linux/serial.h> - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have the tty_clk line discipline/streams module" >&5 --$as_echo_n "checking if we have the tty_clk line discipline/streams module... " >&6; } --if test "${ac_cv_var_tty_clk+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- case "$ac_cv_header_sys_clkdefs_h$ac_cv_hdr_def_tiocdcdtimestamp" in -- *yes*) ac_cv_var_tty_clk=yes ;; -- *) ac_cv_var_tty_clk=no ;; -- esac --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tty_clk" >&5 --$as_echo "$ac_cv_var_tty_clk" >&6; } --case "$ac_cv_var_tty_clk" in -- yes) --$as_echo "#define TTYCLK 1" >>confdefs.h -- ;; --esac -+#ifdef TIOCGSERIAL -+#ifdef TIOCSSERIAL -+#ifdef ASYNC_PPS_CD_POS -+#ifdef ASYNC_PPS_CD_NEG -+#ifdef CIOGETEV -+ yes -+#endif -+#endif -+#endif -+#endif -+#endif - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the ppsclock streams module" >&5 --$as_echo_n "checking for the ppsclock streams module... " >&6; } --if test "${ac_cv_var_ppsclock+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- ac_cv_var_ppsclock=$ac_cv_struct_ppsclockev -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "yes" >/dev/null 2>&1; then : -+ ntp_ok=yes - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_ppsclock" >&5 --$as_echo "$ac_cv_var_ppsclock" >&6; } --case "$ac_cv_var_ppsclock" in -- yes) --$as_echo "#define PPS 1" >>confdefs.h -- ;; --esac -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for multicast IP support" >&5 --$as_echo_n "checking for multicast IP support... " >&6; } --if test "${ntp_cv_multicast+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -+rm -f conftest* - -- ntp_cv_multicast=no -- case "$host" in -- i386-sequent-sysv4) -- ;; -- *) -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ -+ ;; -+ *) -+ ntp_ok=no -+ ;; -+esac -+if test "$ntp_ok" = "yes"; then - -- #ifdef HAVE_NETINET_IN_H -- #include <netinet/in.h> -- #endif -+$as_echo "#define HAVE_TIO_SERIAL_STUFF 1" >>confdefs.h - --int --main () --{ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 -+$as_echo "$ntp_ok" >&6; } - -- struct ip_mreq ipmr; -- ipmr.imr_interface.s_addr = 0; -+# Check for SHMEM_STATUS support -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SHMEM_STATUS support" >&5 -+$as_echo_n "checking SHMEM_STATUS support... " >&6; } -+case "$ac_cv_header_sys_mman_h" in -+ yes) ntp_ok=yes ;; -+ *) ntp_ok=no ;; -+esac -+if test "$ntp_ok" = "yes"; then - -+$as_echo "#define ONCORE_SHMEM_STATUS 1" >>confdefs.h - -- ; -- return 0; --} --_ACEOF --if ac_fn_c_try_compile "$LINENO"; then : -- ntp_cv_multicast=yes - fi --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- esac -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 -+$as_echo "$ntp_ok" >&6; } -+ - -+ntp_refclock=no - -+# HPUX only, and by explicit request -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Datum/Bancomm bc635/VME interface" >&5 -+$as_echo_n "checking Datum/Bancomm bc635/VME interface... " >&6; } -+# Check whether --enable-BANCOMM was given. -+if test "${enable_BANCOMM+set}" = set; then : -+ enableval=$enable_BANCOMM; ntp_ok=$enableval -+else -+ ntp_ok=no - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_multicast" >&5 --$as_echo "$ntp_cv_multicast" >&6; } - --case "$ntp_cv_multicast" in -- yes) -- --$as_echo "#define MCAST 1" >>confdefs.h -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking arg type needed for setsockopt() IP*_MULTICAST_LOOP" >&5 --$as_echo_n "checking arg type needed for setsockopt() IP*_MULTICAST_LOOP... " >&6; } --if test "${ntp_cv_typeof_ip_multicast_loop+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- -- case "$host" in -- *-*-netbsd*|*-*-*linux*) -- ntp_cv_typeof_ip_multicast_loop=u_int -- ;; -- *-*-winnt*) -- ntp_cv_typeof_ip_multicast_loop=BOOL -- ;; -- *) -- ntp_cv_typeof_ip_multicast_loop=u_char -- esac -+if test "$ntp_ok" = "yes"; then -+ ntp_refclock=yes - -+$as_echo "#define CLOCK_BANC 1" >>confdefs.h - - fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_cv_typeof_ip_multicast_loop" >&5 --$as_echo "$ntp_cv_typeof_ip_multicast_loop" >&6; } -- --cat >>confdefs.h <<_ACEOF --#define TYPEOF_IP_MULTICAST_LOOP $ntp_cv_typeof_ip_multicast_loop --_ACEOF -- -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 -+$as_echo "$ntp_ok" >&6; } -+case "$ntp_ok$host" in -+ yes*-*-hpux*) ;; -+ yes*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** But the expected answer is... no ***" >&5 -+$as_echo "$as_me: WARNING: *** But the expected answer is... no ***" >&2;} ;; - esac - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking availability of ntp_{adj,get}time()" >&5 --$as_echo_n "checking availability of ntp_{adj,get}time()... " >&6; } --if test "${ac_cv_var_ntp_syscalls+set}" = set; then : -- $as_echo_n "(cached) " >&6 -+#HPUX only, and only by explicit request -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking TrueTime GPS receiver/VME interface" >&5 -+$as_echo_n "checking TrueTime GPS receiver/VME interface... " >&6; } -+# Check whether --enable-GPSVME was given. -+if test "${enable_GPSVME+set}" = set; then : -+ enableval=$enable_GPSVME; ntp_ok=$enableval - else -- ac_cv_var_ntp_syscalls=no -- case "$ac_cv_func_ntp_adjtime$ac_cv_func_ntp_gettime$ac_cv_func___adjtimex" in -- yesyes*) -- ac_cv_var_ntp_syscalls=libc -- ;; -- *yes) -- ac_cv_var_ntp_syscalls=inline -- ;; -- *) cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <sys/syscall.h> --#if defined(SYS_ntp_gettime) && defined(SYS_ntp_adjtime) -- yes --#endif -- --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "yes" >/dev/null 2>&1; then : -- ac_cv_var_ntp_syscalls=kernel -+ ntp_ok=no - fi --rm -f conftest* - -- ;; -- esac --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_ntp_syscalls" >&5 --$as_echo "$ac_cv_var_ntp_syscalls" >&6; } --case "$ac_cv_var_ntp_syscalls" in -- libc) -+if test "$ntp_ok" = "yes"; then -+ ntp_refclock=yes - --$as_echo "#define NTP_SYSCALLS_LIBC 1" >>confdefs.h -+$as_echo "#define CLOCK_GPSVME 1" >>confdefs.h - -- ;; -- kernel) -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 -+$as_echo "$ntp_ok" >&6; } -+case "$ntp_ok$host" in -+ yes*-*-hpux*) ;; -+ yes*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** But the expected answer is... no ***" >&5 -+$as_echo "$as_me: WARNING: *** But the expected answer is... no ***" >&2;} ;; -+esac - --$as_echo "#define NTP_SYSCALLS_STD 1" >>confdefs.h -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCL720 clock support" >&5 -+$as_echo_n "checking for PCL720 clock support... " >&6; } -+case "$ac_cv_header_machine_inline_h$ac_cv_header_sys_pcl720_h$ac_cv_header_sys_i8253_h" in -+ yesyesyes) -+ -+$as_echo "#define CLOCK_PPS720 1" >>confdefs.h - -+ ans=yes - ;; - *) -+ ans=no - ;; - esac -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ans" >&5 -+$as_echo "$ans" >&6; } - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if sys/timex.h has STA_FLL" >&5 --$as_echo_n "checking if sys/timex.h has STA_FLL... " >&6; } --if test "${ac_cv_var_sta_fll+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <sys/timex.h> --#ifdef STA_FLL -- yes --#endif -- --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "yes" >/dev/null 2>&1; then : -- ac_cv_var_sta_fll=yes -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for default inclusion of all suitable non-PARSE clocks" >&5 -+$as_echo_n "checking for default inclusion of all suitable non-PARSE clocks... " >&6; } -+# Check whether --enable-all-clocks was given. -+if test "${enable_all_clocks+set}" = set; then : -+ enableval=$enable_all_clocks; ntp_eac=$enableval - else -- ac_cv_var_sta_fll=no -+ ntp_eac=yes - fi --rm -f conftest* - --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_sta_fll" >&5 --$as_echo "$ac_cv_var_sta_fll" >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_eac" >&5 -+$as_echo "$ntp_eac" >&6; } - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have kernel PLL support" >&5 --$as_echo_n "checking if we have kernel PLL support... " >&6; } --if test "${ac_cv_var_kernel_pll+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- case "$ac_cv_header_sys_timex_h$ac_cv_struct_ntptimeval$ac_cv_var_sta_fll$ac_cv_var_ntp_syscalls" in -- *no*) -- ac_cv_var_kernel_pll=no -+# HMS: Should we also require ac_cv_var_parse_ok? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have support for PARSE clocks" >&5 -+$as_echo_n "checking if we have support for PARSE clocks... " >&6; } -+case "$ac_cv_var_atom_ok$ac_cv_header_termio_h$ac_cv_header_termios_h" in -+ yes*yes*) -+ ntp_canparse=yes - ;; -- *) ac_cv_var_kernel_pll=yes -+ *) ntp_canparse=no - ;; - esac --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_kernel_pll" >&5 --$as_echo "$ac_cv_var_kernel_pll" >&6; } --case "$ac_cv_var_kernel_pll" in -- yes) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_canparse" >&5 -+$as_echo "$ntp_canparse" >&6; } - --$as_echo "#define KERNEL_PLL 1" >>confdefs.h -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have support for audio clocks" >&5 -+$as_echo_n "checking if we have support for audio clocks... " >&6; } -+case "$ac_cv_header_sun_audioio_h$ac_cv_header_sys_audioio_h$ac_cv_header_machine_soundcard_h$ac_cv_header_sys_soundcard_h" in -+ *yes*) -+ ntp_canaudio=yes -+ -+$as_echo "#define HAVE_AUDIO /**/" >>confdefs.h - - ;; -+ *) ntp_canaudio=no ;; - esac -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_canaudio" >&5 -+$as_echo "$ntp_canaudio" >&6; } - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if SIOCGIFCONF returns buffer size in the buffer" >&5 --$as_echo_n "checking if SIOCGIFCONF returns buffer size in the buffer... " >&6; } --if test "${ac_cv_var_size_returned_in_buffer+set}" = set; then : -- $as_echo_n "(cached) " >&6 --else -- ans=no -- case "$host" in -- *-fujitsu-uxp*) -- ans=yes -- ;; -- *-ncr-sysv4*) -- ans=yes -- ;; -- *-univel-sysv*) -- ans=yes -- ;; -- esac -- ac_cv_var_size_returned_in_buffer=$ans --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_size_returned_in_buffer" >&5 --$as_echo "$ac_cv_var_size_returned_in_buffer" >&6; } --case "$ac_cv_var_size_returned_in_buffer" in -- yes) --$as_echo "#define SIZE_RETURNED_IN_BUFFER 1" >>confdefs.h -- ;; -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have support for the SHM refclock interface" >&5 -+$as_echo_n "checking if we have support for the SHM refclock interface... " >&6; } -+case "$ac_cv_header_sys_ipc_h$ac_cv_header_sys_shm_h" in -+ yesyes) -+ ntp_canshm=yes -+ ;; -+ *) ntp_canshm=no ;; - esac -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_canshm" >&5 -+$as_echo "$ntp_canshm" >&6; } - -- --# Check for ioctls TIOCGPPSEV --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ioctl TIOCGPPSEV" >&5 --$as_echo_n "checking ioctl TIOCGPPSEV... " >&6; } --if test "$ac_cv_header_termios_h" = "yes"; then -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+# Requires modem control -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ACTS modem service" >&5 -+$as_echo_n "checking ACTS modem service... " >&6; } -+# Check whether --enable-ACTS was given. -+if test "${enable_ACTS+set}" = set; then : -+ enableval=$enable_ACTS; ntp_ok=$enableval -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <termios.h> --#ifdef TIOCGPPSEV -+#ifdef HAVE_SYS_IOCTL_H -+#include <sys/ioctl.h> -+#endif -+#ifdef TIOCMBIS - yes - #endif - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then : -- ntp_ok=yes -+ ntp_ok=$ntp_eac - else - ntp_ok=no - fi - rm -f conftest* - --else --ntp_ok=no - fi -+ - if test "$ntp_ok" = "yes"; then -+ ntp_refclock=yes - --$as_echo "#define HAVE_TIOCGPPSEV 1" >>confdefs.h -+$as_echo "#define CLOCK_ACTS 1" >>confdefs.h - -- ac_cv_var_oncore_ok=yes - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 - $as_echo "$ntp_ok" >&6; } - --# Check for ioctls TIOCSPPS --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ioctl TIOCSPPS" >&5 --$as_echo_n "checking ioctl TIOCSPPS... " >&6; } --if test "$ac_cv_header_termios_h" = "yes"; then -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <termios.h> --#ifdef TIOCSPPS -- yes --#endif -- --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "yes" >/dev/null 2>&1; then : -- ntp_ok=yes --else -- ntp_ok=no --fi --rm -f conftest* -- -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Arbiter 1088A/B GPS receiver" >&5 -+$as_echo_n "checking Arbiter 1088A/B GPS receiver... " >&6; } -+# Check whether --enable-ARBITER was given. -+if test "${enable_ARBITER+set}" = set; then : -+ enableval=$enable_ARBITER; ntp_ok=$enableval - else -- ntp_ok=no -+ ntp_ok=$ntp_eac - fi - - if test "$ntp_ok" = "yes"; then -+ ntp_refclock=yes - --$as_echo "#define HAVE_TIOCSPPS 1" >>confdefs.h -+$as_echo "#define CLOCK_ARBITER 1" >>confdefs.h - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 - $as_echo "$ntp_ok" >&6; } - --# Check for ioctls CIOGETEV --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ioctl CIOGETEV" >&5 --$as_echo_n "checking ioctl CIOGETEV... " >&6; } --if test "$ac_cv_header_sys_ppsclock_h" = "yes"; then -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <sys/ppsclock.h> --#ifdef CIOGETEV -- yes --#endif -- --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "yes" >/dev/null 2>&1; then : -- ntp_ok=yes -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Arcron MSF receiver" >&5 -+$as_echo_n "checking Arcron MSF receiver... " >&6; } -+# Check whether --enable-ARCRON_MSF was given. -+if test "${enable_ARCRON_MSF+set}" = set; then : -+ enableval=$enable_ARCRON_MSF; ntp_ok=$enableval - else -- ntp_ok=no -+ ntp_ok=$ntp_eac - fi --rm -f conftest* - --else --ntp_ok=no --fi - if test "$ntp_ok" = "yes"; then -- ac_cv_var_oncore_ok=yes -+ ntp_refclock=yes - --$as_echo "#define HAVE_CIOGETEV 1" >>confdefs.h -+$as_echo "#define CLOCK_ARCRON_MSF 1" >>confdefs.h - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 - $as_echo "$ntp_ok" >&6; } - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Austron 2200A/2201A GPS receiver" >&5 -+$as_echo_n "checking Austron 2200A/2201A GPS receiver... " >&6; } -+# Check whether --enable-AS2201 was given. -+if test "${enable_AS2201+set}" = set; then : -+ enableval=$enable_AS2201; ntp_ok=$enableval -+else -+ ntp_ok=$ntp_eac -+fi - --# ATOM/PPSAPI stuff. -- --# ATOM used to require struct timespec, but that's been fixed now. -- --# case "$ac_cv_struct_timespec" in --# 'yes') --# ac_cv_var_atom_ok=yes --# ;; --# esac --ac_cv_var_atom_ok=yes -- --# Check for header timepps.h, if found then we have PPS API (Draft RFC) stuff. -- --# The PPSAPI headers need "inline" ($ac_cv_c_inline='inline') -- --# The PPSAPI needs struct timespec. -+if test "$ntp_ok" = "yes"; then -+ ntp_refclock=yes - --# The PPSAPI also needs a timepps header. -+$as_echo "#define CLOCK_AS2201 1" >>confdefs.h - --case "$ac_cv_c_inline$ac_cv_struct_timespec" in -- inlineyes) -- case "$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h$host_os" in -- *yes* | *sunos* | *solaris* | *sco* | *netbsd* ) -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 -+$as_echo "$ntp_ok" >&6; } - --$as_echo "#define HAVE_PPSAPI 1" >>confdefs.h -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ATOM PPS interface" >&5 -+$as_echo_n "checking ATOM PPS interface... " >&6; } -+# Check whether --enable-ATOM was given. -+if test "${enable_ATOM+set}" = set; then : -+ enableval=$enable_ATOM; ntp_ok=$enableval -+else -+ ntp_ok=$ntp_eac -+fi - -- ac_cv_var_jupiter_ok=yes -- ac_cv_var_oncore_ok=yes -- ac_cv_var_parse_ok=yes -- ac_cv_var_ripe_ncc_ok=yes -- ;; -- esac -- ;; -+case "$ac_cv_var_atom_ok" in -+ no) ntp_ok=no ;; - esac -+if test "$ntp_ok" = "yes"; then -+ ntp_refclock=yes - --# Check for ioctls TIOCGSERIAL, TIOCSSERIAL, ASYNC_PPS_CD_POS, ASYNC_PPS_CD_NEG --ac_fn_c_check_header_mongrel "$LINENO" "linux/serial.h" "ac_cv_header_linux_serial_h" "$ac_includes_default" --if test "x$ac_cv_header_linux_serial_h" = x""yes; then : -+$as_echo "#define CLOCK_ATOM 1" >>confdefs.h - - fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 -+$as_echo "$ntp_ok" >&6; } - -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Chrono-log K-series WWVB receiver" >&5 -+$as_echo_n "checking Chrono-log K-series WWVB receiver... " >&6; } -+# Check whether --enable-CHRONOLOG was given. -+if test "${enable_CHRONOLOG+set}" = set; then : -+ enableval=$enable_CHRONOLOG; ntp_ok=$enableval -+else -+ ntp_ok=$ntp_eac -+fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ioctl TIOCGSERIAL, TIOCSSERIAL, ASYNC_PPS_CD_POS, ASYNC_PPS_CD_NEG" >&5 --$as_echo_n "checking ioctl TIOCGSERIAL, TIOCSSERIAL, ASYNC_PPS_CD_POS, ASYNC_PPS_CD_NEG... " >&6; } --case "$ac_cv_header_sys_ppsclock_h$ac_cv_header_linux_serial_h" in -- yesyes) -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <sys/time.h> --typedef int u_int; -+if test "$ntp_ok" = "yes"; then -+ ntp_refclock=yes - --#include <sys/ppsclock.h> --#include <linux/serial.h> -+$as_echo "#define CLOCK_CHRONOLOG 1" >>confdefs.h - --#ifdef TIOCGSERIAL --#ifdef TIOCSSERIAL --#ifdef ASYNC_PPS_CD_POS --#ifdef ASYNC_PPS_CD_NEG --#ifdef CIOGETEV -- yes --#endif --#endif --#endif --#endif --#endif -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 -+$as_echo "$ntp_ok" >&6; } - --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "yes" >/dev/null 2>&1; then : -- ntp_ok=yes -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CHU modem/decoder" >&5 -+$as_echo_n "checking CHU modem/decoder... " >&6; } -+# Check whether --enable-CHU was given. -+if test "${enable_CHU+set}" = set; then : -+ enableval=$enable_CHU; ntp_ok=$enableval -+else -+ ntp_ok=$ntp_eac - fi --rm -f conftest* - -- ;; -- *) -- ntp_ok=no -- ;; --esac - if test "$ntp_ok" = "yes"; then -+ ntp_refclock=yes - --$as_echo "#define HAVE_TIO_SERIAL_STUFF 1" >>confdefs.h -+$as_echo "#define CLOCK_CHU 1" >>confdefs.h - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 - $as_echo "$ntp_ok" >&6; } -+ac_refclock_chu=$ntp_ok - --# Check for SHMEM_STATUS support --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SHMEM_STATUS support" >&5 --$as_echo_n "checking SHMEM_STATUS support... " >&6; } --case "$ac_cv_header_sys_mman_h" in -- yes) ntp_ok=yes ;; -- *) ntp_ok=no ;; -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CHU audio/decoder" >&5 -+$as_echo_n "checking CHU audio/decoder... " >&6; } -+# Check whether --enable-AUDIO-CHU was given. -+if test "${enable_AUDIO_CHU+set}" = set; then : -+ enableval=$enable_AUDIO_CHU; ntp_ok=$enableval -+else -+ case "$ntp_eac$ac_refclock_chu$ntp_canaudio" in -+ *no*) ntp_ok=no ;; -+ *) ntp_ok=yes ;; - esac -+fi -+ - if test "$ntp_ok" = "yes"; then - --$as_echo "#define ONCORE_SHMEM_STATUS 1" >>confdefs.h -+$as_echo "#define AUDIO_CHU 1" >>confdefs.h - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 - $as_echo "$ntp_ok" >&6; } -+# We used to check for sunos/solaris target... -+case "$ntp_ok$ac_refclock_chu$ntp_canaudio" in -+ yes*no*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** But the expected answer is...no ***" >&5 -+$as_echo "$as_me: WARNING: *** But the expected answer is...no ***" >&2;} ;; -+esac - -- --ntp_refclock=no -- --# HPUX only, and by explicit request --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Datum/Bancomm bc635/VME interface" >&5 --$as_echo_n "checking Datum/Bancomm bc635/VME interface... " >&6; } --# Check whether --enable-BANCOMM was given. --if test "${enable_BANCOMM+set}" = set; then : -- enableval=$enable_BANCOMM; ntp_ok=$enableval -+# Not under HP-UX -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Datum Programmable Time System" >&5 -+$as_echo_n "checking Datum Programmable Time System... " >&6; } -+# Check whether --enable-DATUM was given. -+if test "${enable_DATUM+set}" = set; then : -+ enableval=$enable_DATUM; ntp_ok=$enableval - else -- ntp_ok=no -+ case "$ac_cv_header_termios_h" in -+ yes) -+ ntp_ok=$ntp_eac -+ ;; -+ *) ntp_ok=no -+ ;; -+ esac - fi - - if test "$ntp_ok" = "yes"; then - ntp_refclock=yes - --$as_echo "#define CLOCK_BANC 1" >>confdefs.h -+$as_echo "#define CLOCK_DATUM 1" >>confdefs.h - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 - $as_echo "$ntp_ok" >&6; } --case "$ntp_ok$host" in -- yes*-*-hpux*) ;; -- yes*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** But the expected answer is... no ***" >&5 --$as_echo "$as_me: WARNING: *** But the expected answer is... no ***" >&2;} ;; --esac - --#HPUX only, and only by explicit request --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking TrueTime GPS receiver/VME interface" >&5 --$as_echo_n "checking TrueTime GPS receiver/VME interface... " >&6; } --# Check whether --enable-GPSVME was given. --if test "${enable_GPSVME+set}" = set; then : -- enableval=$enable_GPSVME; ntp_ok=$enableval -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Dumb generic hh:mm:ss local clock" >&5 -+$as_echo_n "checking Dumb generic hh:mm:ss local clock... " >&6; } -+# Check whether --enable-DUMBCLOCK was given. -+if test "${enable_DUMBCLOCK+set}" = set; then : -+ enableval=$enable_DUMBCLOCK; ntp_ok=$enableval - else -- ntp_ok=no -+ ntp_ok=$ntp_eac - fi - - if test "$ntp_ok" = "yes"; then - ntp_refclock=yes - --$as_echo "#define CLOCK_GPSVME 1" >>confdefs.h -+$as_echo "#define CLOCK_DUMBCLOCK 1" >>confdefs.h - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 - $as_echo "$ntp_ok" >&6; } --case "$ntp_ok$host" in -- yes*-*-hpux*) ;; -- yes*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** But the expected answer is... no ***" >&5 --$as_echo "$as_me: WARNING: *** But the expected answer is... no ***" >&2;} ;; --esac -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCL720 clock support" >&5 --$as_echo_n "checking for PCL720 clock support... " >&6; } --case "$ac_cv_header_machine_inline_h$ac_cv_header_sys_pcl720_h$ac_cv_header_sys_i8253_h" in -- yesyesyes) -- --$as_echo "#define CLOCK_PPS720 1" >>confdefs.h -- -- ans=yes -- ;; -- *) -- ans=no -- ;; --esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ans" >&5 --$as_echo "$ans" >&6; } - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for default inclusion of all suitable non-PARSE clocks" >&5 --$as_echo_n "checking for default inclusion of all suitable non-PARSE clocks... " >&6; } --# Check whether --enable-all-clocks was given. --if test "${enable_all_clocks+set}" = set; then : -- enableval=$enable_all_clocks; ntp_eac=$enableval -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Forum Graphic GPS" >&5 -+$as_echo_n "checking Forum Graphic GPS... " >&6; } -+# Check whether --enable-FG was given. -+if test "${enable_FG+set}" = set; then : -+ enableval=$enable_FG; ntp_ok=$enableval - else -- ntp_eac=yes -+ ntp_ok=$ntp_eac - fi - --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_eac" >&5 --$as_echo "$ntp_eac" >&6; } -+if test "$ntp_ok" = "yes"; then -+ ntp_refclock=yes - --# HMS: Should we also require ac_cv_var_parse_ok? --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have support for PARSE clocks" >&5 --$as_echo_n "checking if we have support for PARSE clocks... " >&6; } --case "$ac_cv_var_atom_ok$ac_cv_header_termio_h$ac_cv_header_termios_h" in -- yes*yes*) -- ntp_canparse=yes -- ;; -- *) ntp_canparse=no -- ;; --esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_canparse" >&5 --$as_echo "$ntp_canparse" >&6; } -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have support for audio clocks" >&5 --$as_echo_n "checking if we have support for audio clocks... " >&6; } --case "$ac_cv_header_sun_audioio_h$ac_cv_header_sys_audioio_h$ac_cv_header_machine_soundcard_h$ac_cv_header_sys_soundcard_h" in -- *yes*) -- ntp_canaudio=yes -- --$as_echo "#define HAVE_AUDIO /**/" >>confdefs.h -- -- ;; -- *) ntp_canaudio=no ;; --esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_canaudio" >&5 --$as_echo "$ntp_canaudio" >&6; } -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we have support for the SHM refclock interface" >&5 --$as_echo_n "checking if we have support for the SHM refclock interface... " >&6; } --case "$ac_cv_header_sys_ipc_h$ac_cv_header_sys_shm_h" in -- yesyes) -- ntp_canshm=yes -- ;; -- *) ntp_canshm=no ;; --esac --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_canshm" >&5 --$as_echo "$ntp_canshm" >&6; } -- --# Requires modem control --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ACTS modem service" >&5 --$as_echo_n "checking ACTS modem service... " >&6; } --# Check whether --enable-ACTS was given. --if test "${enable_ACTS+set}" = set; then : -- enableval=$enable_ACTS; ntp_ok=$enableval --else -- cat confdefs.h - <<_ACEOF >conftest.$ac_ext --/* end confdefs.h. */ --#include <termios.h> --#ifdef HAVE_SYS_IOCTL_H --#include <sys/ioctl.h> --#endif --#ifdef TIOCMBIS -- yes --#endif -- --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "yes" >/dev/null 2>&1; then : -- ntp_ok=$ntp_eac --else -- ntp_ok=no --fi --rm -f conftest* -- --fi -- --if test "$ntp_ok" = "yes"; then -- ntp_refclock=yes -- --$as_echo "#define CLOCK_ACTS 1" >>confdefs.h -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 --$as_echo "$ntp_ok" >&6; } -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Arbiter 1088A/B GPS receiver" >&5 --$as_echo_n "checking Arbiter 1088A/B GPS receiver... " >&6; } --# Check whether --enable-ARBITER was given. --if test "${enable_ARBITER+set}" = set; then : -- enableval=$enable_ARBITER; ntp_ok=$enableval --else -- ntp_ok=$ntp_eac --fi -- --if test "$ntp_ok" = "yes"; then -- ntp_refclock=yes -- --$as_echo "#define CLOCK_ARBITER 1" >>confdefs.h -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 --$as_echo "$ntp_ok" >&6; } -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Arcron MSF receiver" >&5 --$as_echo_n "checking Arcron MSF receiver... " >&6; } --# Check whether --enable-ARCRON_MSF was given. --if test "${enable_ARCRON_MSF+set}" = set; then : -- enableval=$enable_ARCRON_MSF; ntp_ok=$enableval --else -- ntp_ok=$ntp_eac --fi -- --if test "$ntp_ok" = "yes"; then -- ntp_refclock=yes -- --$as_echo "#define CLOCK_ARCRON_MSF 1" >>confdefs.h -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 --$as_echo "$ntp_ok" >&6; } -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Austron 2200A/2201A GPS receiver" >&5 --$as_echo_n "checking Austron 2200A/2201A GPS receiver... " >&6; } --# Check whether --enable-AS2201 was given. --if test "${enable_AS2201+set}" = set; then : -- enableval=$enable_AS2201; ntp_ok=$enableval --else -- ntp_ok=$ntp_eac --fi -- --if test "$ntp_ok" = "yes"; then -- ntp_refclock=yes -- --$as_echo "#define CLOCK_AS2201 1" >>confdefs.h -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 --$as_echo "$ntp_ok" >&6; } -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking ATOM PPS interface" >&5 --$as_echo_n "checking ATOM PPS interface... " >&6; } --# Check whether --enable-ATOM was given. --if test "${enable_ATOM+set}" = set; then : -- enableval=$enable_ATOM; ntp_ok=$enableval --else -- ntp_ok=$ntp_eac --fi -- --case "$ac_cv_var_atom_ok" in -- no) ntp_ok=no ;; --esac --if test "$ntp_ok" = "yes"; then -- ntp_refclock=yes -- --$as_echo "#define CLOCK_ATOM 1" >>confdefs.h -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 --$as_echo "$ntp_ok" >&6; } -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Chrono-log K-series WWVB receiver" >&5 --$as_echo_n "checking Chrono-log K-series WWVB receiver... " >&6; } --# Check whether --enable-CHRONOLOG was given. --if test "${enable_CHRONOLOG+set}" = set; then : -- enableval=$enable_CHRONOLOG; ntp_ok=$enableval --else -- ntp_ok=$ntp_eac --fi -- --if test "$ntp_ok" = "yes"; then -- ntp_refclock=yes -- --$as_echo "#define CLOCK_CHRONOLOG 1" >>confdefs.h -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 --$as_echo "$ntp_ok" >&6; } -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CHU modem/decoder" >&5 --$as_echo_n "checking CHU modem/decoder... " >&6; } --# Check whether --enable-CHU was given. --if test "${enable_CHU+set}" = set; then : -- enableval=$enable_CHU; ntp_ok=$enableval --else -- ntp_ok=$ntp_eac --fi -- --if test "$ntp_ok" = "yes"; then -- ntp_refclock=yes -- --$as_echo "#define CLOCK_CHU 1" >>confdefs.h -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 --$as_echo "$ntp_ok" >&6; } --ac_refclock_chu=$ntp_ok -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CHU audio/decoder" >&5 --$as_echo_n "checking CHU audio/decoder... " >&6; } --# Check whether --enable-AUDIO-CHU was given. --if test "${enable_AUDIO_CHU+set}" = set; then : -- enableval=$enable_AUDIO_CHU; ntp_ok=$enableval --else -- case "$ntp_eac$ac_refclock_chu$ntp_canaudio" in -- *no*) ntp_ok=no ;; -- *) ntp_ok=yes ;; --esac --fi -- --if test "$ntp_ok" = "yes"; then -- --$as_echo "#define AUDIO_CHU 1" >>confdefs.h -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 --$as_echo "$ntp_ok" >&6; } --# We used to check for sunos/solaris target... --case "$ntp_ok$ac_refclock_chu$ntp_canaudio" in -- yes*no*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** But the expected answer is...no ***" >&5 --$as_echo "$as_me: WARNING: *** But the expected answer is...no ***" >&2;} ;; --esac -- --# Not under HP-UX --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Datum Programmable Time System" >&5 --$as_echo_n "checking Datum Programmable Time System... " >&6; } --# Check whether --enable-DATUM was given. --if test "${enable_DATUM+set}" = set; then : -- enableval=$enable_DATUM; ntp_ok=$enableval --else -- case "$ac_cv_header_termios_h" in -- yes) -- ntp_ok=$ntp_eac -- ;; -- *) ntp_ok=no -- ;; -- esac --fi -- --if test "$ntp_ok" = "yes"; then -- ntp_refclock=yes -- --$as_echo "#define CLOCK_DATUM 1" >>confdefs.h -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 --$as_echo "$ntp_ok" >&6; } -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Dumb generic hh:mm:ss local clock" >&5 --$as_echo_n "checking Dumb generic hh:mm:ss local clock... " >&6; } --# Check whether --enable-DUMBCLOCK was given. --if test "${enable_DUMBCLOCK+set}" = set; then : -- enableval=$enable_DUMBCLOCK; ntp_ok=$enableval --else -- ntp_ok=$ntp_eac --fi -- --if test "$ntp_ok" = "yes"; then -- ntp_refclock=yes -- --$as_echo "#define CLOCK_DUMBCLOCK 1" >>confdefs.h -- --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 --$as_echo "$ntp_ok" >&6; } -- --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Forum Graphic GPS" >&5 --$as_echo_n "checking Forum Graphic GPS... " >&6; } --# Check whether --enable-FG was given. --if test "${enable_FG+set}" = set; then : -- enableval=$enable_FG; ntp_ok=$enableval --else -- ntp_ok=$ntp_eac --fi -- --if test "$ntp_ok" = "yes"; then -- ntp_refclock=yes -- --$as_echo "#define CLOCK_FG 1" >>confdefs.h -+$as_echo "#define CLOCK_FG 1" >>confdefs.h - - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ntp_ok" >&5 -@@ -24545,23 +22638,6 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we want the HPUX version of FindConfig()" >&5 + $as_echo_n "checking if we want the HPUX version of FindConfig()... " >&6; } +@@ -24561,23 +22654,6 @@ $as_echo "$as_me: WARNING: *** But the expected answer is... no ***" >&2;} ;; esac @@ -24679,7 +22180,7 @@ Index: ntp-4.2.6p1+dfsg/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking NMEA GPS receiver" >&5 $as_echo_n "checking NMEA GPS receiver... " >&6; } -@@ -25143,29 +23219,6 @@ +@@ -25159,29 +23235,6 @@ ;; esac @@ -24709,7 +22210,7 @@ Index: ntp-4.2.6p1+dfsg/configure { $as_echo "$as_me:${as_lineno-$LINENO}: checking VARITEXT clock" >&5 $as_echo_n "checking VARITEXT clock... " >&6; } -@@ -27372,8 +25425,6 @@ +@@ -27392,8 +25445,6 @@ ac_config_files="$ac_config_files Makefile" @@ -24718,7 +22219,7 @@ Index: ntp-4.2.6p1+dfsg/configure ac_config_files="$ac_config_files adjtimed/Makefile" ac_config_files="$ac_config_files clockstuff/Makefile" -@@ -27422,8 +25473,6 @@ +@@ -27442,8 +25493,6 @@ ac_config_files="$ac_config_files scripts/ntptrace" @@ -24727,7 +22228,7 @@ Index: ntp-4.2.6p1+dfsg/configure ac_config_files="$ac_config_files scripts/plot_summary" ac_config_files="$ac_config_files scripts/summary" -@@ -28167,6 +26216,261 @@ +@@ -28187,6 +26236,261 @@ # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" @@ -24989,7 +22490,7 @@ Index: ntp-4.2.6p1+dfsg/configure _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -@@ -28178,8 +26482,8 @@ +@@ -28198,8 +26502,8 @@ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libopts/Makefile") CONFIG_FILES="$CONFIG_FILES libopts/Makefile" ;; @@ -24999,7 +22500,7 @@ Index: ntp-4.2.6p1+dfsg/configure "adjtimed/Makefile") CONFIG_FILES="$CONFIG_FILES adjtimed/Makefile" ;; "clockstuff/Makefile") CONFIG_FILES="$CONFIG_FILES clockstuff/Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; -@@ -28204,7 +26508,6 @@ +@@ -28224,7 +26528,6 @@ "scripts/ntp-wait") CONFIG_FILES="$CONFIG_FILES scripts/ntp-wait" ;; "scripts/ntpsweep") CONFIG_FILES="$CONFIG_FILES scripts/ntpsweep" ;; "scripts/ntptrace") CONFIG_FILES="$CONFIG_FILES scripts/ntptrace" ;; @@ -25007,7 +22508,7 @@ Index: ntp-4.2.6p1+dfsg/configure "scripts/plot_summary") CONFIG_FILES="$CONFIG_FILES scripts/plot_summary" ;; "scripts/summary") CONFIG_FILES="$CONFIG_FILES scripts/summary" ;; "util/Makefile") CONFIG_FILES="$CONFIG_FILES util/Makefile" ;; -@@ -28887,6 +27190,641 @@ +@@ -28907,6 +27210,641 @@ done } ;; @@ -25649,7 +23150,7 @@ Index: ntp-4.2.6p1+dfsg/configure "ntpdc/nl.pl":F) chmod +x ntpdc/nl.pl ;; "scripts/calc_tickadj":F) chmod +x scripts/calc_tickadj ;; "scripts/checktime":F) chmod +x scripts/checktime ;; -@@ -28896,7 +27834,6 @@ +@@ -28916,7 +27854,6 @@ "scripts/ntp-wait":F) chmod +x scripts/ntp-wait ;; "scripts/ntpsweep":F) chmod +x scripts/ntpsweep ;; "scripts/ntptrace":F) chmod +x scripts/ntptrace ;; @@ -25657,10 +23158,10 @@ Index: ntp-4.2.6p1+dfsg/configure "scripts/plot_summary":F) chmod +x scripts/plot_summary ;; "scripts/summary":F) chmod +x scripts/summary ;; -Index: ntp-4.2.6p1+dfsg/Makefile.in +Index: ntp-4.2.6.p2+dfsg/Makefile.in =================================================================== ---- ntp-4.2.6p1+dfsg.orig/Makefile.in 2010-04-09 08:11:16.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/Makefile.in 2010-05-24 10:29:15.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/Makefile.in 2010-07-09 02:21:36.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/Makefile.in 2010-07-13 18:24:09.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -25678,7 +23179,7 @@ Index: ntp-4.2.6p1+dfsg/Makefile.in $(top_srcdir)/m4/ntp_cacheversion.m4 \ $(top_srcdir)/m4/ntp_dir_sep.m4 \ $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ -@@ -128,7 +130,8 @@ +@@ -129,7 +131,8 @@ DCFD = @DCFD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -25688,7 +23189,7 @@ Index: ntp-4.2.6p1+dfsg/Makefile.in ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -@@ -137,6 +140,7 @@ +@@ -138,6 +141,7 @@ EF_PROGS = @EF_PROGS@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -25696,7 +23197,7 @@ Index: ntp-4.2.6p1+dfsg/Makefile.in GREP = @GREP@ HAVE_INLINE = @HAVE_INLINE@ INSTALL = @INSTALL@ -@@ -145,6 +149,7 @@ +@@ -146,6 +150,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LCRYPTO = @LCRYPTO@ @@ -25704,7 +23205,7 @@ Index: ntp-4.2.6p1+dfsg/Makefile.in LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@ -@@ -153,6 +158,7 @@ +@@ -154,6 +159,7 @@ LIBPARSE = @LIBPARSE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -25712,7 +23213,7 @@ Index: ntp-4.2.6p1+dfsg/Makefile.in LN_S = @LN_S@ LSCF = @LSCF@ LTLIBOBJS = @LTLIBOBJS@ -@@ -170,10 +176,15 @@ +@@ -171,10 +177,15 @@ MAKE_TICKADJ = @MAKE_TICKADJ@ MAKE_TIMETRIM = @MAKE_TIMETRIM@ MKDIR_P = @MKDIR_P@ @@ -25728,7 +23229,7 @@ Index: ntp-4.2.6p1+dfsg/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -187,6 +198,7 @@ +@@ -188,6 +199,7 @@ PATH_SH = @PATH_SH@ PROPDELAY = @PROPDELAY@ RANLIB = @RANLIB@ @@ -25736,7 +23237,7 @@ Index: ntp-4.2.6p1+dfsg/Makefile.in SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SNMP_CFLAGS = @SNMP_CFLAGS@ -@@ -202,6 +214,7 @@ +@@ -203,6 +215,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ @@ -25744,7 +23245,7 @@ Index: ntp-4.2.6p1+dfsg/Makefile.in am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -232,6 +245,7 @@ +@@ -233,6 +246,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -25752,7 +23253,7 @@ Index: ntp-4.2.6p1+dfsg/Makefile.in mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -@@ -251,13 +265,12 @@ +@@ -252,13 +266,12 @@ AUTOMAKE_OPTIONS = foreign 1.10 ACLOCAL_AMFLAGS = -I m4 -I libopts/m4 NULL = @@ -25769,7 +23270,7 @@ Index: ntp-4.2.6p1+dfsg/Makefile.in libntp \ libopts \ libparse \ -@@ -270,7 +283,6 @@ +@@ -271,7 +284,6 @@ adjtimed \ clockstuff \ kernel \ @@ -25777,7 +23278,7 @@ Index: ntp-4.2.6p1+dfsg/Makefile.in util \ $(NULL) -@@ -409,7 +421,7 @@ +@@ -410,7 +422,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): @@ -25786,7 +23287,7 @@ Index: ntp-4.2.6p1+dfsg/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -434,7 +446,7 @@ +@@ -435,7 +447,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): @@ -25795,7 +23296,7 @@ Index: ntp-4.2.6p1+dfsg/Makefile.in for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ -@@ -601,7 +613,8 @@ +@@ -602,7 +614,8 @@ top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook -test -n "$(am__skip_mode_fix)" \ @@ -25805,7 +23306,7 @@ Index: ntp-4.2.6p1+dfsg/Makefile.in ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ -@@ -645,17 +658,17 @@ +@@ -646,17 +659,17 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ @@ -25827,10 +23328,10 @@ Index: ntp-4.2.6p1+dfsg/Makefile.in *.zip*) \ unzip $(distdir).zip ;;\ esac -Index: ntp-4.2.6p1+dfsg/config.h.in +Index: ntp-4.2.6.p2+dfsg/config.h.in =================================================================== ---- ntp-4.2.6p1+dfsg.orig/config.h.in 2010-04-09 08:13:00.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/config.h.in 2010-05-24 10:29:11.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/config.h.in 2010-07-09 02:23:25.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/config.h.in 2010-07-13 18:24:06.000000000 +0000 @@ -90,9 +90,6 @@ /* Magnavox MX4200 GPS receiver */ #undef CLOCK_MX4200 @@ -25862,10 +23363,10 @@ Index: ntp-4.2.6p1+dfsg/config.h.in /* Does the target support multicast IP? */ #undef MCAST -Index: ntp-4.2.6p1+dfsg/aclocal.m4 +Index: ntp-4.2.6.p2+dfsg/aclocal.m4 =================================================================== ---- ntp-4.2.6p1+dfsg.orig/aclocal.m4 2010-04-09 08:11:01.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/aclocal.m4 2010-05-24 10:29:02.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/aclocal.m4 2010-07-09 02:21:23.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/aclocal.m4 2010-07-13 18:23:57.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- @@ -32073,10 +29574,10 @@ Index: ntp-4.2.6p1+dfsg/aclocal.m4 m4_include([m4/ntp_cacheversion.m4]) m4_include([m4/ntp_dir_sep.m4]) m4_include([m4/ntp_lineeditlibs.m4]) -Index: ntp-4.2.6p1+dfsg/libopts/Makefile.in +Index: ntp-4.2.6.p2+dfsg/libopts/Makefile.in =================================================================== ---- ntp-4.2.6p1+dfsg.orig/libopts/Makefile.in 2010-04-09 08:11:12.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/libopts/Makefile.in 2010-05-24 10:29:13.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/libopts/Makefile.in 2010-07-09 02:21:33.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/libopts/Makefile.in 2010-07-13 18:24:08.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -32094,7 +29595,7 @@ Index: ntp-4.2.6p1+dfsg/libopts/Makefile.in $(top_srcdir)/m4/ntp_cacheversion.m4 \ $(top_srcdir)/m4/ntp_dir_sep.m4 \ $(top_srcdir)/m4/ntp_lineeditlibs.m4 \ -@@ -119,7 +121,8 @@ +@@ -120,7 +122,8 @@ DCFD = @DCFD@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -32104,7 +29605,7 @@ Index: ntp-4.2.6p1+dfsg/libopts/Makefile.in ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -@@ -128,6 +131,7 @@ +@@ -129,6 +132,7 @@ EF_PROGS = @EF_PROGS@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ @@ -32112,7 +29613,7 @@ Index: ntp-4.2.6p1+dfsg/libopts/Makefile.in GREP = @GREP@ HAVE_INLINE = @HAVE_INLINE@ INSTALL = @INSTALL@ -@@ -136,6 +140,7 @@ +@@ -137,6 +141,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ LCRYPTO = @LCRYPTO@ @@ -32120,7 +29621,7 @@ Index: ntp-4.2.6p1+dfsg/libopts/Makefile.in LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBOPTS_CFLAGS = @LIBOPTS_CFLAGS@ -@@ -144,6 +149,7 @@ +@@ -145,6 +150,7 @@ LIBPARSE = @LIBPARSE@ LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ @@ -32128,7 +29629,7 @@ Index: ntp-4.2.6p1+dfsg/libopts/Makefile.in LN_S = @LN_S@ LSCF = @LSCF@ LTLIBOBJS = @LTLIBOBJS@ -@@ -161,10 +167,15 @@ +@@ -162,10 +168,15 @@ MAKE_TICKADJ = @MAKE_TICKADJ@ MAKE_TIMETRIM = @MAKE_TIMETRIM@ MKDIR_P = @MKDIR_P@ @@ -32144,7 +29645,7 @@ Index: ntp-4.2.6p1+dfsg/libopts/Makefile.in PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ -@@ -178,6 +189,7 @@ +@@ -179,6 +190,7 @@ PATH_SH = @PATH_SH@ PROPDELAY = @PROPDELAY@ RANLIB = @RANLIB@ @@ -32152,7 +29653,7 @@ Index: ntp-4.2.6p1+dfsg/libopts/Makefile.in SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SNMP_CFLAGS = @SNMP_CFLAGS@ -@@ -193,6 +205,7 @@ +@@ -194,6 +206,7 @@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ @@ -32160,7 +29661,7 @@ Index: ntp-4.2.6p1+dfsg/libopts/Makefile.in am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ -@@ -223,6 +236,7 @@ +@@ -224,6 +237,7 @@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ @@ -32168,7 +29669,7 @@ Index: ntp-4.2.6p1+dfsg/libopts/Makefile.in mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ -@@ -277,9 +291,9 @@ +@@ -278,9 +292,9 @@ exit 1;; \ esac; \ done; \ @@ -32180,10 +29681,10 @@ Index: ntp-4.2.6p1+dfsg/libopts/Makefile.in .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ -Index: ntp-4.2.6p1+dfsg/ltmain.sh +Index: ntp-4.2.6.p2+dfsg/ltmain.sh =================================================================== ---- ntp-4.2.6p1+dfsg.orig/ltmain.sh 2005-09-24 01:15:44.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/ltmain.sh 2010-05-24 10:28:46.000000000 +0000 +--- ntp-4.2.6.p2+dfsg.orig/ltmain.sh 2005-09-24 01:15:44.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/ltmain.sh 2010-07-13 18:22:21.000000000 +0000 @@ -1,30 +1,174 @@ -# ltmain.sh - Provide generalized library-building support services. -# NOTE: Changing this file will not affect anything until you rerun configure. @@ -46023,10 +43524,10 @@ Index: ntp-4.2.6p1+dfsg/ltmain.sh # End: +# vi:sw=2 + -Index: ntp-4.2.6p1+dfsg/m4/libtool.m4 +Index: ntp-4.2.6.p2+dfsg/m4/libtool.m4 =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/m4/libtool.m4 2010-05-24 10:28:46.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/m4/libtool.m4 2010-07-13 18:22:21.000000000 +0000 @@ -0,0 +1,7377 @@ +# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- +# @@ -53405,10 +50906,10 @@ Index: ntp-4.2.6p1+dfsg/m4/libtool.m4 + ;; + esac +]) -Index: ntp-4.2.6p1+dfsg/m4/ltoptions.m4 +Index: ntp-4.2.6.p2+dfsg/m4/ltoptions.m4 =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/m4/ltoptions.m4 2010-05-24 10:28:46.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/m4/ltoptions.m4 2010-07-13 18:22:21.000000000 +0000 @@ -0,0 +1,368 @@ +# Helper functions for option handling. -*- Autoconf -*- +# @@ -53778,10 +51279,10 @@ Index: ntp-4.2.6p1+dfsg/m4/ltoptions.m4 + [m4_define([_LTDL_TYPE], [installable])]) +LT_OPTION_DEFINE([LTDL_INIT], [convenience], + [m4_define([_LTDL_TYPE], [convenience])]) -Index: ntp-4.2.6p1+dfsg/m4/ltsugar.m4 +Index: ntp-4.2.6.p2+dfsg/m4/ltsugar.m4 =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/m4/ltsugar.m4 2010-05-24 10:28:46.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/m4/ltsugar.m4 2010-07-13 18:22:21.000000000 +0000 @@ -0,0 +1,123 @@ +# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- +# @@ -53906,10 +51407,10 @@ Index: ntp-4.2.6p1+dfsg/m4/ltsugar.m4 + lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), + [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl +]) -Index: ntp-4.2.6p1+dfsg/m4/ltversion.m4 +Index: ntp-4.2.6.p2+dfsg/m4/ltversion.m4 =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/m4/ltversion.m4 2010-05-24 10:28:46.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/m4/ltversion.m4 2010-07-13 18:22:21.000000000 +0000 @@ -0,0 +1,23 @@ +# ltversion.m4 -- version numbers -*- Autoconf -*- +# @@ -53934,10 +51435,10 @@ Index: ntp-4.2.6p1+dfsg/m4/ltversion.m4 +_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) +_LT_DECL(, macro_revision, 0) +]) -Index: ntp-4.2.6p1+dfsg/m4/lt~obsolete.m4 +Index: ntp-4.2.6.p2+dfsg/m4/lt~obsolete.m4 =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ ntp-4.2.6p1+dfsg/m4/lt~obsolete.m4 2010-05-24 10:28:46.000000000 +0000 ++++ ntp-4.2.6.p2+dfsg/m4/lt~obsolete.m4 2010-07-13 18:22:21.000000000 +0000 @@ -0,0 +1,92 @@ +# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- +# |