Changed the way to find glade dirs.

diff --git a/configure.ac b/configure.ac
index ee62498295b436225df6874384168ee8f6679b3b..9d49b1c7018e5b267708531472443c2a8f0ee9e1 100644 (file)
--- 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 4dcb31f9078e063ca56f89f6db51c5cdd427a0dc..5ecb3e75f61b0f8b1c0c3c232c8b275285e887e1 100644 (file)
--- 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 b67f788f23766baf9249198021db09bc6f6b3880..9eb5418fcfcfdff2c99530ac22ab7e140ce1825f 100644 (file)
--- 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 e217b8086975d8f517ddf806233bf94ad1409525..bd88ff5eeea8ae617254227690998b0dbf3ca271 100644 (file)
--- 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