Added --with-moduledir configure option

--HG--
branch : HEAD

diff --git a/configure.in b/configure.in
index b2d8c40d3e64fd4e7310a774b11a50b9740f7720..3d0ff5dacf7ea12801d5952175c279d6b89e9911 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(src)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(dovecot, 1.0-test10)
+AM_INIT_AUTOMAKE(dovecot, 1.0-test13)
 
 AM_MAINTAINER_MODE
 
@@ -206,6 +206,13 @@ AC_ARG_WITH(storages,
        mail_storages=`echo "$withval"|sed 's/,/ /g'` ],
        mail_storages="maildir mbox")
 
+AC_ARG_WITH(moduledir,
+[  --with-moduledir=DIR    Base directory for dynamically loadable modules],
+       moduledir="$withval",
+       moduledir=$libdir/dovecot
+)
+AC_SUBST(moduledir)
+
 dnl * gcc specific options
 if test "x$ac_cv_prog_gcc" = "xyes"; then
        # -Wcast-qual -Wcast-align -Wconversion # too many warnings

diff --git a/src/master/Makefile.am b/src/master/Makefile.am
index fbe24577f0e941ba96a3e0e764812fab6cc1f34f..0fc85ba90b216dd14e82020470d1da69a2c89107 100644 (file)
--- a/src/master/Makefile.am
+++ b/src/master/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = \
        -DSYSCONFDIR=\""$(sysconfdir)"\" \
        -DPKG_RUNDIR=\""$(localstatedir)/run/$(PACKAGE)"\" \
        -DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \
-       -DPKG_LIBDIR=\""$(libdir)/$(PACKAGE)"\" \
+       -DMODULEDIR=\""$(moduledir)"\" \
        -DSSLDIR=\""$(ssldir)\""
 
 dovecot_LDADD = \

diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index bc4aec972d3336bddf47d5915e2f234dcabb1778..afc6d951db52e83e769f72e755f409d730b7f6cc 100644 (file)
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -237,7 +237,7 @@ struct settings default_settings = {
        MEMBER(mail_executable) PKG_LIBEXECDIR"/imap",
        MEMBER(mail_process_size) 256,
        MEMBER(mail_use_modules) FALSE,
-       MEMBER(mail_modules) PKG_LIBDIR"/imap",
+       MEMBER(mail_modules) MODULEDIR"/imap",
 
        /* imap */
        MEMBER(imap_max_line_length) 65536,
@@ -715,13 +715,13 @@ create_new_server(const char *name,
        server->imap->protocol = MAIL_PROTOCOL_IMAP;
        server->imap->login_executable = PKG_LIBEXECDIR"/imap-login";
        server->imap->mail_executable = PKG_LIBEXECDIR"/imap";
-       server->imap->mail_modules = PKG_LIBDIR"/imap";
+       server->imap->mail_modules = MODULEDIR"/imap";
 
        server->pop3->server = server;
        server->pop3->protocol = MAIL_PROTOCOL_POP3;
        server->pop3->login_executable = PKG_LIBEXECDIR"/pop3-login";
        server->pop3->mail_executable = PKG_LIBEXECDIR"/pop3";
-       server->pop3->mail_modules = PKG_LIBDIR"/pop3";
+       server->pop3->mail_modules = MODULEDIR"/pop3";
 
        return server;
 }