From 65a57398bf0e0842518b96f2d08836705ff7735e Mon Sep 17 00:00:00 2001
From: Andrea Zagli <a.zagli@comune.scandicci.fi.it>
Date: Thu, 2 Oct 2014 16:12:18 +0200
Subject: [PATCH] Changed the way to find glade dirs.

---
 configure.ac                                      | 15 +++++++++++++++
 libgtkformui/glade/Makefile.am                    |  4 ++--
 .../glade/icons/hicolor/16x16/actions/Makefile.am |  2 +-
 .../glade/icons/hicolor/22x22/actions/Makefile.am |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index ee62498..9d49b1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,8 @@ AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL
 
+PKG_PROG_PKG_CONFIG([0.19])
+
 GTK_DOC_CHECK
 IT_PROG_INTLTOOL
 
@@ -44,9 +46,22 @@ AM_GLIB_GNU_GETTEXT
 # Checks for libraries.
 PKG_CHECK_EXISTS(gladeui-2.0 >= 3.14.0, [GLADEUI_FOUND=yes], [GLADEUI_FOUND=no])
 
+if test "x$GLADEUI_FOUND" = "xyes"; then
+	GLADE_CATALOG_DIR=`$PKG_CONFIG --variable=catalogdir gladeui-2.0`
+	GLADE_MODULE_DIR=`$PKG_CONFIG --variable=moduledir gladeui-2.0`
+	GLADE_ICONS_DIR=`$PKG_CONFIG --variable=pixmapdir gladeui-2.0`
+	GLADE_CATALOG_DIR=`cygpath $GLADE_CATALOG_DIR`
+	GLADE_MODULE_DIR=`cygpath $GLADE_MODULE_DIR`
+	GLADE_ICONS_DIR=`cygpath $GLADE_ICONS_DIR`
+	AC_SUBST(GLADE_CATALOG_DIR)
+	AC_SUBST(GLADE_MODULE_DIR)
+	AC_SUBST(GLADE_ICONS_DIR)
+fi
+
 AM_CONDITIONAL(GLADEUI, test $GLADEUI_FOUND = yes)
 
 PKG_CHECK_MODULES(GTKFORM, [libxml-2.0 >= 2.0.0
+                            gmodule-2.0 >= 2.0.0
                             libgdaex >= 0.5.0])
 
 AC_SUBST(GTKFORM_CFLAGS)
diff --git a/libgtkformui/glade/Makefile.am b/libgtkformui/glade/Makefile.am
index 4dcb31f..5ecb3e7 100644
--- a/libgtkformui/glade/Makefile.am
+++ b/libgtkformui/glade/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = icons
 
-glademodulesdir = `pkg-config --variable=moduledir gladeui-2.0`
+glademodulesdir = $(GLADE_MODULE_DIR)
 
-gladecatalogsdir = `pkg-config --variable=catalogdir gladeui-2.0`
+gladecatalogsdir = $(GLADE_CATALOG_DIR)
 
 gladecatalogs_DATA = gtkformui.xml
 
diff --git a/libgtkformui/glade/icons/hicolor/16x16/actions/Makefile.am b/libgtkformui/glade/icons/hicolor/16x16/actions/Makefile.am
index b67f788..9eb5418 100644
--- a/libgtkformui/glade/icons/hicolor/16x16/actions/Makefile.am
+++ b/libgtkformui/glade/icons/hicolor/16x16/actions/Makefile.am
@@ -1,4 +1,4 @@
-gladeiconsdir = $(shell pkg-config --variable=pixmapdir gladeui-2.0)
+gladeiconsdir = $(GLADE_ICONS_DIR)
 iconsdir = $(gladeiconsdir)/hicolor/16x16/actions
 
 icons_DATA = widget-gtkformui-gtkformdecoder.png
diff --git a/libgtkformui/glade/icons/hicolor/22x22/actions/Makefile.am b/libgtkformui/glade/icons/hicolor/22x22/actions/Makefile.am
index e217b80..bd88ff5 100644
--- a/libgtkformui/glade/icons/hicolor/22x22/actions/Makefile.am
+++ b/libgtkformui/glade/icons/hicolor/22x22/actions/Makefile.am
@@ -1,4 +1,4 @@
-gladeiconsdir = $(shell pkg-config --variable=pixmapdir gladeui-2.0)
+gladeiconsdir = $(GLADE_ICONS_DIR)
 iconsdir = $(gladeiconsdir)/hicolor/22x22/actions
 
 icons_DATA = widget-gtkformui-gtkformdecoder.png
-- 
2.49.0