From 24abf21d02b4fe2bf539102fa50e4a6261242222 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Thu, 12 Jun 2008 00:31:59 +0300 Subject: [PATCH] Use dynamic module suffix provided by libtool rather than hardcoded ".so". --HG-- branch : HEAD --- configure.in | 5 +++++ src/lib/module-dir.c | 4 ++-- src/plugins/acl/Makefile.am | 4 ++-- src/plugins/convert/Makefile.am | 4 ++-- src/plugins/expire/Makefile.am | 4 ++-- src/plugins/fts-lucene/Makefile.am | 4 ++-- src/plugins/fts-squat/Makefile.am | 4 ++-- src/plugins/fts/Makefile.am | 4 ++-- src/plugins/lazy-expunge/Makefile.am | 4 ++-- src/plugins/mail-log/Makefile.am | 4 ++-- src/plugins/mbox-snarf/Makefile.am | 4 ++-- src/plugins/quota/Makefile.am | 4 ++-- src/plugins/trash/Makefile.am | 4 ++-- 13 files changed, 29 insertions(+), 24 deletions(-) diff --git a/configure.in b/configure.in index 10f7223201..4f193ac4c0 100644 --- a/configure.in +++ b/configure.in @@ -1990,6 +1990,11 @@ AC_CHECK_FUNC(dlopen, [ 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 --git a/src/lib/module-dir.c b/src/lib/module-dir.c index ab912ae4a4..57a1edbecd 100644 --- a/src/lib/module-dir.c +++ b/src/lib/module-dir.c @@ -56,7 +56,7 @@ const char *module_file_get_name(const char *fname) if (*p == '_') fname = p + 1; - p = strstr(fname, ".so"); + p = strstr(fname, MODULE_SUFFIX); if (p == NULL) return fname; @@ -221,7 +221,7 @@ module_dir_load_real(const char *dir, const char *module_names, if (name[0] == '.') continue; - p = strstr(name, ".so"); + p = strstr(name, MODULE_SUFFIX); if (p == NULL || strlen(p) != 3) continue; diff --git a/src/plugins/acl/Makefile.am b/src/plugins/acl/Makefile.am index 851fccf42c..330a168e65 100644 --- a/src/plugins/acl/Makefile.am +++ b/src/plugins/acl/Makefile.am @@ -31,6 +31,6 @@ noinst_HEADERS = \ 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 --git a/src/plugins/convert/Makefile.am b/src/plugins/convert/Makefile.am index 637f5f5ab6..4cde041287 100644 --- a/src/plugins/convert/Makefile.am +++ b/src/plugins/convert/Makefile.am @@ -48,6 +48,6 @@ convert_tool_DEPENDENCIES = $(libs) $(common_objects) 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 --git a/src/plugins/expire/Makefile.am b/src/plugins/expire/Makefile.am index 0d8745fe03..22b3c0a992 100644 --- a/src/plugins/expire/Makefile.am +++ b/src/plugins/expire/Makefile.am @@ -52,6 +52,6 @@ install-exec-local: $(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 --git a/src/plugins/fts-lucene/Makefile.am b/src/plugins/fts-lucene/Makefile.am index bc19182be3..60fc6ad551 100644 --- a/src/plugins/fts-lucene/Makefile.am +++ b/src/plugins/fts-lucene/Makefile.am @@ -26,6 +26,6 @@ noinst_HEADERS = \ 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 --git a/src/plugins/fts-squat/Makefile.am b/src/plugins/fts-squat/Makefile.am index 4b6bdf898d..e5cd1cc345 100644 --- a/src/plugins/fts-squat/Makefile.am +++ b/src/plugins/fts-squat/Makefile.am @@ -51,6 +51,6 @@ squat_test_DEPENDENCIES = $(libs) $(common_objects) 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 --git a/src/plugins/fts/Makefile.am b/src/plugins/fts/Makefile.am index 04e720f08d..705ea54b21 100644 --- a/src/plugins/fts/Makefile.am +++ b/src/plugins/fts/Makefile.am @@ -25,6 +25,6 @@ noinst_HEADERS = \ 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 --git a/src/plugins/lazy-expunge/Makefile.am b/src/plugins/lazy-expunge/Makefile.am index 98d96b33da..c752d82991 100644 --- a/src/plugins/lazy-expunge/Makefile.am +++ b/src/plugins/lazy-expunge/Makefile.am @@ -22,7 +22,7 @@ noinst_HEADERS = \ 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 --git a/src/plugins/mail-log/Makefile.am b/src/plugins/mail-log/Makefile.am index febc6645e0..3cb2084855 100644 --- a/src/plugins/mail-log/Makefile.am +++ b/src/plugins/mail-log/Makefile.am @@ -20,7 +20,7 @@ noinst_HEADERS = \ 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 --git a/src/plugins/mbox-snarf/Makefile.am b/src/plugins/mbox-snarf/Makefile.am index 9224c44b03..653fb264b5 100644 --- a/src/plugins/mbox-snarf/Makefile.am +++ b/src/plugins/mbox-snarf/Makefile.am @@ -18,6 +18,6 @@ noinst_HEADERS = \ 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 --git a/src/plugins/quota/Makefile.am b/src/plugins/quota/Makefile.am index 2b9dad07d0..21cd01f02f 100644 --- a/src/plugins/quota/Makefile.am +++ b/src/plugins/quota/Makefile.am @@ -55,8 +55,8 @@ noinst_HEADERS = \ 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 --git a/src/plugins/trash/Makefile.am b/src/plugins/trash/Makefile.am index eb7ef678bb..28530e94b5 100644 --- a/src/plugins/trash/Makefile.am +++ b/src/plugins/trash/Makefile.am @@ -19,7 +19,7 @@ noinst_HEADERS = \ 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 -- 2.47.3