ChangeLog, configure.in, refclock_parse.c:

  * ntpd/refclock_parse.c (parse_start): ASYNC_PPS_CD_NEG cleanup
  * configure.in (ac_cv_make_ntptime): OK on Linux
  From: <Ulrich.Windl@rz.uni-regensburg.de>
  * configure.in: NetBSD has PPSAPI now
  F_SETOWN is needed for NetBSD
  From: Jonathan Stone <jonathan@dsg.stanford.edu>

bk: 3823b023YG1HPvtkO2E-10Zbh5DigQ

diff --git a/ChangeLog b/ChangeLog
index 946de8f451ccdafb03c6ec0c159ff3d3d4361171..4dd15862fe5ee9db0f2c060c40d6ee6afc9827b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1999-11-05  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+       * ntpd/refclock_parse.c (parse_start): ASYNC_PPS_CD_NEG cleanup
+       * configure.in (ac_cv_make_ntptime): OK on Linux
+       From: <Ulrich.Windl@rz.uni-regensburg.de>
+
+       * configure.in: NetBSD has PPSAPI now
+       F_SETOWN is needed for NetBSD
+       From: Jonathan Stone <jonathan@dsg.stanford.edu>
+
 1999-11-02  Harlan Stenn  <stenn@whimsy.udel.edu>
 
        * configure.in: 4.0.98d

diff --git a/configure.in b/configure.in
index 6d4e0ad6419a5d38be99b835bedf9c6562127a81..998091d5ebfa7fe29253f7e5dfa4666e66aad898 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -919,6 +919,9 @@ AC_CACHE_CHECK(if we need a ctty for F_SETOWN, ac_cv_func_ctty_for_f_setown,
  *-*-freebsd*)
     ans=yes
     ;;
+ *-*-netbsd*)
+    ans=yes
+    ;;
  *-*-osf*)
     ans=yes
     ;;
@@ -1399,13 +1402,8 @@ AC_MSG_RESULT($ntp_ok)
 
 case "$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h" in
  *yes*)
-    case "$target" in
-      *-*-netbsd*)
-         ;;
-      *) AC_DEFINE(HAVE_PPSAPI)
-         ac_cv_var_oncore_ok=yes
-         ;;
-    esac
+    AC_DEFINE(HAVE_PPSAPI)
+    ac_cv_var_oncore_ok=yes
     AC_DEFINE(HAVE_TIMESPEC)
     ;;
 esac
@@ -2661,9 +2659,6 @@ esac
 AC_SUBST(MAKE_NTPTIME)
 AC_CACHE_CHECK(if we want and can make the ntptime utility, ac_cv_make_ntptime,
 [case "$target" in
- *linux*)
-    ans=no
-    ;;
  *) case "$ac_cv_struct_ntptimeval$ac_cv_var_kernel_pll" in
      yesyes)
        ans=yes

diff --git a/ntpd/refclock_parse.c b/ntpd/refclock_parse.c
index 23a6bbcccb08e2907450036d520a8f3a93875a07..6771a139ed10479c6f9622ce07666c9265b2e6ce 100644 (file)
--- a/ntpd/refclock_parse.c
+++ b/ntpd/refclock_parse.c
@@ -2615,8 +2615,9 @@ parse_start(
                  if (ioctl(fd232, TIOCGSERIAL, &ss) < 0 ||
                      (
 #ifdef ASYNC_LOW_LATENCY
-                      ss.flags |= ASYNC_PPS_CD_NEG|ASYNC_LOW_LATENCY,
-#else
+                      ss.flags |= ASYNC_LOW_LATENCY,
+#endif
+#ifdef ASYNC_PPS_CD_NEG
                       ss.flags |= ASYNC_PPS_CD_NEG,
 #endif
                       ioctl(fd232, TIOCSSERIAL, &ss)) < 0) {