talons

commit 8873ab1c1d4645491e9b53eb018ea96ae6c0e7cb
parent 994ed792cea71b6a710b5d9948affa63cc674b00
Author: Colin Leroy <colin@colino.net>
Date:   Sat,  2 Oct 2010 06:39:05 +0000

2010-10-02 [colin]	3.7.6cvs43

	* configure.ac
		It's now time to remove the temporary enable-openssl
		option that was used when we removed OpenSSL. See
		bug #2276 comment #14.

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
9
+--------

3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2010-10-02 [colin]	3.7.6cvs43
+
+	* configure.ac
+		It's now time to remove the temporary enable-openssl
+		option that was used when we removed OpenSSL. See 
+		bug #2276 comment #14.
+
 2010-09-30 [wwp]	3.7.6cvs42
 
 	* src/prefs_account.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4038,3 +4038,4 @@
 ( cvs diff -u -r 1.382.2.558 -r 1.382.2.559 src/compose.c;  cvs diff -u -r 1.274.2.315 -r 1.274.2.316 src/mainwindow.c;  cvs diff -u -r 1.395.2.422 -r 1.395.2.423 src/summaryview.c;  ) > 3.7.6cvs40.patchset
 ( cvs diff -u -r 1.382.2.559 -r 1.382.2.560 src/compose.c;  cvs diff -u -r 1.274.2.316 -r 1.274.2.317 src/mainwindow.c;  cvs diff -u -r 1.395.2.423 -r 1.395.2.424 src/summaryview.c;  ) > 3.7.6cvs41.patchset
 ( cvs diff -u -r 1.105.2.160 -r 1.105.2.161 src/prefs_account.c;  cvs diff -u -r 1.1.4.63 -r 1.1.4.64 src/prefs_filtering_action.c;  cvs diff -u -r 1.43.2.84 -r 1.43.2.85 src/prefs_matcher.c;  ) > 3.7.6cvs42.patchset
+( cvs diff -u -r 1.654.2.4111 -r 1.654.2.4112 configure.ac;  ) > 3.7.6cvs43.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=42
+EXTRA_VERSION=43
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -382,16 +382,9 @@ fi
 
 dnl GNUTLS
 AC_MSG_CHECKING([whether to use GnuTLS])
-AC_ARG_ENABLE(openssl,    [  --enable-openssl      enable GnuTLS support],
-            [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_ERROR(*** Use GnuTLS instead of OpenSSL due to licensing ***)
-	fi
-fi
 AC_MSG_RESULT($ac_cv_enable_gnutls)
 if test "x$ac_cv_enable_gnutls" != "xno"; then
   OCPPFLAGS="$CPPFLAGS"