diff options
| author | Daniel Martin <consume.noise@gmail.com> | 2012-12-31 11:57:49 +0100 |
|---|---|---|
| committer | Daniel Martin <consume.noise@gmail.com> | 2013-08-15 00:35:02 +0200 |
| commit | dd01db570c34dd3e2e0f5d07b8d40c837fa51057 (patch) | |
| tree | b6ed4d75ca4eb1964fca40673603d34212748b32 | |
| parent | 0289348f2c4ed3b1b286c51df19d82c6787c2b36 (diff) | |
Make xsltproc optional
Fix Bug 23863 - xcb still checks for xsltproc:
https://bugs.freedesktop.org/show_bug.cgi?id=23863
xsltproc is used to generate the optional html page for `check` results,
only. So, it's not a hard build dependency.
Additionally, use yes/no instead of true/false in the HTML_CHECK_RESULT
variable for consistent output after a configure run.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 482f85b..72bd4f0 100644 --- a/configure.ac +++ b/configure.ac @@ -27,15 +27,12 @@ AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL AC_PROG_CC -AC_PATH_PROG(XSLTPROC, xsltproc, no) -if test "$XSLTPROC" = "no"; then - AC_MSG_ERROR([XCB requires xsltproc.]) -fi - -HTML_CHECK_RESULT=false +XSLTPROC=no +HTML_CHECK_RESULT=no if test x"$HAVE_CHECK" = xyes; then + AC_PATH_PROG(XSLTPROC, xsltproc, no) if test x"$XSLTPROC" != xno; then - HTML_CHECK_RESULT=true + HTML_CHECK_RESULT=yes fi fi AC_SUBST(HTML_CHECK_RESULT) @@ -258,6 +255,7 @@ echo "" echo " Configuration" echo " XDM support.........: ${have_xdmcp}" echo " Build unit tests....: ${HAVE_CHECK}" +echo " with html results.: ${HTML_CHECK_RESULT}" echo " XCB buffer size.....: ${xcb_queue_buffer_size}" echo "" echo " X11 extensions" diff --git a/tests/Makefile.am b/tests/Makefile.am index 20bdc72..ceef722 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,7 +14,7 @@ check_all_SOURCES = check_all.c check_suites.h check_public.c check-local: check-TESTS $(RM) CheckLog.html - if test x$(HTML_CHECK_RESULT) = xtrue; then \ + if test x$(HTML_CHECK_RESULT) = xyes; then \ $(XSLTPROC) $(srcdir)/CheckLog.xsl CheckLog*.xml > CheckLog.html; \ else \ touch CheckLog.html; \ |