build system improvements; don't hardcore gobject-introspection libs/cflagspygtk-introspection

7 files changed, 29 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index bce4be78..fd3ea0cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-06-24  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
+
+	* configure.in: Use pkg-config to check for glib/gobject; Check
+	also for gobject-introspection.  This requires patches in bug
+	#308708.
+
+	* pygobject-2.0.pc.in (Requires): Add gobject-introspection.
+
+	* everywhere: Remove gobject-introspection CFLAGS and libs from
+	makefiles, since they moved to configure.
+
 2005-06-19  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
 
 	* gtk/gtkmodule.c (init_gtk): Add an introspection function
@@ -13,6 +24,7 @@
 	* pygobject.h, pygobject-private.h: New API functions
 	pyg_ifunction_new and pyg_ifunction_descr_new.
 
+=== pygkt-introspection branch point ===
 2005-06-17  Gustavo J. A. M. Carneiro  <gjc@gnome.org>
 
 	* examples/pango/pangocairo-simple.py (main): Demonstrate how to
diff --git a/Makefile.am b/Makefile.am
index d0bdbae6..9848b3a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ INCLUDES = \
 	$(GLIB_CFLAGS) \
 	$(PANGO_CFLAGS) \
 	$(ATK_CFLAGS) \
-	-I$(top_srcdir)/gobject  -I$(top_srcdir)/../gobject-introspection/src
+	-I$(top_srcdir)/gobject
 
 COMMONDEFS = \
 	atk-types.defs \
diff --git a/configure.in b/configure.in
index 677e744a..3e34fe94 100644
--- a/configure.in
+++ b/configure.in
@@ -9,6 +9,7 @@ m4_define(pygtk_version, pygtk_major_version.pygtk_minor_version.pygtk_micro_ver
 
 dnl versions of packages we require ...
 m4_define(glib_required_version,     2.6.0)
+m4_define(gobject_introspection_required_version, 0.1)
 m4_define(pango_required_version,    1.8.0)
 m4_define(atk_required_version,      1.8.0)
 m4_define(gtk_required_version,      2.6.0)
@@ -92,7 +93,10 @@ dnl get rid of the -export-dynamic stuff from the configure flags ...
 export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
 
 dnl glib
-AM_PATH_GLIB_2_0(glib_required_version,,[AC_MSG_ERROR(maybe you want the pygtk-2-4 branch?)],gobject $extra_mods)
+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= glib_required_version
+                         gobject-2.0  >= glib_required_version
+                         gobject-introspection >= gobject_introspection_required_version
+                         $extra_mods])
 if test -n "$export_dynamic"; then
   GLIB_LIBS=`echo $GLIB_LIBS | sed -e "s/$export_dynamic//"`
 fi
@@ -128,12 +132,14 @@ fi
 
 dnl gtk+; first try to find gtk+ and pycairo, if that fails look for gtk+ alone
 PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.7,
+                        gobject-introspection >= gobject_introspection_required_version,
                         pycairo >= pycairo_required_version],
         [build_gtk=true
          have_pycairo=true],
         dnl no pycairo
         [have_pycairo=false
-         PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= gtk_required_version],
+         PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= gtk_required_version,
+                                 gobject-introspection >= gobject_introspection_required_version],
 	          build_gtk=true, [build_gtk=false])]
                  )
 AM_CONDITIONAL(BUILD_GTK, $build_gtk)
@@ -150,7 +156,8 @@ fi
 
 
 dnl libglade
-PKG_CHECK_MODULES(LIBGLADE, [libglade-2.0 >= libglade_required_version],
+PKG_CHECK_MODULES(LIBGLADE, [libglade-2.0 >= libglade_required_version,
+                             gobject-introspection >= gobject_introspection_required_version],
 	build_libglade=true, build_libglade=false)
 AC_SUBST(LIBGLADE_CFLAGS)
 AC_SUBST(LIBGLADE_LIBS)
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 89e974c4..8f26b2fa 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = 1.7
 PLATFORM_VERSION = 2.0
-INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -I$(top_srcdir)/../gobject-introspection/src
+INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS)
 
 pkgincludedir = $(includedir)/pygtk-$(PLATFORM_VERSION)
 pkginclude_HEADERS = pygobject.h
@@ -15,7 +15,7 @@ endif
 
 gobject_la_CFLAGS = $(GLIB_CFLAGS)
 gobject_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initgobject
-gobject_la_LIBADD = $(GLIB_LIBS) -L$(top_srcdir)/../gobject-introspection/src -lirepository
+gobject_la_LIBADD = $(GLIB_LIBS)
 gobject_la_SOURCES = \
 	pygiargument.c \
 	pygifunction.c \
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 0c6b6ca9..74a59681 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -18,7 +18,7 @@ EXTRA_DIST += makefile.msc gtk-fake-win32.c
 pkgincludedir = $(includedir)/pygtk-$(PLATFORM_VERSION)/pygtk
 pkginclude_HEADERS = pygtk.h
 
-INCLUDES = -I$(top_srcdir)/gobject $(PYTHON_INCLUDES)   -I$(top_srcdir)/../gobject-introspection/src
+INCLUDES = -I$(top_srcdir)/gobject $(PYTHON_INCLUDES)
 COMMONDEFS = $(srcdir)/gtk-types.defs $(srcdir)/gdk-types.defs \
   $(top_srcdir)/atk-types.defs $(top_srcdir)/pango-types.defs
 
@@ -42,7 +42,7 @@ endif
 
 _gtk_la_CFLAGS = $(GTK_CFLAGS)
 _gtk_la_LDFLAGS = $(common_ldflags) -export-symbols-regex init_gtk
-_gtk_la_LIBADD = $(GTK_LIBS) -L$(top_srcdir)/../gobject-introspection/src -lirepository
+_gtk_la_LIBADD = $(GTK_LIBS)
 _gtk_la_SOURCES = \
   pygtk.h \
   pygtk-private.h \
diff --git a/pygobject-2.0.pc.in b/pygobject-2.0.pc.in
index e63785cd..7ab43251 100644
--- a/pygobject-2.0.pc.in
+++ b/pygobject-2.0.pc.in
@@ -14,6 +14,6 @@ codegendir=${datadir}/pygtk/2.0/codegen
 
 Name: PyGObject
 Description: Python bindings for GObject
-Requires: gobject-2.0
+Requires: gobject-2.0 gobject-introspection
 Version: @VERSION@
 Cflags: -I${pygtkincludedir}
diff --git a/tests/Makefile.am b/tests/Makefile.am
index a8ee7c4e..9b0b8de0 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = \
 	$(PANGO_CFLAGS) \
 	$(ATK_CFLAGS) \
 	$(GTK_CFLAGS) \
-	-I$(top_srcdir)/gobject  -I$(top_srcdir)/../gobject-introspection/src
+	-I$(top_srcdir)/gobject
 
 EXTRA_DIST = $(tests) common.py runtests.py test-thread.h test-unknown.h