[gtksourceview] Fixed Glade catalog installation
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview] Fixed Glade catalog installation
- Date: Sun, 6 Mar 2011 22:34:31 +0000 (UTC)
commit 2bfdd515aaad8b598db2915019b44eced61067cf
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Sun Mar 6 19:30:52 2011 +0900
Fixed Glade catalog installation
Fixed configure.ac to pick up the correct new version of the Glade
core for GTK+3 and fixed the sourceview catalog files to point to
the new name of the sourceview library (and the new devhelp book name).
configure.ac | 6 +++---
data/glade/gtksourceview.xml.in | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index be22fe1..3ecf68f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ AC_CHECK_HEADERS([unistd.h])
# Dependencies
GTK_REQUIRED_VERSION=3.0.0
LIBXML_REQUIRED_VERSION=2.6.0
-GLADE_UI_REQUIRED=3.2
+GLADE_UI_REQUIRED=3.9
AC_SUBST(GTK_REQUIRED)
AC_SUBST(GTK_REQUIRED_VERSION)
@@ -111,9 +111,9 @@ AC_ARG_ENABLE([glade-catalog],
AM_CONDITIONAL([GLADE_CATALOG], [ test "$glade_catalog" = "yes" ])
AS_IF([ test "$glade_catalog" = "yes" ],
- [PKG_CHECK_EXISTS(GLADE, [gladeui-1.0 >= $GLADE_UI_REQUIRED])
+ [PKG_CHECK_EXISTS(GLADE, [gladeui-2.0 >= $GLADE_UI_REQUIRED])
AC_MSG_CHECKING([for Glade catalog dir])
- GLADE_CATALOG_DIR=`$PKG_CONFIG --variable=catalogdir gladeui-1.0 2>&AS_MESSAGE_LOG_FD`
+ GLADE_CATALOG_DIR=`$PKG_CONFIG --variable=catalogdir gladeui-2.0 2>&AS_MESSAGE_LOG_FD`
AC_MSG_RESULT([$GLADE_CATALOG_DIR])
AC_SUBST(GLADE_CATALOG_DIR)])
diff --git a/data/glade/gtksourceview.xml.in b/data/glade/gtksourceview.xml.in
index 5094ff4..b82d8ab 100644
--- a/data/glade/gtksourceview.xml.in
+++ b/data/glade/gtksourceview.xml.in
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<glade-catalog version="3.0" supports="gtkbuilder" name="gtksourceview" library="gtksourceview" domain="gtksourceview" depends="gtk+" book="gtksourceview">
+<glade-catalog version="3.0" supports="gtkbuilder" name="gtksourceview" library="gtksourceview-3.0" domain="gtksourceview" depends="gtk+" book="gtksourceview-3.0">
<glade-widget-classes>
<glade-widget-class name="GtkSourceView" _title="GtkSourceView" generic-name="gtksourceview">
<properties>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]