[cairo-commit] cairo ChangeLog, 1.785, 1.786 Makefile.am, 1.11, 1.12 configure.in, 1.112, 1.113

[Owen Taylor]

Committed by: otaylor

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv5639

Modified Files:
	ChangeLog Makefile.am configure.in 
Log Message:
2005-07-28  Owen Taylor  <otaylor at redhat.com>

        * configure.in Makefile.am: Skip tests/ directory if
        libpng was disabled. (#3423, reported by Steve Chaplin)


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.785
retrieving revision 1.786
diff -u -d -r1.785 -r1.786
--- ChangeLog	28 Jul 2005 17:41:08 -0000	1.785
+++ ChangeLog	28 Jul 2005 17:43:27 -0000	1.786
@@ -1,3 +1,8 @@
+2005-07-28  Owen Taylor  <otaylor at redhat.com>
+
+	* configure.in Makefile.am: Skip tests/ directory if
+	libpng was disabled. (#3423, reported by Steve Chaplin)
+
 2005-07-28  Carl Worth  <cworth at cworth.org>
 
 	* src/cairo-png.c: (read_png),

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile.am	21 Jun 2005 00:01:36 -0000	1.11
+++ Makefile.am	28 Jul 2005 17:43:27 -0000	1.12
@@ -1,4 +1,10 @@
-SUBDIRS = src test doc
+DIST_SUBDIRS = src test doc
+SUBDIRS = src doc
+
+# libpng is required for our test programs
+if CAIRO_HAS_PNG_FUNCTIONS
+SUBDIRS += test
+endif
 
 EXTRA_DIST = \
 	COPYING \

Index: configure.in
===================================================================
RCS file: /cvs/cairo/cairo/configure.in,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- configure.in	28 Jul 2005 17:24:59 -0000	1.112
+++ configure.in	28 Jul 2005 17:43:27 -0000	1.113
@@ -177,6 +177,8 @@
 AM_CONDITIONAL(CAIRO_HAS_PNG_FUNCTIONS, test "x$use_png" = "xyes")
 if test "x$use_png" = "xyes"; then
   PNG_FUNCTIONS_FEATURE="#define CAIRO_HAS_PNG_FUNCTIONS 1"
+else
+  AC_MSG_WARN("*** To run the tests, cairo must be built with png support ***)
 fi
 AC_SUBST(PNG_FUNCTIONS_FEATURE)