# HG changeset patch # User Timo Sirainen # Date 1213219919 -10800 # Node ID b63aa0ffe564cf4cc82d959c1c4294b72496719d # Parent 0307382cf01153628ed456ab4ba7076a1cc64d88 Use dynamic module suffix provided by libtool rather than hardcoded ".so". diff -r 0307382cf011 -r b63aa0ffe564 configure.in --- a/configure.in Thu Jun 12 00:19:20 2008 +0300 +++ b/configure.in Thu Jun 12 00:31:59 2008 +0300 @@ -1990,6 +1990,11 @@ if test $have_modules = yes; then AC_DEFINE(HAVE_MODULES,, Define if you have dynamic module support) AC_SUBST(MODULE_LIBS) + + # shrext_cmds comes from libtool.m4 + MODULE_SUFFIX=$shrext_cmds + AC_DEFINE_UNQUOTED(MODULE_SUFFIX,"$MODULE_SUFFIX",Dynamic module suffix) + AC_SUBST(MODULE_SUFFIX) fi have_nss=no diff -r 0307382cf011 -r b63aa0ffe564 src/lib/module-dir.c --- a/src/lib/module-dir.c Thu Jun 12 00:19:20 2008 +0300 +++ b/src/lib/module-dir.c Thu Jun 12 00:31:59 2008 +0300 @@ -56,7 +56,7 @@ if (*p == '_') fname = p + 1; - p = strstr(fname, ".so"); + p = strstr(fname, MODULE_SUFFIX); if (p == NULL) return fname; @@ -221,7 +221,7 @@ if (name[0] == '.') continue; - p = strstr(name, ".so"); + p = strstr(name, MODULE_SUFFIX); if (p == NULL || strlen(p) != 3) continue; diff -r 0307382cf011 -r b63aa0ffe564 src/plugins/acl/Makefile.am --- a/src/plugins/acl/Makefile.am Thu Jun 12 00:19:20 2008 +0300 +++ b/src/plugins/acl/Makefile.am Thu Jun 12 00:31:59 2008 +0300 @@ -31,6 +31,6 @@ install-exec-local: for d in imap lda; do \ $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \ - rm -f $(DESTDIR)$(moduledir)/$$d/lib01_acl_plugin.so; \ - $(LN_S) ../lib01_acl_plugin.so $(DESTDIR)$(moduledir)/$$d; \ + rm -f $(DESTDIR)$(moduledir)/$$d/lib01_acl_plugin$MODULE_SUFFIX; \ + $(LN_S) ../lib01_acl_plugin$MODULE_SUFFIX $(DESTDIR)$(moduledir)/$$d; \ done diff -r 0307382cf011 -r b63aa0ffe564 src/plugins/convert/Makefile.am --- a/src/plugins/convert/Makefile.am Thu Jun 12 00:19:20 2008 +0300 +++ b/src/plugins/convert/Makefile.am Thu Jun 12 00:31:59 2008 +0300 @@ -48,6 +48,6 @@ install-exec-local: for d in imap pop3 lda; do \ $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \ - rm -f $(DESTDIR)$(moduledir)/$$d/lib20_convert_plugin.so; \ - $(LN_S) ../lib20_convert_plugin.so $(DESTDIR)$(moduledir)/$$d; \ + rm -f $(DESTDIR)$(moduledir)/$$d/lib20_convert_plugin$MODULE_SUFFIX; \ + $(LN_S) ../lib20_convert_plugin$MODULE_SUFFIX $(DESTDIR)$(moduledir)/$$d; \ done diff -r 0307382cf011 -r b63aa0ffe564 src/plugins/expire/Makefile.am --- a/src/plugins/expire/Makefile.am Thu Jun 12 00:19:20 2008 +0300 +++ b/src/plugins/expire/Makefile.am Thu Jun 12 00:31:59 2008 +0300 @@ -52,6 +52,6 @@ $(DESTDIR)$(moduledir)/pop3 \ $(DESTDIR)$(moduledir)/lda for d in imap pop3 lda; do \ - rm -f $(DESTDIR)$(moduledir)/$$d/lib20_expire_plugin.so; \ - $(LN_S) ../lib20_expire_plugin.so $(DESTDIR)$(moduledir)/$$d; \ + rm -f $(DESTDIR)$(moduledir)/$$d/lib20_expire_plugin$MODULE_SUFFIX; \ + $(LN_S) ../lib20_expire_plugin$MODULE_SUFFIX $(DESTDIR)$(moduledir)/$$d; \ done diff -r 0307382cf011 -r b63aa0ffe564 src/plugins/fts-lucene/Makefile.am --- a/src/plugins/fts-lucene/Makefile.am Thu Jun 12 00:19:20 2008 +0300 +++ b/src/plugins/fts-lucene/Makefile.am Thu Jun 12 00:31:59 2008 +0300 @@ -26,6 +26,6 @@ install-exec-local: for d in imap lda; do \ $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \ - rm -f $(DESTDIR)$(moduledir)/$$d/lib21_fts_lucene_plugin.so; \ - $(LN_S) ../lib21_fts_lucene_plugin.so $(DESTDIR)$(moduledir)/$$d; \ + rm -f $(DESTDIR)$(moduledir)/$$d/lib21_fts_lucene_plugin$MODULE_SUFFIX; \ + $(LN_S) ../lib21_fts_lucene_plugin$MODULE_SUFFIX $(DESTDIR)$(moduledir)/$$d; \ done diff -r 0307382cf011 -r b63aa0ffe564 src/plugins/fts-squat/Makefile.am --- a/src/plugins/fts-squat/Makefile.am Thu Jun 12 00:19:20 2008 +0300 +++ b/src/plugins/fts-squat/Makefile.am Thu Jun 12 00:31:59 2008 +0300 @@ -51,6 +51,6 @@ install-exec-local: for d in imap lda; do \ $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \ - rm -f $(DESTDIR)$(moduledir)/$$d/lib21_fts_squat_plugin.so; \ - $(LN_S) ../lib21_fts_squat_plugin.so $(DESTDIR)$(moduledir)/$$d; \ + rm -f $(DESTDIR)$(moduledir)/$$d/lib21_fts_squat_plugin$MODULE_SUFFIX; \ + $(LN_S) ../lib21_fts_squat_plugin$MODULE_SUFFIX $(DESTDIR)$(moduledir)/$$d; \ done diff -r 0307382cf011 -r b63aa0ffe564 src/plugins/fts/Makefile.am --- a/src/plugins/fts/Makefile.am Thu Jun 12 00:19:20 2008 +0300 +++ b/src/plugins/fts/Makefile.am Thu Jun 12 00:31:59 2008 +0300 @@ -25,6 +25,6 @@ install-exec-local: for d in imap lda; do \ $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \ - rm -f $(DESTDIR)$(moduledir)/$$d/lib20_fts_plugin.so; \ - $(LN_S) ../lib20_fts_plugin.so $(DESTDIR)$(moduledir)/$$d; \ + rm -f $(DESTDIR)$(moduledir)/$$d/lib20_fts_plugin$MODULE_SUFFIX; \ + $(LN_S) ../lib20_fts_plugin$MODULE_SUFFIX $(DESTDIR)$(moduledir)/$$d; \ done diff -r 0307382cf011 -r b63aa0ffe564 src/plugins/lazy-expunge/Makefile.am --- a/src/plugins/lazy-expunge/Makefile.am Thu Jun 12 00:19:20 2008 +0300 +++ b/src/plugins/lazy-expunge/Makefile.am Thu Jun 12 00:31:59 2008 +0300 @@ -22,7 +22,7 @@ install-exec-local: for d in imap pop3; do \ $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \ - rm -f $(DESTDIR)$(moduledir)/$$d/lib02_lazy_expunge_plugin.so; \ - $(LN_S) ../lib02_lazy_expunge_plugin.so $(DESTDIR)$(moduledir)/$$d; \ + rm -f $(DESTDIR)$(moduledir)/$$d/lib02_lazy_expunge_plugin$MODULE_SUFFIX; \ + $(LN_S) ../lib02_lazy_expunge_plugin$MODULE_SUFFIX $(DESTDIR)$(moduledir)/$$d; \ done diff -r 0307382cf011 -r b63aa0ffe564 src/plugins/mail-log/Makefile.am --- a/src/plugins/mail-log/Makefile.am Thu Jun 12 00:19:20 2008 +0300 +++ b/src/plugins/mail-log/Makefile.am Thu Jun 12 00:31:59 2008 +0300 @@ -20,7 +20,7 @@ install-exec-local: for d in imap pop3 lda; do \ $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \ - rm -f $(DESTDIR)$(moduledir)/$$d/lib20_mail_log_plugin.so; \ - $(LN_S) ../lib20_mail_log_plugin.so $(DESTDIR)$(moduledir)/$$d; \ + rm -f $(DESTDIR)$(moduledir)/$$d/lib20_mail_log_plugin$MODULE_SUFFIX; \ + $(LN_S) ../lib20_mail_log_plugin$MODULE_SUFFIX $(DESTDIR)$(moduledir)/$$d; \ done diff -r 0307382cf011 -r b63aa0ffe564 src/plugins/mbox-snarf/Makefile.am --- a/src/plugins/mbox-snarf/Makefile.am Thu Jun 12 00:19:20 2008 +0300 +++ b/src/plugins/mbox-snarf/Makefile.am Thu Jun 12 00:31:59 2008 +0300 @@ -18,6 +18,6 @@ install-exec-local: for d in imap pop3; do \ $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \ - rm -f $(DESTDIR)$(moduledir)/$$d/lib20_mbox_snarf_plugin.so; \ - $(LN_S) ../lib20_mbox_snarf_plugin.so $(DESTDIR)$(moduledir)/$$d; \ + rm -f $(DESTDIR)$(moduledir)/$$d/lib20_mbox_snarf_plugin$MODULE_SUFFIX; \ + $(LN_S) ../lib20_mbox_snarf_plugin$MODULE_SUFFIX $(DESTDIR)$(moduledir)/$$d; \ done diff -r 0307382cf011 -r b63aa0ffe564 src/plugins/quota/Makefile.am --- a/src/plugins/quota/Makefile.am Thu Jun 12 00:19:20 2008 +0300 +++ b/src/plugins/quota/Makefile.am Thu Jun 12 00:31:59 2008 +0300 @@ -55,8 +55,8 @@ install-exec-local: for d in imap pop3 lda; do \ $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \ - rm -f $(DESTDIR)$(moduledir)/$$d/lib10_quota_plugin.so; \ - $(LN_S) ../lib10_quota_plugin.so $(DESTDIR)$(moduledir)/$$d; \ + rm -f $(DESTDIR)$(moduledir)/$$d/lib10_quota_plugin$MODULE_SUFFIX; \ + $(LN_S) ../lib10_quota_plugin$MODULE_SUFFIX $(DESTDIR)$(moduledir)/$$d; \ done DISTFILES = $(DIST_COMMON) $(quota_dist_sources) $(TEXINFOS) $(EXTRA_DIST) diff -r 0307382cf011 -r b63aa0ffe564 src/plugins/trash/Makefile.am --- a/src/plugins/trash/Makefile.am Thu Jun 12 00:19:20 2008 +0300 +++ b/src/plugins/trash/Makefile.am Thu Jun 12 00:31:59 2008 +0300 @@ -19,7 +19,7 @@ install-exec-local: for d in imap lda; do \ $(mkdir_p) $(DESTDIR)$(moduledir)/$$d; \ - rm -f $(DESTDIR)$(moduledir)/$$d/lib11_trash_plugin.so; \ - $(LN_S) ../lib11_trash_plugin.so $(DESTDIR)$(moduledir)/$$d; \ + rm -f $(DESTDIR)$(moduledir)/$$d/lib11_trash_plugin$MODULE_SUFFIX; \ + $(LN_S) ../lib11_trash_plugin$MODULE_SUFFIX $(DESTDIR)$(moduledir)/$$d; \ done