[cairo-commit] pycairo/cairo Makefile.am,1.2,1.3

[Carl Worth]

Committed by: cworth

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

Modified Files:
	Makefile.am 
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: Makefile.am
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	28 Oct 2003 15:53:13 -0000	1.2
+++ Makefile.am	1 Nov 2004 16:29:45 -0000	1.3
@@ -1,5 +1,5 @@
 
-INCLUDES = $(PYTHON_INCLUDES) $(CAIRO_GTK_CFLAGS)
+INCLUDES = $(PYTHON_INCLUDES) $(CAIRO_CFLAGS) $(CAIRO_GTK_CFLAGS)
 
 pycairodir = $(pythondir)/cairo
 pycairoexecdir = $(pyexecdir)/cairo