changeset 6195:068df1748a57 HEAD

Renamed --enable-sql-plugins to --with-sql=plugin
author Timo Sirainen <tss@iki.fi>
date Tue, 07 Aug 2007 00:17:27 +0300
parents 0d86bb9cf286
children 17fdcb09159b
files configure.in
diffstat 1 files changed, 6 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/configure.in	Tue Aug 07 00:13:56 2007 +0300
+++ b/configure.in	Tue Aug 07 00:17:27 2007 +0300
@@ -212,8 +212,12 @@
 [  --with-sql              Build with generic SQL support],
 	if test x$withval = xno; then
 		want_sql=no
+	elif test x$withval = xplugin; then
+		want_sql=yes
+		want_sql_plugins=yes
 	else
 		want_sql=yes
+		want_sql_plugins=no
 	fi,
 	want_sql=no)
 
@@ -244,15 +248,6 @@
 	fi,
 	want_sqlite=no)
 
-AC_ARG_ENABLE(sql-plugins,
-[  --enable-sql-plugins    Build SQL modules as plugins],
-	if test x$enableval = xno; then
-		want_sql_plugins=no
-	else
-		want_sql_plugins=yes
-	fi,
-	want_sql_plugins=no)
-
 AC_ARG_WITH(lucene,
 [  --with-lucene           Build with CLucene full text search support],
 	if test x$withval = xno; then
@@ -1765,11 +1760,11 @@
 fi
 	
 SQL_CFLAGS="$MYSQL_CFLAGS $PGSQL_CFLAGS $SQLITE_CFLAGS"
-if test "$want_sql_plugins" = "no"; then
+if test "$want_sql_plugins" != "yes"; then
 	SQL_LIBS="$MYSQL_LIBS $PGSQL_LIBS $SQLITE_LIBS"
 fi
 
-if test "$found_sql_drivers" != "" -o "$want_sql" = "yes"; then
+if test "$found_sql_drivers" != "" -o "$want_sql" != "no"; then
 	if test "$all_sql_drivers" = "yes"; then
 	  sql_drivers="$found_sql_drivers"
 	fi