dovecot-2.0: dovecot --build-options: If SQL or LDAP was built a...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/ed142749ce67
changeset: 9329:ed142749ce67
user:      Timo Sirainen <tss at iki.fi>
date:      Wed May 20 13:52:49 2009 -0400
description:
dovecot --build-options: If SQL or LDAP was built as plugins, say it.

diffstat:

2 files changed, 9 insertions(+)
configure.in      |    2 ++
src/master/main.c |    7 +++++++

diffs (37 lines):

diff -r 91b961fb07a5 -r ed142749ce67 configure.in
--- a/configure.in	Tue May 19 14:48:08 2009 -0400
+++ b/configure.in	Wed May 20 13:52:49 2009 -0400
@@ -2084,6 +2084,8 @@ SQL_CFLAGS="$MYSQL_CFLAGS $PGSQL_CFLAGS 
 SQL_CFLAGS="$MYSQL_CFLAGS $PGSQL_CFLAGS $SQLITE_CFLAGS"
 if test "$want_sql" != "plugin"; then
 	SQL_LIBS="$MYSQL_LIBS $PGSQL_LIBS $SQLITE_LIBS"
+else
+	AC_DEFINE(SQL_DRIVER_PLUGINS,, Build SQL drivers as plugins)
 fi
 
 if test "$found_sql_drivers" != "" || test "$want_sql" != "no"; then
diff -r 91b961fb07a5 -r ed142749ce67 src/master/main.c
--- a/src/master/main.c	Tue May 19 14:48:08 2009 -0400
+++ b/src/master/main.c	Wed May 20 13:52:49 2009 -0400
@@ -476,7 +476,11 @@ static void print_build_options(void)
 #ifdef HAVE_OPENSSL
 		" openssl"
 #endif
+#ifdef SQL_DRIVER_PLUGINS
+	"\nSQL driver plugins:"
+#else
 	"\nSQL drivers:"
+#endif
 #ifdef BUILD_MYSQL
 		" mysql"
 #endif
@@ -520,6 +524,9 @@ static void print_build_options(void)
 #endif
 #ifdef USERDB_LDAP
 		" ldap"
+#ifndef BUILTIN_LDAP
+		"(plugin)"
+#endif
 #endif
 #ifdef USERDB_PASSWD
 		" passwd"