[cairo-commit] pycairo ChangeLog, 1.126, 1.127 configure.ac, 1.25, 1.26 README, 1.13, 1.14

[Steve Chaplin]

Committed by: stevech1097

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

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

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/pycairo/ChangeLog,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- ChangeLog	27 May 2005 03:02:50 -0000	1.126
+++ ChangeLog	29 May 2005 11:11:48 -0000	1.127
@@ -1,3 +1,28 @@
+2005-05-29  Steve Chaplin  <steve1097 at yahoo.com.au>
+
+	* cairo/Makefile.am : change svg target to use LIBSVG_CAIRO (not CAIRO)
+	LIBS and CFLAGS
+
+	* configure.ac : only compile the cairo.gtk module if cairo-xlib is
+	enabled.
+	Change module configuration report from "true/false" to "yes/no"
+
+	* cairo/cairomodule.c (Pycairo_Check_Status): remove
+	CAIRO_STATUS_BAD_NESTING to track changes in cairo
+
+	* README : update to mention the pycairo product in bugzilla
+
+2005-05-29  Steve Chaplin  <steve1097 at yahoo.com.au>
+	
+	* cairo/cairomodule.c: 
+	* cairo/pycairo.h: 
+	* cairo/pycairo-private.h: 
+	* cairo/pycairo-surface.c: 
+	add Win32Surface, conditionally compile all PS/PDF code, contributed 
+	by Niki Spahiev.
+	Change the C API struct back to (type, constructor) pairs to make
+	preprocessor macros simpler.
+
 2005-05-27  Gustavo J. A. M. Carneiro  <gjc at gnome.org>
  
  	* cairo/cairogtkmodule.c (gdk_cairo_create): Don't define

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/pycairo/configure.ac,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- configure.ac	27 May 2005 03:02:50 -0000	1.25
+++ configure.ac	29 May 2005 11:11:48 -0000	1.26
@@ -27,8 +27,8 @@
 
 # Options
 AC_ARG_WITH(pygtk,
-            [AC_HELP_STRING([--with-pygtk],
-                            [support pygtk [default=yes]])],,
+            [AC_HELP_STRING([--with-pygtk], [support pygtk [default=yes]])],
+	    [],
 	    [with_pygtk="yes"])
 
 
@@ -51,49 +51,57 @@
   CAIRO_LIBS=`echo $CAIRO_LIBS | sed -e "s/$export_dynamic//"`
 fi
 
-# cairo + gtk + pygtk
-if test x"$with_pygtk" = xno; then
-  with_pygtk=false
-else
-  PKG_CHECK_MODULES(CAIRO_GTK,
+# cairo + cairo-xlib + gtk + pygtk
+if test x"$with_pygtk" = xyes; then
+  # was cairo compiled with cairo-xlib enabled?
+  save_LIBS="$LIBS"
+  LIBS="$CAIRO_LIBS"
+  AC_CHECK_LIB([cairo], [cairo_xlib_surface_create], [], [with_pygtk=no])
+  LIBS="$save_LIBS"
+fi
+
+if test x"$with_pygtk" = xyes; then
+  PKG_CHECK_MODULES(GTK,
     [gtk+-2.0 >= gtk_required_version
     pygtk-2.0 >= pygtk_required_version],
-    [with_pygtk=true], [with_pygtk=false])
+    [], [with_pygtk=no])
   if test -n "$export_dynamic"; then
-    CAIRO_GTK_LIBS=`echo $CAIRO_GTK_LIBS | sed -e "s/$export_dynamic//"`
+    GTK_LIBS=`echo $GTK_LIBS | sed -e "s/$export_dynamic//"`
   fi
 fi
-AM_CONDITIONAL(WITH_PYGTK, $with_pygtk)
+AM_CONDITIONAL(WITH_PYGTK, test x$with_pygtk = xyes)
 
 # 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])
+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"
 AC_CHECK_HEADER([Numeric/arrayobject.h],
-  [have_numpy=true], [have_numpy=false],
+  [have_numpy=yes], [have_numpy=no],
   [#include <Python.h>])
 CPPFLAGS="$save_CPPFLAGS"
-if $have_numpy; then
-  AC_DEFINE(HAVE_NUMPY,,[whether to include numeric python support])
+if test x$have_numpy = xyes; then
+  AC_DEFINE(HAVE_NUMPY, [1], [Define to 1 if Numeric python is found])
 fi
-AM_CONDITIONAL(HAVE_NUMPY, $have_numpy)
+AM_CONDITIONAL(HAVE_NUMPY, test x$have_numpy = xyes)
 
 # is libsvg-cairo installed?
-PKG_CHECK_MODULES(LIBSVG_CAIRO, dnl
+PKG_CHECK_MODULES(LIBSVG_CAIRO,
   libsvg-cairo >= libsvg_cairo_required_version,
-  [have_libsvg_cairo=true],[have_libsvg_cairo=false])
+  [have_libsvg_cairo=yes],[have_libsvg_cairo=no])
 if test -n "$export_dynamic"; then
   LIBSVG_CAIRO_LIBS=`echo $LIBSVG_CAIRO_LIBS | sed -e "s/$export_dynamic//"`
 fi
-AM_CONDITIONAL(HAVE_LIBSVG_CAIRO, $have_libsvg_cairo)
+AM_CONDITIONAL(HAVE_LIBSVG_CAIRO, test x$have_libsvg_cairo = xyes)
 
 
 # add gcc debugging options
@@ -147,7 +155,7 @@
 Installation prefix             ${prefix}
 
 Additional modules:
-	build cairo.gtk   ?	${with_pygtk}
-	build cairo.svg   ?     ${have_libsvg_cairo}
+	build cairo.gtk?        ${with_pygtk}
+	build cairo.svg?        ${have_libsvg_cairo}
 	build Numeric support?  ${have_numpy}
 "

Index: README
===================================================================
RCS file: /cvs/cairo/pycairo/README,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- README	20 May 2005 11:07:31 -0000	1.13
+++ README	29 May 2005 11:11:48 -0000	1.14
@@ -22,6 +22,5 @@
 
 Bugzilla
 --------
-If you find a bug in cairo or Pycairo, please submit a bugreport to for cairo
-to
-	https://bugs.freedesktop.org/
+If you find a bug in Pycairo, please go to https://bugs.freedesktop.org/
+select the pycairo product and submit a bugreport.