[libgda: 1/2] TOOLS: Adding missed tools to the build system

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit a764c02b78e786f9ca5a95586b68a4d45d1f1384
Author: Pavlo Solntsev <p sun fun gmail com>
Date:   Tue Apr 9 07:51:04 2019 -0500

    TOOLS: Adding missed tools to the build system
    
     * The following tools will be build if -Denable-tool=true
     option is provided. To activate other UI related tools
     the following option must be used: -Dexperimental=true
    
    gda-sql
    gda-list-config
    gda-list-server-op
    infomration-schema-doc
    information-schema-types
    
    * 'enable-experimental' option was renamed to
    the 'experimental'

 .gitlab-ci.yml        | 2 +-
 libgda/meson.build    | 2 +-
 meson.build           | 4 ++--
 meson_options.txt     | 2 +-
 providers/meson.build | 8 ++++----
 tools/meson.build     | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c07c0b2b5..15a5b23b4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -88,7 +88,7 @@ library_build:
 pages:
   stage: deploy_doc
   script:
-  - meson _build --prefix=/usr -Dgtk_doc=true -Denable-experimental=true -Denable-tools=true 
-Denable-ldap=true
+  - meson _build --prefix=/usr -Dgtk_doc=true -Dexperimental=true -Denable-tools=true -Denable-ldap=true
   - cd _build
   - ninja
   - ninja install
diff --git a/libgda/meson.build b/libgda/meson.build
index 7beb6ab48..f6f963e64 100644
--- a/libgda/meson.build
+++ b/libgda/meson.build
@@ -293,7 +293,7 @@ libgda_cargs += c_args
 libgda_dep += sqlite_deps
 
 vala_sources = []
-if get_option('enable-experimental')
+if get_option('experimental')
 vala_sources += [
        'gda-connection-model.vala'
        ]
diff --git a/meson.build b/meson.build
index b09fd2217..83227ca97 100644
--- a/meson.build
+++ b/meson.build
@@ -317,7 +317,7 @@ subdir('libgda')
 subdir('providers')
 
 gtk_dep = dependency('gtk+-3.0', required: false)
-enable_ui = get_option('with-ui') and gtk_dep.found() and get_option('enable-experimental')
+enable_ui = get_option('with-ui') and gtk_dep.found() and get_option('experimental')
 if enable_ui
        gdkpixbuf_dep = dependency('gdk-pixbuf-2.0')
        glade_dep = dependency('gladeui-2.0', required : false)
@@ -413,7 +413,7 @@ install_data(libgda_report_pc,
        )
 endif
 
-if get_option('enable-tools') and get_option('enable-experimental')
+if get_option('enable-tools')
 subdir('tools')
 endif
 subdir('tests')
diff --git a/meson_options.txt b/meson_options.txt
index d5015c695..1dcb5c8f7 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -15,7 +15,7 @@ option('enable-tools', type : 'boolean', value : false, description : 'Enable bu
 option('glade-catalog-dir', type : 'string', value : '', description : 'Use the given directory to install 
glade catalog files. If glade is not available this option is ignored. If it is not given the valaue from 
pkg-config will be used')
 option('glade-pixmap-dir', type : 'string', value : '', description : 'Use the given directory to install 
glade pixmap files. If glade is not available this option is ignored. If it is not given the valaue from 
pkg-config will be used')
 option('gtk_doc', type : 'boolean', value : false, description : 'Enable documentation generation [default = 
false]')
-option('enable-experimental', type : 'boolean', value : false, description : 'Enable experimental features 
[default = false]')
+option('experimental', type : 'boolean', value : false, description : 'Enable experimental features [default 
= false]')
 option('enable-ldap', type : 'boolean', value : false, description : 'Enable experimental LDAP provider')
 option('enable-web', type : 'boolean', value : false, description : 'Enable experimental WEB provider')
 option('enable-test-flatpak', type : 'boolean', value : false, description : 'Enable Terminal Test 
Application ')
diff --git a/providers/meson.build b/providers/meson.build
index 445482246..f4ce1c41c 100644
--- a/providers/meson.build
+++ b/providers/meson.build
@@ -12,15 +12,15 @@ if postgres_dep.found()
 subdir('postgres')
 endif
 
-if ldap_found and get_option('enable-ldap') and get_option('enable-experimental')
+if ldap_found and get_option('enable-ldap') and get_option('experimental')
 subdir('ldap')
 endif
 
-if found_jdbc and get_option('enable-experimental')
+if found_jdbc and get_option('experimental')
 subdir('jdbc')
 endif
 
-if lbdb_found and get_option('enable-experimental')
+if lbdb_found and get_option('experimental')
 subdir('bdb')
 endif
 
@@ -28,6 +28,6 @@ if mysql_dep.found()
 subdir('mysql')
 endif
 
-if soup_dep.found() and get_option('with-libsoup') and mysql_dep.found() and postgres_dep.found() and 
get_option('enable-web') and get_option('enable-experimental')
+if soup_dep.found() and get_option('with-libsoup') and mysql_dep.found() and postgres_dep.found() and 
get_option('enable-web') and get_option('experimental')
 subdir('web')
 endif
diff --git a/tools/meson.build b/tools/meson.build
index 4d0d2fd08..e5562fd6e 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -5,7 +5,6 @@ subdir('misc')
 subdir('common')
 subdir('base')
 subdir('help')
-subdir('resources')
 
 gda_sql_sources = files([
        'tools-main.c'
@@ -69,9 +68,10 @@ gda_sql_man = configure_file(
        )
 install_man(gda_sql_man)
 
-
 if enable_ui
 
+subdir('resources')
+
 browser_deps = [
        libgda_dep,
        gtk_dep,