2004-11-08 [colin] 0.9.12cvs140.3

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7e0d4f9c389bbbef8cf535bffd162c65b1572ca0..8d9ba17e044311d91d5b24c0bf1c04147cee04f9 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=79
+EXTRA_VERSION=140
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.3
 
@@ -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 pgpinline $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)
 
@@ -643,7 +649,6 @@ src/plugins/trayicon/Makefile
 src/plugins/trayicon/libeggtrayicon/Makefile
 src/plugins/clamav/Makefile
 src/plugins/pgpmime/Makefile
-src/plugins/pgpinline/Makefile
 doc/Makefile
 doc/faq/Makefile
 doc/faq/de/Makefile