From: Timo Sirainen <tss@iki.fi>
Date: Wed, 20 May 2009 17:52:49 +0000 (-0400)
Subject: dovecot --build-options: If SQL or LDAP was built as plugins, say it.
X-Git-Tag: 2.0.alpha1~723
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e98c593011b0a3fc289528684815b5ea6ed9ca1c;p=thirdparty%2Fdovecot%2Fcore.git

dovecot --build-options: If SQL or LDAP was built as plugins, say it.

--HG--
branch : HEAD
---

diff --git a/configure.in b/configure.in
index 11d46bc271..f834addcf9 100644
--- a/configure.in
+++ b/configure.in
@@ -2084,6 +2084,8 @@ fi
 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 --git a/src/master/main.c b/src/master/main.c
index 55db150ea1..08538c569e 100644
--- a/src/master/main.c
+++ b/src/master/main.c
@@ -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"