[cairo-commit] pycairo ChangeLog, 1.125, 1.126 configure.ac, 1.24, 1.25

[Steve Chaplin]

Committed by: stevech1097

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
SC

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/pycairo/ChangeLog,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- ChangeLog	26 May 2005 08:26:20 -0000	1.125
+++ ChangeLog	27 May 2005 03:02:50 -0000	1.126
@@ -1,3 +1,10 @@
+2005-05-27  Gustavo J. A. M. Carneiro  <gjc at gnome.org>
+ 
+ 	* cairo/cairogtkmodule.c (gdk_cairo_create): Don't define
+ 	gdk_cairo_create if compiling against gtk+ 2.8 API.
+ 
+ 	* configure.ac : Define HAVE_GTK28 if gtk+ > 2.7 is found.
+
 2005-05-26  Steve Chaplin  <steve1097 at yahoo.com.au>
 	
 	* cairo/Makefile.am (AM_CPPFLAGS): Delete AM_CPPFLAGS (it uses 

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/pycairo/configure.ac,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- configure.ac	20 May 2005 11:07:31 -0000	1.24
+++ configure.ac	27 May 2005 03:02:50 -0000	1.25
@@ -65,6 +65,15 @@
 fi
 AM_CONDITIONAL(WITH_PYGTK, $with_pygtk)
 
+# Define HAVE_GTK28 if gtk+ > 2.7 is found
+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], [], [Defined if gtk+ 2.8 API is found])
+else
+   AC_MSG_RESULT([not found])
+fi
+
 # Numeric Python
 save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"