configure, configure.in:

  * configure.in: --with-crypto={md5,autokey,rsaref} cleanup

bk: 39162ed3DPqZ-ZLxqGJy8jSwEGy4eA

diff --git a/configure b/configure
index 64a7c59c8dfe13afc3d9e0e0e4d988d1a0abe704..de95c29678ed0ec3569c7b57e39e3300180d81b0 100755 (executable)
--- a/configure
+++ b/configure
@@ -9872,6 +9872,7 @@ else
 fi
 
 case "$ans" in
+ no) ans=md5 ;;
  yes|rsaref)
     ans=md5
     if test -f $srcdir/rsaref2/source/rsa.c
@@ -9890,19 +9891,22 @@ EOF
 
     fi
     ;;
- autokey)
+esac
+
+case "$ans" in
+ md5) ;;
+ *)
     cat >>confdefs.h <<\EOF
 #define AUTOKEY 
 EOF
 
-    
     AUTOKEY=1
     ;;
 esac
 echo "$ac_t""$ans" 1>&6
 
 echo $ac_n "checking if we can make dcf parse utilities... $ac_c" 1>&6
-echo "configure:9906: checking if we can make dcf parse utilities" 1>&5
+echo "configure:9910: checking if we can make dcf parse utilities" 1>&5
 ans=no
 if test "$ntp_parseutil" = "yes"; then
     case "$target" in
@@ -9916,7 +9920,7 @@ fi
 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:9920: checking if we can build kernel streams modules for parse" 1>&5
+echo "configure:9924: checking if we can build kernel streams modules for parse" 1>&5
 ans=no
 case "$ntp_parseutil$ac_cv_header_sys_stropts_h" in
  yesyes)
@@ -9943,7 +9947,7 @@ esac
 echo "$ac_t""$ans" 1>&6
 
 echo $ac_n "checking if we need basic refclock support... $ac_c" 1>&6
-echo "configure:9947: checking if we need basic refclock support" 1>&5
+echo "configure:9951: checking if we need basic refclock support" 1>&5
 if test "$ntp_refclock" = "yes"; then
     cat >>confdefs.h <<\EOF
 #define REFCLOCK 1
@@ -9955,7 +9959,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:9959: checking if we want HP-UX adjtimed support" 1>&5
+echo "configure:9963: checking if we want HP-UX adjtimed support" 1>&5
 case "$target" in
  *-*-hpux[56789]*)
     ans=yes
@@ -9973,7 +9977,7 @@ fi
 echo "$ac_t""$ans" 1>&6
 
 echo $ac_n "checking if we can read kmem... $ac_c" 1>&6
-echo "configure:9977: checking if we can read kmem" 1>&5
+echo "configure:9981: checking if we can read kmem" 1>&5
 if test "${ac_cv_var_can_kmem+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10025,7 +10029,7 @@ EOF
 esac
 
 echo $ac_n "checking if adjtime is accurate... $ac_c" 1>&6
-echo "configure:10029: checking if adjtime is accurate" 1>&5
+echo "configure:10033: checking if adjtime is accurate" 1>&5
 if test "${ac_cv_var_adjtime_is_accurate+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10076,7 +10080,7 @@ EOF
 esac
 
 echo $ac_n "checking the name of 'tick' in the kernel... $ac_c" 1>&6
-echo "configure:10080: checking the name of 'tick' in the kernel" 1>&5
+echo "configure:10084: checking the name of 'tick' in the kernel" 1>&5
 if test "${ac_cv_var_nlist_tick+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10119,7 +10123,7 @@ EOF
 esac
 #
 echo $ac_n "checking for the units of 'tick'... $ac_c" 1>&6
-echo "configure:10123: checking for the units of 'tick'" 1>&5
+echo "configure:10127: checking for the units of 'tick'" 1>&5
 if test "${ac_cv_var_tick_nano+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10142,7 +10146,7 @@ EOF
 esac
 #
 echo $ac_n "checking the name of 'tickadj' in the kernel... $ac_c" 1>&6
-echo "configure:10146: checking the name of 'tickadj' in the kernel" 1>&5
+echo "configure:10150: checking the name of 'tickadj' in the kernel" 1>&5
 if test "${ac_cv_var_nlist_tickadj+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10194,7 +10198,7 @@ EOF
 esac
 #
 echo $ac_n "checking for the units of 'tickadj'... $ac_c" 1>&6
-echo "configure:10198: checking for the units of 'tickadj'" 1>&5
+echo "configure:10202: checking for the units of 'tickadj'" 1>&5
 if test "${ac_cv_var_tickadj_nano+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10217,7 +10221,7 @@ EOF
 esac
 #
 echo $ac_n "checking half-heartedly for 'dosynctodr' in the kernel... $ac_c" 1>&6
-echo "configure:10221: checking half-heartedly for 'dosynctodr' in the kernel" 1>&5
+echo "configure:10225: checking half-heartedly for 'dosynctodr' in the kernel" 1>&5
 if test "${ac_cv_var_nlist_dosynctodr+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10269,7 +10273,7 @@ EOF
 esac
 #
 echo $ac_n "checking half-heartedly for 'noprintf' in the kernel... $ac_c" 1>&6
-echo "configure:10273: checking half-heartedly for 'noprintf' in the kernel" 1>&5
+echo "configure:10277: checking half-heartedly for 'noprintf' in the kernel" 1>&5
 if test "${ac_cv_var_nlist_noprintf+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10315,7 +10319,7 @@ EOF
 esac
 
 echo $ac_n "checking for a default value for 'tick'... $ac_c" 1>&6
-echo "configure:10319: checking for a default value for 'tick'" 1>&5
+echo "configure:10323: checking for a default value for 'tick'" 1>&5
 if test "${ac_cv_var_tick+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10358,7 +10362,7 @@ EOF
 esac
 
 echo $ac_n "checking for a default value for 'tickadj'... $ac_c" 1>&6
-echo "configure:10362: checking for a default value for 'tickadj'" 1>&5
+echo "configure:10366: checking for a default value for 'tickadj'" 1>&5
 if test "${ac_cv_var_tickadj+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10489,7 +10493,7 @@ case "$target" in
 esac
 
 echo $ac_n "checking if we want and can make the tickadj utility... $ac_c" 1>&6
-echo "configure:10493: checking if we want and can make the tickadj utility" 1>&5
+echo "configure:10497: checking if we want and can make the tickadj utility" 1>&5
 if test "${ac_cv_make_tickadj+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10503,7 +10507,7 @@ case "$ac_cv_make_tickadj" in
 esac
 
 echo $ac_n "checking if we want and can make the ntptime utility... $ac_c" 1>&6
-echo "configure:10507: checking if we want and can make the ntptime utility" 1>&5
+echo "configure:10511: checking if we want and can make the ntptime utility" 1>&5
 if test "${ac_cv_make_ntptime+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10528,7 +10532,7 @@ case "$ac_cv_make_ntptime" in
 esac
 
 echo $ac_n "checking if we want UDP wildcard delivery... $ac_c" 1>&6
-echo "configure:10532: checking if we want UDP wildcard delivery" 1>&5
+echo "configure:10536: checking if we want UDP wildcard delivery" 1>&5
 if test "${ac_cv_var_udp_wildcard_delivery+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10606,7 +10610,7 @@ case "$host" in
 esac
 
 echo $ac_n "checking if we should always slew the time... $ac_c" 1>&6
-echo "configure:10610: checking if we should always slew the time" 1>&5
+echo "configure:10614: checking if we should always slew the time" 1>&5
 if test "${ac_cv_var_slew_always+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10645,7 +10649,7 @@ EOF
 esac
 
 echo $ac_n "checking if we should step and slew the time... $ac_c" 1>&6
-echo "configure:10649: checking if we should step and slew the time" 1>&5
+echo "configure:10653: checking if we should step and slew the time" 1>&5
 if test "${ac_cv_var_step_slew+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10687,7 +10691,7 @@ EOF
 esac
 
 echo $ac_n "checking if ntpdate should step the time... $ac_c" 1>&6
-echo "configure:10691: checking if ntpdate should step the time" 1>&5
+echo "configure:10695: checking if ntpdate should step the time" 1>&5
 if test "${ac_cv_var_ntpdate_step+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10717,7 +10721,7 @@ EOF
 esac
 
 echo $ac_n "checking if we should sync TODR clock every hour... $ac_c" 1>&6
-echo "configure:10721: checking if we should sync TODR clock every hour" 1>&5
+echo "configure:10725: checking if we should sync TODR clock every hour" 1>&5
 if test "${ac_cv_var_sync_todr+set}" = set; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10749,7 +10753,7 @@ EOF
 esac
 
 echo $ac_n "checking if we should avoid kernel FLL bug... $ac_c" 1>&6
-echo "configure:10753: checking if we should avoid kernel FLL bug" 1>&5
+echo "configure:10757: checking if we should avoid kernel FLL bug" 1>&5
 if 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 07a8f7485ef71653011751f098f013eab0609177..e129be52c291b6d3b07b3a6b60287fd722a98d7b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2228,6 +2228,7 @@ AC_MSG_CHECKING(for the level of crypto support)
 AC_ARG_WITH(crypto,    [  --with-crypto           + ={md5,autokey,rsaref}],
 [ans=$withval], [ans=yes])
 case "$ans" in
+ no) ans=md5 ;;
  yes|rsaref)
     ans=md5
     if test -f $srcdir/rsaref2/source/rsa.c
@@ -2240,9 +2241,12 @@ case "$ans" in
        AC_DEFINE(PUBKEY, , [Public key?])
     fi
     ;;
- autokey)
+esac
+AC_SUBST(AUTOKEY)
+case "$ans" in
+ md5) ;;
+ *)
     AC_DEFINE(AUTOKEY, , [Autokey?])
-    AC_SUBST(AUTOKEY)
     AUTOKEY=1
     ;;
 esac