2004-10-04 [paul] 0.9.12cvs120.1

	* configure.ac
		sync with HEAD [don't try to build
		pgpmime plugin when gpgme is disabled]

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 50d261326b1b68aef2debdd07fdd03951ab8ae3a..7f9f24c76f09c3caab54d6ebc3603ea43b54b8a8 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,9 @@
+2004-10-04 [paul]      0.9.12cvs120.1
+
+       * configure.ac
+               sync with HEAD [don't try to build 
+               pgpmime plugin when gpgme is disabled]
+
 2004-10-03 [colin]     0.9.12cvs119.3
 
        * src/gtk/gtksctree.c

diff --git a/PATCHSETS b/PATCHSETS
index 5523c9d0f5d855b167129deeb0ffdffe444dc921..0706679aaa4ad6b685eada51e5fbf9664dcb20fe 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -191,3 +191,4 @@
 ( cvs diff -u -r 1.274.2.20 -r 1.274.2.21 src/mainwindow.c; cvs diff -u -r 1.94.2.30 -r 1.94.2.31 src/messageview.c; cvs diff -u -r 1.103.2.9 -r 1.103.2.10 src/prefs_common.h; cvs diff -u -r 1.49.2.8 -r 1.49.2.9 src/procmime.c; cvs diff -u -r 1.17.2.3 -r 1.17.2.4 src/procmime.h; cvs diff -u -r 1.96.2.18 -r 1.96.2.19 src/textview.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/gtksctree.c; ) > 0.9.12cvs119.1.patchset
 ( cvs diff -u -r 1.1.4.6 -r 1.1.4.7 src/gtk/gtksctree.c; ) > 0.9.12cvs119.2.patchset
 ( cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/gtk/gtksctree.c; cvs diff -u -r 1.395.2.33 -r 1.395.2.34 src/summaryview.c; ) > 0.9.12cvs119.3.patchset
+( cvs diff -u -r 1.654.2.225 -r 1.654.2.226 configure.ac; ) > 0.9.12cvs120.1.patchset

diff --git a/configure.ac b/configure.ac
index 13f89d3b19d537cc4d6f9a9f90c088eae85846fe..65c815dfdc50f5993c57fa9cd778ece044111c94 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,9 +11,9 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=119
+EXTRA_VERSION=120
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.3
+EXTRA_GTK2_VERSION=.1
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION}
@@ -534,8 +534,14 @@ dnl --- PGP/MIME ---
 AC_ARG_ENABLE(pgpmime-plugin,
        [  --disable-pgpmime-plugin           Do not build PGP/MIME plugin],
        [ac_cv_enable_pgpmime_plugin=$enableval], [ac_cv_enable_pgpmime_plugin=yes])
-if test x"$ac_cv_enable_gpgme" = xyes -a x"$ac_cv_enable_pgpmime_plugin" = xyes; then
-       PLUGINS="pgpmime $PLUGINS"
+if test x"$ac_cv_enable_pgpmime_plugin" = xyes; then
+       if test x"$ac_cv_enable_gpgme" != xyes; then
+               ac_cv_enable_pgpmime_plugin=no
+       fi
+
+       if test x"$ac_cv_enable_pgpmime_plugin" = xyes; then
+               PLUGINS="pgpmime $PLUGINS"
+       fi
 fi
 AM_CONDITIONAL(BUILD_PGPMIME_PLUGIN, test x"$ac_cv_enable_pgpmime_plugin" = xyes)