Makefile.in, acconfig.h, config.h.in, configure, configure.in, mkver.in:

  mkver usage cleanup

bk: 3793c77968vDP8a4hPkTnRKsPyx65Q

diff --git a/Makefile.in b/Makefile.in
index c63b63c6ce83d4b581f7c6e9f3fcb5e62172c0a0..f43d88e2348ca6154e22261c7b65b7187a6d6cd0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -88,6 +88,7 @@ PACKAGE = @PACKAGE@
 PATH_SH = @PATH_SH@
 PROPDELAY = @PROPDELAY@
 RANLIB = @RANLIB@
+RSAREF = @RSAREF@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@

diff --git a/acconfig.h b/acconfig.h
index 3f8bdc2a29de92d956c73484d8ac4dced359a3c6..3e7bf31bfda8ba917139eaff1104a50243c3aaa0 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -13,7 +13,7 @@
 /* MD5 authentication */
 #undef MD5
 
-/* DFS authentication (COCOM only) */
+/* DES authentication (COCOM only) */
 #undef DES
 
 /* time_t */

diff --git a/adjtimed/Makefile.in b/adjtimed/Makefile.in
index 64442c32c517d1fcf9b8cf4b37f5a2f8ae1b9ca1..ce1b6f038e3ff627339d27f3826e63145e20d3da 100644 (file)
--- a/adjtimed/Makefile.in
+++ b/adjtimed/Makefile.in
@@ -88,6 +88,7 @@ PACKAGE = @PACKAGE@
 PATH_SH = @PATH_SH@
 PROPDELAY = @PROPDELAY@
 RANLIB = @RANLIB@
+RSAREF = @RSAREF@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@

diff --git a/clockstuff/Makefile.in b/clockstuff/Makefile.in
index 5d2b6afb20ef75861c45124d45ece44c35f60c4c..e5095d5f4cce1140f30e9e8b379534f92c649d80 100644 (file)
--- a/clockstuff/Makefile.in
+++ b/clockstuff/Makefile.in
@@ -88,6 +88,7 @@ PACKAGE = @PACKAGE@
 PATH_SH = @PATH_SH@
 PROPDELAY = @PROPDELAY@
 RANLIB = @RANLIB@
+RSAREF = @RSAREF@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@

diff --git a/config.h.in b/config.h.in
index 4e4ea5a83c7b0d42e77f211ae45ce5e2075da0c2..87ada03f0122227640dd86f772e105e536a04ce1 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -68,7 +68,7 @@
 /* MD5 authentication */
 #undef MD5
 
-/* DFS authentication (COCOM only) */
+/* DES authentication (COCOM only) */
 #undef DES
 
 /* time_t */

diff --git a/configure b/configure
index 705faa36717e0108643143950fdd968137bf9896..7656055e23d42a5757bfb67cd4b2f53bc88b21dc 100755 (executable)
--- a/configure
+++ b/configure
@@ -8550,8 +8550,9 @@ 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:8555: checking if we need to make and use the RSAREF library" >&5
+echo "configure:8556: checking if we need to make and use the RSAREF library" >&5
 ans=no
 if test -f $srcdir/rsaref2/source/rsa.c
 then
@@ -8569,7 +8570,7 @@ echo "$ac_t""$ans" 1>&6
 
 
 echo $ac_n "checking if we can make dcf parse utilities""... $ac_c" 1>&6
-echo "configure:8573: checking if we can make dcf parse utilities" >&5
+echo "configure:8574: checking if we can make dcf parse utilities" >&5
 ans=no
 if test "$ntp_parseutil" = "yes"; then
     case "$target" in
@@ -8584,7 +8585,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:8588: checking if we can build kernel streams modules for parse" >&5
+echo "configure:8589: 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
@@ -8609,7 +8610,7 @@ fi
 echo "$ac_t""$ans" 1>&6
 
 echo $ac_n "checking if we need basic refclock support""... $ac_c" 1>&6
-echo "configure:8613: checking if we need basic refclock support" >&5
+echo "configure:8614: checking if we need basic refclock support" >&5
 if test "$ntp_refclock" = "yes"; then
     cat >> confdefs.h <<\EOF
 #define REFCLOCK 1
@@ -8621,7 +8622,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:8625: checking if we want HP-UX adjtimed support" >&5
+echo "configure:8626: checking if we want HP-UX adjtimed support" >&5
 case "$target" in
  *-*-hpux[56789]*)
     ans=yes
@@ -8639,7 +8640,7 @@ fi
 echo "$ac_t""$ans" 1>&6
 
 echo $ac_n "checking if we can read kmem""... $ac_c" 1>&6
-echo "configure:8643: checking if we can read kmem" >&5
+echo "configure:8644: 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
@@ -8692,7 +8693,7 @@ EOF
 esac
 
 echo $ac_n "checking if adjtime is accurate""... $ac_c" 1>&6
-echo "configure:8696: checking if adjtime is accurate" >&5
+echo "configure:8697: 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
@@ -8744,7 +8745,7 @@ EOF
 esac
 
 echo $ac_n "checking the name of 'tick' in the kernel""... $ac_c" 1>&6
-echo "configure:8748: checking the name of 'tick' in the kernel" >&5
+echo "configure:8749: 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
@@ -8788,7 +8789,7 @@ EOF
 esac
 #
 echo $ac_n "checking for the units of 'tick'""... $ac_c" 1>&6
-echo "configure:8792: checking for the units of 'tick'" >&5
+echo "configure:8793: 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
@@ -8812,7 +8813,7 @@ EOF
 esac
 #
 echo $ac_n "checking the name of 'tickadj' in the kernel""... $ac_c" 1>&6
-echo "configure:8816: checking the name of 'tickadj' in the kernel" >&5
+echo "configure:8817: 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
@@ -8865,7 +8866,7 @@ EOF
 esac
 #
 echo $ac_n "checking for the units of 'tickadj'""... $ac_c" 1>&6
-echo "configure:8869: checking for the units of 'tickadj'" >&5
+echo "configure:8870: 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
@@ -8889,7 +8890,7 @@ EOF
 esac
 #
 echo $ac_n "checking half-heartedly for 'dosynctodr' in the kernel""... $ac_c" 1>&6
-echo "configure:8893: checking half-heartedly for 'dosynctodr' in the kernel" >&5
+echo "configure:8894: 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
@@ -8942,7 +8943,7 @@ EOF
 esac
 #
 echo $ac_n "checking half-heartedly for 'noprintf' in the kernel""... $ac_c" 1>&6
-echo "configure:8946: checking half-heartedly for 'noprintf' in the kernel" >&5
+echo "configure:8947: 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
@@ -8992,7 +8993,7 @@ esac
 
 
 echo $ac_n "checking for a default value for 'tick'""... $ac_c" 1>&6
-echo "configure:8996: checking for a default value for 'tick'" >&5
+echo "configure:8997: 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
@@ -9036,7 +9037,7 @@ EOF
 esac
 
 echo $ac_n "checking for a default value for 'tickadj'""... $ac_c" 1>&6
-echo "configure:9040: checking for a default value for 'tickadj'" >&5
+echo "configure:9041: 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
@@ -9143,7 +9144,7 @@ esac
 
 
 echo $ac_n "checking if we want and can make the tickadj utility""... $ac_c" 1>&6
-echo "configure:9147: checking if we want and can make the tickadj utility" >&5
+echo "configure:9148: 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
@@ -9159,7 +9160,7 @@ esac
 
 
 echo $ac_n "checking if we want and can make the ntptime utility""... $ac_c" 1>&6
-echo "configure:9163: checking if we want and can make the ntptime utility" >&5
+echo "configure:9164: 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
@@ -9185,7 +9186,7 @@ case "$ac_cv_make_ntptime" in
 esac
 
 echo $ac_n "checking if we want UDP wildcard delivery""... $ac_c" 1>&6
-echo "configure:9189: checking if we want UDP wildcard delivery" >&5
+echo "configure:9190: 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
@@ -9264,7 +9265,7 @@ case "$host" in
 esac
 
 echo $ac_n "checking if we should always slew the time""... $ac_c" 1>&6
-echo "configure:9268: checking if we should always slew the time" >&5
+echo "configure:9269: 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
@@ -9304,7 +9305,7 @@ EOF
 esac
 
 echo $ac_n "checking if we should step and slew the time""... $ac_c" 1>&6
-echo "configure:9308: checking if we should step and slew the time" >&5
+echo "configure:9309: 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
@@ -9347,7 +9348,7 @@ EOF
 esac
 
 echo $ac_n "checking if ntpdate should step the time""... $ac_c" 1>&6
-echo "configure:9351: checking if ntpdate should step the time" >&5
+echo "configure:9352: 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
@@ -9378,7 +9379,7 @@ EOF
 esac
 
 echo $ac_n "checking if we should sync TODR clock every hour""... $ac_c" 1>&6
-echo "configure:9382: checking if we should sync TODR clock every hour" >&5
+echo "configure:9383: 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
@@ -9411,7 +9412,7 @@ EOF
 esac
 
 echo $ac_n "checking if we should avoid kernel FLL bug""... $ac_c" 1>&6
-echo "configure:9415: checking if we should avoid kernel FLL bug" >&5
+echo "configure:9416: 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
@@ -9633,6 +9634,7 @@ s%@LIBOBJS@%$LIBOBJS%g
 s%@LIBPARSE@%$LIBPARSE%g
 s%@MAKE_LIBPARSE@%$MAKE_LIBPARSE%g
 s%@MAKE_LIBPARSE_KERNEL@%$MAKE_LIBPARSE_KERNEL%g
+s%@RSAREF@%$RSAREF%g
 s%@LIBRSAREF@%$LIBRSAREF%g
 s%@MAKE_LIBRSAREF@%$MAKE_LIBRSAREF%g
 s%@TESTDCF@%$TESTDCF%g

diff --git a/configure.in b/configure.in
index 631070ed1905b57d4d33d53cf27427cf6314fa97..24d498d90cc8032ac6b2765f0dd27524d7bcd8a1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2048,6 +2048,7 @@ case "$ntp_libparse" in
 esac
 AC_MSG_RESULT($ans)
 
+AC_SUBST(RSAREF)
 AC_SUBST(LIBRSAREF)
 AC_SUBST(MAKE_LIBRSAREF)
 AC_MSG_CHECKING(if we need to make and use the RSAREF library)

diff --git a/include/Makefile.in b/include/Makefile.in
index 7a204d13c2682a64a8b7592e90633b1b2864901f..89b6acdb2cd9936a5b62339ab39bea965c110fb5 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -88,6 +88,7 @@ PACKAGE = @PACKAGE@
 PATH_SH = @PATH_SH@
 PROPDELAY = @PROPDELAY@
 RANLIB = @RANLIB@
+RSAREF = @RSAREF@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@

diff --git a/kernel/Makefile.in b/kernel/Makefile.in
index 1faae6fb4148886550c06c1709e33abb9c3a0381..4cffeba361159f710beeea001d8a655797a8e11c 100644 (file)
--- a/kernel/Makefile.in
+++ b/kernel/Makefile.in
@@ -88,6 +88,7 @@ PACKAGE = @PACKAGE@
 PATH_SH = @PATH_SH@
 PROPDELAY = @PROPDELAY@
 RANLIB = @RANLIB@
+RSAREF = @RSAREF@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@

diff --git a/kernel/sys/Makefile.in b/kernel/sys/Makefile.in
index 0cfea0cf0b29ce20a7bcfd17f065cc1687ebfd3f..636e0e78c14b672a0a2dbcbff163befc62f0414a 100644 (file)
--- a/kernel/sys/Makefile.in
+++ b/kernel/sys/Makefile.in
@@ -88,6 +88,7 @@ PACKAGE = @PACKAGE@
 PATH_SH = @PATH_SH@
 PROPDELAY = @PROPDELAY@
 RANLIB = @RANLIB@
+RSAREF = @RSAREF@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@

diff --git a/libntp/Makefile.in b/libntp/Makefile.in
index 2be556ba5f4a9575a9391b1087f903a0e26b69a0..1b335b7d39112d6f8e1308f0c032f03f373391f0 100644 (file)
--- a/libntp/Makefile.in
+++ b/libntp/Makefile.in
@@ -88,6 +88,7 @@ PACKAGE = @PACKAGE@
 PATH_SH = @PATH_SH@
 PROPDELAY = @PROPDELAY@
 RANLIB = @RANLIB@
+RSAREF = @RSAREF@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@

diff --git a/libparse/Makefile.in b/libparse/Makefile.in
index 10df11ef7c904bab20c6ce7d66a41940f0e147fb..fad09a6bfb0f9dc7c6f1229b93fc5bf46a0f7d59 100644 (file)
--- a/libparse/Makefile.in
+++ b/libparse/Makefile.in
@@ -88,6 +88,7 @@ PACKAGE = @PACKAGE@
 PATH_SH = @PATH_SH@
 PROPDELAY = @PROPDELAY@
 RANLIB = @RANLIB@
+RSAREF = @RSAREF@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@

diff --git a/ntpd/Makefile.in b/ntpd/Makefile.in
index 8845ec50f532d93a435091f7e1eee147ed5a99ab..9a5d8bb6535821962b12a91fd2becf96eaa453f6 100644 (file)
--- a/ntpd/Makefile.in
+++ b/ntpd/Makefile.in
@@ -88,6 +88,7 @@ PACKAGE = @PACKAGE@
 PATH_SH = @PATH_SH@
 PROPDELAY = @PROPDELAY@
 RANLIB = @RANLIB@
+RSAREF = @RSAREF@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@

diff --git a/ntpdate/Makefile.in b/ntpdate/Makefile.in
index de685b7a5feab34b388dca5e6b6d8993a48e5d1e..07e351f698b7361899331e8ca84a326c4a772ca6 100644 (file)
--- a/ntpdate/Makefile.in
+++ b/ntpdate/Makefile.in
@@ -88,6 +88,7 @@ PACKAGE = @PACKAGE@
 PATH_SH = @PATH_SH@
 PROPDELAY = @PROPDELAY@
 RANLIB = @RANLIB@
+RSAREF = @RSAREF@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@

diff --git a/ntpdc/Makefile.in b/ntpdc/Makefile.in
index 09c7cabccbed3bb2256b25baa905053c156b7038..bb1a45db637f4d64a2e6d6f4799dddf2e9f8ec9c 100644 (file)
--- a/ntpdc/Makefile.in
+++ b/ntpdc/Makefile.in
@@ -88,6 +88,7 @@ PACKAGE = @PACKAGE@
 PATH_SH = @PATH_SH@
 PROPDELAY = @PROPDELAY@
 RANLIB = @RANLIB@
+RSAREF = @RSAREF@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@

diff --git a/ntpq/Makefile.in b/ntpq/Makefile.in
index 0703f4b77f2ddd5b2bd5a5f47a9a45799a685235..b0717c8d272514f8cf432d47d1ceaa3eda524bbe 100644 (file)
--- a/ntpq/Makefile.in
+++ b/ntpq/Makefile.in
@@ -88,6 +88,7 @@ PACKAGE = @PACKAGE@
 PATH_SH = @PATH_SH@
 PROPDELAY = @PROPDELAY@
 RANLIB = @RANLIB@
+RSAREF = @RSAREF@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@

diff --git a/ntptrace/Makefile.in b/ntptrace/Makefile.in
index 6a99fcbcaa204c32c47cc7afad8c643578d4e62c..59183a9c8b2debf5e48d900c4e1383985d9f675e 100644 (file)
--- a/ntptrace/Makefile.in
+++ b/ntptrace/Makefile.in
@@ -88,6 +88,7 @@ PACKAGE = @PACKAGE@
 PATH_SH = @PATH_SH@
 PROPDELAY = @PROPDELAY@
 RANLIB = @RANLIB@
+RSAREF = @RSAREF@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@

diff --git a/parseutil/Makefile.in b/parseutil/Makefile.in
index 3ca7736562307c4a85242eaaf7be7073ee674d8c..39335977c8ec32af8eaaf545d5a831094df9c946 100644 (file)
--- a/parseutil/Makefile.in
+++ b/parseutil/Makefile.in
@@ -88,6 +88,7 @@ PACKAGE = @PACKAGE@
 PATH_SH = @PATH_SH@
 PROPDELAY = @PROPDELAY@
 RANLIB = @RANLIB@
+RSAREF = @RSAREF@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@

diff --git a/scripts/mkver.in b/scripts/mkver.in
index c956378a4e24bf697c2c3dc75098a0dabc4f6209..79d83f83993d3a93167682028822b0f8d95c42d5 100644 (file)
--- a/scripts/mkver.in
+++ b/scripts/mkver.in
@@ -3,7 +3,7 @@ PROG=${1-UNKNOWN}
 
 ConfStr="$PROG"
 
-case "@RSAREF@" in
+case "@LIBRSAREF@" in
  '') ;;
  *)  ConfStr="$ConfStr RSAREF" ;;
 esac

diff --git a/util/Makefile.in b/util/Makefile.in
index 9aed346e3620b21bf2e4a2a1cf8c7b205ef6106c..1b54fdc283cef9643d29d8752a5ee980935e26b3 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -88,6 +88,7 @@ PACKAGE = @PACKAGE@
 PATH_SH = @PATH_SH@
 PROPDELAY = @PROPDELAY@
 RANLIB = @RANLIB@
+RSAREF = @RSAREF@
 TESTDCF = @TESTDCF@
 U = @U@
 VERSION = @VERSION@