From: Harlan Stenn Date: Mon, 8 Nov 1999 04:25:41 +0000 (-0000) Subject: Many files: X-Git-Tag: NTP_4_0_98_E~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3e1f073258bde206940c27decffd3a00d2ab39f;p=thirdparty%2Fntp.git Many files: * configure.in (HAVE_MLOCKALL): Deal with dec-osf5 realities * ntpd/refclock_ulink.c (ulink_poll): Fix cast. * libntp/machines.c (ntp_set_tod): Use a long* for the argument to stime(). Reported by: Tom Smith * ntpd/ntpd.c (set_process_priority): Use whatever we have until something works. bk: 382650c5BGTvkhy2Nyuaitd4nctuPg --- diff --git a/ChangeLog b/ChangeLog index e092e56d34..7ed14fd2b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 1999-11-07 Harlan Stenn + * configure.in (HAVE_MLOCKALL): Deal with dec-osf5 realities + * ntpd/refclock_ulink.c (ulink_poll): Fix cast. + * libntp/machines.c (ntp_set_tod): Use a long* for the argument to + stime(). + Reported by: Tom Smith + + * ntpd/ntpd.c (set_process_priority): Use whatever we have until + something works. + * ntpd/ntp_loopfilter.c: Keep clock_frequency changes in a temp variable so we can record it to loopstats (near as HMS can tell). From: Dave Mills diff --git a/configure b/configure index 83154c9786..f67506e289 100755 --- a/configure +++ b/configure @@ -5470,16 +5470,132 @@ case "$target" in ;; *-*-sco3.2v5.0.*) # Just stubs. Idiots. + ;; + alpha*-dec-osf5*) + # mlockall is there, as a #define calling memlk via + # Not easy to test for - cheat. + for ac_func in memlk +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:5481: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); +char (*f)(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +f = $ac_func; +#endif + +; return 0; } +EOF +if { (eval echo configure:5510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + for ac_func in mlockall +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:5537: checking for $ac_func" >&5 +if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); +char (*f)(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +f = $ac_func; +#endif + +; return 0; } +EOF +if { (eval echo configure:5566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + ;; *) for ac_func in mlockall do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5478: checking for $ac_func" >&5 +echo "configure:5594: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5532,12 +5648,12 @@ esac for ac_func in nice nlist do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5536: checking for $ac_func" >&5 +echo "configure:5652: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5592,12 +5708,12 @@ case "$target" in *) for ac_func in ntp_adjtime ntp_gettime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5596: checking for $ac_func" >&5 +echo "configure:5712: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5650,12 +5766,12 @@ esac for ac_func in plock pututline pututxline rtprio do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5654: checking for $ac_func" >&5 +echo "configure:5770: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5706,12 +5822,12 @@ done for ac_func in random srandom mrand48 srand48 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5710: checking for $ac_func" >&5 +echo "configure:5826: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5769,12 +5885,12 @@ case "$target" in *) for ac_func in sched_setscheduler do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5773: checking for $ac_func" >&5 +echo "configure:5889: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5827,12 +5943,12 @@ esac for ac_func in setlinebuf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5831: checking for $ac_func" >&5 +echo "configure:5947: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5883,12 +5999,12 @@ done for ac_func in setpgid setpriority setsid settimeofday setvbuf sigaction do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5887: checking for $ac_func" >&5 +echo "configure:6003: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5939,12 +6055,12 @@ done for ac_func in sigvec sigset sigsuspend stime strchr sysconf sysctl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5943: checking for $ac_func" >&5 +echo "configure:6059: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5995,12 +6111,12 @@ done for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5999: checking for $ac_func" >&5 +echo "configure:6115: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6063,12 +6179,12 @@ case "$target" in *) for ac_func in timer_create timer_settime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6067: checking for $ac_func" >&5 +echo "configure:6183: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6125,12 +6241,12 @@ case "$target" in *) for ac_func in umask do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6129: checking for $ac_func" >&5 +echo "configure:6245: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6183,12 +6299,12 @@ esac for ac_func in uname updwtmp updwtmpx vsprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6187: checking for $ac_func" >&5 +echo "configure:6303: checking for $ac_func" >&5 if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6238,12 +6354,12 @@ done echo $ac_n "checking number of arguments to gettimeofday()""... $ac_c" 1>&6 -echo "configure:6242: checking number of arguments to gettimeofday()" >&5 +echo "configure:6358: checking number of arguments to gettimeofday()" >&5 if eval "test \"\${ac_cv_func_Xettimeofday_nargs+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -6253,7 +6369,7 @@ settimeofday((struct timeval*)0,(struct timezone*)0); ; return 0; } EOF -if { (eval echo configure:6257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_Xettimeofday_nargs=2 else @@ -6275,12 +6391,12 @@ EOF fi echo $ac_n "checking number of arguments taken by setpgrp()""... $ac_c" 1>&6 -echo "configure:6279: checking number of arguments taken by setpgrp()" >&5 +echo "configure:6395: checking number of arguments taken by setpgrp()" >&5 if eval "test \"\${ac_cv_func_setpgrp_nargs+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_setpgrp_nargs=2 else @@ -6319,12 +6435,12 @@ save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -I$srcdir/include" echo $ac_n "checking argument pointer type of qsort()'s compare function and base""... $ac_c" 1>&6 -echo "configure:6323: checking argument pointer type of qsort()'s compare function and base" >&5 +echo "configure:6439: checking argument pointer type of qsort()'s compare function and base" >&5 if eval "test \"\${ac_cv_func_qsort_argtype+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_qsort_argtype=void else @@ -6373,12 +6489,12 @@ esac CFLAGS=$save_CFLAGS echo $ac_n "checking if we need to declare 'errno'""... $ac_c" 1>&6 -echo "configure:6377: checking if we need to declare 'errno'" >&5 +echo "configure:6493: checking if we need to declare 'errno'" >&5 if eval "test \"\${ac_cv_decl_errno+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -6387,7 +6503,7 @@ int main() { errno = 0; ; return 0; } EOF -if { (eval echo configure:6391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_errno=no else @@ -6408,12 +6524,12 @@ EOF esac echo $ac_n "checking if we may declare 'h_errno'""... $ac_c" 1>&6 -echo "configure:6412: checking if we may declare 'h_errno'" >&5 +echo "configure:6528: checking if we may declare 'h_errno'" >&5 if eval "test \"\${ac_cv_decl_h_errno+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef HAVE_NETINET_IN_H @@ -6432,7 +6548,7 @@ int main() { extern int h_errno; ; return 0; } EOF -if { (eval echo configure:6436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_h_errno=yes else @@ -6453,12 +6569,12 @@ EOF esac echo $ac_n "checking if declaring 'char *sys_errlist' is ok""... $ac_c" 1>&6 -echo "configure:6457: checking if declaring 'char *sys_errlist' is ok" >&5 +echo "configure:6573: checking if declaring 'char *sys_errlist' is ok" >&5 if eval "test \"\${ac_cv_decl_sys_errlist+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef HAVE_ERRNO_H @@ -6469,7 +6585,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_errlist=yes else @@ -6490,12 +6606,12 @@ EOF esac echo $ac_n "checking if declaring 'syscall()' is ok""... $ac_c" 1>&6 -echo "configure:6494: checking if declaring 'syscall()' is ok" >&5 +echo "configure:6610: checking if declaring 'syscall()' is ok" >&5 if eval "test \"\${ac_cv_decl_syscall+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_syscall=yes else @@ -6801,7 +6917,7 @@ EOF esac echo $ac_n "checking if we should use a streams device for ifconfig""... $ac_c" 1>&6 -echo "configure:6805: checking if we should use a streams device for ifconfig" >&5 +echo "configure:6921: checking if we should use a streams device for ifconfig" >&5 if eval "test \"\${ac_cv_var_use_streams_device_for_ifconfig+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6811,7 +6927,7 @@ fi echo "$ac_t""$ac_cv_var_use_streams_device_for_ifconfig" 1>&6 echo $ac_n "checking if we need extra room for SO_RCVBUF""... $ac_c" 1>&6 -echo "configure:6815: checking if we need extra room for SO_RCVBUF" >&5 +echo "configure:6931: checking if we need extra room for SO_RCVBUF" >&5 if eval "test \"\${ac_cv_var_rcvbuf_slop+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6833,7 +6949,7 @@ EOF esac echo $ac_n "checking if we will open the broadcast socket""... $ac_c" 1>&6 -echo "configure:6837: checking if we will open the broadcast socket" >&5 +echo "configure:6953: checking if we will open the broadcast socket" >&5 if eval "test \"\${ac_cv_var_open_bcast_socket+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6858,7 +6974,7 @@ EOF esac echo $ac_n "checking if we want the HPUX version of FindConfig()""... $ac_c" 1>&6 -echo "configure:6862: checking if we want the HPUX version of FindConfig()" >&5 +echo "configure:6978: checking if we want the HPUX version of FindConfig()" >&5 if eval "test \"\${ac_cv_var_hpux_findconfig+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6880,7 +6996,7 @@ EOF esac echo $ac_n "checking if process groups are set with -pid""... $ac_c" 1>&6 -echo "configure:6884: checking if process groups are set with -pid" >&5 +echo "configure:7000: checking if process groups are set with -pid" >&5 if eval "test \"\${ac_cv_arg_setpgrp_negpid+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6916,7 +7032,7 @@ EOF esac echo $ac_n "checking if we need a ctty for F_SETOWN""... $ac_c" 1>&6 -echo "configure:6920: checking if we need a ctty for F_SETOWN" >&5 +echo "configure:7036: checking if we need a ctty for F_SETOWN" >&5 if eval "test \"\${ac_cv_func_ctty_for_f_setown+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6949,7 +7065,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:6953: checking if we'll use clock_settime or settimeofday or stime" >&5 +echo "configure:7069: 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='' @@ -6978,7 +7094,7 @@ case "$ntp_warning" in esac echo $ac_n "checking if we have a losing syscall()""... $ac_c" 1>&6 -echo "configure:6982: checking if we have a losing syscall()" >&5 +echo "configure:7098: 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 @@ -7001,7 +7117,7 @@ EOF esac echo $ac_n "checking for Streams/TLI""... $ac_c" 1>&6 -echo "configure:7005: checking for Streams/TLI" >&5 +echo "configure:7121: 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 @@ -7030,12 +7146,12 @@ EOF esac echo $ac_n "checking for SIGIO""... $ac_c" 1>&6 -echo "configure:7034: checking for SIGIO" >&5 +echo "configure:7150: 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 @@ -7058,7 +7174,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:7062: checking if we want to use signalled IO" >&5 +echo "configure:7178: 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 @@ -7109,12 +7225,12 @@ EOF esac echo $ac_n "checking for SIGPOLL""... $ac_c" 1>&6 -echo "configure:7113: checking for SIGPOLL" >&5 +echo "configure:7229: 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 @@ -7137,12 +7253,12 @@ fi echo "$ac_t""$ac_cv_hdr_def_sigpoll" 1>&6 echo $ac_n "checking for SIGSYS""... $ac_c" 1>&6 -echo "configure:7141: checking for SIGSYS" >&5 +echo "configure:7257: 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 @@ -7165,7 +7281,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:7169: checking if we can use SIGPOLL for UDP I/O" >&5 +echo "configure:7285: 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 @@ -7220,7 +7336,7 @@ EOF esac echo $ac_n "checking if we can use SIGPOLL for TTY I/O""... $ac_c" 1>&6 -echo "configure:7224: checking if we can use SIGPOLL for TTY I/O" >&5 +echo "configure:7340: 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 @@ -7275,7 +7391,7 @@ EOF esac echo $ac_n "checking if nlist() values might require extra indirection""... $ac_c" 1>&6 -echo "configure:7279: checking if nlist() values might require extra indirection" >&5 +echo "configure:7395: 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 @@ -7297,7 +7413,7 @@ EOF esac echo $ac_n "checking for a minimum recommended value of tickadj""... $ac_c" 1>&6 -echo "configure:7301: checking for a minimum recommended value of tickadj" >&5 +echo "configure:7417: 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 @@ -7320,7 +7436,7 @@ EOF esac echo $ac_n "checking if the TTY code permits PARENB and IGNPAR""... $ac_c" 1>&6 -echo "configure:7324: checking if the TTY code permits PARENB and IGNPAR" >&5 +echo "configure:7440: 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 @@ -7345,7 +7461,7 @@ EOF esac echo $ac_n "checking if we're including debugging code""... $ac_c" 1>&6 -echo "configure:7349: checking if we're including debugging code" >&5 +echo "configure:7465: 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" @@ -7363,7 +7479,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:7367: checking for a the number of minutes in a DST adjustment" >&5 +echo "configure:7483: 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" @@ -7379,7 +7495,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:7383: checking if we have the tty_clk line discipline/streams module" >&5 +echo "configure:7499: 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 @@ -7395,12 +7511,12 @@ EOF esac echo $ac_n "checking for AIOCTIMESTAMPCTL""... $ac_c" 1>&6 -echo "configure:7399: checking for AIOCTIMESTAMPCTL" >&5 +echo "configure:7515: 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 @@ -7435,7 +7551,7 @@ EOF esac echo $ac_n "checking for the ppsclock streams module""... $ac_c" 1>&6 -echo "configure:7439: checking for the ppsclock streams module" >&5 +echo "configure:7555: 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 @@ -7451,7 +7567,7 @@ EOF esac echo $ac_n "checking for kernel multicast support""... $ac_c" 1>&6 -echo "configure:7455: checking for kernel multicast support" >&5 +echo "configure:7571: 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 @@ -7459,7 +7575,7 @@ else case "$target" in i386-sequent-sysv4) ;; *) cat > conftest.$ac_ext < #ifdef IP_ADD_MEMBERSHIP @@ -7486,7 +7602,7 @@ EOF esac echo $ac_n "checking availability of ntp_{adj,get}time()""... $ac_c" 1>&6 -echo "configure:7490: checking availability of ntp_{adj,get}time()" >&5 +echo "configure:7606: 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 @@ -7500,7 +7616,7 @@ else ac_cv_var_ntp_syscalls=libc ;; *) cat > conftest.$ac_ext < #if defined(SYS_ntp_gettime) && defined(SYS_ntp_adjtime) @@ -7540,12 +7656,12 @@ EOF esac echo $ac_n "checking if sys/timex.h has STA_FLL""... $ac_c" 1>&6 -echo "configure:7544: checking if sys/timex.h has STA_FLL" >&5 +echo "configure:7660: 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 @@ -7568,7 +7684,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:7572: checking if we have kernel PLL support" >&5 +echo "configure:7688: 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 @@ -7592,7 +7708,7 @@ EOF esac echo $ac_n "checking if SIOCGIFCONF returns buffer size in the buffer""... $ac_c" 1>&6 -echo "configure:7596: checking if SIOCGIFCONF returns buffer size in the buffer" >&5 +echo "configure:7712: 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 @@ -7621,7 +7737,7 @@ esac echo $ac_n "checking if we want to use MD5 authentication""... $ac_c" 1>&6 -echo "configure:7625: checking if we want to use MD5 authentication" >&5 +echo "configure:7741: 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 @@ -7646,10 +7762,10 @@ esac # Check for ioctls TIOCGPPSEV echo $ac_n "checking ioctl TIOCGPPSEV""... $ac_c" 1>&6 -echo "configure:7650: checking ioctl TIOCGPPSEV" >&5 +echo "configure:7766: checking ioctl TIOCGPPSEV" >&5 if test "$ac_cv_header_termios_h" = "yes"; then cat > conftest.$ac_ext < #ifdef TIOCGPPSEV @@ -7682,10 +7798,10 @@ echo "$ac_t""$ntp_ok" 1>&6 # Check for ioctls TIOCSPPS echo $ac_n "checking ioctl TIOCSPPS""... $ac_c" 1>&6 -echo "configure:7686: checking ioctl TIOCSPPS" >&5 +echo "configure:7802: checking ioctl TIOCSPPS" >&5 if test "$ac_cv_header_termios_h" = "yes"; then cat > conftest.$ac_ext < #ifdef TIOCSPPS @@ -7717,10 +7833,10 @@ echo "$ac_t""$ntp_ok" 1>&6 # Check for ioctls CIOGETEV echo $ac_n "checking ioctl CIOGETEV""... $ac_c" 1>&6 -echo "configure:7721: checking ioctl CIOGETEV" >&5 +echo "configure:7837: checking ioctl CIOGETEV" >&5 if test "$ac_cv_header_sys_ppsclock_h" = "yes"; then cat > conftest.$ac_ext < #ifdef CIOGETEV @@ -7772,17 +7888,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:7776: checking for linux/serial.h" >&5 +echo "configure:7892: 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:7786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7902: \"$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* @@ -7804,11 +7920,11 @@ else fi echo $ac_n "checking ioctl TIOCGSERIAL""... $ac_c" 1>&6 -echo "configure:7808: checking ioctl TIOCGSERIAL" >&5 +echo "configure:7924: 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; @@ -7855,7 +7971,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:7859: checking Datum/Bancomm bc635/VME interface" >&5 +echo "configure:7975: 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" @@ -7879,7 +7995,7 @@ esac #HPUX only, and only by explicit request echo $ac_n "checking TrueTime GPS receiver/VME interface""... $ac_c" 1>&6 -echo "configure:7883: checking TrueTime GPS receiver/VME interface" >&5 +echo "configure:7999: 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" @@ -7902,7 +8018,7 @@ case "$ntp_ok$target" in esac echo $ac_n "checking for PCL720 clock support""... $ac_c" 1>&6 -echo "configure:7906: checking for PCL720 clock support" >&5 +echo "configure:8022: 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 @@ -7918,7 +8034,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:7922: checking for SHM clock attached thru shared memory" >&5 +echo "configure:8038: 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" @@ -7937,7 +8053,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:7941: checking for default inclusion of all suitable non-PARSE clocks" >&5 +echo "configure:8057: 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" @@ -7949,7 +8065,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:7953: checking if we have support for PARSE clocks" >&5 +echo "configure:8069: 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 @@ -7961,14 +8077,14 @@ echo "$ac_t""$ntp_canparse" 1>&6 # Requires modem control echo $ac_n "checking ACTS modem service""... $ac_c" 1>&6 -echo "configure:7965: checking ACTS modem service" >&5 +echo "configure:8081: 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 @@ -8001,7 +8117,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Arbiter 1088A/B GPS receiver""... $ac_c" 1>&6 -echo "configure:8005: checking Arbiter 1088A/B GPS receiver" >&5 +echo "configure:8121: 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" @@ -8020,7 +8136,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Arcron MSF receiver""... $ac_c" 1>&6 -echo "configure:8024: checking Arcron MSF receiver" >&5 +echo "configure:8140: 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" @@ -8039,7 +8155,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Austron 2200A/2201A GPS receiver""... $ac_c" 1>&6 -echo "configure:8043: checking Austron 2200A/2201A GPS receiver" >&5 +echo "configure:8159: 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" @@ -8058,7 +8174,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking PPS interface""... $ac_c" 1>&6 -echo "configure:8062: checking PPS interface" >&5 +echo "configure:8178: checking PPS interface" >&5 # Check whether --enable-ATOM or --disable-ATOM was given. if test "${enable_ATOM+set}" = set; then enableval="$enable_ATOM" @@ -8077,7 +8193,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking CHU modem/decoder""... $ac_c" 1>&6 -echo "configure:8081: checking CHU modem/decoder" >&5 +echo "configure:8197: checking CHU modem/decoder" >&5 # Check whether --enable-CHU or --disable-CHU was given. if test "${enable_CHU+set}" = set; then enableval="$enable_CHU" @@ -8097,7 +8213,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:8101: checking CHU audio/decoder" >&5 +echo "configure:8217: 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" @@ -8121,7 +8237,7 @@ esac # Not under HP-UX echo $ac_n "checking Datum Programmable Time System""... $ac_c" 1>&6 -echo "configure:8125: checking Datum Programmable Time System" >&5 +echo "configure:8241: 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" @@ -8147,14 +8263,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:8151: checking Heath GC-1000 WWV/WWVH receiver" >&5 +echo "configure:8267: 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 @@ -8187,7 +8303,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking HP 58503A GPS receiver""... $ac_c" 1>&6 -echo "configure:8191: checking HP 58503A GPS receiver" >&5 +echo "configure:8307: 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" @@ -8206,7 +8322,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Sun IRIG audio decoder""... $ac_c" 1>&6 -echo "configure:8210: checking Sun IRIG audio decoder" >&5 +echo "configure:8326: 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" @@ -8234,7 +8350,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:8238: checking Leitch CSD 5300 Master Clock System Driver" >&5 +echo "configure:8354: 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" @@ -8253,7 +8369,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking local clock reference""... $ac_c" 1>&6 -echo "configure:8257: checking local clock reference" >&5 +echo "configure:8373: 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" @@ -8272,7 +8388,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking EES M201 MSF receiver""... $ac_c" 1>&6 -echo "configure:8276: checking EES M201 MSF receiver" >&5 +echo "configure:8392: 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" @@ -8292,7 +8408,7 @@ echo "$ac_t""$ntp_ok" 1>&6 # Not Ultrix echo $ac_n "checking Magnavox MX4200 GPS receiver""... $ac_c" 1>&6 -echo "configure:8296: checking Magnavox MX4200 GPS receiver" >&5 +echo "configure:8412: 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" @@ -8319,7 +8435,7 @@ case "$ntp_ok$target" in esac echo $ac_n "checking NMEA GPS receiver""... $ac_c" 1>&6 -echo "configure:8323: checking NMEA GPS receiver" >&5 +echo "configure:8439: checking NMEA GPS receiver" >&5 # Check whether --enable-NMEA or --disable-NMEA was given. if test "${enable_NMEA+set}" = set; then enableval="$enable_NMEA" @@ -8338,7 +8454,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:8342: checking for ONCORE Motorola VP/UT Oncore GPS" >&5 +echo "configure:8458: 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" @@ -8360,7 +8476,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking for Palisade clock""... $ac_c" 1>&6 -echo "configure:8364: checking for Palisade clock" >&5 +echo "configure:8480: checking for Palisade clock" >&5 # Check whether --enable-PALISADE or --disable-PALISADE was given. if test "${enable_PALISADE+set}" = set; then enableval="$enable_PALISADE" @@ -8386,7 +8502,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:8390: checking PST/Traconex 1020 WWV/WWVH receiver" >&5 +echo "configure:8506: 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" @@ -8406,7 +8522,7 @@ echo "$ac_t""$ntp_ok" 1>&6 # Not Ultrix echo $ac_n "checking Rockwell Jupiter GPS receiver""... $ac_c" 1>&6 -echo "configure:8410: checking Rockwell Jupiter GPS receiver" >&5 +echo "configure:8526: 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" @@ -8434,14 +8550,14 @@ esac # Requires modem control echo $ac_n "checking PTB modem service""... $ac_c" 1>&6 -echo "configure:8438: checking PTB modem service" >&5 +echo "configure:8554: 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 @@ -8474,7 +8590,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:8478: checking KSI/Odetics TPRO/S GPS receiver/IRIG interface" >&5 +echo "configure:8594: 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" @@ -8502,7 +8618,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:8506: checking TRAK 8810 GPS receiver" >&5 +echo "configure:8622: 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" @@ -8521,7 +8637,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:8525: checking Chrono-log K-series WWVB receiver" >&5 +echo "configure:8641: 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" @@ -8540,7 +8656,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:8544: checking Dumb generic hh:mm:ss local clock" >&5 +echo "configure:8660: 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" @@ -8560,7 +8676,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:8564: checking Kinemetrics/TrueTime receivers" >&5 +echo "configure:8680: checking Kinemetrics/TrueTime receivers" >&5 # Check whether --enable-TRUETIME or --disable-TRUETIME was given. if test "${enable_TRUETIME+set}" = set; then enableval="$enable_TRUETIME" @@ -8589,7 +8705,7 @@ case "$ntp_ok$target" in esac echo $ac_n "checking Spectracom 8170/Netclock/2 WWVB receiver""... $ac_c" 1>&6 -echo "configure:8593: checking Spectracom 8170/Netclock/2 WWVB receiver" >&5 +echo "configure:8709: 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" @@ -8608,7 +8724,7 @@ fi echo "$ac_t""$ntp_ok" 1>&6 echo $ac_n "checking Ultralink M320 WWVB receiver""... $ac_c" 1>&6 -echo "configure:8612: checking Ultralink M320 WWVB receiver" >&5 +echo "configure:8728: 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" @@ -8628,14 +8744,14 @@ echo "$ac_t""$ntp_ok" 1>&6 # Requires modem control echo $ac_n "checking USNO modem service""... $ac_c" 1>&6 -echo "configure:8632: checking USNO modem service" >&5 +echo "configure:8748: 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 @@ -8668,7 +8784,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:8672: checking for default inclusion of all suitable PARSE clocks" >&5 +echo "configure:8788: 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" @@ -8698,7 +8814,7 @@ ntp_parseutil=no ntp_rawdcf=no echo $ac_n "checking Diem Computime Radio Clock""... $ac_c" 1>&6 -echo "configure:8702: checking Diem Computime Radio Clock" >&5 +echo "configure:8818: 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" @@ -8723,7 +8839,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking ELV/DCF7000 clock""... $ac_c" 1>&6 -echo "configure:8727: checking ELV/DCF7000 clock" >&5 +echo "configure:8843: checking ELV/DCF7000 clock" >&5 # Check whether --enable-DCF7000 or --disable-DCF7000 was given. if test "${enable_DCF7000+set}" = set; then enableval="$enable_DCF7000" @@ -8748,7 +8864,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking HOPF 6021 clock""... $ac_c" 1>&6 -echo "configure:8752: checking HOPF 6021 clock" >&5 +echo "configure:8868: checking HOPF 6021 clock" >&5 # Check whether --enable-HOPF6021 or --disable-HOPF6021 was given. if test "${enable_HOPF6021+set}" = set; then enableval="$enable_HOPF6021" @@ -8773,7 +8889,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking Meinberg clocks""... $ac_c" 1>&6 -echo "configure:8777: checking Meinberg clocks" >&5 +echo "configure:8893: checking Meinberg clocks" >&5 # Check whether --enable-MEINBERG or --disable-MEINBERG was given. if test "${enable_MEINBERG+set}" = set; then enableval="$enable_MEINBERG" @@ -8798,7 +8914,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking DCF77 raw time code""... $ac_c" 1>&6 -echo "configure:8802: checking DCF77 raw time code" >&5 +echo "configure:8918: 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" @@ -8827,7 +8943,7 @@ esac case "$ntp_rawdcf" in yes) echo $ac_n "checking if we must enable parity for RAWDCF""... $ac_c" 1>&6 -echo "configure:8831: checking if we must enable parity for RAWDCF" >&5 +echo "configure:8947: 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 @@ -8855,7 +8971,7 @@ EOF esac echo $ac_n "checking RCC 8000 clock""... $ac_c" 1>&6 -echo "configure:8859: checking RCC 8000 clock" >&5 +echo "configure:8975: checking RCC 8000 clock" >&5 # Check whether --enable-RCC8000 or --disable-RCC8000 was given. if test "${enable_RCC8000+set}" = set; then enableval="$enable_RCC8000" @@ -8880,7 +8996,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking Schmid DCF77 clock""... $ac_c" 1>&6 -echo "configure:8884: checking Schmid DCF77 clock" >&5 +echo "configure:9000: checking Schmid DCF77 clock" >&5 # Check whether --enable-SCHMID or --disable-SCHMID was given. if test "${enable_SCHMID+set}" = set; then enableval="$enable_SCHMID" @@ -8905,7 +9021,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking Trimble GPS receiver/TAIP protocol""... $ac_c" 1>&6 -echo "configure:8909: checking Trimble GPS receiver/TAIP protocol" >&5 +echo "configure:9025: 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" @@ -8930,7 +9046,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking Trimble GPS receiver/TSIP protocol""... $ac_c" 1>&6 -echo "configure:8934: checking Trimble GPS receiver/TSIP protocol" >&5 +echo "configure:9050: 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" @@ -8955,7 +9071,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking WHARTON 400A Series clock""... $ac_c" 1>&6 -echo "configure:8959: checking WHARTON 400A Series clock" >&5 +echo "configure:9075: 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" @@ -8980,7 +9096,7 @@ case "$ntp_ok$ntp_canparse" in esac echo $ac_n "checking VARITEXT clock""... $ac_c" 1>&6 -echo "configure:8984: checking VARITEXT clock" >&5 +echo "configure:9100: checking VARITEXT clock" >&5 # Check whether --enable-VARITEXT or --disable-VARITEXT was given. if test "${enable_VARITEXT+set}" = set; then enableval="$enable_VARITEXT" @@ -9008,7 +9124,7 @@ esac echo $ac_n "checking if we need to make and use the parse libraries""... $ac_c" 1>&6 -echo "configure:9012: checking if we need to make and use the parse libraries" >&5 +echo "configure:9128: checking if we need to make and use the parse libraries" >&5 ans=no case "$ntp_libparse" in yes) @@ -9036,7 +9152,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:9040: checking if we need to make and use the RSAREF library" >&5 +echo "configure:9156: checking if we need to make and use the RSAREF library" >&5 ans=no if test -f $srcdir/rsaref2/source/rsa.c then @@ -9054,7 +9170,7 @@ echo "$ac_t""$ans" 1>&6 echo $ac_n "checking if we can make dcf parse utilities""... $ac_c" 1>&6 -echo "configure:9058: checking if we can make dcf parse utilities" >&5 +echo "configure:9174: checking if we can make dcf parse utilities" >&5 ans=no if test "$ntp_parseutil" = "yes"; then case "$target" in @@ -9069,7 +9185,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:9073: checking if we can build kernel streams modules for parse" >&5 +echo "configure:9189: checking if we can build kernel streams modules for parse" >&5 ans=no case "$ntp_parseutil$ac_cv_header_sys_stropts_h" in yesyes) @@ -9096,7 +9212,7 @@ esac echo "$ac_t""$ans" 1>&6 echo $ac_n "checking if we need basic refclock support""... $ac_c" 1>&6 -echo "configure:9100: checking if we need basic refclock support" >&5 +echo "configure:9216: checking if we need basic refclock support" >&5 if test "$ntp_refclock" = "yes"; then cat >> confdefs.h <<\EOF #define REFCLOCK 1 @@ -9108,7 +9224,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:9112: checking if we want HP-UX adjtimed support" >&5 +echo "configure:9228: checking if we want HP-UX adjtimed support" >&5 case "$target" in *-*-hpux[56789]*) ans=yes @@ -9126,7 +9242,7 @@ fi echo "$ac_t""$ans" 1>&6 echo $ac_n "checking if we can read kmem""... $ac_c" 1>&6 -echo "configure:9130: checking if we can read kmem" >&5 +echo "configure:9246: 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 @@ -9179,7 +9295,7 @@ EOF esac echo $ac_n "checking if adjtime is accurate""... $ac_c" 1>&6 -echo "configure:9183: checking if adjtime is accurate" >&5 +echo "configure:9299: 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 @@ -9231,7 +9347,7 @@ EOF esac echo $ac_n "checking the name of 'tick' in the kernel""... $ac_c" 1>&6 -echo "configure:9235: checking the name of 'tick' in the kernel" >&5 +echo "configure:9351: 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 @@ -9275,7 +9391,7 @@ EOF esac # echo $ac_n "checking for the units of 'tick'""... $ac_c" 1>&6 -echo "configure:9279: checking for the units of 'tick'" >&5 +echo "configure:9395: 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 @@ -9299,7 +9415,7 @@ EOF esac # echo $ac_n "checking the name of 'tickadj' in the kernel""... $ac_c" 1>&6 -echo "configure:9303: checking the name of 'tickadj' in the kernel" >&5 +echo "configure:9419: 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 @@ -9352,7 +9468,7 @@ EOF esac # echo $ac_n "checking for the units of 'tickadj'""... $ac_c" 1>&6 -echo "configure:9356: checking for the units of 'tickadj'" >&5 +echo "configure:9472: 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 @@ -9376,7 +9492,7 @@ EOF esac # echo $ac_n "checking half-heartedly for 'dosynctodr' in the kernel""... $ac_c" 1>&6 -echo "configure:9380: checking half-heartedly for 'dosynctodr' in the kernel" >&5 +echo "configure:9496: 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 @@ -9429,7 +9545,7 @@ EOF esac # echo $ac_n "checking half-heartedly for 'noprintf' in the kernel""... $ac_c" 1>&6 -echo "configure:9433: checking half-heartedly for 'noprintf' in the kernel" >&5 +echo "configure:9549: 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 @@ -9479,7 +9595,7 @@ esac echo $ac_n "checking for a default value for 'tick'""... $ac_c" 1>&6 -echo "configure:9483: checking for a default value for 'tick'" >&5 +echo "configure:9599: 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 @@ -9523,7 +9639,7 @@ EOF esac echo $ac_n "checking for a default value for 'tickadj'""... $ac_c" 1>&6 -echo "configure:9527: checking for a default value for 'tickadj'" >&5 +echo "configure:9643: 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 @@ -9656,7 +9772,7 @@ esac echo $ac_n "checking if we want and can make the tickadj utility""... $ac_c" 1>&6 -echo "configure:9660: checking if we want and can make the tickadj utility" >&5 +echo "configure:9776: 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 @@ -9672,7 +9788,7 @@ esac echo $ac_n "checking if we want and can make the ntptime utility""... $ac_c" 1>&6 -echo "configure:9676: checking if we want and can make the ntptime utility" >&5 +echo "configure:9792: 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 @@ -9698,7 +9814,7 @@ case "$ac_cv_make_ntptime" in esac echo $ac_n "checking if we want UDP wildcard delivery""... $ac_c" 1>&6 -echo "configure:9702: checking if we want UDP wildcard delivery" >&5 +echo "configure:9818: 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 @@ -9777,7 +9893,7 @@ case "$host" in esac echo $ac_n "checking if we should always slew the time""... $ac_c" 1>&6 -echo "configure:9781: checking if we should always slew the time" >&5 +echo "configure:9897: 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 @@ -9817,7 +9933,7 @@ EOF esac echo $ac_n "checking if we should step and slew the time""... $ac_c" 1>&6 -echo "configure:9821: checking if we should step and slew the time" >&5 +echo "configure:9937: 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 @@ -9860,7 +9976,7 @@ EOF esac echo $ac_n "checking if ntpdate should step the time""... $ac_c" 1>&6 -echo "configure:9864: checking if ntpdate should step the time" >&5 +echo "configure:9980: 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 @@ -9891,7 +10007,7 @@ EOF esac echo $ac_n "checking if we should sync TODR clock every hour""... $ac_c" 1>&6 -echo "configure:9895: checking if we should sync TODR clock every hour" >&5 +echo "configure:10011: 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 @@ -9924,7 +10040,7 @@ EOF esac echo $ac_n "checking if we should avoid kernel FLL bug""... $ac_c" 1>&6 -echo "configure:9928: checking if we should avoid kernel FLL bug" >&5 +echo "configure:10044: 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 ee64409f5c..1563034682 100644 --- a/configure.in +++ b/configure.in @@ -572,6 +572,12 @@ case "$target" in *-*-sco3.2v5.0.*) # Just stubs. Idiots. ;; + alpha*-dec-osf5*) + # mlockall is there, as a #define calling memlk via + # Not easy to test for - cheat. + AC_CHECK_FUNCS(memlk, [ac_cv_func_mlockall='yes']) + AC_CHECK_FUNCS(mlockall) + ;; *) AC_CHECK_FUNCS(mlockall) ;; esac diff --git a/libntp/machines.c b/libntp/machines.c index ba50b264d3..bbcfd54b9c 100644 --- a/libntp/machines.c +++ b/libntp/machines.c @@ -167,7 +167,9 @@ ntp_set_tod( #endif /* HAVE_SETTIMEOFDAY */ #ifdef HAVE_STIME { - rc = stime(&tvp->tv_sec); /* lie as bad as SysVR4 */ + long tp = tvp->tv_sec; + + rc = stime(&tp); /* lie as bad as SysVR4 */ if (!rc) { set_tod_using = "stime"; diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c index d3c1bcfb06..7c6d1dd2b3 100644 --- a/ntpd/ntpd.c +++ b/ntpd/ntpd.c @@ -227,15 +227,17 @@ catch_danger(int signo) static void set_process_priority(void) { + int done = 0; + #ifdef SYS_WINNT if (!SetPriorityClass(GetCurrentProcess(), (DWORD) REALTIME_PRIORITY_CLASS)) - { msyslog(LOG_ERR, "SetPriorityClass: %m"); - return; - } + else + ++done; #else /* not SYS_WINNT */ # if defined(HAVE_SCHED_SETSCHEDULER) - { + + if (!done) { extern int config_priority_override, config_priority; int pmax, pmin; struct sched_param sched; @@ -252,43 +254,60 @@ set_process_priority(void) sched.sched_priority = config_priority; } if ( sched_setscheduler(0, SCHED_FIFO, &sched) == -1 ) - { msyslog(LOG_ERR, "sched_setscheduler(): %m"); - return; - } + else + ++done; } -# else /* not HAVE_SCHED_SETSCHEDULER */ -# if defined(HAVE_RTPRIO) -# ifdef RTP_SET - { +# endif /* HAVE_SCHED_SETSCHEDULER */ +# if defined(HAVE_RTPRIO) +# ifdef RTP_SET + if (!done) { struct rtprio srtp; srtp.type = RTP_PRIO_REALTIME; /* was: RTP_PRIO_NORMAL */ srtp.prio = 0; /* 0 (hi) -> RTP_PRIO_MAX (31,lo) */ - if (rtprio(RTP_SET, getpid(), &srtp) < 0) { + if (rtprio(RTP_SET, getpid(), &srtp) < 0) msyslog(LOG_ERR, "rtprio() error: %m"); - return; - } + else + ++done; } -# else /* not RTP_SET */ - if (rtprio(0, 120) < 0) { - msyslog(LOG_ERR, "rtprio() error: %m"); - return; +# else /* not RTP_SET */ + if (!done) { + if (rtprio(0, 120) < 0) + msyslog(LOG_ERR, "rtprio() error: %m"); + else + ++done; + } +# endif /* not RTP_SET */ +# endif /* HAVE_RTPRIO */ +# if defined(NTPD_PRIO) && NTPD_PRIO != 0 +# ifdef HAVE_ATT_NICE + if (!done) { + nice (NTPD_PRIO); + /* + ** HMS: One of my AT&T books says nice() returns the new + ** nice value minus NZERO, or -1 (and errno gets set). + ** If we can verify this behavioe *always*, we can do some + ** better checking and logging here. + */ + ++done; + } +# endif /* HAVE_ATT_NICE */ +# ifdef HAVE_BSD_NICE + if (!done) { + errno = 0; + (void) setpriority(PRIO_PROCESS, 0, NTPD_PRIO); + if (errno) + msyslog(LOG_ERR, "setpriority() error: %m"); + else + ++done; } -# endif /* not RTP_SET */ -# else /* not HAVE_RTPRIO */ -# if defined(NTPD_PRIO) && NTPD_PRIO != 0 -# ifdef HAVE_ATT_NICE - nice (NTPD_PRIO); -# endif /* HAVE_ATT_NICE */ -# ifdef HAVE_BSD_NICE - (void) setpriority(PRIO_PROCESS, 0, NTPD_PRIO); -# endif /* HAVE_BSD_NICE */ -# endif /* NTPD_PRIO && NTPD_PRIO != 0 */ -# endif /* not HAVE_RTPRIO */ -# endif /* not HAVE_SCHED_SETSCHEDULER */ +# endif /* HAVE_BSD_NICE */ +# endif /* NTPD_PRIO && NTPD_PRIO != 0 */ #endif /* not SYS_WINNT */ + if (!done) + msyslog(LOG_ERR, "set_process_priority: No way found to improve our priority"); } /* diff --git a/ntpd/refclock_ulink.c b/ntpd/refclock_ulink.c index 1369de59fd..347040dea6 100644 --- a/ntpd/refclock_ulink.c +++ b/ntpd/refclock_ulink.c @@ -288,7 +288,7 @@ ulink_poll( char pollchar; pp = peer->procptr; - up = (struct wwvbunit *)pp->unitptr; + up = (struct ulinkunit *)pp->unitptr; pollchar = 'T'; if (write(pp->io.fd, &pollchar, 1) != 1) refclock_report(peer, CEVNT_FAULT); diff --git a/stamp-h.in b/stamp-h.in index 9788f70238..e69de29bb2 100644 --- a/stamp-h.in +++ b/stamp-h.in @@ -1 +0,0 @@ -timestamp