[cairo-commit] pycairo ChangeLog, 1.167, 1.168 configure.ac, 1.32, 1.33

[Steve Chaplin]

Committed by: stevech1097

Update of /cvs/cairo/pycairo
In directory gabe:/tmp/cvs-serv30259

Modified Files:
	ChangeLog configure.ac 
Log Message:
'SC'

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/pycairo/ChangeLog,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- ChangeLog	12 Aug 2005 01:09:03 -0000	1.167
+++ ChangeLog	12 Aug 2005 07:23:31 -0000	1.168
@@ -1,5 +1,13 @@
 2005-08-12  Steve Chaplin  <steve1097 at yahoo.com.au>
 
+	* cairo/cairogtkmodule.c (gdk_cairo_create): rename to
+	_gdk_cairo_create and remove the "#ifndef HAVE_GTK28" check
+
+	* configure.ac : delete HAVE_GTK28 check. If pygtk > 2.7 do not
+	compile cairo.gtk (use pygtk instead)
+
+2005-08-12  Steve Chaplin  <steve1097 at yahoo.com.au>
+
 	* RELEASING: add new step #9 - post message to python-announce-list
 
 2005-08-11  Steve Chaplin  <steve1097 at yahoo.com.au>

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/pycairo/configure.ac,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- configure.ac	10 Aug 2005 16:08:45 -0000	1.32
+++ configure.ac	12 Aug 2005 07:23:31 -0000	1.33
@@ -63,7 +63,8 @@
 if test x"$with_pygtk" = xyes; then
   PKG_CHECK_MODULES(GTK,
     [gtk+-2.0 >= gtk_required_version
-    pygtk-2.0 >= pygtk_required_version],
+    pygtk-2.0 >= pygtk_required_version
+    pygtk-2.0 < 2.7.0],
     [], [with_pygtk=no])
   if test -n "$export_dynamic"; then
     GTK_LIBS=`echo $GTK_LIBS | sed -e "s/$export_dynamic//"`
@@ -71,17 +72,6 @@
 fi
 AM_CONDITIONAL(WITH_PYGTK, test x$with_pygtk = xyes)
 
-# Define HAVE_GTK28 if gtk+ > 2.7 is found
-if test x"$with_pygtk" = xyes; then
-  AC_MSG_CHECKING([for gtk+ 2.8 API])
-  if $PKG_CONFIG --modversion "gtk+-2.0 >= 2.7.0" > /dev/null 2>&1; then
-     AC_MSG_RESULT([found])
-     AC_DEFINE([HAVE_GTK28], [1], [Define to 1 if gtk+ 2.8 API is found])
-  else
-     AC_MSG_RESULT([not found])
-  fi
-fi
-
 # Numeric Python
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"