? .Makefile.am.swp ? .foo.txt.swp ? foo.txt ? png-patch.diff Index: Makefile.am =================================================================== RCS file: /cvs/cairo/cairo/test/Makefile.am,v retrieving revision 1.67 diff -p -u -r1.67 Makefile.am --- Makefile.am 28 Jul 2005 02:13:39 -0000 1.67 +++ Makefile.am 28 Jul 2005 04:27:01 -0000 @@ -1,3 +1,4 @@ +if CAIRO_HAS_PNG_FUNCTIONS # All test cases go here TESTS = \ clip-nesting \ @@ -53,6 +54,8 @@ if CAIRO_HAS_XLIB_SURFACE TESTS += xlib-surface endif +endif # CAIRO_HAS_PNG_FUNCTIONS + # All tests which have a reference image go here. # I really don't like having to repeat this list. Anyone know a good # way to avoid it? Can I use a wildcard here? @@ -111,7 +114,16 @@ source-surface-scale-paint \ text-antialias-subpixel \ text-rotate +if CAIRO_HAS_PNG_FUNCTIONS check_PROGRAMS = $(TESTS) +else +check-local: + @echo "" + @echo "****************************************************************" + @echo "*** Note: To run the tests, cairo must be built with png support" + @echo "****************************************************************" + @echo "" +endif # We're using _GNU_SOURCE to get the prototype for asprintf. This may # not be the most portable approach, but it is pragmatic and I'm @@ -124,7 +136,9 @@ INCLUDES = \ -I$(top_builddir)/src \ -I$(top_srcdir)/src +if CAIRO_HAS_PNG_FUNCTIONS noinst_LTLIBRARIES = libcairotest.la +endif libcairotest_la_SOURCES =\ buffer-diff.c \ @@ -188,8 +202,10 @@ user_data_LDADD = $(LDADDS) rel_path_LDADD = $(LDADDS) xlib_surface_LDADD = $(LDADDS) +if CAIRO_HAS_PNG_FUNCTIONS noinst_PROGRAMS = imagediff imagediff_LDADD = $(LDADDS) +endif CLEANFILES = \ *-out.png \