[cairo-commit] pycairo ChangeLog,1.16,1.17 configure.ac,1.3,1.4
Steve Chaplin
commit at pdx.freedesktop.org
Sat Nov 13 06:14:19 PST 2004
Committed by: stevech1097
Update of /cvs/cairo/pycairo
In directory gabe:/tmp/cvs-serv23989
Modified Files:
ChangeLog configure.ac
Log Message:
SC 13/11/2004
Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/pycairo/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ChangeLog 11 Nov 2004 15:32:12 -0000 1.16
+++ ChangeLog 13 Nov 2004 14:14:17 -0000 1.17
@@ -1,3 +1,8 @@
+2004-11-13 Steve Chaplin <steve1097 at yahoo.com.au>
+
+ * configure.ac:
+ * cairo/__init__.py.in: Add support for version numbers.
+
2004-11-11 Steve Chaplin <steve1097 at yahoo.com.au>
* examples/cairo-demo.py: Move the missing 6th row into view.
Index: configure.ac
===================================================================
RCS file: /cvs/cairo/pycairo/configure.ac,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure.ac 9 Nov 2004 13:49:34 -0000 1.3
+++ configure.ac 13 Nov 2004 14:14:17 -0000 1.4
@@ -1,13 +1,13 @@
-*- mode: m4 -*-
AC_PREREQ(2.54)
-dnl the pygtk version number
+# the pycairo version number
m4_define(pycairo_major_version, 0)
m4_define(pycairo_minor_version, 1)
-m4_define(pycairo_micro_version, 1)
+m4_define(pycairo_micro_version, 2)
m4_define(pycairo_version, pycairo_major_version.pycairo_minor_version.pycairo_micro_version)
-dnl versions of packages we require ...
+# versions of packages we require
m4_define(cairo_required_version, 0.2.0)
m4_define(gtk_required_version, 2.0.0)
m4_define(pygtk_required_version, 1.99.16)
@@ -23,7 +23,7 @@
AM_INIT_AUTOMAKE
-dnl put the ACLOCAL flags in the makefile
+# put the ACLOCAL flags in the makefile
ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
@@ -34,16 +34,16 @@
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
-dnl get rid of the -export-dynamic stuff from the configure flags ...
+# get rid of the -export-dynamic stuff from the configure flags ...
export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
-dnl cairo
+# cairo
PKG_CHECK_MODULES(CAIRO, cairo >= cairo_required_version)
if test -n "$export_dynamic"; then
CAIRO_LIBS=`echo $CAIRO_LIBS | sed -e "s/$export_dynamic//"`
fi
-dnl cairo + gtk + pygtk
+# cairo + gtk + pygtk
PKG_CHECK_MODULES(CAIRO_GTK, dnl
gtk+-2.0 >= gtk_required_version dnl
pygtk-2.0 >= pygtk_required_version,
@@ -53,7 +53,7 @@
fi
AM_CONDITIONAL(HAVE_GTK, $have_gtk)
-dnl checks to see if Numeric Python is installed.
+# checks to see if Numeric Python is installed.
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
AC_CHECK_HEADER([Numeric/arrayobject.h],
@@ -66,7 +66,7 @@
AM_CONDITIONAL(HAVE_NUMPY, $have_numpy)
-dnl add debugging options ...
+# add debugging options ...
changequote(,)dnl
if test "x$GCC" = xyes; then
case " $CFLAGS " in
@@ -83,6 +83,7 @@
AC_CONFIG_FILES(
Makefile
+ cairo/__init__.py
cairo/Makefile)
AC_OUTPUT
More information about the cairo-commit
mailing list