commit d57e5e84b5ec6f6b96391a8a1a7cdcca634eb990 parent 3e0e3d163379f4ed36f5f1568de86d417bd8fda5 Author: Colin Leroy <colin@colino.net> Date: Wed, 20 Feb 2013 13:12:55 +0000 2013-02-20 [colin] 3.9.0cvs87 * src/plugins/Makefile.am * src/plugins/acpi_notifier/Makefile.am * src/plugins/address_keeper/Makefile.am * src/plugins/archive/Makefile.am * src/plugins/att_remover/Makefile.am * src/plugins/attachwarner/Makefile.am * src/plugins/bogofilter/Makefile.am * src/plugins/bsfilter/Makefile.am * src/plugins/clamd/Makefile.am * src/plugins/demo/Makefile.am * src/plugins/fancy/Makefile.am * src/plugins/fetchinfo/Makefile.am * src/plugins/gdata/Makefile.am * src/plugins/mailmbox/Makefile.am * src/plugins/newmail/Makefile.am * src/plugins/notification/Makefile.am * src/plugins/pdf_viewer/Makefile.am * src/plugins/perl/Makefile.am * src/plugins/pgpcore/Makefile.am * src/plugins/pgpinline/Makefile.am * src/plugins/pgpmime/Makefile.am * src/plugins/python/Makefile.am * src/plugins/rssyl/Makefile.am * src/plugins/smime/Makefile.am * src/plugins/spam_report/Makefile.am * src/plugins/spamassassin/Makefile.am * src/plugins/tnef_parse/Makefile.am * src/plugins/vcalendar/Makefile.am Change automake conditionals so that all plugins subdirectories are included, but nothing built in disabled plugins. Fixes make dist with some plugins --disabled. Diffstat:
31 files changed, 118 insertions(+), 134 deletions(-)
diff --git a/ChangeLog b/ChangeLog @@ -1,3 +1,37 @@ +2013-02-20 [colin] 3.9.0cvs87 + + * src/plugins/Makefile.am + * src/plugins/acpi_notifier/Makefile.am + * src/plugins/address_keeper/Makefile.am + * src/plugins/archive/Makefile.am + * src/plugins/att_remover/Makefile.am + * src/plugins/attachwarner/Makefile.am + * src/plugins/bogofilter/Makefile.am + * src/plugins/bsfilter/Makefile.am + * src/plugins/clamd/Makefile.am + * src/plugins/demo/Makefile.am + * src/plugins/fancy/Makefile.am + * src/plugins/fetchinfo/Makefile.am + * src/plugins/gdata/Makefile.am + * src/plugins/mailmbox/Makefile.am + * src/plugins/newmail/Makefile.am + * src/plugins/notification/Makefile.am + * src/plugins/pdf_viewer/Makefile.am + * src/plugins/perl/Makefile.am + * src/plugins/pgpcore/Makefile.am + * src/plugins/pgpinline/Makefile.am + * src/plugins/pgpmime/Makefile.am + * src/plugins/python/Makefile.am + * src/plugins/rssyl/Makefile.am + * src/plugins/smime/Makefile.am + * src/plugins/spam_report/Makefile.am + * src/plugins/spamassassin/Makefile.am + * src/plugins/tnef_parse/Makefile.am + * src/plugins/vcalendar/Makefile.am + Change automake conditionals so that all plugins subdirectories + are included, but nothing built in disabled plugins. Fixes make + dist with some plugins --disabled. + 2013-02-20 [colin] 3.9.0cvs86 * configure.ac diff --git a/PATCHSETS b/PATCHSETS @@ -4584,3 +4584,4 @@ ( cvs diff -u -r 1.654.2.4660 -r 1.654.2.4661 configure.ac; cvs diff -u -r 1.53.2.46 -r 1.53.2.47 po/POTFILES.in; cvs diff -u -r 1.8.2.15 -r 1.8.2.16 src/plugins/Makefile.am; cvs diff -u -r -1.1 -r -1.2 src/plugins/dillo_viewer/.cvsignore; cvs diff -u -r -1.4.2.10 -r -1.4.2.11 src/plugins/dillo_viewer/Makefile.am; cvs diff -u -r -1.2.4.2 -r -1.2.4.3 src/plugins/dillo_viewer/README; cvs diff -u -r -1.5.2.30 -r -1.5.2.31 src/plugins/dillo_viewer/dillo_prefs.c; cvs diff -u -r -1.2.4.11 -r -1.2.4.12 src/plugins/dillo_viewer/dillo_prefs.h; cvs diff -u -r -1.12.2.32 -r -1.12.2.33 src/plugins/dillo_viewer/dillo_viewer.c; cvs diff -u -r -1.1 -r -1.2 src/plugins/trayicon/.cvsignore; cvs diff -u -r -1.4.2.15 -r -1.4.2.16 src/plugins/trayicon/Makefile.am; cvs diff -u -r -1.1.4.1 -r -1.1.4.2 src/plugins/trayicon/README; cvs diff -u -r -1.14.2.83 -r -1.14.2.84 src/plugins/trayicon/trayicon.c; cvs diff -u -r -1.1.2.12 -r -1.1.2.13 src/plugins/trayicon/trayicon_prefs.c; cvs diff -u -r -1.1.2.7 -r -1.1.2.8 src/plugins/trayicon/trayicon_prefs.h; cvs diff -u -r -1.1.4.2 -r -1.1.4.3 src/plugins/trayicon/libeggtrayicon/.cvsignore; ) > 3.9.0cvs84.patchset ( cvs diff -u -r 1.654.2.4661 -r 1.654.2.4662 configure.ac; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/fancy/fancy_viewer.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/fancy/fancy_viewer.h; cvs diff -u -r 1.1.2.4 -r 1.1.2.5 src/plugins/notification/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/notification/notification_plugin.c; diff -u /dev/null src/plugins/notification/gtkhotkey/.cvsignore; diff -u /dev/null src/plugins/notification/gtkhotkey/Makefile.am; diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-error.c; diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-error.h; diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-info.c; diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-info.h; diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c; diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.h; diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-listener.c; diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-listener.h; diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-marshal.c; diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-marshal.h; diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-registry.c; diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-registry.h; diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-utils.c; diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-utils.h; diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.c; diff -u /dev/null src/plugins/notification/gtkhotkey/gtk-hotkey-x11-listener.h; diff -u /dev/null src/plugins/notification/gtkhotkey/gtkhotkey.h; diff -u /dev/null src/plugins/notification/gtkhotkey/x11/eggaccelerators.c; diff -u /dev/null src/plugins/notification/gtkhotkey/x11/eggaccelerators.h; diff -u /dev/null src/plugins/notification/gtkhotkey/x11/tomboykeybinder.c; diff -u /dev/null src/plugins/notification/gtkhotkey/x11/tomboykeybinder.h; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/spam_report/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/spam_report/spam_report.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/tnef_parse/Makefile.am; ) > 3.9.0cvs85.patchset ( cvs diff -u -r 1.654.2.4662 -r 1.654.2.4663 configure.ac; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/fancy/fancy_viewer.h; ) > 3.9.0cvs86.patchset +( cvs diff -u -r 1.8.2.16 -r 1.8.2.17 src/plugins/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/acpi_notifier/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/address_keeper/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/archive/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/att_remover/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/attachwarner/Makefile.am; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/bogofilter/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/bsfilter/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/clamd/Makefile.am; cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/plugins/demo/Makefile.am; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/fancy/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/fetchinfo/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/gdata/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/mailmbox/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/newmail/Makefile.am; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/notification/Makefile.am; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pdf_viewer/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/perl/Makefile.am; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/pgpcore/Makefile.am; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpinline/Makefile.am; cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/plugins/pgpmime/Makefile.am; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/python/Makefile.am; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/rssyl/Makefile.am; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/smime/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/spam_report/Makefile.am; cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/plugins/spamassassin/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/tnef_parse/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/vcalendar/Makefile.am; ) > 3.9.0cvs87.patchset diff --git a/configure.ac b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=9 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=86 +EXTRA_VERSION=87 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am @@ -1,133 +1,28 @@ -if BUILD_ACPI_NOTIFIER_PLUGIN -acpi_notifier_dir = acpi_notifier -endif - -if BUILD_ADDRESS_KEEPER_PLUGIN -address_keeper_dir = address_keeper -endif - -if BUILD_ARCHIVE_PLUGIN -archive_dir = archive -endif - -if BUILD_ATTACHWARNER_PLUGIN -attachwarner_dir = attachwarner -endif - -if BUILD_ATT_REMOVER_PLUGIN -att_remover_dir = att_remover -endif - -if BUILD_BOGOFILTER_PLUGIN -bogofilter_dir = bogofilter -endif - -if BUILD_BSFILTER_PLUGIN -bsfilter_dir = bsfilter -endif - -if BUILD_CLAMD_PLUGIN -clamd_dir = clamd -endif - -if BUILD_DEMO_PLUGIN -demo_dir = demo -endif - -if BUILD_FANCY_PLUGIN -fancy_dir = fancy -endif - -if BUILD_FETCHINFO_PLUGIN -fetchinfo_dir = fetchinfo -endif - -if BUILD_GDATA_PLUGIN -gdata_dir = gdata -endif - -if BUILD_MAILMBOX_PLUGIN -mailmbox_dir = mailmbox -endif - -if BUILD_NEWMAIL_PLUGIN -newmail_dir = newmail -endif - -if BUILD_NOTIFICATION_PLUGIN -notification_dir = notification -endif - -if BUILD_PDF_VIEWER_PLUGIN -pdf_viewer_dir = pdf_viewer -endif - -if BUILD_PERL_PLUGIN -perl_dir = perl -endif - -if BUILD_PYTHON_PLUGIN -python_dir = python -endif - -if BUILD_PGPCORE_PLUGIN -pgpcore_dir = pgpcore -if BUILD_PGPMIME_PLUGIN -pgpmime_dir = pgpmime -endif -if BUILD_PGPINLINE_PLUGIN -pgpinline_dir = pgpinline -endif -if BUILD_SMIME_PLUGIN -smime_dir = smime -endif -endif - -if BUILD_RSSYL_PLUGIN -rssyl_dir = rssyl -endif - -if BUILD_SPAMASSASSIN_PLUGIN -spamassassin_dir = spamassassin -endif - -if BUILD_SPAM_REPORT_PLUGIN -spam_report_dir = spam_report -endif - -if BUILD_TNEF_PARSE_PLUGIN -tnef_parse_dir = tnef_parse -endif - -if BUILD_VCALENDAR_PLUGIN -vcalendar_dir = vcalendar -endif - SUBDIRS = \ - $(acpi_notifier_dir) \ - $(address_keeper_dir) \ - $(archive_dir) \ - $(att_remover_dir) \ - $(attachwarner_dir) \ - $(bogofilter_dir) \ - $(bsfilter_dir) \ - $(clamd_dir) \ - $(demo_dir) \ - $(fancy_dir) \ - $(fetchinfo_dir) \ - $(gdata_dir) \ - $(mailmbox_dir) \ - $(newmail_dir) \ - $(notification_dir) \ - $(pdf_viewer_dir) \ - $(perl_dir) \ - $(python_dir) \ - $(pgpcore_dir) \ - $(pgpmime_dir) \ - $(pgpinline_dir) \ - $(rssyl_dir) \ - $(smime_dir) \ - $(spamassassin_dir) \ - $(spam_report_dir) \ - $(tnef_parse_dir) \ - $(vcalendar_dir) + acpi_notifier \ + address_keeper \ + archive \ + att_remover \ + attachwarner \ + bogofilter \ + bsfilter \ + clamd \ + demo \ + fancy \ + fetchinfo \ + gdata \ + mailmbox \ + newmail \ + notification \ + pdf_viewer \ + perl \ + python \ + pgpcore \ + pgpmime \ + pgpinline \ + rssyl \ + smime \ + spamassassin \ + spam_report \ + tnef_parse \ + vcalendar diff --git a/src/plugins/acpi_notifier/Makefile.am b/src/plugins/acpi_notifier/Makefile.am @@ -1,6 +1,8 @@ plugindir = $(pkglibdir)/plugins +if BUILD_ACPI_NOTIFIER_PLUGIN plugin_LTLIBRARIES = acpi_notifier.la +endif acpi_notifier_la_SOURCES = \ acpi_notifier.c diff --git a/src/plugins/address_keeper/Makefile.am b/src/plugins/address_keeper/Makefile.am @@ -43,7 +43,9 @@ endif plugindir = $(pkglibdir)/plugins +if BUILD_ADDRESS_KEEPER_PLUGIN plugin_LTLIBRARIES = address_keeper.la +endif address_keeper_la_LDFLAGS = \ $(plugin_res_ldflag) $(no_undefined) $(export_symbols) \ diff --git a/src/plugins/archive/Makefile.am b/src/plugins/archive/Makefile.am @@ -1,6 +1,8 @@ plugindir = $(pkglibdir)/plugins +if BUILD_ARCHIVE_PLUGIN plugin_LTLIBRARIES = archive.la +endif archive_la_SOURCES = \ libarchive_archive.c \ diff --git a/src/plugins/att_remover/Makefile.am b/src/plugins/att_remover/Makefile.am @@ -1,6 +1,8 @@ plugindir = $(pkglibdir)/plugins +if BUILD_ATT_REMOVER_PLUGIN plugin_LTLIBRARIES = att_remover.la +endif att_remover_la_SOURCES = \ att_remover.c diff --git a/src/plugins/attachwarner/Makefile.am b/src/plugins/attachwarner/Makefile.am @@ -43,7 +43,9 @@ endif plugindir = $(pkglibdir)/plugins +if BUILD_ATTACHWARNER_PLUGIN plugin_LTLIBRARIES = attachwarner.la +endif attachwarner_la_LDFLAGS = \ $(plugin_res_ldflag) $(no_undefined) $(export_symbols) \ diff --git a/src/plugins/bogofilter/Makefile.am b/src/plugins/bogofilter/Makefile.am @@ -1,6 +1,8 @@ plugindir = $(pkglibdir)/plugins +if BUILD_BOGOFILTER_PLUGIN plugin_LTLIBRARIES = bogofilter.la +endif bogofilter_la_SOURCES = \ bogofilter.c bogofilter.h \ diff --git a/src/plugins/bsfilter/Makefile.am b/src/plugins/bsfilter/Makefile.am @@ -43,7 +43,9 @@ endif plugindir = $(pkglibdir)/plugins +if BUILD_BSFILTER_PLUGIN plugin_LTLIBRARIES = bsfilter.la +endif bsfilter_la_LDFLAGS = \ $(plugin_res_ldflag) $(no_undefined) $(export_symbols) \ diff --git a/src/plugins/clamd/Makefile.am b/src/plugins/clamd/Makefile.am @@ -1,7 +1,9 @@ SUBDIRS = libclamd plugindir = $(pkglibdir)/plugins +if BUILD_CLAMD_PLUGIN plugin_LTLIBRARIES = clamd.la +endif clamd_la_SOURCES = \ clamav_plugin.c \ diff --git a/src/plugins/demo/Makefile.am b/src/plugins/demo/Makefile.am @@ -1,6 +1,8 @@ plugindir = $(pkglibdir)/plugins +if BUILD_DEMO_PLUGIN plugin_LTLIBRARIES = demo.la +endif demo_la_SOURCES = \ demo.c diff --git a/src/plugins/fancy/Makefile.am b/src/plugins/fancy/Makefile.am @@ -1,6 +1,8 @@ plugindir = $(pkglibdir)/plugins +if BUILD_FANCY_PLUGIN plugin_LTLIBRARIES = fancy.la +endif fancy_la_SOURCES = \ fancy_viewer.c \ diff --git a/src/plugins/fetchinfo/Makefile.am b/src/plugins/fetchinfo/Makefile.am @@ -1,6 +1,8 @@ plugindir = $(pkglibdir)/plugins +if BUILD_FETCHINFO_PLUGIN plugin_LTLIBRARIES = fetchinfo_plugin.la +endif fetchinfo_plugin_la_SOURCES = \ fetchinfo_plugin.c fetchinfo_plugin.h \ diff --git a/src/plugins/gdata/Makefile.am b/src/plugins/gdata/Makefile.am @@ -1,6 +1,8 @@ plugindir = $(pkglibdir)/plugins +if BUILD_GDATA_PLUGIN plugin_LTLIBRARIES = gdata_plugin.la +endif gdata_plugin_la_SOURCES = \ gdata_plugin.c \ diff --git a/src/plugins/mailmbox/Makefile.am b/src/plugins/mailmbox/Makefile.am @@ -1,5 +1,8 @@ plugindir = $(pkglibdir)/plugins + +if BUILD_MAILMBOX_PLUGIN plugin_LTLIBRARIES = mailmbox.la +endif ## Mailmbox folder plugin diff --git a/src/plugins/newmail/Makefile.am b/src/plugins/newmail/Makefile.am @@ -1,6 +1,8 @@ plugindir = $(pkglibdir)/plugins +if BUILD_NEWMAIL_PLUGIN plugin_LTLIBRARIES = newmail.la +endif newmail_la_SOURCES = \ newmail.c diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am @@ -53,7 +53,9 @@ endif plugindir = $(pkglibdir)/plugins +if BUILD_NOTIFICATION_PLUGIN plugin_LTLIBRARIES = notification_plugin.la +endif notification_plugin_la_SOURCES = \ notification_plugin.c notification_plugin.h \ diff --git a/src/plugins/pdf_viewer/Makefile.am b/src/plugins/pdf_viewer/Makefile.am @@ -1,6 +1,8 @@ plugindir = $(pkglibdir)/plugins +if BUILD_PDF_VIEWER_PLUGIN plugin_LTLIBRARIES = pdf_viewer.la +endif pdf_viewer_la_SOURCES = \ poppler_viewer.c \ diff --git a/src/plugins/perl/Makefile.am b/src/plugins/perl/Makefile.am @@ -1,6 +1,8 @@ plugindir = $(pkglibdir)/plugins +if BUILD_PERL_PLUGIN plugin_LTLIBRARIES = perl_plugin.la +endif perl_plugin_la_SOURCES = \ perl_plugin.c perl_plugin.h \ diff --git a/src/plugins/pgpcore/Makefile.am b/src/plugins/pgpcore/Makefile.am @@ -43,7 +43,9 @@ endif plugindir = $(pkglibdir)/plugins +if BUILD_PGPCORE_PLUGIN plugin_LTLIBRARIES = pgpcore.la +endif pgpcore_la_SOURCES = \ passphrase.c \ diff --git a/src/plugins/pgpinline/Makefile.am b/src/plugins/pgpinline/Makefile.am @@ -50,7 +50,9 @@ endif plugindir = $(pkglibdir)/plugins plugin_DATA=pgpinline.deps +if BUILD_PGPINLINE_PLUGIN plugin_LTLIBRARIES = pgpinline.la +endif pgpinline_la_SOURCES = \ plugin.c \ diff --git a/src/plugins/pgpmime/Makefile.am b/src/plugins/pgpmime/Makefile.am @@ -48,8 +48,9 @@ endif plugindir = $(pkglibdir)/plugins plugin_DATA=pgpmime.deps +if BUILD_PGPMIME_PLUGIN plugin_LTLIBRARIES = pgpmime.la - +endif pgpmime_la_SOURCES = \ plugin.c \ diff --git a/src/plugins/python/Makefile.am b/src/plugins/python/Makefile.am @@ -1,6 +1,8 @@ plugindir = $(pkglibdir)/plugins +if BUILD_PYTHON_PLUGIN plugin_LTLIBRARIES = python_plugin.la +endif python_plugin_la_SOURCES = \ clawsmailmodule.c \ diff --git a/src/plugins/rssyl/Makefile.am b/src/plugins/rssyl/Makefile.am @@ -43,7 +43,9 @@ endif plugindir = $(pkglibdir)/plugins +if BUILD_RSSYL_PLUGIN plugin_LTLIBRARIES = rssyl.la +endif INCLUDES= \ -I$(top_srcdir)/src \ diff --git a/src/plugins/smime/Makefile.am b/src/plugins/smime/Makefile.am @@ -50,7 +50,9 @@ endif plugindir = $(pkglibdir)/plugins plugin_DATA=smime.deps +if BUILD_SMIME_PLUGIN plugin_LTLIBRARIES = smime.la +endif smime_la_SOURCES = \ plugin.c \ diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am @@ -1,6 +1,8 @@ plugindir = $(pkglibdir)/plugins +if BUILD_SPAM_REPORT_PLUGIN plugin_LTLIBRARIES = spamreport.la +endif spamreport_la_SOURCES = \ spam_report.c \ diff --git a/src/plugins/spamassassin/Makefile.am b/src/plugins/spamassassin/Makefile.am @@ -1,6 +1,8 @@ plugindir = $(pkglibdir)/plugins +if BUILD_SPAMASSASSIN_PLUGIN plugin_LTLIBRARIES = spamassassin.la +endif spamassassin_la_SOURCES = \ spamassassin.c spamassassin.h \ diff --git a/src/plugins/tnef_parse/Makefile.am b/src/plugins/tnef_parse/Makefile.am @@ -43,7 +43,9 @@ endif plugindir = $(pkglibdir)/plugins +if BUILD_TNEF_PARSE_PLUGIN plugin_LTLIBRARIES = tnef_parse.la +endif tnef_parse_la_SOURCES = \ tnef_parse.c \ diff --git a/src/plugins/vcalendar/Makefile.am b/src/plugins/vcalendar/Makefile.am @@ -44,7 +44,9 @@ endif plugindir = $(pkglibdir)/plugins +if BUILD_VCALENDAR_PLUGIN plugin_LTLIBRARIES = vcalendar.la +endif INCLUDES= \ -I$(top_srcdir)/src \