Mercurial > dovecot > core-2.2

changeset 2070:0c8f884d1648 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added --with-moduledir configure option
author Timo Sirainen <tss@iki.fi>
date Wed, 26 May 2004 18:26:05 +0300
parents 028a6cf7488f
children fd17ca21af0b
files configure.in src/master/Makefile.am src/master/master-settings.c
diffstat 3 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Wed May 26 17:46:35 2004 +0300
+++ b/configure.in	Wed May 26 18:26:05 2004 +0300
@@ -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 @@
 	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
--- a/src/master/Makefile.am	Wed May 26 17:46:35 2004 +0300
+++ b/src/master/Makefile.am	Wed May 26 18:26:05 2004 +0300
@@ -8,7 +8,7 @@
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DPKG_RUNDIR=\""$(localstatedir)/run/$(PACKAGE)"\" \
 	-DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \
-	-DPKG_LIBDIR=\""$(libdir)/$(PACKAGE)"\" \
+	-DMODULEDIR=\""$(moduledir)"\" \
 	-DSSLDIR=\""$(ssldir)\""
 
 dovecot_LDADD = \
--- a/src/master/master-settings.c	Wed May 26 17:46:35 2004 +0300
+++ b/src/master/master-settings.c	Wed May 26 18:26:05 2004 +0300
@@ -237,7 +237,7 @@
 	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 @@
 	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;
 }