dovecot-2.0: OSX: Don't try add plugin dependencies. It just bre...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/5df19422d561
changeset: 10489:5df19422d561
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Dec 14 20:34:44 2009 -0500
description:
OSX: Don't try add plugin dependencies. It just breaks plugin loading.

diffstat:

7 files changed, 21 insertions(+), 1 deletion(-)
configure.in                       |    6 ++++++
src/plugins/fts-solr/Makefile.am   |    6 +++++-
src/plugins/fts-squat/Makefile.am  |    2 ++
src/plugins/imap-acl/Makefile.am   |    2 ++
src/plugins/imap-quota/Makefile.am |    2 ++
src/plugins/mail-log/Makefile.am   |    2 ++
src/plugins/trash/Makefile.am      |    2 ++

diffs (113 lines):

diff -r 394a63985b33 -r 5df19422d561 configure.in
--- a/configure.in	Mon Dec 14 20:23:46 2009 -0500
+++ b/configure.in	Mon Dec 14 20:34:44 2009 -0500
@@ -580,6 +580,7 @@ fi
 fi
 
 dnl * OS specific options
+have_plugin_deps=yes
 case "$host_os" in
 	hpux*)
 		CFLAGS="$CFLAGS -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED"
@@ -591,9 +592,14 @@ case "$host_os" in
 	linux*)
 		AC_DEFINE(PROCTITLE_HACK,, Define if process title can be changed by modifying argv)
 		;;
+	darwin*)
+		# OSX loads the plugins twice, which breaks stuff
+		have_plugin_deps=no
+		;;
 	*)
 		;;
 esac
+AM_CONDITIONAL(PLUGIN_DEPS, test "$have_plugin_deps" = "yes")
 
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
diff -r 394a63985b33 -r 5df19422d561 src/plugins/fts-solr/Makefile.am
--- a/src/plugins/fts-solr/Makefile.am	Mon Dec 14 20:23:46 2009 -0500
+++ b/src/plugins/fts-solr/Makefile.am	Mon Dec 14 20:34:44 2009 -0500
@@ -11,8 +11,12 @@ module_LTLIBRARIES = \
 module_LTLIBRARIES = \
 	lib21_fts_solr_plugin.la
 
+if PLUGIN_DEPS
+fts_plugin_dep = ../fts/lib20_fts_plugin.la
+endif
+
 lib21_fts_solr_plugin_la_LIBADD = \
-	../fts/lib20_fts_plugin.la \
+	$(fts_plugin_dep) \
 	$(CURL_LIBS) -lexpat
 
 lib21_fts_solr_plugin_la_SOURCES = \
diff -r 394a63985b33 -r 5df19422d561 src/plugins/fts-squat/Makefile.am
--- a/src/plugins/fts-squat/Makefile.am	Mon Dec 14 20:23:46 2009 -0500
+++ b/src/plugins/fts-squat/Makefile.am	Mon Dec 14 20:34:44 2009 -0500
@@ -10,8 +10,10 @@ module_LTLIBRARIES = \
 module_LTLIBRARIES = \
 	lib21_fts_squat_plugin.la
 
+if PLUGIN_DEPS
 lib21_fts_squat_plugin_la_LIBADD = \
 	../fts/lib20_fts_plugin.la
+endif
 
 lib21_fts_squat_plugin_la_SOURCES = \
 	fts-squat-plugin.c \
diff -r 394a63985b33 -r 5df19422d561 src/plugins/imap-acl/Makefile.am
--- a/src/plugins/imap-acl/Makefile.am	Mon Dec 14 20:23:46 2009 -0500
+++ b/src/plugins/imap-acl/Makefile.am	Mon Dec 14 20:34:44 2009 -0500
@@ -14,8 +14,10 @@ imap_module_LTLIBRARIES = \
 imap_module_LTLIBRARIES = \
 	lib02_imap_acl_plugin.la
 
+if PLUGIN_DEPS
 lib02_imap_acl_plugin_la_LIBADD = \
 	../acl/lib01_acl_plugin.la
+endif
 
 lib02_imap_acl_plugin_la_SOURCES = \
 	imap-acl-plugin.c
diff -r 394a63985b33 -r 5df19422d561 src/plugins/imap-quota/Makefile.am
--- a/src/plugins/imap-quota/Makefile.am	Mon Dec 14 20:23:46 2009 -0500
+++ b/src/plugins/imap-quota/Makefile.am	Mon Dec 14 20:34:44 2009 -0500
@@ -13,8 +13,10 @@ imap_module_LTLIBRARIES = \
 imap_module_LTLIBRARIES = \
 	lib11_imap_quota_plugin.la
 
+if PLUGIN_DEPS
 lib11_imap_quota_plugin_la_LIBADD = \
 	../quota/lib10_quota_plugin.la
+endif
 
 lib11_imap_quota_plugin_la_SOURCES = \
 	imap-quota-plugin.c
diff -r 394a63985b33 -r 5df19422d561 src/plugins/mail-log/Makefile.am
--- a/src/plugins/mail-log/Makefile.am	Mon Dec 14 20:23:46 2009 -0500
+++ b/src/plugins/mail-log/Makefile.am	Mon Dec 14 20:34:44 2009 -0500
@@ -13,8 +13,10 @@ module_LTLIBRARIES = \
 module_LTLIBRARIES = \
 	lib20_mail_log_plugin.la
 
+if PLUGIN_DEPS
 lib20_mail_log_plugin_la_LIBADD = \
 	../notify/lib15_notify_plugin.la
+endif
 
 lib20_mail_log_plugin_la_SOURCES = \
 	mail-log-plugin.c
diff -r 394a63985b33 -r 5df19422d561 src/plugins/trash/Makefile.am
--- a/src/plugins/trash/Makefile.am	Mon Dec 14 20:23:46 2009 -0500
+++ b/src/plugins/trash/Makefile.am	Mon Dec 14 20:34:44 2009 -0500
@@ -10,8 +10,10 @@ module_LTLIBRARIES = \
 module_LTLIBRARIES = \
 	lib11_trash_plugin.la
 
+if PLUGIN_DEPS
 lib11_trash_plugin_la_LIBADD = \
 	../quota/lib10_quota_plugin.la
+endif
 
 lib11_trash_plugin_la_SOURCES = \
 	trash-plugin.c