[svn] Enable turning off SSL.

diff --git a/ChangeLog b/ChangeLog
index 0661da7fbfb98af708d3ef4476fe59c883b67bca..2006532a1ad29eb1d7c65aa623fd46076f6c661f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-06-24  Hrvoje Niksic  <hniksic@xemacs.org>
 
+       * configure.in: Enable the user to turn off SSL autodetection and
+       disable SSL using --without-ssl.
+
        * Makefile.in ($(srcdir)/stamp-h.in): Remove the aclocal.m4
        dependencies.
 

diff --git a/configure.in b/configure.in
index a815aadb5297d190e6ee919ee62593bf76be3148..14e3237cb1833899fb1d81c9838c1a4bee2800de 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -59,8 +59,7 @@ dnl Process features.
 dnl
 
 AC_ARG_WITH(ssl,
-[[  --with-ssl[=SSL-ROOT]   link with SSL support [default=auto]
-  --without-ssl           disable SSL autodetection]])
+[[  --without-ssl           disable SSL autodetection]])
 
 AC_ARG_ENABLE(opie,
 [  --disable-opie          disable support for opie or s/key FTP login],
@@ -246,31 +245,33 @@ dnl Checks for libraries.
 dnl
 
 dnl Check for OpenSSL
-
-dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library
-dnl doesn't record its dependency on libdl, so we need to make sure
-dnl -ldl ends up in LIBS on systems that have it.  Most OSes use
-dnl dlopen(), but HP-UX uses dnl shl_load().
-AC_CHECK_LIB(dl, dlopen, [], [
-  AC_CHECK_LIB(dl, shl_load)
-])
-
-dnl Now actually check for -lssl
-AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
-#include <openssl/ssl.h>
-#include <openssl/x509.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-#include <openssl/des.h>
-#include <openssl/md4.h>
-#include <openssl/md5.h>
-], [SSL_library_init ()])
-if test x"$LIBSSL" != x
+if test x"$with_ssl" != x"no"
 then
-  AC_MSG_NOTICE([compiling in support for SSL])
-  AC_DEFINE([HAVE_SSL], 1,
-            [Define if SSL support should be compiled in.])
-  SSL_OBJ='openssl.o'
+  dnl As of this writing (OpenSSL 0.9.6), the libcrypto shared library
+  dnl doesn't record its dependency on libdl, so we need to make sure
+  dnl -ldl ends up in LIBS on systems that have it.  Most OSes use
+  dnl dlopen(), but HP-UX uses dnl shl_load().
+  AC_CHECK_LIB(dl, dlopen, [], [
+    AC_CHECK_LIB(dl, shl_load)
+  ])
+
+  dnl Now actually check for -lssl
+  AC_LIB_HAVE_LINKFLAGS([ssl], [crypto], [
+  #include <openssl/ssl.h>
+  #include <openssl/x509.h>
+  #include <openssl/err.h>
+  #include <openssl/rand.h>
+  #include <openssl/des.h>
+  #include <openssl/md4.h>
+  #include <openssl/md5.h>
+  ], [SSL_library_init ()])
+  if test x"$LIBSSL" != x
+  then
+    AC_MSG_NOTICE([compiling in support for SSL])
+    AC_DEFINE([HAVE_SSL], 1,
+             [Define if SSL support should be compiled in.])
+    SSL_OBJ='openssl.o'
+  fi
 fi
 AC_SUBST(SSL_OBJ)