0.8.10claws3

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ede7407d39e6a6fa23a221a266c19a391931d908..580d4b9c3355f71ac7040162136cfc2d6051daf7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws1
+EXTRA_VERSION=claws3

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target


@@ -369,22 +369,16 @@ 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])
 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])

-if test x"$ac_cv_enable_demo_plugin" = xyes; then
-       PLUGINS="demo $PLUGINS"
-fi
+AM_CONDITIONAL(BUILD_DEMO_PLUGIN, test x"$ac_cv_enable_demo_plugin" = xyes)

 
 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])
 
 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
 if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
        AC_SPAMASSASSIN

-
-       PLUGINS="spamassassin $PLUGINS"

 fi
 
 fi
 

-AC_SUBST(PLUGINS)
-AC_SUBST(PLUGINDIR)
-

 dnl ****************************
 dnl ** Final configure output **
 dnl ****************************
 dnl ****************************
 dnl ** Final configure output **
 dnl ****************************