[libgda: 1/2] Meson: Fixing meson doc option

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 9aff5728e43c437d46e0290737fc4de6939e56ff
Author: Pavlo Solntsev <p sun fun gmail com>
Date:   Tue Apr 2 12:24:54 2019 -0500

    Meson: Fixing meson doc option
    
    jhbuild uses gtk_doc to enable or disable doc.
    To be consistent we need to use the same.

 .gitlab-ci.yml    | 4 ++--
 meson.build       | 2 +-
 meson_options.txt | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3cdc1829..c3793b5ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -67,7 +67,7 @@ library_build:
   script:
   - export PGPASSWORD=$POSTGRES_PASSWORD
   - psql -h "postgres" -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c "SELECT 'OK' AS status;"
-  - meson _build --prefix=/usr -Denable-debug=true -Denable-gtk-doc=true
+  - meson _build --prefix=/usr -Denable-debug=true -Dgtk_doc=true
   - cd _build
   - ninja
   - broadwayd &
@@ -87,7 +87,7 @@ library_build:
 pages:
   stage: deploy_doc
   script:
-  - meson _build --prefix=/usr -Denable-gtk-doc=true -Denable-experimental=true -Denable-tools=true 
-Denable-ldap=true
+  - meson _build --prefix=/usr -Dgtk_doc=true -Denable-experimental=true -Denable-tools=true 
-Denable-ldap=true
   - cd _build
   - ninja
   - ninja install
diff --git a/meson.build b/meson.build
index 8ace0e403..f97cd2a3f 100644
--- a/meson.build
+++ b/meson.build
@@ -363,7 +363,7 @@ int main() {
        subdir('control-center')
 endif
 
-if get_option('enable-gtk-doc')
+if get_option('gtk_doc')
         subdir('doc')
 endif
 
diff --git a/meson_options.txt b/meson_options.txt
index 960f41265..d5015c695 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -14,8 +14,9 @@ option('with-examples', type : 'boolean', value : false, description : 'Compile
 option('enable-tools', type : 'boolean', value : false, description : 'Enable build experimental GUI Tools')
 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('enable-gtk-doc', type : 'boolean', value : false, description : 'Enable documentation generation 
[default = false]')
+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('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 ')
+