[dovecot-cvs] dovecot/src/pop3 Makefile.am, 1.12.2.2,
1.12.2.3 main.c, 1.48, 1.48.2.1
cras at dovecot.org
cras at dovecot.org
Wed Jun 28 00:03:55 EEST 2006
Update of /var/lib/cvs/dovecot/src/pop3
In directory talvi:/tmp/cvs-serv29820/pop3
Modified Files:
Tag: branch_1_0
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/pop3/Makefile.am,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -d -r1.12.2.2 -r1.12.2.3
--- Makefile.am 18 Jun 2006 09:49:51 -0000 1.12.2.2
+++ Makefile.am 27 Jun 2006 21:03:52 -0000 1.12.2.3
@@ -6,7 +6,8 @@
-I$(top_srcdir)/src/lib \
-I$(top_srcdir)/src/lib-dict \
-I$(top_srcdir)/src/lib-mail \
- -I$(top_srcdir)/src/lib-storage
+ -I$(top_srcdir)/src/lib-storage \
+ -DMODULEDIR=\""$(moduledir)"\"
pop3_LDFLAGS = -export-dynamic
Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/pop3/main.c,v
retrieving revision 1.48
retrieving revision 1.48.2.1
diff -u -d -r1.48 -r1.48.2.1
--- main.c 3 May 2006 22:58:56 -0000 1.48
+++ main.c 27 Jun 2006 21:03:52 -0000 1.48.2.1
@@ -187,13 +187,15 @@
mail_storage_register_all();
clients_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);
}
mail = getenv("MAIL");
More information about the dovecot-cvs
mailing list