Put in a little protection against the developer not having the check

package available.

sfbug #664541.

* configure.in: look for check.h. This will set up a HAVE_CHECK_H define.

* tests/chardata.c, tests/runtests.c: update banner. add test for
    HAVE_CHECK_H and bail if not present.

diff --git a/expat/configure.in b/expat/configure.in
index e6440509a86fc65ebf02fa2900c9e29cb1c07d7a..721c2652f12904ed56041d9745fe7cafaa47030f 100644 (file)
--- a/expat/configure.in
+++ b/expat/configure.in
@@ -105,6 +105,7 @@ fi
 AC_SUBST(FILEMAP)
 
 AC_CHECK_FUNCS(memmove bcopy)
+AC_CHECK_HEADERS(check.h)
 
 dnl some basic configuration
 AC_DEFINE([XML_NS], 1,

diff --git a/expat/tests/chardata.c b/expat/tests/chardata.c
index 4a228a7a126645723ea16021cb5e10facd07a1e8..4351f4ce7bcaf1f233a9a108f77c2a67bc7d1d20 100644 (file)
--- a/expat/tests/chardata.c
+++ b/expat/tests/chardata.c
@@ -1,7 +1,15 @@
-/*  chardata.c
- *
- *
- */
+/* Copyright (c) 1998-2003 Thai Open Source Software Center Ltd
+   See the file COPYING for copying permission.
+
+   chardata.c
+*/
+
+#include <expat_config.h>
+#ifdef HAVE_CHECK_H
+#include <check.h>
+#else
+#error This test suite requires the 'check' unit test framework (http://check.sf.net/)
+#endif
 
 #include <assert.h>
 #include <check.h>

diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 2280470d94eba20ccbc30a1b6e692aaa6f7ef849..209c05528d41fc4de644fba26b57d4208799c926 100644 (file)
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -1,5 +1,17 @@
-#include <assert.h>
+/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
+   See the file COPYING for copying permission.
+
+   runtest.c : run the Expat test suite
+*/
+
+#include <expat_config.h>
+#ifdef HAVE_CHECK_H
 #include <check.h>
+#else
+#error This test suite requires the 'check' unit test framework (http://check.sf.net/)
+#endif
+
+#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>