[dovecot-cvs] dovecot/src/dict Makefile.am, 1.5, 1.6 main.c, 1.9, 1.10

[tss-movial at dovecot.org]

Update of /var/lib/cvs/dovecot/src/dict
In directory talvi:/tmp/cvs-serv24041/src/dict

Modified Files:
	Makefile.am main.c 
Log Message:
Berkeley DB dict support is now enabled only when using --with-db configure option.



Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/dovecot/src/dict/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	18 Jun 2006 09:50:23 -0000	1.5
+++ Makefile.am	30 Jul 2006 19:27:25 -0000	1.6
@@ -19,6 +19,7 @@
 	$(libs) \
 	$(RAND_LIBS) \
 	$(MODULE_LIBS) \
+	$(DICT_LIBS) \
 	$(SQL_LIBS)
 
 dict_DEPENDENCIES = $(libs)

Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/dict/main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- main.c	17 Jun 2006 11:24:10 -0000	1.9
+++ main.c	30 Jul 2006 19:27:25 -0000	1.10
@@ -7,7 +7,7 @@
 #include "restrict-access.h"
 #include "randgen.h"
 #include "sql-api.h"
-#include "dict-sql.h"
+#include "dict.h"
 #include "dict-client.h"
 #include "dict-server.h"
 #include "module-dir.h"
@@ -68,8 +68,7 @@
 	/* If master dies, the log fd gets closed and we'll quit */
 	log_io = io_add(STDERR_FILENO, IO_ERROR, log_error_callback, NULL);
 
-	dict_client_register();
-	dict_sql_register();
+	dict_drivers_register_all();
 
 	modules = getenv("MODULE_DIR") == NULL ? NULL :
 		module_dir_load(getenv("MODULE_DIR"), NULL, TRUE);
@@ -89,8 +88,7 @@
 
 	module_dir_unload(&modules);
 
-	dict_sql_unregister();
-	dict_client_unregister();
+	dict_drivers_unregister_all();
 
 	sql_drivers_deinit();
 	random_deinit();