Use dynamic module suffix provided by libtool rather than hardcoded ".so".

--HG--
branch : HEAD

diff --git a/configure.in b/configure.in
index 10f72232012aaae8dd8549e06450ccab2c4c3df6..4f193ac4c0041fc3ca81cfeadbcd3a9d814e2d25 100644 (file)
--- 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 ab912ae4a4e2f983f252d2a453ba039499fa4f4d..57a1edbecde5f7c4abe5312c20944907d557d28e 100644 (file)
--- 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 851fccf42c590c9989f3e3b7f126d3ef44a5443f..330a168e65c64c6cf11a7a9fb3427a96685d797f 100644 (file)
--- 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 637f5f5ab66f004ebc7edb09c48d909515024b76..4cde041287035695d83e1fa7f930306213d8c5c2 100644 (file)
--- 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 0d8745fe03eba278e7e67deca0cbd4090cdb6380..22b3c0a992f9ed9f29edbe4578367e81f2b722a6 100644 (file)
--- 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 bc19182be3110f5de63da15805ea43dfc9eb0a6c..60fc6ad551baeb776d1cc0def78948a79b87c3a7 100644 (file)
--- 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 4b6bdf898debdac996736f3596ead967bbbdc243..e5cd1cc34516fe487c9977e1c86553445c36f75b 100644 (file)
--- 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 04e720f08def8dae2b32456a03e95d52b0c42778..705ea54b21da96ce66d64bd367f9035d54631088 100644 (file)
--- 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 98d96b33dad4402f18deea2f3af81678c54695a3..c752d829911cea2b633f7927b2e3adc22faa5e0a 100644 (file)
--- 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 febc6645e0ed8400e4377d4d592cdb4609729f6b..3cb208485528e45a3e7e092ad56b9ba14fd700f3 100644 (file)
--- 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 9224c44b03ecd1b5fd28fa54e5228d01e39a2603..653fb264b56343c6bfdf5355666f992262de6185 100644 (file)
--- 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 2b9dad07d0912c346bc21decd82a442f6763dd46..21cd01f02f071b984a551b811589a1e0c8fac007 100644 (file)
--- 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 eb7ef678bb50fc8b23af08a864db79274f87ceb9..28530e94b55e6efcb772648d7ce2faa8bc68c523 100644 (file)
--- 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