Added HAVE_GCRYPT define. Removed explicit checks for libcryto and libdes,

since they interfered with libgcrypt.

diff --git a/macros/ssl-check.m4 b/macros/ssl-check.m4
index 9fa7b3729b008ad7390a0babe7e7282961f1b25d..7ac5ea155af1b0811d8b6f7d2289f0c06f829405 100644 (file)
--- a/macros/ssl-check.m4
+++ b/macros/ssl-check.m4
@@ -1,4 +1,4 @@
-dnl $Id: ssl-check.m4,v 1.9 2003-06-08 16:04:49 srittau Exp $
+dnl $Id: ssl-check.m4,v 1.10 2003-06-08 16:49:25 srittau Exp $
 dnl Autoconf macro to check for SSL or OpenSSL
 
 AC_DEFUN([AC_PATH_GCRYPT], [
@@ -28,6 +28,7 @@ AC_DEFUN([AC_PATH_GCRYPT], [
                else
                        GCRYPT_CFLAGS="`$GCRYPT_CONFIG --cflags`"
                        GCRYPT_LIBS="`$GCRYPT_CONFIG --libs`"
+                       AC_DEFINE(HAVE_GCRYPT, 1, [Define if libgcrypt is available])
                fi
        fi
 
@@ -68,12 +69,6 @@ AC_DEFUN([AC_PATH_SSL], [
                                fi
                                AC_MSG_RESULT([$ssldir (enabling RANDNUM and DHX support)])
 
-dnl FIXME: The following looks crude and probably doesn't work properly.
-                               dnl Check for the crypto library:
-                               AC_CHECK_LIB(crypto, main)
-                               dnl Check for "DES" library (for SSLeay, not openssl):
-                               AC_CHECK_LIB(des, main)
-
                                AC_DEFINE(OPENSSL_DHX,  1, [Define if the OpenSSL DHX modules should be built])
                                AC_DEFINE(UAM_DHX,      1, [Define if the DHX UAM modules should be compiled])
                                compile_ssl=yes