[Expat-checkins] expat Makefile.in, 1.44, 1.45 README, 1.25, 1.26 configure.in, 1.37, 1.38

[Fred L. Drake]

Update of /cvsroot/expat/expat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29945

Modified Files:
	Makefile.in README configure.in 
Log Message:
If the check library is not available, use an abbreviated implementation of
the check API.  This allows the unit and regression tests to be run on any
system without requiring an external package.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- Makefile.in	2 Nov 2003 08:21:30 -0000	1.44
+++ Makefile.in	30 Apr 2004 03:18:08 -0000	1.45
@@ -146,9 +146,10 @@
 	$(LINK_EXE) $< $(LIBRARY)
 
 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 $(LIBRARY)
-	$(LINK_EXE) $^ -lcheck
+tests/runtests: tests/runtests.o tests/chardata.o @MINICHECK_OBJECT@ $(LIBRARY)
+	$(LINK_EXE) $^ @CHECK_LIBRARY@
 
 tests/xmlts.zip:
 	wget --output-document=tests/xmlts.zip \

Index: README
===================================================================
RCS file: /cvsroot/expat/expat/README,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- README	2 Apr 2004 21:53:40 -0000	1.25
+++ README	30 Apr 2004 03:18:09 -0000	1.26
@@ -92,12 +92,12 @@
 
         PATH=/usr/ccs/bin:$PATH make
 
-The unit and regression tests for Expat require the "check" library on
+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/.  You do
-not need to install the check library to build and use Expat, only to
-build and run Expat's test suite.
+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

Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- configure.in	16 Oct 2003 04:32:39 -0000	1.37
+++ configure.in	30 Apr 2004 03:18:09 -0000	1.38
@@ -104,7 +104,12 @@
 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,