From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 6 Nov 1999 04:35:47 +0000 (-0000)
Subject: ChangeLog, configure.in, refclock_parse.c:
X-Git-Tag: NTP_4_0_98_E~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bf5d471b59601c2c4fa519ed0e3518e2afa689b;p=thirdparty%2Fntp.git

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 946de8f451..4dd15862fe 100644
--- 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 6d4e0ad641..998091d5eb 100644
--- 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 23a6bbcccb..6771a139ed 100644
--- 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) {