[libgda] Doc: improve generation

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 8660494da619c03827a9e5ac8cd3f2c236e68a85
Author: Daniel Espinosa <esodan gmail com>
Date:   Sun Jan 31 17:44:29 2021 -0600

    Doc: improve generation
    
    Renamed gtk_doc to doc option. Fix use of libsoup
    option when building tools

 .gitlab-ci.yml           | 6 +++---
 meson.build              | 2 +-
 meson_options.txt        | 2 +-
 tools/common/meson.build | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd0c53ea7..45dc906f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,7 +69,7 @@ library_build:
   stage: build
   script:
   - export PGPASSWORD=$POSTGRES_PASSWORD
-  - meson --prefix=/usr --buildtype=debug -Dgtk_doc=true --werror _build
+  - meson --prefix=/usr --buildtype=debug -Ddoc=true --werror _build
   - cd _build
   - ninja
   - broadwayd &
@@ -91,7 +91,7 @@ paralel_build:
   script:
   - export PGPASSWORD=$POSTGRES_PASSWORD
   - psql -h "postgres" -U "$POSTGRES_USER" -d "$POSTGRES_DB" -c "SELECT 'OK' AS status;"
-  - meson --prefix=/usr --buildtype=debug -Dgtk_doc=true --werror _build
+  - meson --prefix=/usr --buildtype=debug -Ddoc=true --werror _build
   - cd _build
   - ninja
   - broadwayd &
@@ -111,7 +111,7 @@ paralel_build:
 pages:
   stage: deploy_doc
   script:
-  - meson _build --prefix=/usr -Dgtk_doc=true -Dexperimental=true -Dtools=true -Dldap=true
+  - meson _build --prefix=/usr -Ddoc=true -Dexperimental=true -Dtools=true -Dldap=true
   - cd _build
   - ninja
   - ninja install
diff --git a/meson.build b/meson.build
index 254aeaab9..2750bb678 100644
--- a/meson.build
+++ b/meson.build
@@ -367,7 +367,7 @@ int main() {
        subdir('control-center')
 endif
 
-if get_option('gtk_doc')
+if get_option('doc')
         subdir('doc')
 endif
 
diff --git a/meson_options.txt b/meson_options.txt
index 095739d1f..8305deb12 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -12,7 +12,7 @@ option('examples', type : 'boolean', value : false, description : 'Compile examp
 option('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('gtk_doc', type : 'boolean', value : false, description : 'Enable documentation generation [default = 
false]')
+option('doc', type : 'boolean', value : false, description : 'Build documentation generation [default = 
false]')
 option('experimental', type : 'boolean', value : false, description : 'Enable experimental features [default 
= false]')
 option('ldap', type : 'boolean', value : false, description : 'Enable experimental LDAP provider')
 option('web', type : 'boolean', value : false, description : 'Enable experimental WEB provider')
diff --git a/tools/common/meson.build b/tools/common/meson.build
index 73c71267b..2e32b4823 100644
--- a/tools/common/meson.build
+++ b/tools/common/meson.build
@@ -36,7 +36,7 @@ tools_nonuisources_ui = files([
        'web-server.h', 'web-server.c', 'html-doc.h', 'html-doc.c'
        ])
 
-if soup_dep.found() and get_option('with-libsoup')
+if soup_dep.found() and get_option('libsoup')
 tools_nonuisources += tools_nonuisources_ui
 endif