2004-11-16 [colin] 0.9.12cvs147.1

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6c6f5a0f415c830126cb48c6f3dbe8ede0e47fc6..d7285d46e43fb60c0e63ac9837f2dfeb85e23c59 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=93
+EXTRA_VERSION=147
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 
@@ -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)