[dovecot-cvs] dovecot/src/imap Makefile.am, 1.32, 1.33 main.c, 1.77, 1.78

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/imap
In directory talvi:/tmp/cvs-serv20993/imap

Modified Files:
	Makefile.am main.c 
Log Message:
Changed the mail_plugins/mail_plugin_dir settings to be passed as the same
environments. If MAIL_PLUGIN_DIR environment isn't given, use the built-in
default.



Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- Makefile.am	18 Jun 2006 09:50:24 -0000	1.32
+++ Makefile.am	27 Jun 2006 21:03:54 -0000	1.33
@@ -7,7 +7,8 @@
 	-I$(top_srcdir)/src/lib-dict \
 	-I$(top_srcdir)/src/lib-mail \
 	-I$(top_srcdir)/src/lib-imap \
-	-I$(top_srcdir)/src/lib-storage
+	-I$(top_srcdir)/src/lib-storage \
+	-DMODULEDIR=\""$(moduledir)"\"
 
 imap_LDFLAGS = -export-dynamic
 

Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/imap/main.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- main.c	3 May 2006 22:58:54 -0000	1.77
+++ main.c	27 Jun 2006 21:03:54 -0000	1.78
@@ -177,13 +177,15 @@
 	clients_init();
 	commands_init();
 
-	if (getenv("MODULE_LIST") == NULL)
+	if (getenv("MAIL_PLUGINS") == NULL)
 		modules = NULL;
 	else {
-		if (getenv("MODULE_DIR") == NULL)
-			i_fatal("MODULE_LIST given but MODULE_DIR was not");
-		modules = module_dir_load(getenv("MODULE_DIR"),
-					  getenv("MODULE_LIST"), TRUE);
+		const char *plugin_dir = getenv("MAIL_PLUGIN_DIR");
+
+		if (plugin_dir == NULL)
+			plugin_dir = MODULEDIR"/imap";
+		modules = module_dir_load(plugin_dir, getenv("MAIL_PLUGINS"),
+					  TRUE);
 	}
 
 	if (getenv("DUMP_CAPABILITY") != NULL) {