Hello list,
I am making use of LibXML2 across a number of Unix and Windows platforms,
and have a slew of fixes to contribute. The attached patch is against git
master.
The main thrust of my changes was to get Automake's "make distcheck" target
into working order, and address the handful of portability issues I
encountered on various non-Linux platforms (including compatibility with
non-GNU make(1)).
Note that distcheck is still technically broken, because the programs
invoked by the "runtests" target cannot find the data files they need when
builddir != srcdir. This can be worked around by invoking "CHECKER=true make
distcheck". (Modifying the test programs to take an srcdir argument is
non-trivial, alas. The test programs could be invoked in srcdir, but this
might break assumptions for the CHECKER wrapper.)
I'll be happy to answer any questions, and rework elements of this patch as
needed to get it in.
A walk-through of my changes, in patch order:
Makefile.am:
* Appended an $(empty) to libxml2_la_LDFLAGS to avoid Make parse errors
when @MODULE_PLATFORM_LIBS@ is empty
* testapi.c should be specified as BUILT_SOURCES
* Don't do MAKEFLAGS+=--silent as this is not portable to non-GNU Makes
* Fixed incorrect find(1) syntax in the "cleanup" rule, and doing "rm -f"
instead of just "rm" is good form
* (DIST)CLEANFILES needed a bit more coverage to allow "make distcheck" to
pass
configure.in:
* AC_LIBTOOL_WIN32_DLL and AM_PROG_LIBTOOL are obsolete; these have been
superceded by LT_INIT
* Don't rebuild docs by default, as this requires GNU Make (as
implemented)
* Check for uint32_t as some platforms don't provide it
* Check for some more functions, and undefine HAVE_MMAP if we don't also
HAVE_MUNMAP
* The "Copyright" file will not be in the current directory if builddir !=
srcdir
doc/Makefile.am:
* EXTRA_DIST cannot use wildcards when they refer to generated files; this
breaks dependencies. What I did was define EXTRA_DIST_wc, which uses GNU
Make $(wildcard) directives to build up a list of files, and EXTRA_DIST,
as a literal expansion of EXTRA_DIST_wc. I also added a new rule,
"check-extra-dist", to simplify checking that the two variables are
equivalent. (Note that this works only if builddir == srcdir)
* Don't define an "all" target; this steps on Automake's toes
* Fixed up the "libxml2-api.xml ..." rule by using $(wildcard) for
dependencies (as Make doesn't process the wildcards otherwise) and
qualifying appropriate files with $(srcdir)
(Note that $(srcdir) is not needed in the dependencies, thanks to VPATH)
doc/devhelp/Makefile.am:
* Qualified appropriate files with $(srcdir)
* Added an "uninstall-local" rule so that "make distcheck" passes
doc/examples/Makefile.am:
* Rather than use a wildcard that doesn't work, use a substitution that
most Make programs can handle
doc/examples/index.py:
* Do the same thing here
include/libxml/nanoftp.h:
* Some platforms (Windows IIRC) already #define INVALID_SOCKET
include/libxml/xmlversion.h.in:
* Support ancient GCCs (this was the only issue that arose with 2.5)
python/Makefile.am:
* Expanded CLEANFILES to allow "make distcheck" to pass
python/tests/Makefile.am:
* Define CLEANFILES instead of a "clean" rule, and added tmp.xml to allow
"make distcheck" to pass
testRelax.c:
* Use HAVE_MMAP instead of the less explicit HAVE_SYS_MMAN_H (as some
systems have the latter but not the former)
testSchemas.c:
* Use HAVE_MMAP instead of the less explicit HAVE_SYS_MMAN_H
testapi.c:
* Don't use putenv() if it's not available
threads.c:
* This fixes the build on (IIRC) Solaris 8
trio.c:
* Define isascii() if the system doesn't provide it
trio.h:
* The trio library's HAVE_CONFIG_H header is not the same as LibXML2's
HAVE_CONFIG_H header
win32/configure.js:
* Added support for the LZMA compression option
win32/Makefile.{bcb,mingw,msvc}:
* Added appropriate bits to support WITH_LZMA=1
* Install the header files under $(INCPREFIX)\libxml2\libxml instead of
$(INCPREFIX)\libxml, to mirror the install location on Unix/Autotools
xmllint.c:
* Use HAVE_MMAP instead of the less explicit HAVE_SYS_MMAN_H
--Daniel
--
Daniel Richard G. || danielg teragram com || Software Developer
Teragram Linguistic Technologies (a division of SAS)
http://www.teragram.com/
Attachment:
libxml-fixups.patch
Description: Binary data