2007-06-04 Jeffrey Stedfast <fejj@novell.com>

	* configure.in: AM_CONDITIONAL()s always need to be run.


svn path=/trunk/monodevelop/; revision=78568

2 files changed, 16 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 94023d53d5..f4b8713cd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-04  Jeffrey Stedfast  <fejj@novell.com>
+
+	* configure.in: AM_CONDITIONAL()s always need to be run.
+
 2007-06-01  Jeffrey Stedfast  <fejj@novell.com>
 
 	* configure.in: Wrote some configure script-fu to detect which
diff --git a/configure.in b/configure.in
index 717445a6dc..1dccb0a79a 100644
--- a/configure.in
+++ b/configure.in
@@ -188,6 +188,12 @@ AC_ARG_ENABLE(monoquery,
 		enable_monoquery=${enableval}, enable_monoquery=yes)
 
 monoquery_avail=0
+enable_postgres=no
+enable_mysql=no
+enable_sqlite=no
+enable_oracle=no
+enable_sqlserv=no
+enable_sybase=no
 
 if test "x$enable_monoquery" == "xyes"; then
    monoquery_try_compile () {
@@ -224,7 +230,6 @@ EOF
    Dbase="Npgsql"
    monoquery_try_compile
    enable_postgres=$my_ac_conftest_result
-   AM_CONDITIONAL(ENABLE_POSTGRES, [test $enable_postgres = yes])
    AC_MSG_RESULT($my_ac_conftest_result)
    
    AC_MSG_CHECKING([for MySQL support])
@@ -233,7 +238,6 @@ EOF
    Dbase="MySql"
    monoquery_try_compile
    enable_mysql=$my_ac_conftest_result
-   AM_CONDITIONAL(ENABLE_MYSQL, [test $enable_mysql = yes])
    AC_MSG_RESULT($my_ac_conftest_result)
    
    AC_MSG_CHECKING([for SQLite support])
@@ -242,7 +246,6 @@ EOF
    Dbase="Sqlite"
    monoquery_try_compile
    enable_sqlite=$my_ac_conftest_result
-   AM_CONDITIONAL(ENABLE_SQLITE, [test $enable_sqlite = yes])
    AC_MSG_RESULT($my_ac_conftest_result)
    
    AC_MSG_CHECKING([for Oracle support])
@@ -251,7 +254,6 @@ EOF
    Dbase="Oracle"
    monoquery_try_compile
    enable_oracle=$my_ac_conftest_result
-   AM_CONDITIONAL(ENABLE_ORACLE, [test $enable_oracle = yes])
    AC_MSG_RESULT($my_ac_conftest_result)
    
    AC_MSG_CHECKING([for SQL Server support])
@@ -260,7 +262,6 @@ EOF
    Dbase="Sql"
    monoquery_try_compile
    enable_sqlserv=$my_ac_conftest_result
-   AM_CONDITIONAL(ENABLE_SQLSERV, [test $enable_sqlserv = yes])
    AC_MSG_RESULT($my_ac_conftest_result)
    
    AC_MSG_CHECKING([for Sybase support])
@@ -269,7 +270,6 @@ EOF
    Dbase="Sybase"
    monoquery_try_compile
    enable_sybase=$my_ac_conftest_result
-   AM_CONDITIONAL(ENABLE_SYBASE, [test $enable_sybase = yes])
    AC_MSG_RESULT($my_ac_conftest_result)
    
    dnl If no providers are available, disable MonoQuery support
@@ -279,6 +279,12 @@ EOF
 fi
 
 AM_CONDITIONAL(ENABLE_MONOQUERY, test "x$enable_monoquery" == "xyes")
+AM_CONDITIONAL(ENABLE_POSTGRES, [test $enable_postgres = yes])
+AM_CONDITIONAL(ENABLE_MYSQL, [test $enable_mysql = yes])
+AM_CONDITIONAL(ENABLE_SQLITE, [test $enable_sqlite = yes])
+AM_CONDITIONAL(ENABLE_ORACLE, [test $enable_oracle = yes])
+AM_CONDITIONAL(ENABLE_SQLSERV, [test $enable_sqlserv = yes])
+AM_CONDITIONAL(ENABLE_SYBASE, [test $enable_sybase = yes])
 
 
 dnl ASP.NET project addin