[dovecot-cvs] dovecot/src/master Makefile.am, 1.12, 1.13 master-settings.c, 1.48, 1.49

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv17198/src/master

Modified Files:
	Makefile.am master-settings.c 
Log Message:
Added --with-moduledir configure option



Index: Makefile.am
===================================================================
RCS file: /home/cvs/dovecot/src/master/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- a/Makefile.am	10 May 2004 16:05:10 -0000	1.12
+++ b/Makefile.am	26 May 2004 15:26:06 -0000	1.13
@@ -8,7 +8,7 @@
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DPKG_RUNDIR=\""$(localstatedir)/run/$(PACKAGE)"\" \
 	-DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \
-	-DPKG_LIBDIR=\""$(libdir)/$(PACKAGE)"\" \
+	-DMODULEDIR=\""$(moduledir)"\" \
 	-DSSLDIR=\""$(ssldir)\""
 
 dovecot_LDADD = \

Index: master-settings.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- a/master-settings.c	26 May 2004 14:46:35 -0000	1.48
+++ b/master-settings.c	26 May 2004 15:26:06 -0000	1.49
@@ -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;
 }