Many files:

  * parseutil/dcfd.c: Renamed drift_comp to accum_drift
  * configure.in: Added MAKE_CHECK_Y2K support; check_y2k needs libparse.
  * ntpd/Makefile.am (check_PROGRAMS): Use MAKE_CHECK_Y2K
  * ntpd/Makefile.am (check-local): Added.
  * parseutil/Makefile.am (check-local): Added.

bk: 37ae0a1frn2Q6rcymFox4m8Kot_e0w

diff --git a/ChangeLog b/ChangeLog
index fd65d14aa34fe5695fa87bc87b3d5829c62d50b1..b749e074a82b242d8680b1cb3aaa620e27bb5efc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 1999-08-08  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * parseutil/dcfd.c: Renamed drift_comp to accum_drift
+
+       * configure.in: Added MAKE_CHECK_Y2K support; check_y2k needs libparse.
+       * ntpd/Makefile.am (check_PROGRAMS): Use MAKE_CHECK_Y2K
+       * ntpd/Makefile.am (check-local): Added.
+       * parseutil/Makefile.am (check-local): Added.
+
        * include/ntp.h: Y2KFixes
        * libparse/parse.c: Ditto
        * ntpd/Makefile.am (check_PROGRAMS): Ditto

diff --git a/Makefile.in b/Makefile.in
index ce848a9c839dd660e7f7b7d7d6db8e4d0fbda100..0463b7db2790310b44005b8100369475587f7daa 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,6 +78,7 @@ LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_LIBRSAREF = @MAKE_LIBRSAREF@

diff --git a/adjtimed/Makefile.in b/adjtimed/Makefile.in
index ce1b6f038e3ff627339d27f3826e63145e20d3da..3640497a3346832d021cde1e4657a31e61303cc5 100644 (file)
--- a/adjtimed/Makefile.in
+++ b/adjtimed/Makefile.in
@@ -78,6 +78,7 @@ LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_LIBRSAREF = @MAKE_LIBRSAREF@

diff --git a/clockstuff/Makefile.in b/clockstuff/Makefile.in
index e5095d5f4cce1140f30e9e8b379534f92c649d80..702b2d72d0deac8c1d56679447005e692b8eb854 100644 (file)
--- a/clockstuff/Makefile.in
+++ b/clockstuff/Makefile.in
@@ -78,6 +78,7 @@ LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_LIBRSAREF = @MAKE_LIBRSAREF@

diff --git a/configure b/configure
index d8eba730a57ba7e42ecc1a8e503783f66775e0d2..7d02c376512fdcaed337824be495b831c85068cc 100755 (executable)
--- a/configure
+++ b/configure
@@ -8676,8 +8676,9 @@ esac
 
 
 
+
 echo $ac_n "checking if we need to make and use the parse libraries""... $ac_c" 1>&6
-echo "configure:8681: checking if we need to make and use the parse libraries" >&5
+echo "configure:8682: checking if we need to make and use the parse libraries" >&5
 ans=no
 case "$ntp_libparse" in
  yes)
@@ -8688,6 +8689,7 @@ EOF
 
     LIBPARSE=../libparse/libparse.a
     MAKE_LIBPARSE=libparse.a
+    MAKE_CHECK_Y2K=check_y2k
     cat >> confdefs.h <<\EOF
 #define PPS_SAMPLE 1
 EOF
@@ -8704,7 +8706,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:8708: checking if we need to make and use the RSAREF library" >&5
+echo "configure:8710: checking if we need to make and use the RSAREF library" >&5
 ans=no
 if test -f $srcdir/rsaref2/source/rsa.c
 then
@@ -8722,7 +8724,7 @@ echo "$ac_t""$ans" 1>&6
 
 
 echo $ac_n "checking if we can make dcf parse utilities""... $ac_c" 1>&6
-echo "configure:8726: checking if we can make dcf parse utilities" >&5
+echo "configure:8728: checking if we can make dcf parse utilities" >&5
 ans=no
 if test "$ntp_parseutil" = "yes"; then
     case "$target" in
@@ -8737,7 +8739,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:8741: checking if we can build kernel streams modules for parse" >&5
+echo "configure:8743: checking if we can build kernel streams modules for parse" >&5
 ans=no
 if test "$ntp_parseutil$ac_cv_header_sys_stropts_h" = "yesyes"; then
     case "$target" in
@@ -8762,7 +8764,7 @@ fi
 echo "$ac_t""$ans" 1>&6
 
 echo $ac_n "checking if we need basic refclock support""... $ac_c" 1>&6
-echo "configure:8766: checking if we need basic refclock support" >&5
+echo "configure:8768: checking if we need basic refclock support" >&5
 if test "$ntp_refclock" = "yes"; then
     cat >> confdefs.h <<\EOF
 #define REFCLOCK 1
@@ -8774,7 +8776,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:8778: checking if we want HP-UX adjtimed support" >&5
+echo "configure:8780: checking if we want HP-UX adjtimed support" >&5
 case "$target" in
  *-*-hpux[56789]*)
     ans=yes
@@ -8792,7 +8794,7 @@ fi
 echo "$ac_t""$ans" 1>&6
 
 echo $ac_n "checking if we can read kmem""... $ac_c" 1>&6
-echo "configure:8796: checking if we can read kmem" >&5
+echo "configure:8798: 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
@@ -8845,7 +8847,7 @@ EOF
 esac
 
 echo $ac_n "checking if adjtime is accurate""... $ac_c" 1>&6
-echo "configure:8849: checking if adjtime is accurate" >&5
+echo "configure:8851: 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
@@ -8897,7 +8899,7 @@ EOF
 esac
 
 echo $ac_n "checking the name of 'tick' in the kernel""... $ac_c" 1>&6
-echo "configure:8901: checking the name of 'tick' in the kernel" >&5
+echo "configure:8903: 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
@@ -8941,7 +8943,7 @@ EOF
 esac
 #
 echo $ac_n "checking for the units of 'tick'""... $ac_c" 1>&6
-echo "configure:8945: checking for the units of 'tick'" >&5
+echo "configure:8947: 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
@@ -8965,7 +8967,7 @@ EOF
 esac
 #
 echo $ac_n "checking the name of 'tickadj' in the kernel""... $ac_c" 1>&6
-echo "configure:8969: checking the name of 'tickadj' in the kernel" >&5
+echo "configure:8971: 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
@@ -9018,7 +9020,7 @@ EOF
 esac
 #
 echo $ac_n "checking for the units of 'tickadj'""... $ac_c" 1>&6
-echo "configure:9022: checking for the units of 'tickadj'" >&5
+echo "configure:9024: 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
@@ -9042,7 +9044,7 @@ EOF
 esac
 #
 echo $ac_n "checking half-heartedly for 'dosynctodr' in the kernel""... $ac_c" 1>&6
-echo "configure:9046: checking half-heartedly for 'dosynctodr' in the kernel" >&5
+echo "configure:9048: 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
@@ -9095,7 +9097,7 @@ EOF
 esac
 #
 echo $ac_n "checking half-heartedly for 'noprintf' in the kernel""... $ac_c" 1>&6
-echo "configure:9099: checking half-heartedly for 'noprintf' in the kernel" >&5
+echo "configure:9101: 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
@@ -9145,7 +9147,7 @@ esac
 
 
 echo $ac_n "checking for a default value for 'tick'""... $ac_c" 1>&6
-echo "configure:9149: checking for a default value for 'tick'" >&5
+echo "configure:9151: 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
@@ -9189,7 +9191,7 @@ EOF
 esac
 
 echo $ac_n "checking for a default value for 'tickadj'""... $ac_c" 1>&6
-echo "configure:9193: checking for a default value for 'tickadj'" >&5
+echo "configure:9195: 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
@@ -9296,7 +9298,7 @@ esac
 
 
 echo $ac_n "checking if we want and can make the tickadj utility""... $ac_c" 1>&6
-echo "configure:9300: checking if we want and can make the tickadj utility" >&5
+echo "configure:9302: 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
@@ -9312,7 +9314,7 @@ esac
 
 
 echo $ac_n "checking if we want and can make the ntptime utility""... $ac_c" 1>&6
-echo "configure:9316: checking if we want and can make the ntptime utility" >&5
+echo "configure:9318: 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
@@ -9341,7 +9343,7 @@ case "$ac_cv_make_ntptime" in
 esac
 
 echo $ac_n "checking if we want UDP wildcard delivery""... $ac_c" 1>&6
-echo "configure:9345: checking if we want UDP wildcard delivery" >&5
+echo "configure:9347: 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
@@ -9420,7 +9422,7 @@ case "$host" in
 esac
 
 echo $ac_n "checking if we should always slew the time""... $ac_c" 1>&6
-echo "configure:9424: checking if we should always slew the time" >&5
+echo "configure:9426: 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
@@ -9460,7 +9462,7 @@ EOF
 esac
 
 echo $ac_n "checking if we should step and slew the time""... $ac_c" 1>&6
-echo "configure:9464: checking if we should step and slew the time" >&5
+echo "configure:9466: 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
@@ -9503,7 +9505,7 @@ EOF
 esac
 
 echo $ac_n "checking if ntpdate should step the time""... $ac_c" 1>&6
-echo "configure:9507: checking if ntpdate should step the time" >&5
+echo "configure:9509: 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
@@ -9534,7 +9536,7 @@ EOF
 esac
 
 echo $ac_n "checking if we should sync TODR clock every hour""... $ac_c" 1>&6
-echo "configure:9538: checking if we should sync TODR clock every hour" >&5
+echo "configure:9540: 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
@@ -9567,7 +9569,7 @@ EOF
 esac
 
 echo $ac_n "checking if we should avoid kernel FLL bug""... $ac_c" 1>&6
-echo "configure:9571: checking if we should avoid kernel FLL bug" >&5
+echo "configure:9573: 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
@@ -9789,6 +9791,7 @@ s%@LIBOBJS@%$LIBOBJS%g
 s%@LIBPARSE@%$LIBPARSE%g
 s%@MAKE_LIBPARSE@%$MAKE_LIBPARSE%g
 s%@MAKE_LIBPARSE_KERNEL@%$MAKE_LIBPARSE_KERNEL%g
+s%@MAKE_CHECK_Y2K@%$MAKE_CHECK_Y2K%g
 s%@RSAREF@%$RSAREF%g
 s%@LIBRSAREF@%$LIBRSAREF%g
 s%@MAKE_LIBRSAREF@%$MAKE_LIBRSAREF%g

diff --git a/configure.in b/configure.in
index 78aea0ddea1757d0cb7e2765a538e6d595742000..c4f66511b2dcb1706e451819ba5bcd62f5b040ce 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2085,6 +2085,7 @@ esac
 AC_SUBST(LIBPARSE)
 AC_SUBST(MAKE_LIBPARSE)
 AC_SUBST(MAKE_LIBPARSE_KERNEL)
+AC_SUBST(MAKE_CHECK_Y2K)
 AC_MSG_CHECKING(if we need to make and use the parse libraries)
 ans=no
 case "$ntp_libparse" in
@@ -2093,6 +2094,7 @@ case "$ntp_libparse" in
     AC_DEFINE(CLOCK_PARSE)
     LIBPARSE=../libparse/libparse.a
     MAKE_LIBPARSE=libparse.a
+    MAKE_CHECK_Y2K=check_y2k
     AC_DEFINE(PPS_SAMPLE)
     AC_DEFINE(CLOCK_ATOM)
     ;;

diff --git a/include/Makefile.in b/include/Makefile.in
index 684daa64023979bd7a78469ea26452dd97c498f6..17690dafb640217dc0806952cc0f2dea61f5bf75 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -78,6 +78,7 @@ LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_LIBRSAREF = @MAKE_LIBRSAREF@

diff --git a/include/ntpd.h b/include/ntpd.h
index 9a3b929b7b376b8de1343661f3a7febdabee2dab..3f5399cebf2971f2ee3aa24da49ee141c405628f 100644 (file)
--- a/include/ntpd.h
+++ b/include/ntpd.h
@@ -190,7 +190,7 @@ extern      void    record_raw_stats P((struct sockaddr_in *, struct sockaddr_in *, l_fp
  */
 
 /* ntp_config.c */
-extern char *  progname;
+extern char const *    progname;
 extern char    sys_phone[][MAXDIAL];   /* ACTS phone numbers */
 extern char    pps_device[];           /* PPS device name */
 #if defined(HAVE_SCHED_SETSCHEDULER)

diff --git a/kernel/Makefile.in b/kernel/Makefile.in
index 4cffeba361159f710beeea001d8a655797a8e11c..4542c6b797a4d1cc21230a6a3fb187f614966307 100644 (file)
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -78,6 +78,7 @@ LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_LIBRSAREF = @MAKE_LIBRSAREF@

diff --git a/kernel/sys/Makefile.in b/kernel/sys/Makefile.in
index 636e0e78c14b672a0a2dbcbff163befc62f0414a..cc3ca8ed0d1aa36901b0f91eb3d886c1d05501c0 100644 (file)
--- a/kernel/sys/Makefile.in
+++ b/kernel/sys/Makefile.in
@@ -78,6 +78,7 @@ LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_LIBRSAREF = @MAKE_LIBRSAREF@

diff --git a/libntp/Makefile.in b/libntp/Makefile.in
index 3f9d16b3cb31e6d351e34e7061d593b3e0340ca9..558a29eeab1c9c1266dd8f5bb4e4357ffe38683b 100644 (file)
--- a/libntp/Makefile.in
+++ b/libntp/Makefile.in
@@ -78,6 +78,7 @@ LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_LIBRSAREF = @MAKE_LIBRSAREF@

diff --git a/libparse/Makefile.in b/libparse/Makefile.in
index a96743d998df94c952f38884f380df602cced029..63ec6ed471717a5e266e51881bce0c714a41851e 100644 (file)
--- a/libparse/Makefile.in
+++ b/libparse/Makefile.in
@@ -78,6 +78,7 @@ LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_LIBRSAREF = @MAKE_LIBRSAREF@

diff --git a/librsaref/Makefile.in b/librsaref/Makefile.in
index 29acd41c5f26271f43afe2121fb6f013e34918be..33944cfb7e84d89b480a32a2ff5c274b78ddb609 100644 (file)
--- a/librsaref/Makefile.in
+++ b/librsaref/Makefile.in
@@ -78,6 +78,7 @@ LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_LIBRSAREF = @MAKE_LIBRSAREF@

diff --git a/ntpd/Makefile.am b/ntpd/Makefile.am
index 6947061c42cfa9b7c29e36d1b4aa8b89ca9199d0..c31044c53bc908ee7f34adb5ca6b56440619dae0 100644 (file)
--- a/ntpd/Makefile.am
+++ b/ntpd/Makefile.am
@@ -9,7 +9,11 @@ DISTCLEANFILES = .version version.c
 #EXTRA_DIST = ntpd.mak
 ETAGS_ARGS = Makefile.am
 ###                                                    Y2Kfixes
-check_PROGRAMS = check_y2k
+check_PROGRAMS = @MAKE_CHECK_Y2K@
+EXTRA_PROGRAMS = check_y2k
+
+check-local: @MAKE_CHECK_Y2K@
+       [ -z "@MAKE_CHECK_Y2K@" ] || ./@MAKE_CHECK_Y2K@
 
 ntpd_SOURCES = map_vme.c ntp_config.c ntp_control.c ntp_io.c \
        ntp_loopfilter.c ntp_monitor.c ntp_peer.c ntp_proto.c \

diff --git a/ntpd/Makefile.in b/ntpd/Makefile.in
index dfdb643204243ee3dbd14f9dd04d15f368783872..3544dc253c245ebdee45f092d708157b03019514 100644 (file)
--- a/ntpd/Makefile.in
+++ b/ntpd/Makefile.in
@@ -78,6 +78,7 @@ LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_LIBRSAREF = @MAKE_LIBRSAREF@
@@ -98,8 +99,6 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = ../util/ansi2knr
 bin_PROGRAMS = ntpd
-                                                       #       Y2Kfixes
-check_PROGRAMS = check_y2k
 INCLUDES = -I$(top_srcdir)/include
 # LDADD might need RESLIB and ADJLIB
 LDADD = version.o @LIBPARSE@ ../libntp/libntp.a @LIBRSAREF@
@@ -107,6 +106,9 @@ ntpd_LDADD = $(LDADD) -lm
 DISTCLEANFILES = .version version.c
 #EXTRA_DIST = ntpd.mak
 ETAGS_ARGS = Makefile.am
+###                                                    Y2Kfixes
+check_PROGRAMS = @MAKE_CHECK_Y2K@
+EXTRA_PROGRAMS = check_y2k
 
 ntpd_SOURCES = map_vme.c ntp_config.c ntp_control.c ntp_io.c \
        ntp_loopfilter.c ntp_monitor.c ntp_peer.c ntp_proto.c \
@@ -136,6 +138,11 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
 CPPFLAGS = @CPPFLAGS@
 LIBS = @LIBS@
 ANSI2KNR = ../util/ansi2knr
+check_y2k_SOURCES = check_y2k.c
+check_y2k_OBJECTS =  check_y2k$U.o
+check_y2k_LDADD = $(LDADD)
+check_y2k_DEPENDENCIES =  version.o ../libntp/libntp.a
+check_y2k_LDFLAGS = 
 am_ntpd_OBJECTS =  map_vme$U.o ntp_config$U.o ntp_control$U.o ntp_io$U.o \
 ntp_loopfilter$U.o ntp_monitor$U.o ntp_peer$U.o ntp_proto$U.o \
 ntp_refclock$U.o ntp_request$U.o ntp_restrict$U.o ntp_timer$U.o \
@@ -156,20 +163,21 @@ ntpd_LDFLAGS =
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-DIST_SOURCES =  $(ntpd_SOURCES)
+DIST_SOURCES =  check_y2k.c $(ntpd_SOURCES)
 DIST_COMMON =  Makefile.am Makefile.in
 
 
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP_ENV = --best
-DEP_FILES =  .deps/map_vme.P .deps/ntp_config.P .deps/ntp_control.P \
-.deps/ntp_filegen.P .deps/ntp_intres.P .deps/ntp_io.P \
-.deps/ntp_loopfilter.P .deps/ntp_monitor.P .deps/ntp_peer.P \
-.deps/ntp_proto.P .deps/ntp_refclock.P .deps/ntp_request.P \
-.deps/ntp_restrict.P .deps/ntp_timer.P .deps/ntp_util.P .deps/ntpd.P \
-.deps/refclock_acts.P .deps/refclock_arbiter.P .deps/refclock_arc.P \
-.deps/refclock_as2201.P .deps/refclock_atom.P .deps/refclock_bancomm.P \
+DEP_FILES =  .deps/check_y2k.P .deps/map_vme.P .deps/ntp_config.P \
+.deps/ntp_control.P .deps/ntp_filegen.P .deps/ntp_intres.P \
+.deps/ntp_io.P .deps/ntp_loopfilter.P .deps/ntp_monitor.P \
+.deps/ntp_peer.P .deps/ntp_proto.P .deps/ntp_refclock.P \
+.deps/ntp_request.P .deps/ntp_restrict.P .deps/ntp_timer.P \
+.deps/ntp_util.P .deps/ntpd.P .deps/refclock_acts.P \
+.deps/refclock_arbiter.P .deps/refclock_arc.P .deps/refclock_as2201.P \
+.deps/refclock_atom.P .deps/refclock_bancomm.P \
 .deps/refclock_chronolog.P .deps/refclock_chu.P .deps/refclock_conf.P \
 .deps/refclock_datum.P .deps/refclock_dumbclock.P \
 .deps/refclock_gpsvme.P .deps/refclock_heath.P .deps/refclock_hpgps.P \
@@ -179,8 +187,8 @@ DEP_FILES =  .deps/map_vme.P .deps/ntp_config.P .deps/ntp_control.P \
 .deps/refclock_parse.P .deps/refclock_pst.P .deps/refclock_ptbacts.P \
 .deps/refclock_shm.P .deps/refclock_tpro.P .deps/refclock_trak.P \
 .deps/refclock_true.P .deps/refclock_usno.P .deps/refclock_wwvb.P
-SOURCES = $(ntpd_SOURCES)
-OBJECTS = $(am_ntpd_OBJECTS)
+SOURCES = check_y2k.c $(ntpd_SOURCES)
+OBJECTS = check_y2k$U.o $(am_ntpd_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
@@ -221,6 +229,15 @@ uninstall-binPROGRAMS:
          rm -f $(DESTDIR)$(bindir)/$$f; \
        done
 
+mostlyclean-checkPROGRAMS:
+
+clean-checkPROGRAMS:
+       -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
+
+distclean-checkPROGRAMS:
+
+maintainer-clean-checkPROGRAMS:
+
 mostlyclean-compile:
        -rm -f *.o core *.core
 
@@ -245,6 +262,11 @@ clean-kr:
 distclean-kr:
 
 maintainer-clean-kr:
+check_y2k$U.o:
+
+check_y2k: $(check_y2k_OBJECTS) $(check_y2k_DEPENDENCIES)
+       @rm -f check_y2k
+       $(LINK) $(check_y2k_LDFLAGS) $(check_y2k_OBJECTS) $(check_y2k_LDADD) $(LIBS)
 map_vme$U.o:
 ntp_config$U.o:
 ntp_control$U.o:
@@ -294,19 +316,11 @@ refclock_oncore$U.o:
 refclock_chronolog$U.o:
 refclock_dumbclock$U.o:
 
-                                                               #Y2Kfixes [
-check_y2k.o: Makefile check_y2k.c ../config.h \
-           ../include/ntp.h ../include/ntpd.h ../include/ntp_calendar.h
-       $(COMPILE) -o check_y2k.o -c check_y2k.c
-
-check_y2k: check_y2k.o 
-       @if [ -f check_y2k ]; then rm -f check_y2k; fi
-       $(LINK) $(ntpd_LDFLAGS) check_y2k.o $(ntpd_LDADD) $(LIBS)
-                                                               #Y2Kfixes ]
-
 ntpd: $(ntpd_OBJECTS) $(ntpd_DEPENDENCIES)
        @rm -f ntpd
        $(LINK) $(ntpd_LDFLAGS) $(ntpd_OBJECTS) $(ntpd_LDADD) $(LIBS)
+check_y2k_.c: check_y2k.c $(ANSI2KNR)
+       $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/check_y2k.c; then echo $(srcdir)/check_y2k.c; else echo check_y2k.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > check_y2k_.c
 map_vme_.c: map_vme.c $(ANSI2KNR)
        $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/map_vme.c; then echo $(srcdir)/map_vme.c; else echo map_vme.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > map_vme_.c
 ntp_config_.c: ntp_config.c $(ANSI2KNR)
@@ -403,11 +417,11 @@ refclock_usno_.c: refclock_usno.c $(ANSI2KNR)
        $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_usno.c; then echo $(srcdir)/refclock_usno.c; else echo refclock_usno.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_usno_.c
 refclock_wwvb_.c: refclock_wwvb.c $(ANSI2KNR)
        $(CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/refclock_wwvb.c; then echo $(srcdir)/refclock_wwvb.c; else echo refclock_wwvb.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > refclock_wwvb_.c
-map_vme_.o ntp_config_.o ntp_control_.o ntp_filegen_.o ntp_intres_.o \
-ntp_io_.o ntp_loopfilter_.o ntp_monitor_.o ntp_peer_.o ntp_proto_.o \
-ntp_refclock_.o ntp_request_.o ntp_restrict_.o ntp_timer_.o ntp_util_.o \
-ntpd_.o refclock_acts_.o refclock_arbiter_.o refclock_arc_.o \
-refclock_as2201_.o refclock_atom_.o refclock_bancomm_.o \
+check_y2k_.o map_vme_.o ntp_config_.o ntp_control_.o ntp_filegen_.o \
+ntp_intres_.o ntp_io_.o ntp_loopfilter_.o ntp_monitor_.o ntp_peer_.o \
+ntp_proto_.o ntp_refclock_.o ntp_request_.o ntp_restrict_.o \
+ntp_timer_.o ntp_util_.o ntpd_.o refclock_acts_.o refclock_arbiter_.o \
+refclock_arc_.o refclock_as2201_.o refclock_atom_.o refclock_bancomm_.o \
 refclock_chronolog_.o refclock_chu_.o refclock_conf_.o \
 refclock_datum_.o refclock_dumbclock_.o refclock_gpsvme_.o \
 refclock_heath_.o refclock_hpgps_.o refclock_irig_.o \
@@ -502,6 +516,8 @@ info: info-am
 dvi-am:
 dvi: dvi-am
 check-am: all-am
+       $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+       $(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
 installcheck-am:
 installcheck: installcheck-am
@@ -534,27 +550,28 @@ distclean-generic:
        -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-               mostlyclean-kr mostlyclean-tags mostlyclean-depend \
-               mostlyclean-generic
+mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-checkPROGRAMS \
+               mostlyclean-compile mostlyclean-kr mostlyclean-tags \
+               mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-binPROGRAMS clean-compile clean-kr clean-tags \
-               clean-depend clean-generic mostlyclean-am
+clean-am:  clean-binPROGRAMS clean-checkPROGRAMS clean-compile clean-kr \
+               clean-tags clean-depend clean-generic mostlyclean-am
 
 clean: clean-am
 
-distclean-am:  distclean-binPROGRAMS distclean-compile distclean-kr \
-               distclean-tags distclean-depend distclean-generic \
-               clean-am
+distclean-am:  distclean-binPROGRAMS distclean-checkPROGRAMS \
+               distclean-compile distclean-kr distclean-tags \
+               distclean-depend distclean-generic clean-am
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-binPROGRAMS \
-               maintainer-clean-compile maintainer-clean-kr \
-               maintainer-clean-tags maintainer-clean-depend \
-               maintainer-clean-generic distclean-am
+               maintainer-clean-checkPROGRAMS maintainer-clean-compile \
+               maintainer-clean-kr maintainer-clean-tags \
+               maintainer-clean-depend maintainer-clean-generic \
+               distclean-am
        @echo "This command is intended for maintainers to use;"
        @echo "it deletes files that may require special tools to rebuild."
 
@@ -562,17 +579,21 @@ maintainer-clean: maintainer-clean-am
 
 .PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
 maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \
-maintainer-clean-kr tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
-clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
+mostlyclean-checkPROGRAMS distclean-checkPROGRAMS clean-checkPROGRAMS \
+maintainer-clean-checkPROGRAMS mostlyclean-compile distclean-compile \
+clean-compile maintainer-clean-compile mostlyclean-kr distclean-kr \
+clean-kr maintainer-clean-kr tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check-local check check-am installcheck-am installcheck \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all install-strip \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+check-local: @MAKE_CHECK_Y2K@
+       [ -z "@MAKE_CHECK_Y2K@" ] || ./@MAKE_CHECK_Y2K@
 
 $(PROGRAMS): $(LDADD)
 

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index cec82b66d90e142415aa90fbca6064b442f466c3..84286dcc91689fe74e29473252f288350c533dea 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -388,7 +388,7 @@ static char res_file[MAX_PATH];
 /*
  * Definitions of things either imported from or exported to outside
  */
-char   *progname;
+char const *progname;
 char   sys_phone[MAXPHONE][MAXDIAL]; /* ACTS phone numbers */
 char   pps_device[MAXPPS + 1]; /* PPS device name */
 int    pps_assert = 1;

diff --git a/ntpdate/Makefile.in b/ntpdate/Makefile.in
index 07e351f698b7361899331e8ca84a326c4a772ca6..e63a7acff70d0ce4f5b9c74e176908d3fc22ff1b 100644 (file)
--- a/ntpdate/Makefile.in
+++ b/ntpdate/Makefile.in
@@ -78,6 +78,7 @@ LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_LIBRSAREF = @MAKE_LIBRSAREF@

diff --git a/ntpdc/Makefile.in b/ntpdc/Makefile.in
index bb1a45db637f4d64a2e6d6f4799dddf2e9f8ec9c..ca1b52a2c1762de6de2a0335f69333356ff4c59d 100644 (file)
--- a/ntpdc/Makefile.in
+++ b/ntpdc/Makefile.in
@@ -78,6 +78,7 @@ LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_LIBRSAREF = @MAKE_LIBRSAREF@

diff --git a/ntpq/Makefile.in b/ntpq/Makefile.in
index b0717c8d272514f8cf432d47d1ceaa3eda524bbe..18c83f5178b3364820ce187f3b3cbdc6bc011a88 100644 (file)
--- a/ntpq/Makefile.in
+++ b/ntpq/Makefile.in
@@ -78,6 +78,7 @@ LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_LIBRSAREF = @MAKE_LIBRSAREF@

diff --git a/ntptrace/Makefile.in b/ntptrace/Makefile.in
index 59183a9c8b2debf5e48d900c4e1383985d9f675e..832ae594d4a42cdd31d3c712e5c8b18087b72bf7 100644 (file)
--- a/ntptrace/Makefile.in
+++ b/ntptrace/Makefile.in
@@ -78,6 +78,7 @@ LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_LIBRSAREF = @MAKE_LIBRSAREF@

diff --git a/parseutil/Makefile.am b/parseutil/Makefile.am
index 40c3a2b1b4578b53cb09621dd05e5f90194bad90..902eb5cd48595bd38a3825bce7006614afc05f32 100644 (file)
--- a/parseutil/Makefile.am
+++ b/parseutil/Makefile.am
@@ -5,3 +5,6 @@ EXTRA_PROGRAMS = testdcf dcfd
 INCLUDES = -I$(top_srcdir)/include
 ETAGS_ARGS = Makefile.am
 #EXTRA_DIST= TAGS
+
+check-local: dcfd
+       ./dcfd -Y

diff --git a/parseutil/Makefile.in b/parseutil/Makefile.in
index 39335977c8ec32af8eaaf545d5a831094df9c946..0b0deb8e5f2cf319f51a0267dd66f501cf9a3424 100644 (file)
--- a/parseutil/Makefile.in
+++ b/parseutil/Makefile.in
@@ -78,6 +78,7 @@ LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_LIBRSAREF = @MAKE_LIBRSAREF@
@@ -280,6 +281,7 @@ info: info-am
 dvi-am:
 dvi: dvi-am
 check-am: all-am
+       $(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
 installcheck-am:
 installcheck: installcheck-am
@@ -342,15 +344,18 @@ mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-kr distclean-kr clean-kr \
 maintainer-clean-kr tags mostlyclean-tags distclean-tags clean-tags \
 maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
-clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all install-strip installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+clean-depend maintainer-clean-depend info-am info dvi-am dvi \
+check-local check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all install-strip \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 #EXTRA_DIST= TAGS
 
+check-local: dcfd
+       ./dcfd -Y
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/parseutil/dcfd.c b/parseutil/dcfd.c
index 98bfd81f8b526273473080e793edf5d9bff00b0f..5ed2b0962ccc05f21939aaf364bea1f1ea287b9e 100644 (file)
--- a/parseutil/dcfd.c
+++ b/parseutil/dcfd.c
@@ -166,7 +166,7 @@ static char pat[] = "-\\|/";
 static struct timeval max_adj_offset = { 0, 128000 };
 
 static long clock_adjust = 0;  /* current adjustment value (usec * 2^USECSCALE) */
-static long drift_comp   = 0;  /* accumulated drift value  (usec / ADJINTERVAL) */
+static long accum_drift   = 0; /* accumulated drift value  (usec / ADJINTERVAL) */
 static long adjustments  = 0;
 static char skip_adjust  = 1;  /* discard first adjustment (bad samples) */
 
@@ -958,10 +958,10 @@ read_drift(
                fclose(df);
                LPRINTF("read_drift: %d.%03d ppm ", idrift, fdrift);
 
-               drift_comp = idrift << USECSCALE;
+               accum_drift = idrift << USECSCALE;
                fdrift     = (fdrift << USECSCALE) / 1000;
-               drift_comp += fdrift & (1<<USECSCALE);
-               LPRINTF("read_drift: drift_comp %ld ", (long int)drift_comp);
+               accum_drift += fdrift & (1<<USECSCALE);
+               LPRINTF("read_drift: drift_comp %ld ", (long int)accum_drift);
        }
 }
 
@@ -980,10 +980,10 @@ update_drift(
        df = fopen(drift_file, "w");
        if (df != NULL)
        {
-               int idrift = R_SHIFT(drift_comp, USECSCALE);
-               int fdrift = drift_comp & ((1<<USECSCALE)-1);
+               int idrift = R_SHIFT(accum_drift, USECSCALE);
+               int fdrift = accum_drift & ((1<<USECSCALE)-1);
 
-               LPRINTF("update_drift: drift_comp %ld ", (long int)drift_comp);
+               LPRINTF("update_drift: drift_comp %ld ", (long int)accum_drift);
                fdrift = (fdrift * 1000) / (1<<USECSCALE);
                fprintf(df, "%4d.%03d %c%ld.%06ld %.24s\n", idrift, fdrift,
                        (offset < 0) ? '-' : '+', (long int)(abs(offset) / 1000000),
@@ -1042,18 +1042,18 @@ adjust_clock(
        if (tmp > FREQ_WEIGHT)
            tmp = FREQ_WEIGHT;
 
-       drift_comp  += R_SHIFT(usecoffset << USECSCALE, TIMECONSTANT+TIMECONSTANT+FREQ_WEIGHT-tmp);
+       accum_drift  += R_SHIFT(usecoffset << USECSCALE, TIMECONSTANT+TIMECONSTANT+FREQ_WEIGHT-tmp);
 
-       if (drift_comp > MAX_DRIFT)             /* clamp into interval */
-           drift_comp = MAX_DRIFT;
+       if (accum_drift > MAX_DRIFT)            /* clamp into interval */
+           accum_drift = MAX_DRIFT;
        else
-           if (drift_comp < -MAX_DRIFT)
-               drift_comp = -MAX_DRIFT;
+           if (accum_drift < -MAX_DRIFT)
+               accum_drift = -MAX_DRIFT;
 
        update_drift(drift_file, usecoffset, reftime);
        LPRINTF("clock_adjust: %s, clock_adjust %ld, drift_comp %ld(%ld) ",
                pr_timeval(offset),(long int) R_SHIFT(clock_adjust, USECSCALE),
-               (long int)R_SHIFT(drift_comp, USECSCALE), (long int)drift_comp);
+               (long int)R_SHIFT(accum_drift, USECSCALE), (long int)accum_drift);
 }
 
 /*-----------------------------------------------------------------------
@@ -1072,7 +1072,7 @@ periodic_adjust(
 
        clock_adjust -= adjustment;
 
-       adjustment += R_SHIFT(drift_comp, USECSCALE+ADJINTERVAL);
+       adjustment += R_SHIFT(accum_drift, USECSCALE+ADJINTERVAL);
 
        adj_time(adjustment);
 }

diff --git a/util/Makefile.in b/util/Makefile.in
index 1b54fdc283cef9643d29d8752a5ee980935e26b3..1015e870f4acf2e134181145eb904502199bc60c 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -78,6 +78,7 @@ LIBRSAREF = @LIBRSAREF@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MAKE_ADJTIMED = @MAKE_ADJTIMED@
+MAKE_CHECK_Y2K = @MAKE_CHECK_Y2K@
 MAKE_LIBPARSE = @MAKE_LIBPARSE@
 MAKE_LIBPARSE_KERNEL = @MAKE_LIBPARSE_KERNEL@
 MAKE_LIBRSAREF = @MAKE_LIBRSAREF@