[gtksourceview] Fix introspection data when building with Gtk+ 3.0



commit 0f9bd50ffd3f4e946c4f9f26553d213399f6968b
Author: Steve Frécinaux <code istique net>
Date:   Mon May 31 11:13:32 2010 +0200

    Fix introspection data when building with Gtk+ 3.0
    
    The generated introspection data depended on the Gtk+-2.0 typelib
    despite being built against Gtk+-3.0, hence it was not possible to
    import the typelib when Gtk+ 2.0 was not installed.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=620149

 configure.ac              |    3 +++
 gtksourceview/Makefile.am |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f2ffc50..336f16e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,11 +51,14 @@ PKG_CHECK_EXISTS([gtk+-3.0 >= 2.90],
 		 [
 		 	GTK_REQUIRED=gtk+-3.0
 		 	GTK_REQUIRED_VERSION=2.90.0
+			GTK_TYPELIB=Gtk-3.0
 		 ],[
 		 	GTK_REQUIRED=gtk+-2.0
 		 	GTK_REQUIRED_VERSION=2.16.0
+			GTK_TYPELIB=Gtk-2.0
 		 ])
 
+AC_SUBST(GTK_TYPELIB)
 PKG_CHECK_MODULES(DEP, [
 	gio-2.0
 	$GTK_REQUIRED >= $GTK_REQUIRED_VERSION
diff --git a/gtksourceview/Makefile.am b/gtksourceview/Makefile.am
index d9e7c16..be010d4 100644
--- a/gtksourceview/Makefile.am
+++ b/gtksourceview/Makefile.am
@@ -157,7 +157,7 @@ GtkSource_2_0_gir_NAMESPACE = GtkSource
 GtkSource_2_0_gir_VERSION = 2.0
 GtkSource_2_0_gir_LIBS = libgtksourceview-2.0.la
 GtkSource_2_0_gir_FILES = $(libgtksourceview_2_0_la_SOURCES)
-GtkSource_2_0_gir_INCLUDES = GObject-2.0 Gtk-2.0
+GtkSource_2_0_gir_INCLUDES = $(GTK_TYPELIB)
 GtkSource_2_0_gir_PACKAGES = gtksourceview-2.0
 girdir = $(INTROSPECTION_GIRDIR)
 dist_gir_DATA = GtkSource-2.0.gir



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]