ChangeLog, aclocal.m4, configure.in, ntp_config.c, ntpdate.c, ntp-genkeys.c:

  * util/ntp-genkeys.c:
  * ntpdate/ntpdate.c:
  * ntpd/ntp_config.c: Netinfo header reorder.
  From: Jack Bryans <jbryans@csulb.edu>

bk: 3ae12038k4mWtW2xGC_aXoomeKzpRg

diff --git a/ChangeLog b/ChangeLog
index 030bf253ab90d0a512cea90d0d59e3636bbbe271..0b66e2cb55071bd1f9ed1fe50b5a0abfec40c7d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-04-21  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * util/ntp-genkeys.c:
+       * ntpdate/ntpdate.c:
+       * ntpd/ntp_config.c: Netinfo header reorder.
+       From: Jack Bryans <jbryans@csulb.edu>
+
        * configure.in: timespec can be found by looking in goofy places
        under SunOS.
 

diff --git a/configure.in b/configure.in
index 2ffaf55375e477dee4704a9da8cb15a3acb86a36..0420c918c8788850598000da2c0a76ff1d874082 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -177,7 +177,7 @@ case "$target" in
     AC_CHECK_LIB(advapi32, main)
     ;;
 esac
-AC_CHECK_LIB(elf, nlist)
+AC_CHECK_LIB(elf, nlist)       dnl Only needed for tickadj...
 dnl AC_CHECK_LIB(kvm, main, , , -lelf)
 AC_CHECK_LIB(kvm, main)                dnl We already know about -lelf here...
 AC_CHECK_LIB(ld, nlist)

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index dbc0b79513fde09001588e04fdc3fb9cfeb39a1a..6c668f9b8d5bb5dbd13a94b055672d61ab477609 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -5,6 +5,10 @@
 # include <config.h>
 #endif
 
+#ifdef HAVE_NETINFO
+# include <netinfo/ni.h>
+#endif
+
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_unixtime.h"
@@ -31,10 +35,6 @@
 # endif
 #endif /* VMS */
 
-#ifdef HAVE_NETINFO
-# include <netinfo/ni.h>
-#endif
-
 #ifdef SYS_WINNT
 # include <io.h>
 extern HANDLE ResolverThreadHandle;

diff --git a/ntpdate/ntpdate.c b/ntpdate/ntpdate.c
index c8f6024a7c4c2e12fbd8aab277ad4837b6021b8e..43813684c718cf4313cb2e6ce13e02c478bdf4e8 100644 (file)
--- a/ntpdate/ntpdate.c
+++ b/ntpdate/ntpdate.c
@@ -6,6 +6,10 @@
 # include <config.h>
 #endif
 
+#ifdef HAVE_NETINFO
+#include <netinfo/ni.h>
+#endif
+
 #include "ntp_fp.h"
 #include "ntp.h"
 #include "ntp_io.h"
@@ -48,10 +52,6 @@ struct timeval timeout = {0,0};
 struct timeval timeout = {60,0};
 #endif
 
-#ifdef HAVE_NETINFO
-#include <netinfo/ni.h>
-#endif
-
 #include "recvbuff.h"
 
 #ifdef SYS_WINNT

diff --git a/util/ntp-genkeys.c b/util/ntp-genkeys.c
index df99373b079dc89e665dfc2bd7edd297ac51c36e..03e8bde75d8788419c9d4897a7cdcc3630921e8a 100644 (file)
--- a/util/ntp-genkeys.c
+++ b/util/ntp-genkeys.c
@@ -6,6 +6,10 @@
 # include <config.h>
 #endif
 
+#ifdef HAVE_NETINFO
+#include <netinfo/ni.h>
+#endif
+
 #include "ntpd.h"
 #include "ntp_stdlib.h"
 #include "ntp_string.h"
@@ -19,10 +23,6 @@
 #include <limits.h>            /* PATH_MAX */
 #include <sys/stat.h>
 
-#ifdef HAVE_NETINFO
-#include <netinfo/ni.h>
-#endif
-
 #ifdef PUBKEY
 # include "ntp_crypto.h"
 #endif