[Monodevelop-patches-list] r2221 - in trunk/MonoDevelop: . Extras/MonoQuery Extras/MonoQuery/Gui/SqlQueryView

[commit-watcher at mono-cvs.ximian.com]

Author: chergert
Date: 2005-02-02 11:29:09 -0500 (Wed, 02 Feb 2005)
New Revision: 2221

Modified:
   trunk/MonoDevelop/Extras/MonoQuery/ChangeLog
   trunk/MonoDevelop/Extras/MonoQuery/Gui/SqlQueryView/SqlQueryView.cs
   trunk/MonoDevelop/Extras/MonoQuery/Makefile.am
   trunk/MonoDevelop/configure.in
Log:
* Fix monoquery build on mono 1.0.x builds that lack SqliteDataAdapter.


Modified: trunk/MonoDevelop/Extras/MonoQuery/ChangeLog
===================================================================
--- trunk/MonoDevelop/Extras/MonoQuery/ChangeLog	2005-02-02 03:20:18 UTC (rev 2220)
+++ trunk/MonoDevelop/Extras/MonoQuery/ChangeLog	2005-02-02 16:29:09 UTC (rev 2221)
@@ -1,3 +1,7 @@
+2005-02-02  Christian Hergert <chris at mosaix.net>
+
+	* Extras/MonoQuery/Gui/SqlQueryView/SqlQueryView.cs: flush
+
 2005-01-31  Christian Hergert <chris at mosaix.net>
 
 	* Extras/MonoQuery/Gui/SqlQueryView/SqlQueryView.cs: Updated to new

Modified: trunk/MonoDevelop/Extras/MonoQuery/Gui/SqlQueryView/SqlQueryView.cs
===================================================================
--- trunk/MonoDevelop/Extras/MonoQuery/Gui/SqlQueryView/SqlQueryView.cs	2005-02-02 03:20:18 UTC (rev 2220)
+++ trunk/MonoDevelop/Extras/MonoQuery/Gui/SqlQueryView/SqlQueryView.cs	2005-02-02 16:29:09 UTC (rev 2221)
@@ -128,7 +128,6 @@
 		public SqlQueryViewToolbar() : base()
 		{
 			this.ToolbarStyle = ToolbarStyle.BothHoriz;
-			Tooltips tips = new Tooltips();
 			Gtk.ToolButton execute = new Gtk.ToolButton( Gtk.Stock.Execute );
 			
 			execute.Clicked += new EventHandler( OnExecuteClicked );
@@ -140,4 +139,4 @@
 			this.Run( this, new EventArgs() );
 		}
 	}
-}
\ No newline at end of file
+}

Modified: trunk/MonoDevelop/Extras/MonoQuery/Makefile.am
===================================================================
--- trunk/MonoDevelop/Extras/MonoQuery/Makefile.am	2005-02-02 03:20:18 UTC (rev 2220)
+++ trunk/MonoDevelop/Extras/MonoQuery/Makefile.am	2005-02-02 16:29:09 UTC (rev 2221)
@@ -12,7 +12,6 @@
 Connection/Interface/IConnection.cs \
 Connection/Npgsql/NpgsqlConnectionWrapper.cs \
 Connection/Mysql/MysqlConnectionWrapper.cs \
-Connection/Sqlite/SqliteConnectionWrapper.cs \
 Exceptions/Abstract/MonoQueryAbstractException.cs \
 Exceptions/ConnectionStringException.cs \
 Exceptions/ExecuteProcedureException.cs \
@@ -34,8 +33,16 @@
 Gui/SqlQueryView/SqlQueryView.cs \
 Services/MonoQueryService.cs
 
-build_sources = $(addprefix $(srcdir)/, $(FILES))
+if ENABLE_MONOQUERY_SQLITE
+SQLITE_FILES=Connection/Sqlite/SqliteConnectionWrapper.cs
+else
+SQLITE_FILES=
+endif
 
+
+build_sources = $(addprefix $(srcdir)/, $(FILES)) \
+	$(addprefix $(srcdir)/, $(SQLITE_FILES))
+
 REFS = /r:$(top_builddir)/build/bin/MonoDevelop.Core.dll \
        /r:$(top_builddir)/build/bin/MonoDevelop.Base.dll \
        /r:$(top_builddir)/build/bin/MonoDevelop.Gui.Widgets.dll \

Modified: trunk/MonoDevelop/configure.in
===================================================================
--- trunk/MonoDevelop/configure.in	2005-02-02 03:20:18 UTC (rev 2220)
+++ trunk/MonoDevelop/configure.in	2005-02-02 16:29:09 UTC (rev 2221)
@@ -122,6 +122,10 @@
 dnl AC_SUBST(MONO_DEBUGGER_LIBS)
 enable_debugger=no
 
+dnl check for sqlite supported mono
+MONOQUERY_REQUIRED_MONO_VERSION=1.1.2.99
+PKG_CHECK_MODULES(MONO_VERSION, mono >= MONOQUERY_REQUIRED_MONO_VERSION, enable_sqlite=yes, enable_sqliter=no)
+
 MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
 AC_SUBST(MOZILLA_HOME)
 
@@ -148,6 +152,9 @@
     enable_update_mimedb=yes)
  AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes)
 
+dnl MonoQuery
+PKG_CHECK_MODULES(MONOQUERY_DEPENDENCIES_SQLITE,mono >= 1.1.2.99, enable_monoquery_sqlite=yes, enable_monoquery_sqlite=no)
+AM_CONDITIONAL(ENABLE_MONOQUERY_SQLITE, test x$enable_monoquery_sqlite = xyes)
 
 dnl Intl
 ALL_LINGUAS="da es fr ja_JP pt_BR tr"