Mercurial > dovecot > core-2.2
changeset 1948:7fa8697bc2a9 HEAD
Default to OpenSSL
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sat, 01 May 2004 21:44:40 +0300 |
| parents | 777da553d1d3 |
| children | d2755efdd187 |
| files | configure.in |
| diffstat | 1 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Sat May 01 21:30:52 2004 +0300 +++ b/configure.in Sat May 01 21:44:40 2004 +0300 @@ -1,7 +1,7 @@ AC_INIT(src) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(dovecot, 1.0-test1) +AM_INIT_AUTOMAKE(dovecot, 1.0-test2) AM_MAINTAINER_MODE @@ -828,18 +828,6 @@ have_ssl=no -if test $want_gnutls = yes; then - AC_CHECK_LIB(gnutls, gnutls_global_init, [ - AC_CHECK_HEADERS(gnutls/gnutls.h, [ - AC_DEFINE(HAVE_GNUTLS,, Build with GNUTLS support) - SSL_LIBS="-lgnutls -lgcrypt" - AC_SUBST(SSL_LIBS) - have_ssl="yes (GNUTLS)" - have_gnutls=yes - ]) - ],, -lgcrypt) -fi - if test "$want_openssl" = "yes" && test "$have_ssl" = "no"; then if pkg-config --exists openssl; then PKG_CHECK_MODULES(SSL, openssl) @@ -860,6 +848,18 @@ fi fi +if test $want_gnutls = yes && test $have_ssl = no; then + AC_CHECK_LIB(gnutls, gnutls_global_init, [ + AC_CHECK_HEADERS(gnutls/gnutls.h, [ + AC_DEFINE(HAVE_GNUTLS,, Build with GNUTLS support) + SSL_LIBS="-lgnutls -lgcrypt" + AC_SUBST(SSL_LIBS) + have_ssl="yes (GNUTLS)" + have_gnutls=yes + ]) + ],, -lgcrypt) +fi + if test "$have_ssl" != "no"; then AC_DEFINE(HAVE_SSL,, Build with SSL/TLS support) fi