[dovecot-cvs] dovecot configure.in,1.154,1.155

[cras at procontrol.fi]

Update of /home/cvs/dovecot
In directory talvi:/tmp/cvs-serv21198

Modified Files:
	configure.in 
Log Message:
Default to OpenSSL



Index: configure.in
===================================================================
RCS file: /home/cvs/dovecot/configure.in,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- configure.in	28 Apr 2004 16:54:32 -0000	1.154
+++ configure.in	1 May 2004 18:44:40 -0000	1.155
@@ -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