From: Christoph Hohmann <reboot@gmx.ch>
Date: Wed, 12 Feb 2003 19:33:44 +0000 (+0000)
Subject: 0.8.10claws3
X-Git-Tag: rel_0_8_11~127
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=105e9859e9dae059fd928c1339d349dac506af2a;hp=7d11960526f168ec560f7fcaeb7c4a4a6244ddbd

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 dcb66fd27..e95e6d1b0 100644
--- 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 ede7407d3..580d4b9c3 100644
--- 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 b65d0b201..ca47eb058 100644
--- 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)