From: Harlan Stenn Date: Sat, 6 Nov 1999 07:06:04 +0000 (-0000) Subject: ChangeLog, acconfig.h, config.h.in, configure, configure.in, systime.c: X-Git-Tag: NTP_4_0_98_E~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4b595f8dad2c7fb1f82ba3813b4d1c1cff00a88;p=thirdparty%2Fntp.git ChangeLog, acconfig.h, config.h.in, configure, configure.in, systime.c: * acconfig.h: RELIANTUNIX_CLOCK * configure.in (ac_cv_var_tickadj): RELIANTUNIX_CLOCK * libntp/systime.c (adj_systime): Reliant patches From: Andrej Borsenkow bk: 3823d35c6nOTUbkTq9X2dMPbn_n05A --- diff --git a/ChangeLog b/ChangeLog index 4dd15862fe..a85dd015bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +1999-11-06 Harlan Stenn + + * acconfig.h: RELIANTUNIX_CLOCK + * configure.in (ac_cv_var_tickadj): RELIANTUNIX_CLOCK + * libntp/systime.c (adj_systime): Reliant patches + From: Andrej Borsenkow + 1999-11-05 Harlan Stenn * ntpd/refclock_parse.c (parse_start): ASYNC_PPS_CD_NEG cleanup diff --git a/acconfig.h b/acconfig.h index da7387e3fb..94707efc33 100644 --- a/acconfig.h +++ b/acconfig.h @@ -346,6 +346,9 @@ /* Do we want the SCO clock hacks? */ #undef SCO5_CLOCK +/* Do we want the ReliantUNIX clock hacks? */ +#undef RELIANTUNIX_CLOCK + /* Does the kernel have an FLL bug? */ #undef KERNEL_FLL_BUG diff --git a/config.h.in b/config.h.in index 250aa05bc7..8ad124b005 100644 --- a/config.h.in +++ b/config.h.in @@ -398,6 +398,9 @@ /* Do we want the SCO clock hacks? */ #undef SCO5_CLOCK +/* Do we want the ReliantUNIX clock hacks? */ +#undef RELIANTUNIX_CLOCK + /* Does the kernel have an FLL bug? */ #undef KERNEL_FLL_BUG diff --git a/configure b/configure index d2b309f547..83154c9786 100755 --- a/configure +++ b/configure @@ -6927,6 +6927,9 @@ else *-*-freebsd*) ans=yes ;; + *-*-netbsd*) + ans=yes + ;; *-*-osf*) ans=yes ;; @@ -6946,7 +6949,7 @@ esac ntp_warning='GRONK' echo $ac_n "checking if we'll use clock_settime or settimeofday or stime""... $ac_c" 1>&6 -echo "configure:6950: checking if we'll use clock_settime or settimeofday or stime" >&5 +echo "configure:6953: checking if we'll use clock_settime or settimeofday or stime" >&5 case "$ac_cv_func_clock_settime$ac_cv_func_settimeofday$ac_cv_func_stime" in yes*) ntp_warning='' @@ -6975,7 +6978,7 @@ case "$ntp_warning" in esac echo $ac_n "checking if we have a losing syscall()""... $ac_c" 1>&6 -echo "configure:6979: checking if we have a losing syscall()" >&5 +echo "configure:6982: checking if we have a losing syscall()" >&5 if eval "test \"\${ac_cv_var_syscall_bug+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6998,7 +7001,7 @@ EOF esac echo $ac_n "checking for Streams/TLI""... $ac_c" 1>&6 -echo "configure:7002: checking for Streams/TLI" >&5 +echo "configure:7005: checking for Streams/TLI" >&5 if eval "test \"\${ac_cv_var_streams_tli+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7027,12 +7030,12 @@ EOF esac echo $ac_n "checking for SIGIO""... $ac_c" 1>&6 -echo "configure:7031: checking for SIGIO" >&5 +echo "configure:7034: checking for SIGIO" >&5 if eval "test \"\${ac_cv_hdr_def_sigio+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef SIGIO @@ -7055,7 +7058,7 @@ fi echo "$ac_t""$ac_cv_hdr_def_sigio" 1>&6 echo $ac_n "checking if we want to use signalled IO""... $ac_c" 1>&6 -echo "configure:7059: checking if we want to use signalled IO" >&5 +echo "configure:7062: checking if we want to use signalled IO" >&5 if eval "test \"\${ac_cv_var_signalled_io+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7106,12 +7109,12 @@ EOF esac echo $ac_n "checking for SIGPOLL""... $ac_c" 1>&6 -echo "configure:7110: checking for SIGPOLL" >&5 +echo "configure:7113: checking for SIGPOLL" >&5 if eval "test \"\${ac_cv_hdr_def_sigpoll+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef SIGPOLL @@ -7134,12 +7137,12 @@ fi echo "$ac_t""$ac_cv_hdr_def_sigpoll" 1>&6 echo $ac_n "checking for SIGSYS""... $ac_c" 1>&6 -echo "configure:7138: checking for SIGSYS" >&5 +echo "configure:7141: checking for SIGSYS" >&5 if eval "test \"\${ac_cv_hdr_def_sigsys+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef SIGSYS @@ -7162,7 +7165,7 @@ fi echo "$ac_t""$ac_cv_hdr_def_sigsys" 1>&6 echo $ac_n "checking if we can use SIGPOLL for UDP I/O""... $ac_c" 1>&6 -echo "configure:7166: checking if we can use SIGPOLL for UDP I/O" >&5 +echo "configure:7169: checking if we can use SIGPOLL for UDP I/O" >&5 if eval "test \"\${ac_cv_var_use_udp_sigpoll+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7217,7 +7220,7 @@ EOF esac echo $ac_n "checking if we can use SIGPOLL for TTY I/O""... $ac_c" 1>&6 -echo "configure:7221: checking if we can use SIGPOLL for TTY I/O" >&5 +echo "configure:7224: checking if we can use SIGPOLL for TTY I/O" >&5 if eval "test \"\${ac_cv_var_use_tty_sigpoll+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7272,7 +7275,7 @@ EOF esac echo $ac_n "checking if nlist() values might require extra indirection""... $ac_c" 1>&6 -echo "configure:7276: checking if nlist() values might require extra indirection" >&5 +echo "configure:7279: checking if nlist() values might require extra indirection" >&5 if eval "test \"\${ac_cv_var_nlist_extra_indirection+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7294,7 +7297,7 @@ EOF esac echo $ac_n "checking for a minimum recommended value of tickadj""... $ac_c" 1>&6 -echo "configure:7298: checking for a minimum recommended value of tickadj" >&5 +echo "configure:7301: checking for a minimum recommended value of tickadj" >&5 if eval "test \"\${ac_cv_var_min_rec_tickadj+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7317,7 +7320,7 @@ EOF esac echo $ac_n "checking if the TTY code permits PARENB and IGNPAR""... $ac_c" 1>&6 -echo "configure:7321: checking if the TTY code permits PARENB and IGNPAR" >&5 +echo "configure:7324: checking if the TTY code permits PARENB and IGNPAR" >&5 if eval "test \"\${ac_cv_var_no_parenb_ignpar+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7342,7 +7345,7 @@ EOF esac echo $ac_n "checking if we're including debugging code""... $ac_c" 1>&6 -echo "configure:7346: checking if we're including debugging code" >&5 +echo "configure:7349: checking if we're including debugging code" >&5 # Check whether --enable-debugging or --disable-debugging was given. if test "${enable_debugging+set}" = set; then enableval="$enable_debugging" @@ -7360,7 +7363,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking for a the number of minutes in a DST adjustment""... $ac_c" 1>&6 -echo "configure:7364: checking for a the number of minutes in a DST adjustment" >&5 +echo "configure:7367: checking for a the number of minutes in a DST adjustment" >&5 # Check whether --enable-dst_minutes or --disable-dst_minutes was given. if test "${enable_dst_minutes+set}" = set; then enableval="$enable_dst_minutes" @@ -7376,7 +7379,7 @@ EOF echo "$ac_t""$ans" 1>&6 echo $ac_n "checking if we have the tty_clk line discipline/streams module""... $ac_c" 1>&6 -echo "configure:7380: checking if we have the tty_clk line discipline/streams module" >&5 +echo "configure:7383: checking if we have the tty_clk line discipline/streams module" >&5 if eval "test \"\${ac_cv_var_tty_clk+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7392,12 +7395,12 @@ EOF esac echo $ac_n "checking for AIOCTIMESTAMPCTL""... $ac_c" 1>&6 -echo "configure:7396: checking for AIOCTIMESTAMPCTL" >&5 +echo "configure:7399: checking for AIOCTIMESTAMPCTL" >&5 if eval "test \"\${ac_cv_var_aioctimestamp+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef AIOCTIMESTAMPCTL @@ -7432,7 +7435,7 @@ EOF esac echo $ac_n "checking for the ppsclock streams module""... $ac_c" 1>&6 -echo "configure:7436: checking for the ppsclock streams module" >&5 +echo "configure:7439: checking for the ppsclock streams module" >&5 if eval "test \"\${ac_cv_var_ppsclock+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7448,7 +7451,7 @@ EOF esac echo $ac_n "checking for kernel multicast support""... $ac_c" 1>&6 -echo "configure:7452: checking for kernel multicast support" >&5 +echo "configure:7455: checking for kernel multicast support" >&5 if eval "test \"\${ac_cv_var_mcast+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7456,7 +7459,7 @@ else case "$target" in i386-sequent-sysv4) ;; *) cat > conftest.$ac_ext < #ifdef IP_ADD_MEMBERSHIP @@ -7483,7 +7486,7 @@ EOF esac echo $ac_n "checking availability of ntp_{adj,get}time()""... $ac_c" 1>&6 -echo "configure:7487: checking availability of ntp_{adj,get}time()" >&5 +echo "configure:7490: checking availability of ntp_{adj,get}time()" >&5 if eval "test \"\${ac_cv_var_ntp_syscalls+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7497,7 +7500,7 @@ else ac_cv_var_ntp_syscalls=libc ;; *) cat > conftest.$ac_ext < #if defined(SYS_ntp_gettime) && defined(SYS_ntp_adjtime) @@ -7537,12 +7540,12 @@ EOF esac echo $ac_n "checking if sys/timex.h has STA_FLL""... $ac_c" 1>&6 -echo "configure:7541: checking if sys/timex.h has STA_FLL" >&5 +echo "configure:7544: checking if sys/timex.h has STA_FLL" >&5 if eval "test \"\${ac_cv_var_sta_fll+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef STA_FLL @@ -7565,7 +7568,7 @@ fi echo "$ac_t""$ac_cv_var_sta_fll" 1>&6 echo $ac_n "checking if we have kernel PLL support""... $ac_c" 1>&6 -echo "configure:7569: checking if we have kernel PLL support" >&5 +echo "configure:7572: checking if we have kernel PLL support" >&5 if eval "test \"\${ac_cv_var_kernel_pll+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7589,7 +7592,7 @@ EOF esac echo $ac_n "checking if SIOCGIFCONF returns buffer size in the buffer""... $ac_c" 1>&6 -echo "configure:7593: checking if SIOCGIFCONF returns buffer size in the buffer" >&5 +echo "configure:7596: checking if SIOCGIFCONF returns buffer size in the buffer" >&5 if eval "test \"\${ac_cv_var_size_returned_in_buffer+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7618,7 +7621,7 @@ esac echo $ac_n "checking if we want to use MD5 authentication""... $ac_c" 1>&6 -echo "configure:7622: checking if we want to use MD5 authentication" >&5 +echo "configure:7625: checking if we want to use MD5 authentication" >&5 if eval "test \"\${ac_cv_var_use_md5+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7643,10 +7646,10 @@ esac # Check for ioctls TIOCGPPSEV echo $ac_n "checking ioctl TIOCGPPSEV""... $ac_c" 1>&6 -echo "configure:7647: checking ioctl TIOCGPPSEV" >&5 +echo "configure:7650: checking ioctl TIOCGPPSEV" >&5 if test "$ac_cv_header_termios_h" = "yes"; then cat > conftest.$ac_ext < #ifdef TIOCGPPSEV @@ -7679,10 +7682,10 @@ echo "$ac_t""$ntp_ok" 1>&6 # Check for ioctls TIOCSPPS echo $ac_n "checking ioctl TIOCSPPS""... $ac_c" 1>&6 -echo "configure:7683: checking ioctl TIOCSPPS" >&5 +echo "configure:7686: checking ioctl TIOCSPPS" >&5 if test "$ac_cv_header_termios_h" = "yes"; then cat > conftest.$ac_ext < #ifdef TIOCSPPS @@ -7714,10 +7717,10 @@ echo "$ac_t""$ntp_ok" 1>&6 # Check for ioctls CIOGETEV echo $ac_n "checking ioctl CIOGETEV""... $ac_c" 1>&6 -echo "configure:7718: checking ioctl CIOGETEV" >&5 +echo "configure:7721: checking ioctl CIOGETEV" >&5 if test "$ac_cv_header_sys_ppsclock_h" = "yes"; then cat > conftest.$ac_ext < #ifdef CIOGETEV @@ -7754,16 +7757,11 @@ echo "$ac_t""$ntp_ok" 1>&6 case "$ac_cv_header_timepps_h$ac_cv_header_sys_timepps_h" in *yes*) - case "$target" in - *-*-netbsd*) - ;; - *) cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_PPSAPI 1 EOF - ac_cv_var_oncore_ok=yes - ;; - esac + ac_cv_var_oncore_ok=yes cat >> confdefs.h <<\EOF #define HAVE_TIMESPEC 1 EOF @@ -7774,17 +7772,17 @@ esac # Check for ioctls TIOCGSERIAL, TIOCSSERIAL, ASYNC_PPS_CD_POS, ASYNC_PPS_CD_NEG ac_safe=`echo "linux/serial.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/serial.h""... $ac_c" 1>&6 -echo "configure:7778: checking for linux/serial.h" >&5 +echo "configure:7776: checking for linux/serial.h" >&5 if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7806,11 +7804,11 @@ else fi echo $ac_n "checking ioctl TIOCGSERIAL""... $ac_c" 1>&6 -echo "configure:7810: checking ioctl TIOCGSERIAL" >&5 +echo "configure:7808: checking ioctl TIOCGSERIAL" >&5 case "$ac_cv_header_sys_ppsclock_h$ac_cv_header_linux_serial_h" in yesyes) cat > conftest.$ac_ext < typedef int u_int; @@ -7857,7 +7855,7 @@ ntp_refclock=no # HPUX only, and by explicit request echo $ac_n "checking Datum/Bancomm bc635/VME interface""... $ac_c" 1>&6 -echo "configure:7861: checking Datum/Bancomm bc635/VME interface" >&5 +echo "configure:7859: checking Datum/Bancomm bc635/VME interface" >&5 # Check whether --enable-BANCOMM or --disable-BANCOMM was given. if test "${enable_BANCOMM+set}" = set; then enableval="$enable_BANCOMM" @@ -7881,7 +7879,7 @@ esac #HPUX only, and only by explicit request echo $ac_n "checking TrueTime GPS receiver/VME interface""... $ac_c" 1>&6 -echo "configure:7885: checking TrueTime GPS receiver/VME interface" >&5 +echo "configure:7883: checking TrueTime GPS receiver/VME interface" >&5 # Check whether --enable-GPSVME or --disable-GPSVME was given. if test "${enable_GPSVME+set}" = set; then enableval="$enable_GPSVME" @@ -7904,7 +7902,7 @@ case "$ntp_ok$target" in esac echo $ac_n "checking for PCL720 clock support""... $ac_c" 1>&6 -echo "configure:7908: checking for PCL720 clock support" >&5 +echo "configure:7906: checking for PCL720 clock support" >&5 case "$ac_cv_header_machine_inline_h$ac_cv_header_sys_pcl720_h$ac_cv_header_sys_i8253_h" in yesyesyes) cat >> confdefs.h <<\EOF @@ -7920,7 +7918,7 @@ esac echo "$ac_t""$ans" 1>&6 echo $ac_n "checking for SHM clock attached thru shared memory""... $ac_c" 1>&6 -echo "configure:7924: checking for SHM clock attached thru shared memory" >&5 +echo "configure:7922: checking for SHM clock attached thru shared memory" >&5 # Check whether --enable-SHM or --disable-SHM was given. if test "${enable_SHM+set}" = set; then enableval="$enable_SHM" @@ -7939,7 +7937,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking for default inclusion of all suitable non-PARSE clocks""... $ac_c" 1>&6 -echo "configure:7943: checking for default inclusion of all suitable non-PARSE clocks" >&5 +echo "configure:7941: checking for default inclusion of all suitable non-PARSE clocks" >&5 # Check whether --enable-all-clocks or --disable-all-clocks was given. if test "${enable_all_clocks+set}" = set; then enableval="$enable_all_clocks" @@ -7951,7 +7949,7 @@ fi echo "$ac_t""$ntp_eac" 1>&6 echo $ac_n "checking if we have support for PARSE clocks""... $ac_c" 1>&6 -echo "configure:7955: checking if we have support for PARSE clocks" >&5 +echo "configure:7953: checking if we have support for PARSE clocks" >&5 case "$ac_cv_header_termio_h$ac_cv_header_termios_h" in *yes*) ntp_canparse=yes @@ -7963,14 +7961,14 @@ echo "$ac_t""$ntp_canparse" 1>&6 # Requires modem control echo $ac_n "checking ACTS modem service""... $ac_c" 1>&6 -echo "configure:7967: checking ACTS modem service" >&5 +echo "configure:7965: checking ACTS modem service" >&5 # Check whether --enable-ACTS or --disable-ACTS was given. if test "${enable_ACTS+set}" = set; then enableval="$enable_ACTS" ntp_ok=$enableval else cat > conftest.$ac_ext < #ifdef HAVE_SYS_IOCTL_H @@ -8003,7 +8001,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Arbiter 1088A/B GPS receiver""... $ac_c" 1>&6 -echo "configure:8007: checking Arbiter 1088A/B GPS receiver" >&5 +echo "configure:8005: checking Arbiter 1088A/B GPS receiver" >&5 # Check whether --enable-ARBITER or --disable-ARBITER was given. if test "${enable_ARBITER+set}" = set; then enableval="$enable_ARBITER" @@ -8022,7 +8020,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Arcron MSF receiver""... $ac_c" 1>&6 -echo "configure:8026: checking Arcron MSF receiver" >&5 +echo "configure:8024: checking Arcron MSF receiver" >&5 # Check whether --enable-ARCRON_MSF or --disable-ARCRON_MSF was given. if test "${enable_ARCRON_MSF+set}" = set; then enableval="$enable_ARCRON_MSF" @@ -8041,7 +8039,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Austron 2200A/2201A GPS receiver""... $ac_c" 1>&6 -echo "configure:8045: checking Austron 2200A/2201A GPS receiver" >&5 +echo "configure:8043: checking Austron 2200A/2201A GPS receiver" >&5 # Check whether --enable-AS2201 or --disable-AS2201 was given. if test "${enable_AS2201+set}" = set; then enableval="$enable_AS2201" @@ -8060,7 +8058,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking PPS interface""... $ac_c" 1>&6 -echo "configure:8064: checking PPS interface" >&5 +echo "configure:8062: checking PPS interface" >&5 # Check whether --enable-ATOM or --disable-ATOM was given. if test "${enable_ATOM+set}" = set; then enableval="$enable_ATOM" @@ -8079,7 +8077,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking CHU modem/decoder""... $ac_c" 1>&6 -echo "configure:8083: checking CHU modem/decoder" >&5 +echo "configure:8081: checking CHU modem/decoder" >&5 # Check whether --enable-CHU or --disable-CHU was given. if test "${enable_CHU+set}" = set; then enableval="$enable_CHU" @@ -8099,7 +8097,7 @@ echo "$ac_t""$ntp_ok" 1>&6 ac_refclock_chu=$ntp_ok echo $ac_n "checking CHU audio/decoder""... $ac_c" 1>&6 -echo "configure:8103: checking CHU audio/decoder" >&5 +echo "configure:8101: checking CHU audio/decoder" >&5 # Check whether --enable-AUDIO-CHU or --disable-AUDIO-CHU was given. if test "${enable_AUDIO_CHU+set}" = set; then enableval="$enable_AUDIO_CHU" @@ -8123,7 +8121,7 @@ esac # Not under HP-UX echo $ac_n "checking Datum Programmable Time System""... $ac_c" 1>&6 -echo "configure:8127: checking Datum Programmable Time System" >&5 +echo "configure:8125: checking Datum Programmable Time System" >&5 # Check whether --enable-DATUM or --disable-DATUM was given. if test "${enable_DATUM+set}" = set; then enableval="$enable_DATUM" @@ -8149,14 +8147,14 @@ echo "$ac_t""$ntp_ok" 1>&6 # Requires modem control echo $ac_n "checking Heath GC-1000 WWV/WWVH receiver""... $ac_c" 1>&6 -echo "configure:8153: checking Heath GC-1000 WWV/WWVH receiver" >&5 +echo "configure:8151: checking Heath GC-1000 WWV/WWVH receiver" >&5 # Check whether --enable-HEATH or --disable-HEATH was given. if test "${enable_HEATH+set}" = set; then enableval="$enable_HEATH" ntp_ok=$enableval else cat > conftest.$ac_ext < #ifdef HAVE_SYS_IOCTL_H @@ -8189,7 +8187,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking HP 58503A GPS receiver""... $ac_c" 1>&6 -echo "configure:8193: checking HP 58503A GPS receiver" >&5 +echo "configure:8191: checking HP 58503A GPS receiver" >&5 # Check whether --enable-HPGPS or --disable-HPGPS was given. if test "${enable_HPGPS+set}" = set; then enableval="$enable_HPGPS" @@ -8208,7 +8206,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Sun IRIG audio decoder""... $ac_c" 1>&6 -echo "configure:8212: checking Sun IRIG audio decoder" >&5 +echo "configure:8210: checking Sun IRIG audio decoder" >&5 # Check whether --enable-IRIG or --disable-IRIG was given. if test "${enable_IRIG+set}" = set; then enableval="$enable_IRIG" @@ -8236,7 +8234,7 @@ case "$ntp_ok$ac_cv_header_sun_audioio_h$ac_cv_header_sys_audioio_h" in esac echo $ac_n "checking Leitch CSD 5300 Master Clock System Driver""... $ac_c" 1>&6 -echo "configure:8240: checking Leitch CSD 5300 Master Clock System Driver" >&5 +echo "configure:8238: checking Leitch CSD 5300 Master Clock System Driver" >&5 # Check whether --enable-LEITCH or --disable-LEITCH was given. if test "${enable_LEITCH+set}" = set; then enableval="$enable_LEITCH" @@ -8255,7 +8253,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking local clock reference""... $ac_c" 1>&6 -echo "configure:8259: checking local clock reference" >&5 +echo "configure:8257: checking local clock reference" >&5 # Check whether --enable-LOCAL-CLOCK or --disable-LOCAL-CLOCK was given. if test "${enable_LOCAL_CLOCK+set}" = set; then enableval="$enable_LOCAL_CLOCK" @@ -8274,7 +8272,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking EES M201 MSF receiver""... $ac_c" 1>&6 -echo "configure:8278: checking EES M201 MSF receiver" >&5 +echo "configure:8276: checking EES M201 MSF receiver" >&5 # Check whether --enable-MSFEES or --disable-MSFEES was given. if test "${enable_MSFEES+set}" = set; then enableval="$enable_MSFEES" @@ -8294,7 +8292,7 @@ echo "$ac_t""$ntp_ok" 1>&6 # Not Ultrix echo $ac_n "checking Magnavox MX4200 GPS receiver""... $ac_c" 1>&6 -echo "configure:8298: checking Magnavox MX4200 GPS receiver" >&5 +echo "configure:8296: checking Magnavox MX4200 GPS receiver" >&5 # Check whether --enable-MX4200 or --disable-MX4200 was given. if test "${enable_MX4200+set}" = set; then enableval="$enable_MX4200" @@ -8321,7 +8319,7 @@ case "$ntp_ok$target" in esac echo $ac_n "checking NMEA GPS receiver""... $ac_c" 1>&6 -echo "configure:8325: checking NMEA GPS receiver" >&5 +echo "configure:8323: checking NMEA GPS receiver" >&5 # Check whether --enable-NMEA or --disable-NMEA was given. if test "${enable_NMEA+set}" = set; then enableval="$enable_NMEA" @@ -8340,7 +8338,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking for ONCORE Motorola VP/UT Oncore GPS""... $ac_c" 1>&6 -echo "configure:8344: checking for ONCORE Motorola VP/UT Oncore GPS" >&5 +echo "configure:8342: checking for ONCORE Motorola VP/UT Oncore GPS" >&5 # Check whether --enable-ONCORE or --disable-ONCORE was given. if test "${enable_ONCORE+set}" = set; then enableval="$enable_ONCORE" @@ -8362,7 +8360,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking for Palisade clock""... $ac_c" 1>&6 -echo "configure:8366: checking for Palisade clock" >&5 +echo "configure:8364: checking for Palisade clock" >&5 # Check whether --enable-PALISADE or --disable-PALISADE was given. if test "${enable_PALISADE+set}" = set; then enableval="$enable_PALISADE" @@ -8388,7 +8386,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking PST/Traconex 1020 WWV/WWVH receiver""... $ac_c" 1>&6 -echo "configure:8392: checking PST/Traconex 1020 WWV/WWVH receiver" >&5 +echo "configure:8390: checking PST/Traconex 1020 WWV/WWVH receiver" >&5 # Check whether --enable-PST or --disable-PST was given. if test "${enable_PST+set}" = set; then enableval="$enable_PST" @@ -8408,7 +8406,7 @@ echo "$ac_t""$ntp_ok" 1>&6 # Not Ultrix echo $ac_n "checking Rockwell Jupiter GPS receiver""... $ac_c" 1>&6 -echo "configure:8412: checking Rockwell Jupiter GPS receiver" >&5 +echo "configure:8410: checking Rockwell Jupiter GPS receiver" >&5 # Check whether --enable-JUPITER or --disable-JUPITER was given. if test "${enable_JUPITER+set}" = set; then enableval="$enable_JUPITER" @@ -8436,14 +8434,14 @@ esac # Requires modem control echo $ac_n "checking PTB modem service""... $ac_c" 1>&6 -echo "configure:8440: checking PTB modem service" >&5 +echo "configure:8438: checking PTB modem service" >&5 # Check whether --enable-PTBACTS or --disable-PTBACTS was given. if test "${enable_PTBACTS+set}" = set; then enableval="$enable_PTBACTS" ntp_ok=$enableval else cat > conftest.$ac_ext < #ifdef HAVE_SYS_IOCTL_H @@ -8476,7 +8474,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking KSI/Odetics TPRO/S GPS receiver/IRIG interface""... $ac_c" 1>&6 -echo "configure:8480: checking KSI/Odetics TPRO/S GPS receiver/IRIG interface" >&5 +echo "configure:8478: checking KSI/Odetics TPRO/S GPS receiver/IRIG interface" >&5 # Check whether --enable-TPRO or --disable-TPRO was given. if test "${enable_TPRO+set}" = set; then enableval="$enable_TPRO" @@ -8504,7 +8502,7 @@ case "$ntp_ok$ac_cv_header_sys_tpro" in esac echo $ac_n "checking TRAK 8810 GPS receiver""... $ac_c" 1>&6 -echo "configure:8508: checking TRAK 8810 GPS receiver" >&5 +echo "configure:8506: checking TRAK 8810 GPS receiver" >&5 # Check whether --enable-TRAK or --disable-TRAK was given. if test "${enable_TRAK+set}" = set; then enableval="$enable_TRAK" @@ -8523,7 +8521,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Chrono-log K-series WWVB receiver""... $ac_c" 1>&6 -echo "configure:8527: checking Chrono-log K-series WWVB receiver" >&5 +echo "configure:8525: checking Chrono-log K-series WWVB receiver" >&5 # Check whether --enable-CHRONOLOG or --disable-CHRONOLOG was given. if test "${enable_CHRONOLOG+set}" = set; then enableval="$enable_CHRONOLOG" @@ -8542,7 +8540,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Dumb generic hh:mm:ss local clock""... $ac_c" 1>&6 -echo "configure:8546: checking Dumb generic hh:mm:ss local clock" >&5 +echo "configure:8544: checking Dumb generic hh:mm:ss local clock" >&5 # Check whether --enable-DUMBCLOCK or --disable-DUMBCLOCK was given. if test "${enable_DUMBCLOCK+set}" = set; then enableval="$enable_DUMBCLOCK" @@ -8562,7 +8560,7 @@ echo "$ac_t""$ntp_ok" 1>&6 # Not on a vax-dec-bsd echo $ac_n "checking Kinemetrics/TrueTime receivers""... $ac_c" 1>&6 -echo "configure:8566: checking Kinemetrics/TrueTime receivers" >&5 +echo "configure:8564: checking Kinemetrics/TrueTime receivers" >&5 # Check whether --enable-TRUETIME or --disable-TRUETIME was given. if test "${enable_TRUETIME+set}" = set; then enableval="$enable_TRUETIME" @@ -8591,7 +8589,7 @@ case "$ntp_ok$target" in esac echo $ac_n "checking Spectracom 8170/Netclock/2 WWVB receiver""... $ac_c" 1>&6 -echo "configure:8595: checking Spectracom 8170/Netclock/2 WWVB receiver" >&5 +echo "configure:8593: checking Spectracom 8170/Netclock/2 WWVB receiver" >&5 # Check whether --enable-WWVB or --disable-WWVB was given. if test "${enable_WWVB+set}" = set; then enableval="$enable_WWVB" @@ -8610,7 +8608,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Ultralink M320 WWVB receiver""... $ac_c" 1>&6 -echo "configure:8614: checking Ultralink M320 WWVB receiver" >&5 +echo "configure:8612: checking Ultralink M320 WWVB receiver" >&5 # Check whether --enable-ULINK or --disable-ULINK was given. if test "${enable_ULINK+set}" = set; then enableval="$enable_ULINK" @@ -8630,14 +8628,14 @@ echo "$ac_t""$ntp_ok" 1>&6 # Requires modem control echo $ac_n "checking USNO modem service""... $ac_c" 1>&6 -echo "configure:8634: checking USNO modem service" >&5 +echo "configure:8632: checking USNO modem service" >&5 # Check whether --enable-USNO or --disable-USNO was given. if test "${enable_USNO+set}" = set; then enableval="$enable_USNO" ntp_ok=$enableval else cat > conftest.$ac_ext < #ifdef HAVE_SYS_IOCTL_H @@ -8670,7 +8668,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking for default inclusion of all suitable PARSE clocks""... $ac_c" 1>&6 -echo "configure:8674: checking for default inclusion of all suitable PARSE clocks" >&5 +echo "configure:8672: checking for default inclusion of all suitable PARSE clocks" >&5 # Check whether --enable-parse-clocks or --disable-parse-clocks was given. if test "${enable_parse_clocks+set}" = set; then enableval="$enable_parse_clocks" @@ -8700,7 +8698,7 @@ ntp_parseutil=no ntp_rawdcf=no echo $ac_n "checking Diem Computime Radio Clock""... $ac_c" 1>&6 -echo "configure:8704: checking Diem Computime Radio Clock" >&5 +echo "configure:8702: checking Diem Computime Radio Clock" >&5 # Check whether --enable-COMPUTIME or --disable-COMPUTIME was given. if test "${enable_COMPUTIME+set}" = set; then enableval="$enable_COMPUTIME" @@ -8725,7 +8723,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking ELV/DCF7000 clock""... $ac_c" 1>&6 -echo "configure:8729: checking ELV/DCF7000 clock" >&5 +echo "configure:8727: checking ELV/DCF7000 clock" >&5 # Check whether --enable-DCF7000 or --disable-DCF7000 was given. if test "${enable_DCF7000+set}" = set; then enableval="$enable_DCF7000" @@ -8750,7 +8748,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking HOPF 6021 clock""... $ac_c" 1>&6 -echo "configure:8754: checking HOPF 6021 clock" >&5 +echo "configure:8752: checking HOPF 6021 clock" >&5 # Check whether --enable-HOPF6021 or --disable-HOPF6021 was given. if test "${enable_HOPF6021+set}" = set; then enableval="$enable_HOPF6021" @@ -8775,7 +8773,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking Meinberg clocks""... $ac_c" 1>&6 -echo "configure:8779: checking Meinberg clocks" >&5 +echo "configure:8777: checking Meinberg clocks" >&5 # Check whether --enable-MEINBERG or --disable-MEINBERG was given. if test "${enable_MEINBERG+set}" = set; then enableval="$enable_MEINBERG" @@ -8800,7 +8798,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking DCF77 raw time code""... $ac_c" 1>&6 -echo "configure:8804: checking DCF77 raw time code" >&5 +echo "configure:8802: checking DCF77 raw time code" >&5 # Check whether --enable-RAWDCF or --disable-RAWDCF was given. if test "${enable_RAWDCF+set}" = set; then enableval="$enable_RAWDCF" @@ -8829,7 +8827,7 @@ esac case "$ntp_rawdcf" in yes) echo $ac_n "checking if we must enable parity for RAWDCF""... $ac_c" 1>&6 -echo "configure:8833: checking if we must enable parity for RAWDCF" >&5 +echo "configure:8831: checking if we must enable parity for RAWDCF" >&5 if eval "test \"\${ac_cv_var_rawdcf_parity+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8857,7 +8855,7 @@ EOF esac echo $ac_n "checking RCC 8000 clock""... $ac_c" 1>&6 -echo "configure:8861: checking RCC 8000 clock" >&5 +echo "configure:8859: checking RCC 8000 clock" >&5 # Check whether --enable-RCC8000 or --disable-RCC8000 was given. if test "${enable_RCC8000+set}" = set; then enableval="$enable_RCC8000" @@ -8882,7 +8880,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking Schmid DCF77 clock""... $ac_c" 1>&6 -echo "configure:8886: checking Schmid DCF77 clock" >&5 +echo "configure:8884: checking Schmid DCF77 clock" >&5 # Check whether --enable-SCHMID or --disable-SCHMID was given. if test "${enable_SCHMID+set}" = set; then enableval="$enable_SCHMID" @@ -8907,7 +8905,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking Trimble GPS receiver/TAIP protocol""... $ac_c" 1>&6 -echo "configure:8911: checking Trimble GPS receiver/TAIP protocol" >&5 +echo "configure:8909: checking Trimble GPS receiver/TAIP protocol" >&5 # Check whether --enable-TRIMTAIP or --disable-TRIMTAIP was given. if test "${enable_TRIMTAIP+set}" = set; then enableval="$enable_TRIMTAIP" @@ -8932,7 +8930,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking Trimble GPS receiver/TSIP protocol""... $ac_c" 1>&6 -echo "configure:8936: checking Trimble GPS receiver/TSIP protocol" >&5 +echo "configure:8934: checking Trimble GPS receiver/TSIP protocol" >&5 # Check whether --enable-TRIMTSIP or --disable-TRIMTSIP was given. if test "${enable_TRIMTSIP+set}" = set; then enableval="$enable_TRIMTSIP" @@ -8957,7 +8955,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking WHARTON 400A Series clock""... $ac_c" 1>&6 -echo "configure:8961: checking WHARTON 400A Series clock" >&5 +echo "configure:8959: checking WHARTON 400A Series clock" >&5 # Check whether --enable-WHARTON or --disable-WHARTON was given. if test "${enable_WHARTON+set}" = set; then enableval="$enable_WHARTON" @@ -8982,7 +8980,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking VARITEXT clock""... $ac_c" 1>&6 -echo "configure:8986: checking VARITEXT clock" >&5 +echo "configure:8984: checking VARITEXT clock" >&5 # Check whether --enable-VARITEXT or --disable-VARITEXT was given. if test "${enable_VARITEXT+set}" = set; then enableval="$enable_VARITEXT" @@ -9010,7 +9008,7 @@ esac echo $ac_n "checking if we need to make and use the parse libraries""... $ac_c" 1>&6 -echo "configure:9014: checking if we need to make and use the parse libraries" >&5 +echo "configure:9012: checking if we need to make and use the parse libraries" >&5 ans=no case "$ntp_libparse" in yes) @@ -9038,7 +9036,7 @@ echo "$ac_t""$ans" 1>&6 echo $ac_n "checking if we need to make and use the RSAREF library""... $ac_c" 1>&6 -echo "configure:9042: checking if we need to make and use the RSAREF library" >&5 +echo "configure:9040: checking if we need to make and use the RSAREF library" >&5 ans=no if test -f $srcdir/rsaref2/source/rsa.c then @@ -9056,7 +9054,7 @@ echo "$ac_t""$ans" 1>&6 echo $ac_n "checking if we can make dcf parse utilities""... $ac_c" 1>&6 -echo "configure:9060: checking if we can make dcf parse utilities" >&5 +echo "configure:9058: checking if we can make dcf parse utilities" >&5 ans=no if test "$ntp_parseutil" = "yes"; then case "$target" in @@ -9071,7 +9069,7 @@ echo "$ac_t""$ans" 1>&6 echo $ac_n "checking if we can build kernel streams modules for parse""... $ac_c" 1>&6 -echo "configure:9075: checking if we can build kernel streams modules for parse" >&5 +echo "configure:9073: checking if we can build kernel streams modules for parse" >&5 ans=no case "$ntp_parseutil$ac_cv_header_sys_stropts_h" in yesyes) @@ -9098,7 +9096,7 @@ esac echo "$ac_t""$ans" 1>&6 echo $ac_n "checking if we need basic refclock support""... $ac_c" 1>&6 -echo "configure:9102: checking if we need basic refclock support" >&5 +echo "configure:9100: checking if we need basic refclock support" >&5 if test "$ntp_refclock" = "yes"; then cat >> confdefs.h <<\EOF #define REFCLOCK 1 @@ -9110,7 +9108,7 @@ echo "$ac_t""$ntp_refclock" 1>&6 echo $ac_n "checking if we want HP-UX adjtimed support""... $ac_c" 1>&6 -echo "configure:9114: checking if we want HP-UX adjtimed support" >&5 +echo "configure:9112: checking if we want HP-UX adjtimed support" >&5 case "$target" in *-*-hpux[56789]*) ans=yes @@ -9128,7 +9126,7 @@ fi echo "$ac_t""$ans" 1>&6 echo $ac_n "checking if we can read kmem""... $ac_c" 1>&6 -echo "configure:9132: checking if we can read kmem" >&5 +echo "configure:9130: checking if we can read kmem" >&5 if eval "test \"\${ac_cv_var_can_kmem+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9181,7 +9179,7 @@ EOF esac echo $ac_n "checking if adjtime is accurate""... $ac_c" 1>&6 -echo "configure:9185: checking if adjtime is accurate" >&5 +echo "configure:9183: checking if adjtime is accurate" >&5 if eval "test \"\${ac_cv_var_adjtime_is_accurate+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9233,7 +9231,7 @@ EOF esac echo $ac_n "checking the name of 'tick' in the kernel""... $ac_c" 1>&6 -echo "configure:9237: checking the name of 'tick' in the kernel" >&5 +echo "configure:9235: checking the name of 'tick' in the kernel" >&5 if eval "test \"\${ac_cv_var_nlist_tick+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9277,7 +9275,7 @@ EOF esac # echo $ac_n "checking for the units of 'tick'""... $ac_c" 1>&6 -echo "configure:9281: checking for the units of 'tick'" >&5 +echo "configure:9279: checking for the units of 'tick'" >&5 if eval "test \"\${ac_cv_var_tick_nano+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9301,7 +9299,7 @@ EOF esac # echo $ac_n "checking the name of 'tickadj' in the kernel""... $ac_c" 1>&6 -echo "configure:9305: checking the name of 'tickadj' in the kernel" >&5 +echo "configure:9303: checking the name of 'tickadj' in the kernel" >&5 if eval "test \"\${ac_cv_var_nlist_tickadj+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9354,7 +9352,7 @@ EOF esac # echo $ac_n "checking for the units of 'tickadj'""... $ac_c" 1>&6 -echo "configure:9358: checking for the units of 'tickadj'" >&5 +echo "configure:9356: checking for the units of 'tickadj'" >&5 if eval "test \"\${ac_cv_var_tickadj_nano+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9378,7 +9376,7 @@ EOF esac # echo $ac_n "checking half-heartedly for 'dosynctodr' in the kernel""... $ac_c" 1>&6 -echo "configure:9382: checking half-heartedly for 'dosynctodr' in the kernel" >&5 +echo "configure:9380: checking half-heartedly for 'dosynctodr' in the kernel" >&5 if eval "test \"\${ac_cv_var_nlist_dosynctodr+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9431,7 +9429,7 @@ EOF esac # echo $ac_n "checking half-heartedly for 'noprintf' in the kernel""... $ac_c" 1>&6 -echo "configure:9435: checking half-heartedly for 'noprintf' in the kernel" >&5 +echo "configure:9433: checking half-heartedly for 'noprintf' in the kernel" >&5 if eval "test \"\${ac_cv_var_nlist_noprintf+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9481,7 +9479,7 @@ esac echo $ac_n "checking for a default value for 'tick'""... $ac_c" 1>&6 -echo "configure:9485: checking for a default value for 'tick'" >&5 +echo "configure:9483: checking for a default value for 'tick'" >&5 if eval "test \"\${ac_cv_var_tick+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9525,7 +9523,7 @@ EOF esac echo $ac_n "checking for a default value for 'tickadj'""... $ac_c" 1>&6 -echo "configure:9529: checking for a default value for 'tickadj'" >&5 +echo "configure:9527: checking for a default value for 'tickadj'" >&5 if eval "test \"\${ac_cv_var_tickadj+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9598,7 +9596,14 @@ esac # Unfortunately, there is no easy way to know if particular release # has this "feature" or any obvious way to test for it. case "$target" in - *-*-sco3.2v5*|mips-sni-sysv4*) cat >> confdefs.h <<\EOF + mips-sni-sysv4*) cat >> confdefs.h <<\EOF +#define RELIANTUNIX_CLOCK 1 +EOF + ;; +esac + +case "$target" in + *-*-sco3.2v5*) cat >> confdefs.h <<\EOF #define SCO5_CLOCK 1 EOF ;; @@ -9651,7 +9656,7 @@ esac echo $ac_n "checking if we want and can make the tickadj utility""... $ac_c" 1>&6 -echo "configure:9655: checking if we want and can make the tickadj utility" >&5 +echo "configure:9660: checking if we want and can make the tickadj utility" >&5 if eval "test \"\${ac_cv_make_tickadj+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9667,14 +9672,11 @@ esac echo $ac_n "checking if we want and can make the ntptime utility""... $ac_c" 1>&6 -echo "configure:9671: checking if we want and can make the ntptime utility" >&5 +echo "configure:9676: 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 "$target" in - *linux*) - ans=no - ;; *) case "$ac_cv_struct_ntptimeval$ac_cv_var_kernel_pll" in yesyes) ans=yes @@ -9696,7 +9698,7 @@ case "$ac_cv_make_ntptime" in esac echo $ac_n "checking if we want UDP wildcard delivery""... $ac_c" 1>&6 -echo "configure:9700: checking if we want UDP wildcard delivery" >&5 +echo "configure:9702: 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 @@ -9775,7 +9777,7 @@ case "$host" in esac echo $ac_n "checking if we should always slew the time""... $ac_c" 1>&6 -echo "configure:9779: checking if we should always slew the time" >&5 +echo "configure:9781: 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 @@ -9815,7 +9817,7 @@ EOF esac echo $ac_n "checking if we should step and slew the time""... $ac_c" 1>&6 -echo "configure:9819: checking if we should step and slew the time" >&5 +echo "configure:9821: 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 @@ -9858,7 +9860,7 @@ EOF esac echo $ac_n "checking if ntpdate should step the time""... $ac_c" 1>&6 -echo "configure:9862: checking if ntpdate should step the time" >&5 +echo "configure:9864: 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 @@ -9889,7 +9891,7 @@ EOF esac echo $ac_n "checking if we should sync TODR clock every hour""... $ac_c" 1>&6 -echo "configure:9893: checking if we should sync TODR clock every hour" >&5 +echo "configure:9895: 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 @@ -9922,7 +9924,7 @@ EOF esac echo $ac_n "checking if we should avoid kernel FLL bug""... $ac_c" 1>&6 -echo "configure:9926: checking if we should avoid kernel FLL bug" >&5 +echo "configure:9928: 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 998091d5eb..ee64409f5c 100644 --- a/configure.in +++ b/configure.in @@ -2599,7 +2599,11 @@ esac # Unfortunately, there is no easy way to know if particular release # has this "feature" or any obvious way to test for it. case "$target" in - *-*-sco3.2v5*|mips-sni-sysv4*) AC_DEFINE(SCO5_CLOCK) ;; + mips-sni-sysv4*) AC_DEFINE(RELIANTUNIX_CLOCK) ;; +esac + +case "$target" in + *-*-sco3.2v5*) AC_DEFINE(SCO5_CLOCK) ;; esac ac_cv_make_tickadj=yes diff --git a/libntp/systime.c b/libntp/systime.c index 8f97692943..5f388f9674 100644 --- a/libntp/systime.c +++ b/libntp/systime.c @@ -82,8 +82,10 @@ get_systime( (void) GETTIMEOFDAY(&tv, (struct timezone *)0); now->l_i = tv.tv_sec + JAN_1970; -#if defined SCO5_CLOCK +#if defined(SCO5_CLOCK) || defined(RELIANTUNIX_CLOCK) +#if defined(SCO5_CLOCK) if (sco5_oldclock == 1) { +#endif /* SCO5_CLOCK */ /* fake better than 10ms resolution by interpolating accumulated residual (in adj_systime(), see below) */ dtemp = tv.tv_usec / 1e6; @@ -95,9 +97,11 @@ get_systime( } } dtemp *= FRAC; +#if defined(SCO5_CLOCK) } else /* HEY!!! Watch this "else" statement ... */ #endif /* SCO5_CLOCK */ +#endif /* SCO5_CLOCK || RELIANTUNIX_CLOCK */ { /* HEY!!! See that "else" statement up there??? */ dtemp = tv.tv_usec * FRAC / 1e6; } @@ -140,8 +144,10 @@ adj_systime( dtemp = -dtemp; } -#if defined SCO5_CLOCK +#if defined(SCO5_CLOCK) || defined(RELIANTUNIX_CLOCK) +#if defined(SCO5_CLOCK) if (sco5_oldclock == 1) { +#endif /* SCO5_CLOCK */ /* accumulate changes until we have enough to adjust a tick */ if (dtemp < 5000e-6) { if (isneg) sys_residual = -dtemp; @@ -153,12 +159,14 @@ adj_systime( else sys_residual = dtemp - 10000e-6; dtemp = 10000e-6; } +#if defined(SCO5_CLOCK) } else { if (dtemp > sys_maxfreq) dtemp = sys_maxfreq; } -#else /* SCO5_CLOCK */ +#endif /* SCO5_CLOCK */ +#else /* SCO5_CLOCK || RELIANTUNIX_CLOCK */ if (dtemp > sys_maxfreq) dtemp = sys_maxfreq; #endif /* SCO5_CLOCK */