remove use of the check library; always use our own testing package
(this reduces variables and simplifies the build process)
diff --git a/expat/Changes b/expat/Changes
index 7d24b58..da931fb 100644
--- a/expat/Changes
+++ b/expat/Changes
@@ -1,3 +1,7 @@
+Release 1.95.9 TBD
+ - We no longer use the "check" library for C unit testing; we
+ always use the (partial) internal implementation of the API.
+
Release 1.95.8 Fri Jul 23 2004
- Major new feature: suspend/resume. Handlers can now request
that a parse be suspended for later resumption or aborted
diff --git a/expat/Makefile.in b/expat/Makefile.in
index d68a7da..4e9bf18 100644
--- a/expat/Makefile.in
+++ b/expat/Makefile.in
@@ -151,8 +151,8 @@
tests/chardata.o: tests/chardata.c tests/chardata.h
tests/minicheck.o: tests/minicheck.c tests/minicheck.h
tests/runtests.o: tests/runtests.c tests/chardata.h
-tests/runtests: tests/runtests.o tests/chardata.o @MINICHECK_OBJECT@ $(LIBRARY)
- $(LINK_EXE) $^ @CHECK_LIBRARY@
+tests/runtests: tests/runtests.o tests/chardata.o tests/minicheck.o $(LIBRARY)
+ $(LINK_EXE) $^
tests/xmlts.zip:
wget --output-document=tests/xmlts.zip \
diff --git a/expat/README b/expat/README
index 29f9d66..0885292 100644
--- a/expat/README
+++ b/expat/README
@@ -92,13 +92,6 @@
PATH=/usr/ccs/bin:$PATH make
-The unit and regression tests for Expat can use the "check" library on
-Unix; more information is available at http://check.sourceforge.net/,
-and downloadable packages are available from the library's project
-page on SourceForge: http://sourceforge.net/projects/check/. If the
-check library is not available, a greatly abbreviated implementation
-of the check API is used.
-
When using Expat with a project using autoconf for configuration, you
can use the probing macro in conftools/expat.m4 to determine how to
include Expat. See the comments at the top of that file for more
diff --git a/expat/configure.in b/expat/configure.in
index 5da9d3c..69e9699 100644
--- a/expat/configure.in
+++ b/expat/configure.in
@@ -103,14 +103,6 @@
fi
AC_SUBST(FILEMAP)
-dnl Only needed for regression tests:
-AC_SUBST(MINICHECK_OBJECT)
-AC_SUBST(CHECK_LIBRARY)
-AC_CHECK_HEADERS(check.h)
-AC_CHECK_HEADER(check.h,
- CHECK_LIBRARY=-lcheck,
- MINICHECK_OBJECT=tests/minicheck.o)
-
dnl Some basic configuration:
AC_DEFINE([XML_NS], 1,
[Define to make XML Namespaces functionality available.])
diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 92c2865..849ddc1 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -8,12 +8,6 @@
#include <expat_config.h>
#endif
-#ifdef HAVE_CHECK_H
-#include <check.h>
-#else
-#include "minicheck.h"
-#endif
-
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
@@ -21,6 +15,7 @@
#include "expat.h"
#include "chardata.h"
+#include "minicheck.h"
static XML_Parser parser;
