[libgda: 1/2] libgda-ui: Non system glade file installation fix

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 85c6870ffd063ef7a5d6c7eceba84f4f7319ab8e
Author: Pavlo Solntsev <p sun fun gmail com>
Date:   Mon Jul 30 21:16:31 2018 +0000

    libgda-ui: Non system glade file installation fix

 .gitlab-ci.yml |  3 ++-
 configure.ac   | 13 +++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 139875490..3e1ef7e37 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,6 +29,7 @@ variables:
                 libgirepository1.0-dev
                 libgee-0.8-dev
                 valadoc
+                libgladeui-dev
 
   GIT_SUBMODULE_STRATEGY: normal
 
@@ -93,4 +94,4 @@ pages:
   - cp libgda-ui/libgdaui-6.0.vapi ../public/vala
   artifacts:
     paths:
-    - public
\ No newline at end of file
+    - public
diff --git a/configure.ac b/configure.ac
index 377f81328..d0b047540 100644
--- a/configure.ac
+++ b/configure.ac
@@ -310,8 +310,17 @@ int main() {
        PKG_CHECK_MODULES(GLADE, "gladeui-2.0", [
                        AC_DEFINE(HAVE_GLADE, [1], [Install Glade Catalog])
                        have_glade=yes
-                       GLADE_CATALOG=`$PKG_CONFIG --variable=catalogdir gladeui-2.0`
-                       GLADE_PIXMAP=`$PKG_CONFIG --variable=pixmapdir gladeui-2.0`], [have_glade=no])
+                        if test "x$GLADE_CATALOG_SEARCH_PATH" = "x"; then
+                                GLADE_CATALOG=`$PKG_CONFIG --variable=catalogdir gladeui-2.0`
+                        else
+                                GLADE_CATALOG=$GLADE_CATALOG_SEARCH_PATH
+                        fi
+                        if test "x$GLADE_PIXMAP_DIR" = "x"; then
+                               GLADE_PIXMAP=`$PKG_CONFIG --variable=pixmapdir gladeui-2.0`
+                        else
+                               GLADE_PIXMAP=$GLADE_PIXMAP_DIR
+                        fi
+                        ], [have_glade=no])
 fi
 
 AM_CONDITIONAL(HAVE_GDKPIXBUF, test x"$have_gdkpixbuf" = "xyes")