[glom] Fix the build with MySQL disabled.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glom] Fix the build with MySQL disabled.
- Date: Sun, 13 Jan 2013 16:58:56 +0000 (UTC)
commit eb70094710a1dfb20594b9b3d1ecde8b769a78f3
Author: Murray Cumming <murrayc murrayc com>
Date: Sun Jan 13 17:58:50 2013 +0100
Fix the build with MySQL disabled.
* glom/glom_create_from_example.cc:
* glom/glom_test_connection.cc: Move the ifdefs around.
ChangeLog | 7 +++++++
glom/glom_create_from_example.cc | 5 ++++-
glom/glom_test_connection.cc | 7 +++++--
3 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 897f482..6db24d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2013-01-13 Murray Cumming <murrayc murrayc com>
+ Fix the build with MySQL disabled.
+
+ * glom/glom_create_from_example.cc:
+ * glom/glom_test_connection.cc: Move the ifdefs around.
+
+2013-01-13 Murray Cumming <murrayc murrayc com>
+
MySQL: Actually allow self-hosting in Glom itself.
* glom/appwindow.cc: ui_file_select_save():
diff --git a/glom/glom_create_from_example.cc b/glom/glom_create_from_example.cc
index 226da2e..20b9e02 100644
--- a/glom/glom_create_from_example.cc
+++ b/glom/glom_create_from_example.cc
@@ -72,8 +72,11 @@ public:
GlomCreateOptionGroup::GlomCreateOptionGroup()
: Glib::OptionGroup("glom_create_from_example", _("Glom options"), _("Command-line options")),
m_arg_version(false),
- m_arg_server_port(0),
+ m_arg_server_port(0)
+#ifdef GLOM_ENABLE_MYSQL
+ ,
m_arg_use_mysql(false)
+#endif //GLOM_ENABLE_MYSQL
{
Glib::OptionEntry entry;
entry.set_long_name("input");
diff --git a/glom/glom_test_connection.cc b/glom/glom_test_connection.cc
index f54dc81..69f5312 100644
--- a/glom/glom_test_connection.cc
+++ b/glom/glom_test_connection.cc
@@ -59,8 +59,11 @@ public:
GlomCreateOptionGroup::GlomCreateOptionGroup()
: Glib::OptionGroup("glom_create_from_example", _("Glom options"), _("Command-line options")),
m_arg_version(false),
- m_arg_server_port(0),
+ m_arg_server_port(0)
+#ifdef GLOM_ENABLE_MYSQL
+ ,
m_arg_use_mysql(false)
+#endif //GLOM_ENABLE_MYSQL
{
Glib::OptionEntry entry;
@@ -191,8 +194,8 @@ int main(int argc, char* argv[])
//Specify the backend and backend-specific details to be used by the connectionpool.
//This is usually done by ConnectionPool::setup_from_document():
-#ifdef GLOM_ENABLE_MYSQL
Glom::ConnectionPoolBackends::Backend* backend = 0;
+#ifdef GLOM_ENABLE_MYSQL
if(group.m_arg_use_mysql)
{
//TODO: Move some of the *CentralHosted API into a multiply-inherited Server base class,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]