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

This commit is contained in:
Owen Taylor 2005-07-28 10:43:27 +00:00
parent a83124a3ee
commit 1e66aee352
3 changed files with 14 additions and 1 deletions

View file

@ -1,3 +1,8 @@
2005-07-28 Owen Taylor <otaylor@redhat.com>
* configure.in Makefile.am: Skip tests/ directory if
libpng was disabled. (#3423, reported by Steve Chaplin)
2005-07-28 Carl Worth <cworth@cworth.org>
* src/cairo-png.c: (read_png),

View file

@ -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 \

View file

@ -177,6 +177,8 @@ fi
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)