Fix to build in Suse 93

svn path=/trunk/; revision=30765

3 files changed, 21 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 29d0fb93fa..d0260559b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2005-12-13  Chenthill Palanisamy  <pchenthill@novell.com>
 
+	* configure.in: added a new variable to include all
+	the plugin directories.
+	* plugins/Makefile.am: Add all the plugin directories
+	in the dist_subdirs, so that dist has all the plugin
+	directories even if some package is missing.
+
+2005-12-13  Chenthill Palanisamy  <pchenthill@novell.com>
+
 	* po/POTFILES.in: Removed the entries for 
 	e-util/e-component-listener.c and e-util/e-time-utils.c.
 
diff --git a/configure.in b/configure.in
index dcdd106dcd..4979050b39 100644
--- a/configure.in
+++ b/configure.in
@@ -1382,11 +1382,17 @@ AC_SUBST_FILE(EVO_PLUGIN_RULE)
 AC_ARG_ENABLE(plugins, [  --enable-plugins=[no/base/all/experimental/list]      Enable plugins.],enable_plugins="$enableval",enable_plugins=all)
 
 dnl Add any new plugins here
-plugins_base="calendar-file calendar-http calendar-weather itip-formatter plugin-manager default-source addressbook-file startup-wizard print-message mark-all-read groupwise-features groupwise-account-setup hula-account-setup mail-account-disable $SA_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN" 
+plugins_base_always="calendar-file calendar-http calendar-weather itip-formatter plugin-manager default-source addressbook-file startup-wizard print-message mark-all-read groupwise-features groupwise-account-setup hula-account-setup mail-account-disable"
+plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN" 
+all_plugins_base="$plugins_base_always sa-junk-plugin exchange-operations mono"
 
-plugins_standard="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions new-mail-notify default-mailer" 
+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions new-mail-notify default-mailer" 
+plugins_standard="$plugins_standard_always"
+all_plugins_standard="$plugins_standard"
 
-plugins_experimental="backup-restore folder-unsubscribe mail-to-meeting mail-remote prefer-plain save-attachments $IPOD_SYNC"
+plugins_experimental_always="backup-restore folder-unsubscribe mail-to-meeting mail-remote prefer-plain save-attachments"
+plugins_experimental="$plugins_experimental $IPOD_SYNC"
+all_plugins_experimental="$plugins_experimental_always ipod-sync"
 
 case x"$enable_plugins" in
 xno)
@@ -1426,9 +1432,9 @@ if test "x${enable_mono}" = "xyes"; then
 fi
 
 AC_SUBST(plugins_enabled)
-AC_SUBST(plugins_base)
-AC_SUBST(plugins_standard)
-AC_SUBST(plugins_experimental)
+AC_SUBST(all_plugins_base)
+AC_SUBST(all_plugins_standard)
+AC_SUBST(all_plugins_experimental)
 
 if echo ${plugins_enabled} | grep "audio-inline" > /dev/null
 then
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index f12d493ed0..8364a3a463 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,2 +1,2 @@
 SUBDIRS = $(plugins_enabled)
-DIST_SUBDIRS = $(plugins_base) $(plugins_standard) $(plugins_experimental) profiler 
+DIST_SUBDIRS = $(all_plugins_base) $(all_plugins_standard) $(all_plugins_experimental) profiler