2008-10-24 [paul] 3.6.1cvs10

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a0ddf4fc0eaf41883a2e8668dee88fcd950df584..fa8a48964ed41e677ba9f5b013a8766357f75987 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,10 @@ PACKAGE=claws-mail
 dnl version number
 MAJOR_VERSION=3
 MINOR_VERSION=6
-MICRO_VERSION=0
+MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=21
+EXTRA_VERSION=10
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -368,14 +368,13 @@ fi
 
 dnl GNUTLS
 AC_ARG_ENABLE(openssl,    [ --enable-openssl      enable GnuTLS support],
-            [ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=yes])
+            [ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=no])
 AC_ARG_ENABLE(gnutls,    [ --enable-gnutls      enable GnuTLS support],
             [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=yes])
 
 if test "x$ac_cv_enable_gnutls" != "xyes"; then
        if test "x$ac_cv_enable_openssl" = "xyes"; then
-               AC_MSG_WARN(*** Using GnuTLS instead of OpenSSL due to licensing ***)
-               ac_cv_enable_gnutls="yes"
+               AC_MSG_ERROR(*** Use GnuTLS instead of OpenSSL due to licensing ***)
        fi
 fi
 AC_MSG_CHECKING([whether to use GnuTLS])