From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 3 May 2000 06:23:33 +0000 (-0000)
Subject: ChangeLog, configure, configure.in, ntptrace.c:
X-Git-Tag: NTP_4_0_99_J~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3b84cf0a5e4608953d81cb0128318fed8270fe0;p=thirdparty%2Fntp.git

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 d1925063b..06f5984dc 100644
--- 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 542bcf2fe..4fbb9870c 100755
--- 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 47b348c49..2d926f783 100644
--- 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 76a8aed5f..2d43111bf 100644
--- 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>