sync with 0.8.10cvs9

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2370d75e2513e4a608e45e42dfea52a326cdca81..45d10808c2892f885be6dc52317a914cf2792117 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,10 @@ PACKAGE=sylpheed
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=8
-MICRO_VERSION=9
+MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws43
+EXTRA_VERSION=claws6
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -369,6 +369,7 @@ PLUGINS=""
 AC_ARG_ENABLE(demo-plugin,
        [  --enable-demo-plugin    Build demo plugin [default=no]],
        [ac_cv_enable_demo_plugin=$enableval], [ac_cv_enable_demo_plugin=no])
+AM_CONDITIONAL(BUILD_DEMO_PLUGIN, test x"$ac_cv_enable_demo_plugin" = xyes)
 if test x"$ac_cv_enable_demo_plugin" = xyes; then
        PLUGINS="demo $PLUGINS"
 fi
@@ -376,15 +377,12 @@ fi
 AC_ARG_ENABLE(spamassassin-plugin,
        [  --enable-spamassassin-plugin    Build spamassassin plugin [default=no]],
        [ac_cv_enable_spamassassin_plugin=$enableval], [ac_cv_enable_spamassassin_plugin=no])
+AM_CONDITIONAL(BUILD_SPAMASSASSIN_PLUGIN, test x"$ac_cv_enable_spamassassin_plugin" = xyes)
 if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
        AC_SPAMASSASSIN
-
        PLUGINS="spamassassin $PLUGINS"
 fi
 
-AC_SUBST(PLUGINS)
-AC_SUBST(PLUGINDIR)
-
 dnl ****************************
 dnl ** Final configure output **
 dnl ****************************