ChangeLog, build, configure, configure.in, flock-build:

  * build (KEYSUF):
  * flock-build:
  * configure.in: Lose the "md5" options from the --with-crypto
  check; Dave hates it.

bk: 39220f56gQnNraAmFjT3h77EawWHmg

diff --git a/ChangeLog b/ChangeLog
index 6ac8f519d2e833d2feb2ca4d7bd4afd57c2633a5..5d44be474723f7d27ebd3a94cb613015c694a266 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2000-05-16  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * build (KEYSUF): 
+       * flock-build: 
+       * configure.in: Lose the "md5" options from the --with-crypto
+       check; Dave hates it.
+
        * ntpd/ntp_util.c (stats_config): 
        * ntpd/ntp_loopfilter.c (loop_config): 
        * libntp/systime.c (adj_systime): 

diff --git a/build b/build
index 7b2dda03bfdfffe00c7e1aaf8b116485cbb8260d..acbb6737cead316e6b211206966a17d7af0786fb 100755 (executable)
--- a/build
+++ b/build
@@ -50,8 +50,8 @@ case "$CONFIG_ARGS" in
  *--with-crypto=autokey*)
     KEYSUF="-autokey"
     ;;
- *--with-crypto=md5*)
-    [ -d rsaref2 ] && KEYSUF="-md5"
+ *--without-crypto*)
+    [ -d rsaref2 ] && KEYSUF="-norsaref"
     ;;
 esac
 

diff --git a/configure b/configure
index 9fcdf75ca9782c77527beb7e1e1f5282440458af..1c7e417b6421a364402eb57d9b859c8435ea2ad4 100755 (executable)
--- a/configure
+++ b/configure
@@ -143,7 +143,7 @@ ac_arg_enable_help="$ac_arg_enable_help
 ac_arg_enable_help="$ac_arg_enable_help
   --enable-VARITEXT       s VARITEXT clock"
 ac_arg_with_help="$ac_arg_with_help
-  --with-crypto           + ={md5,autokey,rsaref}"
+  --with-crypto           + ={autokey,rsaref}"
 ac_arg_enable_help="$ac_arg_enable_help
   --enable-kmem           s read /dev/kmem for tick and/or tickadj"
 ac_arg_enable_help="$ac_arg_enable_help
@@ -9911,9 +9911,9 @@ else
 fi
 
 case "$ans" in
- no) ans=md5 ;;
+ no) ;;
  yes|rsaref)
-    ans=md5
+    ans=no
     if test -f $srcdir/rsaref2/source/rsa.c
     then
        ans=rsaref
@@ -9933,7 +9933,7 @@ EOF
 esac
 
 case "$ans" in
- md5) ;;
+ no) ;;
  *)
     cat >>confdefs.h <<\EOF
 #define AUTOKEY 

diff --git a/configure.in b/configure.in
index 026b21c6e6af325f90ff8197cf8bbfca5a803f65..30ecb973762e804a73f144d97e38274992bb6d5c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2227,12 +2227,12 @@ AC_SUBST(LIBRSAREF)
 AC_SUBST(MAKE_LIBRSAREF)
 AC_SUBST(MAKE_NTP_GENKEYS)
 AC_MSG_CHECKING(for the level of crypto support)
-AC_ARG_WITH(crypto,    [  --with-crypto           + ={md5,autokey,rsaref}],
+AC_ARG_WITH(crypto,    [  --with-crypto           + ={autokey,rsaref}],
 [ans=$withval], [ans=yes])
 case "$ans" in
- no) ans=md5 ;;
+ no) ;;
  yes|rsaref)
-    ans=md5
+    ans=no
     if test -f $srcdir/rsaref2/source/rsa.c
     then
        ans=rsaref
@@ -2246,7 +2246,7 @@ case "$ans" in
 esac
 AC_SUBST(AUTOKEY)
 case "$ans" in
- md5) ;;
+ no) ;;
  *)
     AC_DEFINE(AUTOKEY, , [Autokey?])
     AUTOKEY=1

diff --git a/flock-build b/flock-build
index b5273acccc4ef8cf46cd24bc0f635d259b5f34fb..1f3babea228f26e241728df3365815cb419f5993 100755 (executable)
--- a/flock-build
+++ b/flock-build
@@ -29,5 +29,5 @@ do
     echo $i
     ssh $i "cd $c_d ; ./build $SIG --enable-parse-clocks $BUILD_ARGS" &
     ssh $i "cd $c_d ; ./build $SIG --enable-parse-clocks --with-crypto=autokey $BUILD_ARGS" &
-    ssh $i "cd $c_d ; ./build $SIG --enable-parse-clocks --with-crypto=md5 $BUILD_ARGS" &
+    ssh $i "cd $c_d ; ./build $SIG --enable-parse-clocks --without-crypto $BUILD_ARGS" &
 done