COPYRIGHT, ChangeLog, aclocal.m4, configure, configure.in:

  * configure.in (openssl): Publish and default to RSAREF; hide
  openssl, and only use it if explicitly requested (at least until
  we work with it).

bk: 3ac94dbcMP6G31MRQ6kda8BNu-XBZA

diff --git a/COPYRIGHT b/COPYRIGHT
index da8e0c30fbb27beb7c3fda3770c3fa44e5c9fed0..8af5d56b42b290f16edd73ec4f99b6a9ad4b7e8b 100644 (file)
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -38,8 +38,7 @@ This file is automatically generated from html/copyright.htm
     4. [5]Karl Berry <karl@owl.HQ.ileaf.com> syslog to file option
     5. [6]Greg Brackley <greg.brackley@bigfoot.com> Major rework of WINNT
        port. Clean up recvbuf and iosignal code into separate modules.
-    6. [7]Marc Brett <Marc.Brett@westerngeco.com> Magnavox GPS clock
-       driver
+    6. [7]Marc Brett <Marc.Brett@westgeo.com> Magnavox GPS clock driver
     7. [8]Piete Brooks <Piete.Brooks@cl.cam.ac.uk> MSF clock driver,
        Trimble PARSE support
     8. [9]Steve Clift <clift@ml.csiro.au> OMEGA clock driver
@@ -106,7 +105,7 @@ This file is automatically generated from html/copyright.htm
        validated HTML documents according to the HTML DTD
      _________________________________________________________________
    
-   [50][home.gif] 
+   [50]gif 
    
    
     [51]David L. Mills <mills@udel.edu>
@@ -119,7 +118,7 @@ References
    4. mailto:michael.barone@lmco.com
    5. mailto:karl@owl.HQ.ileaf.com
    6. mailto:greg.brackley@bigfoot.com
-   7. mailto:Marc.Brett@westerngeco.com
+   7. mailto:Marc.Brett@westgeo.com
    8. mailto:Piete.Brooks@cl.cam.ac.uk
    9. mailto:clift@ml.csiro.au
   10. mailto:casey@csc.co.za

diff --git a/ChangeLog b/ChangeLog
index 4d46d897d35a33324f2284c546dfd417881bc5cf..32cbfdcfc149ac68af0a8f9931eea4774c3c2493 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-03  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+       * configure.in (openssl): Publish and default to RSAREF; hide
+       openssl, and only use it if explicitly requested (at least until
+       we work with it).
+
 2001-04-02  Harlan Stenn  <stenn@whimsy.udel.edu>
 
        * html/y2k.htm:

diff --git a/configure b/configure
index 773e227c4b35e6ba312bd873ac7aeca8a45d4b4b..c9bc7d13c12cb8a2926e95275cc8be35c6c3f75b 100755 (executable)
--- a/configure
+++ b/configure
@@ -789,7 +789,7 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-openssl-libdir   + =/something/reasonable
   --with-openssl-incdir   + =/something/reasonable
-  --with-crypto           + ={autokey,openssl,rsaref}
+         --with-crypto           + ={autokey,rsaref}
   --with-electricfence    -
 
 Some influential environment variables:
@@ -1395,7 +1395,7 @@ fi
 
 # Define the identity of the package.
 PACKAGE=ntp
-VERSION=4.0.99k20
+VERSION=4.0.99k21
 
 cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
@@ -13359,7 +13359,7 @@ case "$ans" in
  no) ;;
  yes|rsaref|openssl)
     case "$ans" in
-     rsaref)
+     yes|rsaref) # Just "rsaref" when OpenSSL is ready
        ans=no
        ;;
      *)

diff --git a/configure.in b/configure.in
index 5be2dcf125dd5ee96482ab3a2aa0ef0063ff2cb2..a8c5468aa54f5a2bb0888b9537423c1e8c0b1201 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CANONICAL_SYSTEM
 AC_DEFINE_UNQUOTED(STR_SYSTEM, "$target")
 AM_CONFIG_HEADER(config.h)
 AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE(ntp, 4.0.99k20)
+AM_INIT_AUTOMAKE(ntp, 4.0.99k21)
 AC_PREREQ(2.49)
 
 ac_cv_var_oncore_ok=no
@@ -2287,13 +2287,16 @@ esac
 AC_MSG_RESULT($ans)
 
 AC_MSG_CHECKING(for the level of crypto support)
-AC_ARG_WITH(crypto,    [  --with-crypto           + ={autokey,openssl,rsaref}],
+AC_ARG_WITH(crypto,
+       dnl     AC_HELP_STRING([--with-crypto], [+ ={autokey,openssl,rsaref}]),
+       AC_HELP_STRING([--with-crypto], [+ ={autokey,rsaref}]),
+
 [ans=$withval], [ans=yes])
 case "$ans" in
  no) ;;
  yes|rsaref|openssl)
     case "$ans" in
-     rsaref)
+     yes|rsaref) # Just "rsaref" when OpenSSL is ready
        ans=no
        ;;
      *)