From: Timo Sirainen <tss@iki.fi>
Date: Wed, 26 May 2004 15:26:05 +0000 (+0300)
Subject: Added --with-moduledir configure option
X-Git-Tag: 1.1.alpha1~4036
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18aef5852353ee7a78ab55f7818384fd82317e8a;p=thirdparty%2Fdovecot%2Fcore.git

Added --with-moduledir configure option

--HG--
branch : HEAD
---

diff --git a/configure.in b/configure.in
index b2d8c40d3e..3d0ff5dacf 100644
--- 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 fbe24577f0..0fc85ba90b 100644
--- 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 bc4aec972d..afc6d951db 100644
--- 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;
 }