[cairo-commit] configure.in test/Makefile.am

[Chris Wilson]

 configure.in     |    6 ++----
 test/Makefile.am |   15 +++++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

New commits:
diff-tree 284edb86484de8ccf3adf35d5cb9ff6ba64759ec (from a8974223dc6376a11588c6ecf1e54da5329b9c72)
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Apr 12 03:01:31 2007 +0100

    Do not raise an error if we fail to locate 'find' or 'xargs'
    
    Whilst not being able to delete all of the test output is messy it is
    however not fatal, so do not abort configuration simply because we
    cannot find either program.

diff --git a/configure.in b/configure.in
index befcff6..a045699 100644
--- a/configure.in
+++ b/configure.in
@@ -50,10 +50,8 @@ AC_SUBST(CAIRO_VERSION_MICRO)
 
 dnl ===========================================================================
 
-AC_PATH_PROG(FIND, find,
-	     AC_MSG_ERROR([Cairo requires a POSIX compatible 'find'.]))
-AC_PATH_PROG(XARGS, xargs,
-	     AC_MSG_ERROR([Cairo requires 'xargs'.]))
+AC_PATH_PROG(FIND, find)
+AC_PATH_PROG(XARGS, xargs)
 
 dnl ===========================================================================
 
diff --git a/test/Makefile.am b/test/Makefile.am
index a6adec7..4effd77 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -523,14 +523,17 @@ CLEANFILES =					\
 	$(EXTRA_LTLIBRARIES)			\
 	$(EXTRA_PROGRAMS)
 
-# most systems cannot handle all of our clean files together
+# This used to be a simple 'echo ${RM} *.ps *.pdf *.svg *.etc', but
+# most systems cannot handle all of our clean files together.
+# Then it became a fancy find using many GNU extensions, but then the ugly
+# reality of portability was raised and it became....
 clean-local:
-	-${FIND} . -name '*.ps' -print       | ${XARGS} ${RM}
-	-${FIND} . -name '*.pdf' -print      | ${XARGS} ${RM}
-	-${FIND} . -name '*.svg' -print      | ${XARGS} ${RM}
-	-${FIND} . -name '*-out.png' -print  | ${XARGS} ${RM}
+	-${FIND} . -name '*.ps'       -print | ${XARGS} ${RM}
+	-${FIND} . -name '*.pdf'      -print | ${XARGS} ${RM}
+	-${FIND} . -name '*.svg'      -print | ${XARGS} ${RM}
+	-${FIND} . -name '*-out.png'  -print | ${XARGS} ${RM}
 	-${FIND} . -name '*-diff.png' -print | ${XARGS} ${RM}
-	-${FIND} . -name '*.log' -print      | ${XARGS} ${RM}
+	-${FIND} . -name '*.log'      -print | ${XARGS} ${RM}
 
 # Check tests under valgrind
 # Saves log to valgrind-log