From: Andrea Zagli <azagli@libero.it>
Date: Sun, 29 Dec 2013 21:27:00 +0000 (+0100)
Subject: Changes to install widget in glade 3.14.
X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=b0822177a018f97c1c513685685b6525fc08e30a;p=libgtkform

Changes to install widget in glade 3.14.
---

diff --git a/configure.ac b/configure.ac
index cddb7d3..ee62498 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,7 +42,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
 AM_GLIB_GNU_GETTEXT
 
 # Checks for libraries.
-PKG_CHECK_EXISTS(gladeui-1.0 >= 3.2.0, [GLADEUI_FOUND=yes], [GLADEUI_FOUND=no])
+PKG_CHECK_EXISTS(gladeui-2.0 >= 3.14.0, [GLADEUI_FOUND=yes], [GLADEUI_FOUND=no])
 
 AM_CONDITIONAL(GLADEUI, test $GLADEUI_FOUND = yes)
 
diff --git a/libgtkformui/glade/Makefile.am b/libgtkformui/glade/Makefile.am
index be8b722..4dcb31f 100644
--- a/libgtkformui/glade/Makefile.am
+++ b/libgtkformui/glade/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS = icons
 
-glademodulesdir = `pkg-config --variable=moduledir gladeui-1.0`
+glademodulesdir = `pkg-config --variable=moduledir gladeui-2.0`
 
-gladecatalogsdir = `pkg-config --variable=catalogdir gladeui-1.0`
+gladecatalogsdir = `pkg-config --variable=catalogdir gladeui-2.0`
 
 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 6e77a25..b67f788 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-1.0)
+gladeiconsdir = $(shell pkg-config --variable=pixmapdir gladeui-2.0)
 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 d350ee8..e217b80 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-1.0)
+gladeiconsdir = $(shell pkg-config --variable=pixmapdir gladeui-2.0)
 iconsdir = $(gladeiconsdir)/hicolor/22x22/actions
 
 icons_DATA = widget-gtkformui-gtkformdecoder.png