[pygda] Depend on pygobject instead of pygtk.

[Murray Cumming <murrayc src gnome org>]

commit 5658b02574a58a63fd053c8b0c2af6beb0030e7b
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Nov 7 14:14:30 2010 +0100

    Depend on pygobject instead of pygtk.
    
    * configure.ac: Check for pygobject instead of pygtk, and change
    the variable names accordingly.
    * gda/Makefile.am: Adapt.
    
    This is the reason for the split away from gnome-python-extras. There is no
    pygtk for GTK+ 3 yet, but pygobject is still OK because glib has not broken
    ABI. This makes life easier for people building pygda.

 ChangeLog       |   12 ++++++++++++
 configure.ac    |   38 +++++++++++++-------------------------
 gda/Makefile.am |    8 ++++----
 3 files changed, 29 insertions(+), 29 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 716fc71..758caeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2010-11-07  Murray Cumming  <murrayc murrayc com>
 
+	Depend on pygobject instead of pygtk.
+
+	* configure.ac: Check for pygobject instead of pygtk, and change 
+	the variable names accordingly.
+	* gda/Makefile.am: Adapt.
+	
+	This is the reason for the split away from gnome-python-extras. There is no 
+	pygtk for GTK+ 3 yet, but pygobject is still OK because glib has not broken 
+	ABI. This makes life easier for people building pygda.
+
+2010-11-07  Murray Cumming  <murrayc murrayc com>
+
 	Fix tests/common.py for the gnome-python-extras->pygda split.
 
 	* tests/common.py: Don't mention the other modules in gnome-python-extras.
diff --git a/configure.ac b/configure.ac
index 874e47e..b93b6e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,10 +8,10 @@ m4_define(pygda_micro_version, 3)
 m4_define(pygda_version, pygda_major_version.pygda_minor_version.pygda_micro_version)
 
 dnl required versions of other packages
-m4_define(pygtk_required_major_version, 2)
-m4_define(pygtk_required_minor_version, 4)
-m4_define(pygtk_required_micro_version, 0)
-m4_define(pygtk_required_version, pygtk_required_major_version.pygtk_required_minor_version.pygtk_required_micro_version)
+m4_define(pygobject_required_major_version, 2)
+m4_define(pygobject_required_minor_version, 4)
+m4_define(pygobject_required_micro_version, 0)
+m4_define(pygobject_required_version, pygobject_required_major_version.pygobject_required_minor_version.pygobject_required_micro_version)
 m4_define(libgda_required_version,            4.0.0)
 
 AC_INIT(gnome-python-extras, pygda_version,
@@ -76,30 +76,18 @@ dnl check for python
 AM_PATH_PYTHON(2.3)
 AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
 
-dnl check for pygtk
-PKG_CHECK_MODULES(PYGTK, pygtk-2.0 >= pygtk_required_version)
-AC_SUBST(PYGTK_CFLAGS)
+dnl check for pygobject
+PKG_CHECK_MODULES(PYGOBJECT, pygobject-2.0 >= pygobject_required_version)
+AC_SUBST(PYGOBJECT_CFLAGS)
 AC_PATH_PROG(PYGOBJECT_CODEGEN, pygobject-codegen-2.0, no)
 if test "x$PYGOBJECT_CODEGEN" = xno; then
   AC_MSG_ERROR(could not find pygobject-codegen-2.0 script)
 fi
 
-AC_MSG_CHECKING([for conflicting pygtk versions])
-pygtk_version=`$PKG_CONFIG --modversion pygtk-2.0`
-case $pygtk_version in
-     2.9.0|2.9.1)
-        AC_MSG_RESULT([found $pygtk_version])
-        AC_MSG_ERROR([invalid pygtk version found; please upgrade])
-        ;;
-     *)
-        AC_MSG_RESULT([none])
-        ;;
-esac
-
-AC_MSG_CHECKING(for pygtk defs)
-PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
-AC_SUBST(PYGTK_DEFSDIR)
-AC_MSG_RESULT($PYGTK_DEFSDIR)
+AC_MSG_CHECKING(for pygobject defs)
+PYGOBJECT_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygobject-2.0`
+AC_SUBST(PYGOBJECT_DEFSDIR)
+AC_MSG_RESULT($PYGOBJECT_DEFSDIR)
 
 AC_MSG_CHECKING(for gnome-python defs)
 GNOME_PYTHON_DEFSDIR=`$PKG_CONFIG --variable=defsdir gnome-python-2.0`
@@ -128,7 +116,7 @@ fi
 
 AM_CONDITIONAL(ENABLE_DOCS, test x$enable_docs != xno)
 
-PYGOBJECT_INCLUDEDIR=`$PKG_CONFIG --variable=pygtkincludedir pygobject-2.0`
+PYGOBJECT_INCLUDEDIR=`$PKG_CONFIG --variable=pygobjectincludedir pygobject-2.0`
 AC_SUBST(PYGOBJECT_INCLUDEDIR)
 
 PYGOBJECT_DATADIR=`$PKG_CONFIG --variable=datadir pygobject-2.0`
@@ -141,7 +129,7 @@ PYGOBJECT_PYGDOCS="`$PKG_CONFIG --variable=pygdocs pygobject-2.0`"
 AC_SUBST(PYGOBJECT_PYGDOCS)
 
 
-PKG_CHECK_MODULES(GDA, [libgda-4.0 >= libgda_required_version pygtk-2.0 >= pygtk_required_version])
+PKG_CHECK_MODULES(GDA, [libgda-4.0 >= libgda_required_version pygobject-2.0 >= pygobject_required_version])
 
 if test -n "$export_dynamic"; then
   GDA_LIBS=`echo $GDA_LIBS | sed -e "s/$export_dynamic//"`
diff --git a/gda/Makefile.am b/gda/Makefile.am
index debe7fe..c996513 100644
--- a/gda/Makefile.am
+++ b/gda/Makefile.am
@@ -1,6 +1,6 @@
-INCLUDES = $(PYTHON_INCLUDES) $(PYGTK_CFLAGS)
+INCLUDES = $(PYTHON_INCLUDES) $(PYGOBJECT_CFLAGS)
 
-defsdir = $(datadir)/pygtk/2.0/defs
+defsdir = $(datadir)/pygobject/2.0/defs
 defs_DATA = gda.defs
 
 EXTRA_DIST = $(defs_DATA)
@@ -35,7 +35,7 @@ gda_la_LDFLAGS = $(common_ldflags)
 gda_la_LIBADD = $(GDA_LIBS)
 gda_la_SOURCES = gdamodule.c pygdavalue_conversions.c pygdavalue_conversions.h gdaglue.h
 
-argtypesdir = $(datadir)/pygtk/2.0/argtypes
+argtypesdir = $(datadir)/pygobject/2.0/codegen/argtypes
 argtypes_PYTHON = gda-arg-types.py
 
 nodist_gda_la_SOURCES = gda.c
@@ -48,7 +48,7 @@ gda.c: gda.defs gda.override $(argtypes_PYTHON)
 .defs.c:
 	(cd $(srcdir) \
 	 && $(PYGOBJECT_CODEGEN) \
-	    --register $(PYGTK_DEFSDIR)/gtk-types.defs \
+	    --register $(PYGOBJECT_DEFSDIR)/gio-types.defs \
 	    --load-types gda-arg-types.py \
 	    --register gda.defs \
 	    --override $*.override \