Added check for libgcrypt (as an alternative to OpenSSL).

diff --git a/configure.in b/configure.in
index a9edbe345f5116869cd08b5a96199ca86733041b..0a9a7bdb9c434fe3db3308959ed2d1c7f0914bd2 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.186 2003-06-08 15:21:40 srittau Exp $
+dnl $Id: configure.in,v 1.187 2003-06-08 16:04:49 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -611,7 +611,8 @@ if test x"$this_os" = "xtru64"; then
        sysv_style=tru64
 fi
 
-dnl -- look for openssl
+dnl -- look for OpenSSL and other crypt libraries
+AC_PATH_GCRYPT
 AC_PATH_SSL
 
 dnl --------------------- check for building PGP UAM module

diff --git a/macros/ssl-check.m4 b/macros/ssl-check.m4
index 8a9ef9b3f63935b3bdec987f725ec0bcef2b048f..9fa7b3729b008ad7390a0babe7e7282961f1b25d 100644 (file)
--- a/macros/ssl-check.m4
+++ b/macros/ssl-check.m4
@@ -1,6 +1,41 @@
-dnl $Id: ssl-check.m4,v 1.8 2003-01-29 00:16:31 srittau Exp $
+dnl $Id: ssl-check.m4,v 1.9 2003-06-08 16:04:49 srittau Exp $
 dnl Autoconf macro to check for SSL or OpenSSL
 
+AC_DEFUN([AC_PATH_GCRYPT], [
+
+       GCRYPT_CFLAGS=""
+       GCRYPT_LIBS=""
+
+       search="yes"
+       errifnotfound="no"
+
+       AC_ARG_ENABLE(libgcrypt, [  --disable-gcrypt        disable compilation with libgcrypt], [
+               if test "x$enableval" != "xdisable"; then
+                       errifnotfound="yes"
+               else
+                       search="no"
+               fi
+       ])
+
+       GCRYPT_CONFIG=""
+       if test "x$search" == "xyes"; then
+               AC_PATH_PROG([GCRYPT_CONFIG], [libgcrypt-config], [no])
+
+               if test "x$GCRYPT_CONFIG" == "xno"; then
+                       if test "x$errifnotfound" == "xyes"; then
+                               AC_MSG_ERROR([libgcrypt-config not found])
+                       fi
+               else
+                       GCRYPT_CFLAGS="`$GCRYPT_CONFIG --cflags`"
+                       GCRYPT_LIBS="`$GCRYPT_CONFIG --libs`"
+               fi
+       fi
+
+       AC_SUBST(GCRYPT_CFLAGS)
+       AC_SUBST(GCRYPT_LIBS)
+       AM_CONDITIONAL(HAVE_GCRYPT, test -n "$GCRYPT_CONFIG")
+])
+
 AC_DEFUN([AC_PATH_SSL], [
        AC_ARG_WITH(ssl-dir, [  --with-ssl-dir=PATH     specify path to OpenSSL installation (must contain
                           lib and include dirs)],