[cairo-commit] pycairo ChangeLog, 1.205, 1.206 configure.ac, 1.42, 1.43

[Steve Chaplin]

Committed by: stevech1097

Update of /cvs/cairo/pycairo
In directory kemper:/tmp/cvs-serv32746

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

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/pycairo/ChangeLog,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -d -r1.205 -r1.206
--- ChangeLog	29 Apr 2006 10:32:44 -0000	1.205
+++ ChangeLog	29 Apr 2006 14:41:31 -0000	1.206
@@ -1,5 +1,10 @@
 2006-04-29  Steve Chaplin  <steve1097 # yahoo.com.au>
 
+	* examples/Makefile.am (EXTRA_DIST): add cairo_snippets/snippets/ellipse.py
+
+	* configure.ac: require automake 1.9 and autoconf 2.59
+
+2006-04-29  Steve Chaplin  <steve1097 # yahoo.com.au>
 	* cairo/pycairo-context.c (__PyBaseString_AsUTF8): Remove 'static' so
 	function can be used from other files.
 	(pycairo_new_sub_path): new wrapper for cairo_new_sub_path.

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/pycairo/configure.ac,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- configure.ac	29 Apr 2006 02:29:24 -0000	1.42
+++ configure.ac	29 Apr 2006 14:41:31 -0000	1.43
@@ -1,5 +1,5 @@
 -*- mode: m4 -*-
-AC_PREREQ(2.54)
+AC_PREREQ(2.59)
 
 # the pycairo version number
 m4_define(pycairo_version_major, 1)
@@ -26,7 +26,8 @@
 AC_CONFIG_SRCDIR([cairo/pycairo.h])
 AC_CONFIG_HEADERS(config.h)
 
-AM_INIT_AUTOMAKE([1.7 -Wall])
+AM_INIT_AUTOMAKE([1.9 -Wall])
+
 
 # Options
 AC_ARG_WITH(pygtk,
@@ -38,12 +39,15 @@
 # put the ACLOCAL flags in the makefile
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
+
+# Checks for programs
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
 AM_PATH_PYTHON(2.3)
 
-AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+
+# Checks for libraries
 
 # get rid of the -export-dynamic stuff from the configure flags ...
 export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
@@ -95,13 +99,13 @@
 fi
 AM_CONDITIONAL(HAVE_LIBSVG_CAIRO, test x$have_libsvg_cairo = xyes)
 
-# cairo has cairo_image_surface_get_data() patch?
-save_LIBS="$LIBS"
-LIBS="$CAIRO_LIBS"
-AC_CHECK_LIB([cairo], [cairo_image_surface_get_data],
-  [AC_DEFINE(HAVE_GETDATA, [1], [Define to 1 if get_data patch is found])],
-  [])
-LIBS="$save_LIBS"
+
+# Checks for header files
+AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+
+
+# checks for types and compilers
+AC_C_CONST
 
 # add gcc debugging options
 changequote(,)dnl
@@ -139,6 +143,18 @@
     fi
 esac
 
+
+# Checks for library functions
+
+# cairo has cairo_image_surface_get_data() patch?
+save_LIBS="$LIBS"
+LIBS="$CAIRO_LIBS"
+AC_CHECK_LIB([cairo], [cairo_image_surface_get_data],
+  [AC_DEFINE(HAVE_GETDATA, [1], [Define to 1 if get_data patch is found])],
+  [])
+LIBS="$save_LIBS"
+
+
 AC_CONFIG_FILES([
 Makefile
 pycairo.pc