talons

commit d23b5960b151b008dc2c8ca7ad180e7c5ee71ff1
parent 5cf0cd9ce0a5bd15b61f263eec1ad3f8ef4055eb
Author: Colin Leroy <colin@colino.net>
Date:   Thu,  9 Oct 2008 18:02:44 +0000

2008-10-09 [colin]	3.6.0cvs22

	* configure.ac
		Error out when building against openssl

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

3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-09 [colin]	3.6.0cvs22
+
+	* configure.ac
+		Error out when building against openssl
+
 2008-10-09 [colin]	3.6.0cvs21
 
 	* configure.ac
diff --git a/PATCHSETS b/PATCHSETS
@@ -3578,3 +3578,4 @@
 ( cvs diff -u -r 1.654.2.3638 -r 1.654.2.3639 configure.ac;  cvs diff -u -r 1.155.2.91 -r 1.155.2.92 src/Makefile.am;  cvs diff -u -r 1.23.2.30 -r 1.23.2.31 src/crash.c;  cvs diff -u -r -1.1.2.11 -r -1.1.2.12 src/gedit-print.c;  cvs diff -u -r -1.1.2.4 -r -1.1.2.5 src/gedit-print.h;  cvs diff -u -r 1.115.2.210 -r 1.115.2.211 src/main.c;  cvs diff -u -r 1.274.2.282 -r 1.274.2.283 src/mainwindow.c;  cvs diff -u -r 1.94.2.189 -r 1.94.2.190 src/messageview.c;  cvs diff -u -r 1.3.2.21 -r 1.3.2.22 src/prefs_ext_prog.c;  cvs diff -u -r 1.4.2.22 -r 1.4.2.23 src/prefs_fonts.c;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/prefs_image_viewer.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/printing.c;  cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/printing.h;  cvs diff -u -r 1.395.2.395 -r 1.395.2.396 src/summaryview.c;  cvs diff -u -r 1.20.2.18 -r 1.20.2.19 src/gtk/Makefile.am;  cvs diff -u -r 1.4.2.67 -r 1.4.2.68 src/gtk/about.c;  cvs diff -u -r -1.1.2.9 -r -1.1.2.10 src/gtk/gtksourceprintjob.c;  cvs diff -u -r -1.1.2.3 -r -1.1.2.4 src/gtk/gtksourceprintjob.h;  ) > 3.6.0cvs19.patchset
 ( cvs diff -u -r 1.654.2.3639 -r 1.654.2.3640 configure.ac;  cvs diff -u -r 1.155.2.92 -r 1.155.2.93 src/Makefile.am;  cvs diff -u -r 1.23.2.31 -r 1.23.2.32 src/crash.c;  diff -u /dev/null src/gedit-print.c;  diff -u /dev/null src/gedit-print.h;  cvs diff -u -r 1.115.2.211 -r 1.115.2.212 src/main.c;  cvs diff -u -r 1.274.2.283 -r 1.274.2.284 src/mainwindow.c;  cvs diff -u -r 1.94.2.190 -r 1.94.2.191 src/messageview.c;  cvs diff -u -r 1.3.2.22 -r 1.3.2.23 src/prefs_ext_prog.c;  cvs diff -u -r 1.4.2.23 -r 1.4.2.24 src/prefs_fonts.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/prefs_image_viewer.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/printing.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/printing.h;  cvs diff -u -r 1.395.2.396 -r 1.395.2.397 src/summaryview.c;  cvs diff -u -r 1.20.2.19 -r 1.20.2.20 src/gtk/Makefile.am;  cvs diff -u -r 1.4.2.68 -r 1.4.2.69 src/gtk/about.c;  diff -u /dev/null src/gtk/gtksourceprintjob.c;  diff -u /dev/null src/gtk/gtksourceprintjob.h;  ) > 3.6.0cvs20.patchset
 ( cvs diff -u -r 1.654.2.3640 -r 1.654.2.3641 configure.ac;  cvs diff -u -r 1.5.10.7 -r 1.5.10.8 COPYING;  cvs diff -u -r 1.23.2.32 -r 1.23.2.33 src/crash.c;  cvs diff -u -r 1.115.2.212 -r 1.115.2.213 src/main.c;  cvs diff -u -r 1.4.2.69 -r 1.4.2.70 src/gtk/about.c;  ) > 3.6.0cvs21.patchset
+( cvs diff -u -r 1.654.2.3641 -r 1.654.2.3642 configure.ac;  ) > 3.6.0cvs22.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=21
+EXTRA_VERSION=22
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -374,8 +374,7 @@ AC_ARG_ENABLE(gnutls,    [ --enable-gnutls      enable GnuTLS support],
 
 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])