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 11d46bc27123221347bdd340e975e47d08db9673..f834addcf9e68bac1098bb1f4d8d4ff1bc5da1a5 100644 (file)
--- 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 55db150ea1c31b167288e60622c170dc2cad94b9..08538c569ec5706faf2ca468368155223d220d58 100644 (file)
--- 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"