[pygobject/gsoc2009] Update the introspection dependencies

[Simon van der Linden <svdlinden src gnome org>]

commit 71f2baa92480fb16130f3d22bef50b58349dcaec
Author: Simon van der Linden <svdlinden src gnome org>
Date:   Sat Aug 15 15:52:53 2009 +0200

    Update the introspection dependencies
    
    Make the introspection module depend on Python 2.5.2, GLib 2.21.5 (future 2.22)
    and GObject-Introspection 0.6.4

 configure.ac      |    4 +++-
 gi/pygi-private.h |    5 -----
 2 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5404f1a..20625db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ dnl versions of packages we require ...
 m4_define(glib_required_version, 2.14.0)
 m4_define(gio_required_version, 2.16.0)
 m4_define(giounix_required_version, 2.16.0)
-m4_define(gobject_introspection_required_version, 0.6.3)
+m4_define(gobject_introspection_required_version, 0.6.4)
 
 AC_INIT(pygobject, pygobject_version,
         [http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject])
@@ -207,6 +207,8 @@ AC_ARG_ENABLE(introspection,
   enable_introspection=no)
 AM_CONDITIONAL(BUILD_GI, test "$enable_introspection" != no)
 if test "$enable_introspection" != no; then
+  JD_PATH_PYTHON(2.5.2)
+  PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, glib-2.0 >= 2.21.5)
   PKG_CHECK_MODULES(GOBJECT_INTROSPECTION, gobject-introspection-1.0 >= gobject_introspection_required_version)
   AC_SUBST(GOBJECT_INTROSPECTION_CFLAGS)
   AC_SUBST(GOBJECT_INTROSPECTION_LIBS)
diff --git a/gi/pygi-private.h b/gi/pygi-private.h
index dd7cf1e..386e425 100644
--- a/gi/pygi-private.h
+++ b/gi/pygi-private.h
@@ -77,11 +77,6 @@ GIBaseInfo* pygi_object_get_gi_info (PyObject     *object,
 
 /* GArray */
 
-#if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 22
-#   define g_array_get_element_size(a) \
-        *(guint *)((gpointer)(a) + sizeof(guint8 *) + sizeof(guint) * 2)
-#endif
-
 /* Redefine g_array_index because we want it to return the i-th element, casted
  * to the type t, of the array a, and not the i-th element of the array a casted to the type t. */
 #define _g_array_index(a,t,i) \