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

[dovecot at dovecot.org]

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

diffstat:

2 files changed, 11 insertions(+), 1 deletion(-)
configure.in      |    5 ++++-
src/master/main.c |    7 +++++++

diffs (40 lines):

diff -r 172cfd750a40 -r d936c8e243dd configure.in
--- a/configure.in	Tue May 19 14:48:08 2009 -0400
+++ b/configure.in	Wed May 20 13:51:11 2009 -0400
@@ -2073,7 +2073,10 @@ 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"
-fi
+else
+	AC_DEFINE(SQL_DRIVER_PLUGINS,, Build SQL drivers as plugins)
+fi
+exit
 
 if test "$found_sql_drivers" != "" || test "$want_sql" != "no"; then
 	if test "$all_sql_drivers" = "yes"; then
diff -r 172cfd750a40 -r d936c8e243dd 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:51:11 2009 -0400
@@ -401,7 +401,11 @@ static void print_build_options(void)
 		" openssl"
 #endif
 	"\nMail storages: "MAIL_STORAGES"\n"
+#ifdef SQL_DRIVER_PLUGINS
+	"SQL driver plugins:"
+#else
 	"SQL drivers:"
+#endif
 #ifdef BUILD_MYSQL
 		" mysql"
 #endif
@@ -448,6 +452,9 @@ static void print_build_options(void)
 #endif
 #ifdef USERDB_LDAP
 		" ldap"
+#ifndef BUILTIN_LDAP
+		"(plugin)"
+#endif
 #endif
 #ifdef USERDB_PASSWD
 		" passwd"