0.8.10claws3

* configure.ac
* src/plugins/Makefile.am
        use AM_CONDITIONAL to enable plugins, automake correctly
        manages this when creating distdir

diff --git a/ChangeLog.claws b/ChangeLog.claws
index dcb66fd27796150f976eec0408ffc20a8cf0904e..e95e6d1b0eb24b09aca24eab2b5e56d42bf65c94 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,16 @@
+2003-02-12 [christoph] 0.8.10claws3
+
+       * configure.ac
+       * src/plugins/Makefile.am
+               use AM_CONDITIONAL to enable plugins, automake correctly
+               manages this when creating distdir
+
+2003-02-12 [christoph] 0.8.10claws2
+
+       * ac/spamassassin.m4
+       * src/plugins/spamassassin/Makefile.am
+               fix building SpamAssassin plugin without OpenSSL
+
 2003-02-12 [paul]      0.8.10claws1
 
        * ac/Makefile.am
@@ -38,8 +51,7 @@
                matcherrc were added to global filtering
                
        (closes Debian Bug #180253 - Directory's filter-rules are merged with
-        main filter-rules after removing directory
-        http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=180253)
+        main filter-rules after removing directory, http://bugs.debian.org/180253)
        
 2003-02-11 [paul]      0.8.9claws53
 

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
-EXTRA_VERSION=claws1
+EXTRA_VERSION=claws3
 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])
-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])
+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 ****************************

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index b65d0b2012112e06889dd4e93e2ca1da7139a35b..ca47eb058afae6b89e60bf9c642bb448f0768479 100644 (file)
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,2 +1,10 @@
-SUBDIRS = demo spamassassin
+if BUILD_DEMO_PLUGIN
+demodir = demo
+endif
+
+if BUILD_SPAMASSASSIN_PLUGIN
+spamassasssindir = spamassassin
+endif
+
+SUBDIRS = $(demodir) $(spamassasssindir)