OSX: Don't try add plugin dependencies. It just breaks plugin loading.

--HG--
branch : HEAD

diff --git a/configure.in b/configure.in
index 51fcffb081b2632b2710b6780acc3f72f543d6be..3ff45553512782033961babf37a3143a3d2507b1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -580,6 +580,7 @@ if test $i_cv_posix_fallocate_works = yes; then
 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 --git a/src/plugins/fts-solr/Makefile.am b/src/plugins/fts-solr/Makefile.am
index f09a6663be0d0a736c51fd0ce79261c73ee0eb5f..4cc74db481feb60c3f946672798798b666572c9c 100644 (file)
--- a/src/plugins/fts-solr/Makefile.am
+++ b/src/plugins/fts-solr/Makefile.am
@@ -11,8 +11,12 @@ lib21_fts_solr_plugin_la_LDFLAGS = -module -avoid-version
 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 --git a/src/plugins/fts-squat/Makefile.am b/src/plugins/fts-squat/Makefile.am
index e9296f04090ff050a1d24e9a1d691fa6ec73a017..f1393baefb77ee61907a72343cb21011a7c12767 100644 (file)
--- a/src/plugins/fts-squat/Makefile.am
+++ b/src/plugins/fts-squat/Makefile.am
@@ -10,8 +10,10 @@ lib21_fts_squat_plugin_la_LDFLAGS = -module -avoid-version
 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 --git a/src/plugins/imap-acl/Makefile.am b/src/plugins/imap-acl/Makefile.am
index 82dade93ee1b31e677740d443ce3b53c099924a3..d778c2a5d0169d6237e653b51faa8722b69c0809 100644 (file)
--- a/src/plugins/imap-acl/Makefile.am
+++ b/src/plugins/imap-acl/Makefile.am
@@ -14,8 +14,10 @@ lib02_imap_acl_plugin_la_LDFLAGS = -module -avoid-version
 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 --git a/src/plugins/imap-quota/Makefile.am b/src/plugins/imap-quota/Makefile.am
index 2a81ec26776c87e3e3672cab7e3b2b6e2499f648..c459398201c69adc73d9dffeb3daeea6b4e968ac 100644 (file)
--- a/src/plugins/imap-quota/Makefile.am
+++ b/src/plugins/imap-quota/Makefile.am
@@ -13,8 +13,10 @@ lib11_imap_quota_plugin_la_LDFLAGS = -module -avoid-version
 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 --git a/src/plugins/mail-log/Makefile.am b/src/plugins/mail-log/Makefile.am
index c0a0706f0bd1a610f9ddc6f971fb42df0e94d32e..59863b5699e4d1a4703e29cc066dc66a6583fce5 100644 (file)
--- a/src/plugins/mail-log/Makefile.am
+++ b/src/plugins/mail-log/Makefile.am
@@ -13,8 +13,10 @@ lib20_mail_log_plugin_la_LDFLAGS = -module -avoid-version
 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 --git a/src/plugins/trash/Makefile.am b/src/plugins/trash/Makefile.am
index cf719a0e531beeadb1251e85a544613e6a7d0825..710c8a9869fc3b88fb5321b5d66b4fc6145ce26d 100644 (file)
--- a/src/plugins/trash/Makefile.am
+++ b/src/plugins/trash/Makefile.am
@@ -10,8 +10,10 @@ lib11_trash_plugin_la_LDFLAGS = -module -avoid-version
 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