[dovecot-cvs] dovecot configure.in,1.45,1.46 INSTALL,1.3,1.4
cras at procontrol.fi
cras at procontrol.fi
Wed Nov 20 16:18:07 EET 2002
- Previous message: [dovecot-cvs] dovecot/src/master ssl-init-gnutls.c,NONE,1.1 ssl-init-openssl.c,NONE,1.1 Makefile.am,1.3,1.4 ssl-init.c,1.1,1.2 ssl-init.h,1.1,1.2
- Next message: [dovecot-cvs] dovecot/src/master ssl-init-gnutls.c,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/dovecot
In directory danu:/tmp/cvs-serv6275
Modified Files:
configure.in INSTALL
Log Message:
SSL fixes and doc updates.
Index: configure.in
===================================================================
RCS file: /home/cvs/dovecot/configure.in,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- configure.in 20 Nov 2002 14:05:13 -0000 1.45
+++ configure.in 20 Nov 2002 14:18:05 -0000 1.46
@@ -359,38 +359,33 @@
dnl ** SSL
dnl **
+have_ssl=no
+
if test $want_gnutls = yes; then
AC_CHECK_LIB(gnutls, gnutls_global_init, [
- AC_DEFINE(HAVE_SSL)
- AC_DEFINE(HAVE_GNUTLS)
- SSL_LIBS="-lgnutls -lgcrypt"
- AC_SUBST(SSL_LIBS)
- have_ssl="yes (GNUTLS)"
- have_gnutls=yes
- ], [
- have_ssl=no
+ AC_CHECK_HEADERS(gnutls/gnutls.h, [
+ AC_DEFINE(HAVE_SSL)
+ AC_DEFINE(HAVE_GNUTLS)
+ SSL_LIBS="-lgnutls -lgcrypt"
+ AC_SUBST(SSL_LIBS)
+ have_ssl="yes (GNUTLS)"
+ have_gnutls=yes
+ ])
], -lgcrypt)
-else
- have_ssl=no
fi
if test "$want_openssl" = "yes" -a "$have_ssl" = "no"; then
AC_CHECK_LIB(ssl, SSL_read, [
- AC_CHECK_LIB(crypto, X509_new, [
- AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h, [
- AC_DEFINE(HAVE_SSL)
- AC_DEFINE(HAVE_OPENSSL)
- SSL_LIBS="-lssl -lcrypto"
- AC_SUBST(SSL_LIBS)
- have_ssl="yes (OpenSSL)"
- have_openssl=yes
- ])
+ AC_CHECK_HEADERS(openssl/ssl.h openssl/err.h, [
+ AC_DEFINE(HAVE_SSL)
+ AC_DEFINE(HAVE_OPENSSL)
+ SSL_LIBS="-lssl -lcrypto"
+ AC_SUBST(SSL_LIBS)
+ have_ssl="yes (OpenSSL)"
+ have_openssl=yes
])
])
fi
-
-AM_CONDITIONAL(SSL_GNUTLS, test "$have_gnutls" = "yes")
-AM_CONDITIONAL(SSL_OPENSSL, test "$have_openssl" = "yes")
dnl **
dnl ** shadow/pam support
Index: INSTALL
===================================================================
RCS file: /home/cvs/dovecot/INSTALL,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- INSTALL 16 Oct 2002 01:25:14 -0000 1.3
+++ INSTALL 20 Nov 2002 14:18:05 -0000 1.4
@@ -19,8 +19,12 @@
SSL/TLS
-------
-GNUTLS v0.5.5 or later is required to enable SSL and TLS support. OpenSSL
-isn't supported. You can get GNUTLS from http://www.gnutls.org/
+Dovecot supports both GNUTLS and OpenSSL. Dovecot prefers GNUTLS if it's
+found, but fallbacks to OpenSSL. If you wish to force using OpenSSL, give
+--with-ssl=openssl to configure.
+
+For GNUTLS support you need version 0.5.5 or later. You can get GNUTLS from
+http://www.gnutls.org/
Optional configure options
@@ -70,6 +74,6 @@
Specify which authentication modules to use. Disabling them give you a few
bytes smaller binary, but not much else.
- --with-gnutls Build with GNUTLS (default)
+ --with-ssl=gnutls|openssl Build with GNUTLS (default) or OpenSSL
-Use GNUTLS for SSL and TLS support.
+Specify wanted SSL library.
- Previous message: [dovecot-cvs] dovecot/src/master ssl-init-gnutls.c,NONE,1.1 ssl-init-openssl.c,NONE,1.1 Makefile.am,1.3,1.4 ssl-init.c,1.1,1.2 ssl-init.h,1.1,1.2
- Next message: [dovecot-cvs] dovecot/src/master ssl-init-gnutls.c,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the dovecot-cvs
mailing list