fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-01-03 12:50:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not raise an error if we fail to locate 'find' or 'xargs'

Browse source 
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.
This commit is contained in:
Chris Wilson 2007-04-12 03:01:31 +01:00
parent a8974223dc
commit 284edb8648
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
configure.in
View file

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

15
test/Makefile.am
View file

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