[libgda: 1/2] New options for meson wereadded

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit bb8aac211e7724a0bf34dee28698e4b81bd69aee
Author: Pavlo Solntsev <p sun fun gmail com>
Date:   Tue Jan 29 22:47:52 2019 -0600

    New options for meson wereadded
    
    With this patch, user can control were glade files should be installed.
    Otherwise, they shoudlbe installed to the system directory, where path
    is taked from pkg-config. With these options, user has control where
    files should go and can set variable to direct Glade to look for the
    files.

 meson.build       | 17 ++++++++++++++---
 meson_options.txt |  2 ++
 2 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index fbef2110c..78829fc3a 100644
--- a/meson.build
+++ b/meson.build
@@ -329,8 +329,19 @@ int main() {
        endif
 
        if glade_dep.found()
-               glade_catalog = glade_dep.get_pkgconfig_variable('catalogdir')
-               glade_pixmap = glade_dep.get_pkgconfig_variable('pixmapdir')
+                option_glade_catalog = get_option('glade-catalog-dir')
+                option_glade_pixmap = get_option('glade-pixmap-dir')
+                if option_glade_catalog != ''
+                        glade_catalog = option_glade_catalog
+                else
+                       glade_catalog = glade_dep.get_pkgconfig_variable('catalogdir')
+                endif
+
+                if option_glade_pixmap != ''
+                        glade_pixmap = option_glade_pixmap
+                else
+                       glade_pixmap = glade_dep.get_pkgconfig_variable('pixmapdir')
+                endif
        endif
        subdir('libgda-ui')
        subdir('libgda-report')
@@ -387,4 +398,4 @@ subdir('tests')
 subdir('testing')
 if get_option('with-examples')
   subdir('examples')
-endif
\ No newline at end of file
+endif
diff --git a/meson_options.txt b/meson_options.txt
index 1905c12b7..b0415ed0c 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -15,4 +15,6 @@ option('with-examples', type : 'boolean', value : false, description : 'Compile
 option('system-sqlcipher', type : 'boolean', value : true, description : 'Use SQLCipher installed on the 
system [default=false')
 option('enable-tools', type : 'boolean', value : false, description : 'Enable build GUI Tools')
 option('enable-ci-environment', type : 'boolean', value : false, description : 'Enable Continous Integration 
Environment test')
+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')