[cairo-commit] pycairo ChangeLog, 1.10, 1.11 autogen.sh, 1.1, 1.2 configure.ac, 1.1, 1.2

[Carl Worth]

Committed by: cworth

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

Modified Files:
	ChangeLog autogen.sh configure.ac 
Log Message:

        * cairo/Makefile.am (INCLUDES): Add CAIRO_CFLAGS so that things
        compile even without pygtk.

        * configure.ac: Don't re-do cairo pkg-config check when checking
        for gtk.

        * autogen.sh: If user has not set AUTOMAKE, then just use automake
        rather than automake-1.7.


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/pycairo/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ChangeLog	23 Aug 2004 10:03:52 -0000	1.10
+++ ChangeLog	1 Nov 2004 16:29:45 -0000	1.11
@@ -1,3 +1,14 @@
+2004-11-01  Carl Worth  <cworth at cworth.org>
+
+	* cairo/Makefile.am (INCLUDES): Add CAIRO_CFLAGS so that things
+	compile even without pygtk.
+
+	* configure.ac: Don't re-do cairo pkg-config check when checking
+	for gtk.
+
+	* autogen.sh: If user has not set AUTOMAKE, then just use automake
+	rather than automake-1.7.
+
 2004-08-23  Øyvind Kolås <pippin at freedesktop.org>
 
 	* cairo/gtkcairomodule.c: cairo-xlib.h -> cairo.h

Index: autogen.sh
===================================================================
RCS file: /cvs/cairo/pycairo/autogen.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- autogen.sh	17 Sep 2003 14:59:34 -0000	1.1
+++ autogen.sh	1 Nov 2004 16:29:45 -0000	1.2
@@ -32,14 +32,13 @@
 }
 
 if test -z "$AUTOMAKE"; then
-  if automake-1.7 --version < /dev/null > /dev/null 2>&1; then
-    AUTOMAKE=automake-1.7
-    ACLOCAL=aclocal-1.7
+  if automake --version < /dev/null > /dev/null 2>&1; then
+    AUTOMAKE=automake
+    ACLOCAL=aclocal
   else
     echo
     echo "You must have automake installed to compile $PROJECT."
-    echo "Get ftp://ftp.gnu.org/pub/gnu/automake/automake-1.7.6.tar.gz"
-    echo "(or a newer version if it is available)"
+    echo "See ftp://ftp.gnu.org/pub/gnu/automake/"
     DIE=1
   fi
 fi

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/pycairo/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- configure.ac	17 Sep 2003 14:34:02 -0000	1.1
+++ configure.ac	1 Nov 2004 16:29:45 -0000	1.2
@@ -45,7 +45,6 @@
 
 dnl cairo + gtk + pygtk
 PKG_CHECK_MODULES(CAIRO_GTK, dnl
-  cairo >= cairo_required_version dnl
   gtk+-2.0 >= gtk_required_version dnl
   pygtk-2.0 >= pygtk_required_version,
   [have_gtk=true],[have_gtk=false])