[libgda/wip/meson] Meson: lisoup dependency fixes

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 674891edfd89089a11566cc32bbd35536e663039
Author: Daniel Espinosa <esodan gmail com>
Date:   Mon Jun 18 08:27:32 2018 -0500

    Meson: lisoup dependency fixes

 libgda/meson.build | 11 ++---------
 meson.build        | 23 +++++++++++++++--------
 meson_options.txt  | 10 +++++-----
 3 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/libgda/meson.build b/libgda/meson.build
index 35a7e0496..57c04d5f6 100644
--- a/libgda/meson.build
+++ b/libgda/meson.build
@@ -194,15 +194,8 @@ libgda_source_all += libgda_binreloc_sources
 inc_sqliteh = include_directories ('sqlite')
 inc_sqliteh_dep = declare_dependency (include_directories : inc_sqliteh)
 
-libgda_dep = [
-       glib_dep,
-       gobject_dep,
-       gio_dep,
-       gmodule_no_export_dep,
-       libxml_dep,
-       inc_rooth_dep,
-       inc_libgdah_dep
-       ]
+
+libgda_dep += [inc_libgdah_dep]
 
 if sqlite_dep.found ()
        libgda_dep += sqlite_dep
diff --git a/meson.build b/meson.build
index ca03ddbae..256a1db62 100644
--- a/meson.build
+++ b/meson.build
@@ -50,6 +50,10 @@ endif
 configh = configure_file(output : 'config.h',
                        configuration : conf)
 
+
+inc_rooth = include_directories ('.')
+inc_rooth_dep = declare_dependency (include_directories : inc_rooth)
+
 req_ver_glib = '>= 2.38.0'
 glib_dep = dependency('glib-2.0', version : req_ver_glib)
 gio_dep = dependency('gio-2.0', version : '>=2.16')
@@ -58,18 +62,24 @@ gthread_dep = dependency('gthread-2.0', version : req_ver_glib)
 gmodule_no_export_dep = dependency('gmodule-no-export-2.0', version : req_ver_glib)
 libxml_dep = dependency('libxml-2.0')
 
-gtk_dep = dependency('gtk+-3.0', required : false)
-gdkpixbuf_dep = dependency('gdk-pixbuf-2.0', required : false)
-gtksourceview_dep = dependency('gtksourceview-3.0', required : false) 
 goocanvas_dep = dependency('goocanvas-2.0', required : false)
 graphviz_dep = dependency('libgvc', required : false)
 glade_dep = dependency('gladeui-2.0', required : false)
 libxslt_dep = dependency('libxslt')
 jsonglib_dep = dependency('json-glib-1.0',required : false)
-soup_dep = dependency('libsoup-2.4', required : false)
 sqlite_dep = dependency ('sqlite3', version: '>= 3.6.11')
 postgres_dep = dependency ('libpq', required: false)
 
+
+libgda_dep = [
+       glib_dep,
+       gobject_dep,
+       gio_dep,
+       gmodule_no_export_dep,
+       libxml_dep,
+       inc_rooth_dep
+       ]
+
 c_args = ['-Wall',
        '-Wextra',
        '-Wformat-security',
@@ -158,6 +168,7 @@ endif
 
 if get_option('with-libsoup')
   soup_dep = dependency('libsoup-2.4')
+  libgda_dep += [soup_dep]
 endif
 
 if get_option('enable-debug')
@@ -166,10 +177,6 @@ endif
 
 add_global_arguments(c_args, language : 'c')
 
-
-inc_rooth = include_directories ('.')
-inc_rooth_dep = declare_dependency (include_directories : inc_rooth)
-
 subdir('po')
 subdir('libgda')
 subdir('providers')
diff --git a/meson_options.txt b/meson_options.txt
index 5c919d487..f547cc52b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,14 +1,14 @@
 option('with-ui', type : 'boolean', value : false, description : 'Enable GTK+ extension and tools')
-option('with-gtksourceview', type : 'boolean', value : true, description : 'Enable using GtkSourceView')
+option('with-gtksourceview', type : 'boolean', value : false, description : 'Enable using GtkSourceView')
 option('with-help', type : 'boolean', value : true, description : 'Enable building help (GdaBrowser)')
-option('with-goocanvas', type : 'boolean', value : true, description : 'Enable using GooCanvas')
-option('with-graphviz', type : 'boolean', value : true, description : 'Enable using Graphviz')
+option('with-goocanvas', type : 'boolean', value : false, description : 'Enable using GooCanvas')
+option('with-graphviz', type : 'boolean', value : false, description : 'Enable using Graphviz')
 option('enable-json', type : 'boolean', value : true, description : 'Enable support for JSON, disabled by 
default')
 option('enable-gda-gi', type : 'boolean', value : false, description : 'Enable GObject Introspection for 
libgda')
 option('disable-crypto', type : 'boolean', value : true, description : 'Disable SQLCipher database provider 
(using the libcrypto library, part of OpenSSL)') 
-option('with-libsoup', type : 'boolean', value : true, description : 'Enable libsoup support') 
+option('with-libsoup', type : 'boolean', value : false, description : 'Enable libsoup support')
 option('with-libsecret', type : 'boolean', value : false, description : 'Enable libsecret support')
-option('with-gnome-keyring', type : 'boolean', value : true, description : 'Enable gnome-keyring support')
+option('with-gnome-keyring', type : 'boolean', value : false, description : 'Enable gnome-keyring support')
 option('enable-debug', type : 'boolean', value : false, description : 'Enable debug mode')
 option('system-sqlite', type : 'boolean', value : false, description : 'Use SQLite installed on the system 
[default=false')