ChangeLog, configure, configure.in, Makefile.am, Makefile.in:

  * configure.in (ac_cv_make_ntptime): Add tv_nsec check.
  * include/Makefile.am (noinst_HEADERS): Forgot ntp_syscall.h
  From: John.Hay@mikom.csir.co.za

bk: 3796153a9X0OXOr8e1ozxETIWmIJnA

diff --git a/ChangeLog b/ChangeLog
index cb868bed2808cc4df7ef2bc132570b7c0375dea7..0bf349312899c67683cdd5a2118b844a1a42c603 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1999-07-21  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * configure.in (ac_cv_make_ntptime): Add tv_nsec check.
+
+       * include/Makefile.am (noinst_HEADERS): Forgot ntp_syscall.h
+       From: John.Hay@mikom.csir.co.za
+
        * configure.in: 4.0.94
 
        * Makefile.am (SUBDIRS): librsaref

diff --git a/configure b/configure
index 11ae111c7cb2744a5428f75507fdf74edea176a4..742465fc6a305a1f4279d6bb8f7400b006b879b6 100755 (executable)
--- a/configure
+++ b/configure
@@ -9214,17 +9214,20 @@ echo "configure:9214: checking if we want and can make the ntptime utility" >&5
 if eval "test \"\${ac_cv_make_ntptime+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  case "$ac_cv_struct_ntptimeval_timespec$ac_cv_var_kernel_pll$target" in
- noyes*linux*)
+  case "$target" in
+ *linux*)
     ans=no
     ;;
- noyes*)
-    ans=yes
-    ;;
- *)
-    ans=no
+ *) case "$ac_cv_struct_ntptimeval_timespec$ac_cv_struct_ntptimeval_tv_nsc$ac_cv_var_kernel_pll" in
+     *yes*yes)
+       ans=yes
+       ;;
+     *)
+       ans=no
+       ;;
+    esac
     ;;
-esac;
+esac
 ac_cv_make_ntptime=$ans
 fi
 
@@ -9236,7 +9239,7 @@ case "$ac_cv_make_ntptime" in
 esac
 
 echo $ac_n "checking if we want UDP wildcard delivery""... $ac_c" 1>&6
-echo "configure:9240: checking if we want UDP wildcard delivery" >&5
+echo "configure:9243: checking if we want UDP wildcard delivery" >&5
 if eval "test \"\${ac_cv_var_udp_wildcard_delivery+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9315,7 +9318,7 @@ case "$host" in
 esac
 
 echo $ac_n "checking if we should always slew the time""... $ac_c" 1>&6
-echo "configure:9319: checking if we should always slew the time" >&5
+echo "configure:9322: checking if we should always slew the time" >&5
 if eval "test \"\${ac_cv_var_slew_always+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9355,7 +9358,7 @@ EOF
 esac
 
 echo $ac_n "checking if we should step and slew the time""... $ac_c" 1>&6
-echo "configure:9359: checking if we should step and slew the time" >&5
+echo "configure:9362: checking if we should step and slew the time" >&5
 if eval "test \"\${ac_cv_var_step_slew+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9398,7 +9401,7 @@ EOF
 esac
 
 echo $ac_n "checking if ntpdate should step the time""... $ac_c" 1>&6
-echo "configure:9402: checking if ntpdate should step the time" >&5
+echo "configure:9405: checking if ntpdate should step the time" >&5
 if eval "test \"\${ac_cv_var_ntpdate_step+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9429,7 +9432,7 @@ EOF
 esac
 
 echo $ac_n "checking if we should sync TODR clock every hour""... $ac_c" 1>&6
-echo "configure:9433: checking if we should sync TODR clock every hour" >&5
+echo "configure:9436: checking if we should sync TODR clock every hour" >&5
 if eval "test \"\${ac_cv_var_sync_todr+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9462,7 +9465,7 @@ EOF
 esac
 
 echo $ac_n "checking if we should avoid kernel FLL bug""... $ac_c" 1>&6
-echo "configure:9466: checking if we should avoid kernel FLL bug" >&5
+echo "configure:9469: checking if we should avoid kernel FLL bug" >&5
 if eval "test \"\${ac_cv_var_kernel_fll_bug+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

diff --git a/configure.in b/configure.in
index 95306e1d91986d037b5c44fbe2342d298a93f13c..6f6f65ccb0ad8754f987b5052b492f8c650918db 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2581,17 +2581,20 @@ esac
 
 AC_SUBST(MAKE_NTPTIME)
 AC_CACHE_CHECK(if we want and can make the ntptime utility, ac_cv_make_ntptime,
-[case "$ac_cv_struct_ntptimeval_timespec$ac_cv_var_kernel_pll$target" in
- noyes*linux*)
+[case "$target" in
+ *linux*)
     ans=no
     ;;
- noyes*)
-    ans=yes
-    ;;
- *)
-    ans=no
+ *) case "$ac_cv_struct_ntptimeval_timespec$ac_cv_struct_ntptimeval_tv_nsc$ac_cv_var_kernel_pll" in
+     *yes*yes)
+       ans=yes
+       ;;
+     *)
+       ans=no
+       ;;
+    esac
     ;;
-esac;
+esac
 ac_cv_make_ntptime=$ans])
 case "$ac_cv_make_ntptime" in
  yes)

diff --git a/include/Makefile.am b/include/Makefile.am
index 19f72b916a371e3c8bae0cd89d838f43bb279706..1f80c16cf4fb58e2f765629a4d2233c2c8543399 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,11 +1,44 @@
 #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
 AUTOMAKE_OPTIONS = ../util/ansi2knr
-noinst_HEADERS = adjtime.h global.h gps.h l_stdlib.h md5.h mx4200.h \
-ntif.h ntp.h ntp_calendar.h ntp_control.h ntp_datum.h ntp_filegen.h ntp_fp.h \
-ntp_if.h ntp_io.h ntp_machine.h ntp_malloc.h ntp_proto.h ntp_refclock.h \
-ntp_request.h ntp_select.h ntp_stdlib.h ntp_string.h ntp_syslog.h \
-ntp_types.h ntp_unixtime.h ntpd.h parse.h parse_conf.h \
-binio.h mbg_gps166.h ieee754io.h ascii.h trimble.h iosignal.h recvbuff.h
-
 ETAGS_ARGS = $(srcdir)/Makefile.am
 #EXTRA_DIST = TAGS
+
+noinst_HEADERS = \
+       adjtime.h \
+       ascii.h \
+       binio.h \
+       global.h \
+       gps.h \
+       ieee754io.h \
+       iosignal.h \
+       l_stdlib.h \
+       mbg_gps166.h \
+       md5.h \
+       mx4200.h \
+       ntif.h \
+       ntp.h \
+       ntp_calendar.h \
+       ntp_control.h \
+       ntp_datum.h \
+       ntp_filegen.h \
+       ntp_fp.h \
+       ntp_if.h \
+       ntp_io.h \
+       ntp_machine.h \
+       ntp_malloc.h \
+       ntp_proto.h \
+       ntp_refclock.h \
+       ntp_request.h \
+       ntp_select.h \
+       ntp_stdlib.h \
+       ntp_string.h \
+       ntp_syscall.h \
+       ntp_syslog.h \
+       ntp_types.h \
+       ntp_unixtime.h \
+       ntpd.h \
+       parse.h \
+       parse_conf.h \
+       recvbuff.h \
+       trimble.h
+

diff --git a/include/Makefile.in b/include/Makefile.in
index be071bb497d1760ba89ef26b8467b38d19077f04..684daa64023979bd7a78469ea26452dd97c498f6 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -97,15 +97,48 @@ VERSION = @VERSION@
 
 
 AUTOMAKE_OPTIONS = ../util/ansi2knr
-noinst_HEADERS = adjtime.h global.h gps.h l_stdlib.h md5.h mx4200.h \
-ntif.h ntp.h ntp_calendar.h ntp_control.h ntp_datum.h ntp_filegen.h ntp_fp.h \
-ntp_if.h ntp_io.h ntp_machine.h ntp_malloc.h ntp_proto.h ntp_refclock.h \
-ntp_request.h ntp_select.h ntp_stdlib.h ntp_string.h ntp_syslog.h \
-ntp_types.h ntp_unixtime.h ntpd.h parse.h parse_conf.h \
-binio.h mbg_gps166.h ieee754io.h ascii.h trimble.h iosignal.h recvbuff.h
+ETAGS_ARGS = $(srcdir)/Makefile.am
+#EXTRA_DIST = TAGS
 
+noinst_HEADERS = \
+       adjtime.h \
+       ascii.h \
+       binio.h \
+       global.h \
+       gps.h \
+       ieee754io.h \
+       iosignal.h \
+       l_stdlib.h \
+       mbg_gps166.h \
+       md5.h \
+       mx4200.h \
+       ntif.h \
+       ntp.h \
+       ntp_calendar.h \
+       ntp_control.h \
+       ntp_datum.h \
+       ntp_filegen.h \
+       ntp_fp.h \
+       ntp_if.h \
+       ntp_io.h \
+       ntp_machine.h \
+       ntp_malloc.h \
+       ntp_proto.h \
+       ntp_refclock.h \
+       ntp_request.h \
+       ntp_select.h \
+       ntp_stdlib.h \
+       ntp_string.h \
+       ntp_syscall.h \
+       ntp_syslog.h \
+       ntp_types.h \
+       ntp_unixtime.h \
+       ntpd.h \
+       parse.h \
+       parse_conf.h \
+       recvbuff.h \
+       trimble.h
 
-ETAGS_ARGS = $(srcdir)/Makefile.am
 subdir = include
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
@@ -238,7 +271,6 @@ all-redirect all-am all install-strip installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
-#EXTRA_DIST = TAGS
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.