diff options
| author | Lluis Sanchez <lluis@novell.com> | 2007-09-28 22:12:34 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@novell.com> | 2007-09-28 22:12:34 +0400 |
| commit | add5a5e32c8abed5deb2b72b95589c2861c028d3 (patch) | |
| tree | fd33378c441e967ce683da38a92d139572056c04 | |
| parent | 9978afc92ed530ab5d53e55ad74b895dd858d43a (diff) | |
2007-09-28 Lluis Sanchez Gual <lluis@novell.com> monodevelop-0.16
* configure.in: Remove checks for MySql and SQLite providers since
we are bundling them.
svn path=/branches/monodevelop/0.16/; revision=86599
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 20 |
2 files changed, 7 insertions, 18 deletions
@@ -1,3 +1,8 @@ +2007-09-28 Lluis Sanchez Gual <lluis@novell.com> + + * configure.in: Remove checks for MySql and SQLite providers since + we are bundling them. + 2007-09-27 Michael Hutchinson <mhutchinson@novell.com> * configure.in: Enable the C/C++ Addin by default. Remove gcc/g++/ctags diff --git a/configure.in b/configure.in index 55b2434dd6..2ba540db4f 100644 --- a/configure.in +++ b/configure.in @@ -191,16 +191,8 @@ AC_ARG_ENABLE(database, AM_CONDITIONAL(ENABLE_DATABASE, [test x$enable_database = xyes]) -test_sqlite=$(gacutil -l | grep "Mono.Data.SqliteClient, Version=2") test_sqlserver=$(gacutil -l | grep "System.Data, Version=2") test_postgres=$(gacutil -l | grep "Npgsql, Version=2") -test_mysql=$(gacutil -l | grep "MySql.Data") - -if test "x$test_sqlite" != "x"; then - enable_sqlite="yes" -else - enable_sqlite="no (missing Mono.Data.SqliteClient)" -fi if test "x$test_sqlserver" != "x"; then enable_sqlserver="yes" @@ -214,15 +206,7 @@ else enable_postgres="no (missing Npgsql, Version 2)" fi -if test "x$test_mysql" != "x"; then - enable_mysql="yes" -else - enable_mysql="no (missing MySql.Data)" -fi - AM_CONDITIONAL(ENABLE_POSTGRES, [test "x$enable_postgres" = "xyes"]) -AM_CONDITIONAL(ENABLE_MYSQL, [test "x$enable_mysql" = "xyes"]) -AM_CONDITIONAL(ENABLE_SQLITE, [test "x$enable_sqlite" = "xyes"]) AM_CONDITIONAL(ENABLE_SQLSERVER, [test "x$enable_sqlserver" = "xyes"]) # ASP.NET project addin @@ -469,8 +453,8 @@ echo " * MonoDevelop.Database support: $enable_database" if test "x$enable_database" = "xyes"; then echo " * Providers:" echo " * PostgreSQL: $enable_postgres" -echo " * MySQL: $enable_mysql" -echo " * SQLite: $enable_sqlite" +echo " * MySQL: yes" +echo " * SQLite: yes" echo " * SQL Server: $enable_sqlserver" fi |