[libgda: 1/2] Meson: Configuration options adjustment

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 7236964749881d2449b4480b5735472ca2955722
Author: Pavlo Solntsev <p sun fun gmail com>
Date:   Fri Jan 31 13:18:18 2020 -0600

    Meson: Configuration options adjustment
    
     * GDA_DEBUG will be defined if the project is configured
    using --debug or --buildtype={debug|debugoptimized}.
     * Project specific 'enable-debug' option is removed

 .gitlab-ci.yml    | 2 +-
 meson.build       | 4 +++-
 meson_options.txt | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c4ab96632..0970cc45b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -71,7 +71,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 -Dgtk_doc=true -Dc_args="-Werror"
+  - meson --prefix=/usr --buildtype=debug -Dgtk_doc=true --werror _build
   - cd _build
   - ninja
   - broadwayd &
diff --git a/meson.build b/meson.build
index a1ad972c5..7f022b634 100644
--- a/meson.build
+++ b/meson.build
@@ -266,7 +266,9 @@ if libsecret_dep.found() and get_option('with-libsecret')
   c_args += '-DHAVE_LIBSECRET'
 endif
 
-if get_option('enable-debug')
+build_type = get_option('buildtype')
+
+if get_option('debug') or ('debug' == build_type) or ('debugoptimized' == build_type)
   c_args += '-DGDA_DEBUG'
 endif
 
diff --git a/meson_options.txt b/meson_options.txt
index 1dcb5c8f7..426fd09c1 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -9,7 +9,6 @@ option('disable-sqlcipher', type : 'boolean', value : false, description : 'Disa
 option('with-libsoup', type : 'boolean', value : true, description : 'Enable libsoup support')
 option('with-libsecret', type : 'boolean', value : false, description : 'Enable libsecret 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('with-examples', type : 'boolean', value : false, description : 'Compile examples [default=false')
 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')