ChangeLog, configure, configure.in, ntptrace.c:

  * configure.in: 4.0.99i5
  * ntptrace/ntptrace.c: Protect sys/ioctl.h; grab config.h

bk: 390fc5e5EyURGwld-VkoFPfwnxnYBg

diff --git a/ChangeLog b/ChangeLog
index d1925063b4ec71515a1e32842d2233ef91f90e6f..06f5984dc037db5f52ef93c8712763f0569d12f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2000-05-03  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * configure.in: 4.0.99i5
+
+       * ntptrace/ntptrace.c: Protect sys/ioctl.h; grab config.h
+
        * ntpd/ntp_proto.c (transmit): AUTOKEY and tstamp fixes.
        (clock_update): Check oleap against LEAP_NOTINSYNC
        (peer_clear): Free pubkey when we're done

diff --git a/configure b/configure
index 542bcf2fe9acf6b6f740968e812e2dcbf2555539..4fbb9870c69e7f74c767ebc59a9c98e474980feb 100755 (executable)
--- a/configure
+++ b/configure
@@ -1090,7 +1090,7 @@ fi
 
 PACKAGE=ntp
 
-VERSION=4.0.99i4
+VERSION=4.0.99i5
 
 if test "`CDPATH=: && cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then

diff --git a/configure.in b/configure.in
index 47b348c492e5f503c0dd5a23ddfad7953d3d4370..2d926f7837d35562346ee26aefeb10799b59dd6c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CANONICAL_SYSTEM
 AC_DEFINE_UNQUOTED(STR_SYSTEM, "$target")
 AM_CONFIG_HEADER(config.h)
 AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE(ntp, 4.0.99i4)
+AM_INIT_AUTOMAKE(ntp, 4.0.99i5)
 AC_PREREQ(2.14)
 
 ac_cv_var_oncore_ok=no

diff --git a/ntptrace/ntptrace.c b/ntptrace/ntptrace.c
index 76a8aed5f24bd2e670c60f7b2ad217a5adbb6085..2d43111bf05d8a2238f4550821e99f4e2ad74b7e 100644 (file)
--- a/ntptrace/ntptrace.c
+++ b/ntptrace/ntptrace.c
@@ -8,13 +8,20 @@
  *
  *     Large portions stolen from ntpdate.c
  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
 #include <stdio.h>
 #include <signal.h>
 #include <ctype.h>
 #include <netdb.h>
 #include <sys/types.h>
 #include <sys/signal.h>
-#include <sys/ioctl.h>
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
 #include <sys/time.h>
 #include <sys/resource.h>