don't try to build pgpmime plugin when gpgme is disabled

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a80468bd90b2adc0094af602d9f29e88e5a71553..415e0613ef51b8e6543be1b97e6513fb4bf802c1 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=59
+EXTRA_VERSION=120
 EXTRA_RELEASE=
 
 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then
@@ -457,6 +457,27 @@ else
        AC_MSG_RESULT(no)
 fi
 
+dnl #######################################################################
+dnl # Check for startup notification
+dnl #######################################################################
+AC_ARG_ENABLE(startup-notification, [  --disable-startup-notification    compile without startup notification support],,enable_startup_notification=yes)
+
+if test "x$enable_startup_notification" = "xyes"; then
+       PKG_CHECK_MODULES(STARTUP_NOTIFICATION, libstartup-notification-1.0 >= 0.5,
+       [
+               AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, [Define if we're using libstartup-notification.])
+               echo "Building with libstartup-notification"
+               enable_startup_notification=yes
+       ],
+       [
+               echo "Building without libstartup-notification"
+               enable_startup_notification=no
+       ])
+
+       AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
+       AC_SUBST(STARTUP_NOTIFICATION_LIBS)
+fi
+
 dnl *************************
 dnl ** section for plugins **
 dnl *************************
@@ -486,8 +507,17 @@ 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
+       echo $ac_cv_enable_gpgme
+       echo $ac_cv_enable_pgpmime_plugin
+       if test x"$ac_cv_enable_gpgme" != xyes; then
+               ac_cv_enable_pgpmime_plugin=no
+       fi
+
+       echo $ac_cv_enable_pgpmime_plugin
+       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)
 
@@ -576,28 +606,6 @@ fi
 AC_SUBST(CLAMAV_LIBS)
 AM_CONDITIONAL(BUILD_CLAMAV_PLUGIN, test x"$ac_cv_enable_clamav_plugin" = xyes)
 
-dnl #######################################################################
-dnl # Check for startup notification
-dnl #######################################################################
-AC_ARG_ENABLE(startup-notification, [  --disable-startup-notification    compile without startup notification support],,enable_startup_notification=yes)
-
-if test "x$enable_startup_notification" = "xyes"; then
-       PKG_CHECK_MODULES(STARTUP_NOTIFICATION, libstartup-notification-1.0 >= 0.5,
-       [
-               AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, [Define if we're using libstartup-notification.])
-               echo "Building with libstartup-notification"
-               enable_startup_notification=yes
-       ],
-       [
-               echo "Building without libstartup-notification"
-               enable_startup_notification=no
-       ])
-
-       AC_SUBST(STARTUP_NOTIFICATION_CFLAGS)
-       AC_SUBST(STARTUP_NOTIFICATION_LIBS)
-fi
-
-
 dnl ****************************
 dnl ** Final configure output **
 dnl ****************************