2007-10-30 [paul] 3.0.2cvs109

	* configure.ac
		enable GnuTLS support with --enable-gnutls which
		will disable openssl support. if the user has
		gtk >= 2.10.x don't allow gnomeprint even if the
		user asks for it

diff --git a/ChangeLog b/ChangeLog
index 9dfe7dd1f0fef1a751f472e920a52180a41f6b1e..bc4cbcb528bfb0448a93a57daa297af7703245cd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-30 [paul]      3.0.2cvs109
+
+       * configure.ac
+               enable GnuTLS support with --enable-gnutls which
+               will disable openssl support. if the user has
+               gtk >= 2.10.x don't allow gnomeprint even if the
+               user asks for it
+
 2007-10-30 [paul]      3.0.2cvs108
 
        * Makefile.am

diff --git a/PATCHSETS b/PATCHSETS
index 6e629c305c2468e03563470baed470c79c196aca..1a633dc94351b92a339e2c5b6e11112b2308a8c8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3021,3 +3021,4 @@
 ( cvs diff -u -r 1.5.2.18 -r 1.5.2.19 src/plugins/dillo_viewer/dillo_prefs.c;  ) > 3.0.2cvs106.patchset
 ( cvs diff -u -r 1.1.4.27 -r 1.1.4.28 src/expldifdlg.c;  cvs diff -u -r 1.105.2.114 -r 1.105.2.115 src/prefs_account.c;  cvs diff -u -r 1.52.2.53 -r 1.52.2.54 src/prefs_folder_item.c;  cvs diff -u -r 1.5.2.34 -r 1.5.2.35 src/prefs_spelling.c;  cvs diff -u -r 1.3.2.52 -r 1.3.2.53 src/prefs_themes.c;  cvs diff -u -r 1.1.2.63 -r 1.1.2.64 src/wizard.c;  cvs diff -u -r 1.9.2.54 -r 1.9.2.55 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.13 -r 1.5.2.14 src/gtk/gtkaspell.h;  cvs diff -u -r 1.23.2.44 -r 1.23.2.45 src/plugins/spamassassin/spamassassin_gtk.c;  ) > 3.0.2cvs107.patchset
 ( cvs diff -u -r 1.24.2.23 -r 1.24.2.24 Makefile.am;  ) > 3.0.2cvs108.patchset
+( cvs diff -u -r 1.654.2.3078 -r 1.654.2.3079 configure.ac;  ) > 3.0.2cvs109.patchset

diff --git a/configure.ac b/configure.ac
index d95edf43a40ecc0af7e9f0bd9341a44cb7be16fe..c77b6f8ed310b24119b7544f6b0123ed8f515f6f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=108
+EXTRA_VERSION=109
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -365,13 +365,22 @@ dnl Check for OpenSSL
 AC_ARG_ENABLE(openssl,
        [  --disable-openssl    disable OpenSSL support.],
        [ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=yes])
+dnl GNUTLS
+AC_ARG_ENABLE(gnutls,    [ --enable-gnutls      enable GnuTLS support],
+            [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=no])
+if test x$ac_cv_enable_openssl = xyes && test x$ac_cv_enable_gnutls != xyes; then
+       ac_cv_enable_gnutls="no"
+fi
+if test x$ac_cv_enable_gnutls = xyes; then
+         ac_cv_enable_openssl="no"
+fi
+
 AC_MSG_CHECKING([whether to use OpenSSL])
 if test x"$ac_cv_enable_openssl" = xyes; then
        AC_MSG_RESULT(yes)
        PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7, :, ac_cv_enable_openssl=no)
        if test x$ac_cv_enable_openssl = xyes; then
                AC_DEFINE(USE_OPENSSL, 1, Define if you want OpenSSL support)
-               disable_gnutls="yes"
        else
                AC_MSG_RESULT(not found)
                AC_MSG_WARN([*** OpenSSL will not be supported ***])
@@ -382,34 +391,26 @@ fi
 AC_SUBST(OPENSSL_CFLAGS)
 AC_SUBST(OPENSSL_LIBS)
 
-dnl GNUTLS
-AC_ARG_ENABLE(gnutls,    [ --disable-gnutls      disable GnuTLS support],
-            [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=yes])
-if test "x$disable_gnutls" != "xyes"; then
-       AC_MSG_CHECKING([whether to use GnuTLS])
-       if test "x$ac_cv_enable_gnutls" != "xno"; then
-         OCPPFLAGS="$CPPFLAGS"
-         OLDFLAGS="$LDFLAGS"
-         GNUTLS_LIBS=""
-         AC_CHECK_HEADER(gnutls/gnutls.h, [
-               AC_CHECK_LIB(gnutls, gnutls_global_deinit, 
-                       [AC_DEFINE(USE_GNUTLS, 1, Define to use GnuTLS.)],
-                       [ac_cv_enable_gnutls=no])
-         ],[ac_cv_enable_gnutls=no])
-         if test "x$ac_cv_enable_gnutls" != "xyes"; then
-          CPPFLAGS="$OCPPFLAGS"
-          LDFLAGS="$OLDFLAGS"
-         fi
-       fi
-       if test "x$ac_cv_enable_gnutls" = "xyes"; then
-         AC_DEFINE([USE_GNUTLS],1, [Define to use GnuTLS])
-         GNUTLS_LIBS="-lgnutls"
-         disable_openssl="yes"
-       else
-         GNUTLS_LIBS=""
-       fi
+AC_MSG_CHECKING([whether to use GnuTLS])
+if test "x$ac_cv_enable_gnutls" != "xno"; then
+  OCPPFLAGS="$CPPFLAGS"
+  OLDFLAGS="$LDFLAGS"
+  GNUTLS_LIBS=""
+  AC_CHECK_HEADER(gnutls/gnutls.h, [
+       AC_CHECK_LIB(gnutls, gnutls_global_deinit, 
+               [AC_DEFINE(USE_GNUTLS, 1, Define to use GnuTLS.)],
+               [ac_cv_enable_gnutls=no])
+  ],[ac_cv_enable_gnutls=no])
+  if test "x$ac_cv_enable_gnutls" != "xyes"; then
+   CPPFLAGS="$OCPPFLAGS"
+   LDFLAGS="$OLDFLAGS"
+  fi
+fi
+if test "x$ac_cv_enable_gnutls" = "xyes"; then
+  AC_DEFINE([USE_GNUTLS],1, [Define to use GnuTLS])
+  GNUTLS_LIBS="-lgnutls"
 else
-       ac_cv_enable_gnutls="no"
+  GNUTLS_LIBS=""
 fi
 AC_SUBST(GNUTLS_LIBS)
 
@@ -879,12 +880,18 @@ fi
 AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes")
 
 
-dnl Printing support. GTK will be used if present and gnomeprint is not explicitely enabled
+dnl Printing support.
 PKG_CHECK_MODULES(GTK210, gtk+-2.0 >= 2.10, ac_cv_have_gtk210=yes, ac_cv_have_gtk210=no)
+
 AC_MSG_CHECKING([whether to use libgnomeprint])
 AC_ARG_ENABLE(gnomeprint,
        [  --disable-gnomeprint         disable libgnomeprint support],
        [ac_cv_enable_gnomeprint=$enableval], [ac_cv_enable_gnomeprint=auto])
+
+if test x$ac_cv_have_gtk210 = xyes; then
+       ac_cv_enable_gnomeprint="no"
+fi
+
 if test x$ac_cv_enable_gnomeprint = xyes \
        -o \( x$ac_cv_enable_gnomeprint = xauto \
           -a x$ac_cv_have_gtk210 = xno \); then