2006-01-03 [colin] 1.9.100cvs122

	* configure.ac
		We need to recheck for gpgme 1.0.0 after checking
		for 1.1.1, because if 1.1.1 isn't available,
		GPGME_LIBS and friends are blanked out by the
		second check.

diff --git a/ChangeLog b/ChangeLog
index d2179ba2cec003dd6489de1bc35f9284f6f5b205..2b8732213869fb0f5d3f5f4e9b59d3e020aa4a14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-03 [colin]     1.9.100cvs122
+
+       * configure.ac
+               We need to recheck for gpgme 1.0.0 after checking
+               for 1.1.1, because if 1.1.1 isn't available, 
+               GPGME_LIBS and friends are blanked out by the 
+               second check.
+
 2006-01-03 [colin]     1.9.100cvs121
 
        * src/common/prefs.c

diff --git a/PATCHSETS b/PATCHSETS
index b18f7cbd488b44100553de9370bf23449cd07e4a..e55a736b90deaa1d36f17d3acf89ab44649563e3 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1105,3 +1105,4 @@
 ( cvs diff -u -r 1.382.2.212 -r 1.382.2.213 src/compose.c;  cvs diff -u -r 1.179.2.87 -r 1.179.2.88 src/imap.c;  ) > 1.9.100cvs119.patchset
 ( cvs diff -u -r 1.94.2.71 -r 1.94.2.72 src/messageview.c;  ) > 1.9.100cvs120.patchset
 ( cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/common/prefs.c;  cvs diff -u -r 1.1.2.15 -r 1.1.2.16 src/plugins/pgpcore/sgpgme.c;  ) > 1.9.100cvs121.patchset
+( cvs diff -u -r 1.654.2.1151 -r 1.654.2.1152 configure.ac;  ) > 1.9.100cvs122.patchset

diff --git a/configure.ac b/configure.ac
index e1cebd4688038ef8bf0bb4c2097aa026ba13dba5..0a4a99a50b794a4288c9fa7731c131f35bd11609 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=121
+EXTRA_VERSION=122
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -630,6 +630,9 @@ if test x"$ac_cv_enable_pgpcore_plugin" = xyes; then
                 AM_PATH_GPGME(1.1.1,
                               AC_DEFINE(HAVE_GPGME_PKA_TRUST, 1,
                                         [Define if GPGME supports PKA.]))
+               #needed to get GPGME_LIBS and al correctly
+               AM_PATH_GPGME(1.0.0, AC_DEFINE(USE_GPGME, 1, Define if you use GPGME to support OpenPGP.),
+                         [ac_cv_enable_pgpcore_plugin=no])
        else
                AC_MSG_WARN([*** PGP/CORE plugin will not be built ***])
        fi