From: Timo Sirainen <tss@iki.fi>
Date: Sat, 1 May 2004 18:44:40 +0000 (+0300)
Subject: Default to OpenSSL
X-Git-Tag: 1.1.alpha1~4158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b600d896ed54cc2727e162e572923c590c6d9b1;p=thirdparty%2Fdovecot%2Fcore.git

Default to OpenSSL

--HG--
branch : HEAD
---

diff --git a/configure.in b/configure.in
index adf2b9d7b1..b860f2af0e 100644
--- a/configure.in
+++ b/configure.in
@@ -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 @@ dnl **
 
 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 @@ if test "$want_openssl" = "yes" && test "$have_ssl" = "no"; then
   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