2004-10-26 [colin] 0.9.12cvs132.2

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 125d50d958e6f2670ed711ec5d869fa2d1b136e4..0a34a5bc1a0dabdce460d5ef0abaf9bcee543b89 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=80
+EXTRA_VERSION=132
 EXTRA_RELEASE=
-EXTRA_GTK2_VERSION=.1
+EXTRA_GTK2_VERSION=.2
 
 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 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