[cairo-commit] 2 commits - build/configure.ac.features test/any2ppm.c test/Makefile.am

[Chris Wilson]

 build/configure.ac.features |    1 -
 test/Makefile.am            |    3 ++-
 test/any2ppm.c              |    3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 3a82f943988413e0d3fada9932bb385f4cbdb3c7
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Nov 16 18:21:52 2008 +0000

    [test] Add util/cairo-script to include path.
    
    any2ppm needs the include path for cairo-script-interpreter so that it can
    be built without an existing install.

diff --git a/test/Makefile.am b/test/Makefile.am
index 749b309..e092429 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1142,6 +1142,7 @@ AM_CPPFLAGS =					\
 	-I$(srcdir)				\
 	-I$(srcdir)/pdiff			\
 	-I$(top_srcdir)/boilerplate		\
+	-I$(top_srcdir)/util/cairo-script	\
 	-I$(top_srcdir)/src			\
 	-I$(top_builddir)/src			\
 	$(CAIRO_CFLAGS)
@@ -1156,7 +1157,7 @@ $(top_builddir)/test/pdiff/libpdiff.la:
 	cd $(top_builddir)/test/pdiff && $(MAKE) $(AM_MAKEFLAGS) libpdiff.la
 
 $(top_builddir)/util/cairo-script/libcairo-script-interpreter.la: $(top_builddir)/src/libcairo.la
-	cd $(top_builddir)/util/cair-script && $(MAKE) $(AM_MAKEFLAGS) libcairo-script-interpreter.la
+	cd $(top_builddir)/util/cairo-script && $(MAKE) $(AM_MAKEFLAGS) libcairo-script-interpreter.la
 
 EXTRA_PROGRAMS += imagediff png-flatten
 
diff --git a/test/any2ppm.c b/test/any2ppm.c
index e39775b..ae5de32 100644
--- a/test/any2ppm.c
+++ b/test/any2ppm.c
@@ -62,10 +62,7 @@
 #include <string.h>
 
 #include <cairo.h>
-
-#if CAIRO_CAN_TEST_SCRIPT_SURFACE
 #include <cairo-script-interpreter.h>
-#endif
 
 #if CAIRO_CAN_TEST_PDF_SURFACE
 #include <poppler.h>
commit 997fa6a7729b72b25d9275929bf190e71eed1b9d
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sun Nov 16 17:43:40 2008 +0000

    [configure] Remove old line for CairoScript testing.
    
    CairoScript testing should now be unconditional so remove the surplus
    message.

diff --git a/build/configure.ac.features b/build/configure.ac.features
index 9970fde..7173808 100644
--- a/build/configure.ac.features
+++ b/build/configure.ac.features
@@ -390,7 +390,6 @@ AC_DEFUN([CAIRO_REPORT],
 	echo "  test surfaces: $use_test_surfaces"
 	echo "  ps testing:    $test_ps"
 	echo "  pdf testing:   $test_pdf"
-	echo "  cs testing:    $test_script"
 	echo "  svg testing:   $test_svg"
 	if test x"$use_win32" = "xyes"; then
 		echo "  win32 printing testing:    $test_win32_printing"