Commit 7e99c63b authored by Daniel Veillard's avatar Daniel Veillard
Browse files

Tried to build libxml2-2.2.5

Automake is a fucking piece of ugly shit full of tricks and without
any kind of sensible documentation or logic :-(((((((((
Daniel, pissed !
parent 55b91f2d
Fri Oct 6 12:58:04 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
* configure.in Makefile.am: 2.2.5, ship the include in an
include/libxml subdirectory, use symlinks when using CVS
* testSAX.c: fixed small bug
* testXPath.c: changed the way testfiles are parsed
* debugXML.c: same kind of cleanup when parsing an argument expression
XPath/XPointers can have blanks embedded
* xpath.[ch]: more cleanup, reorgs for XPointer work
* parserInternals.c parser.c HTMLparser.c: fixed wrong include
* win32/README.MSDev win32/libxml2/libxml2.dsp: Windows stuff
Thu Oct 5 18:13:15 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
* debugXML.c testXPath.c xpath.[ch]: got pissed by some nastyness
......
......@@ -45,7 +45,7 @@
#include <libxml/valid.h>
#include <libxml/parserInternals.h>
#include <libxml/xmlIO.h>
#include "xml-error.h"
#include <libxml/xml-error.h>
#define HTML_MAX_NAMELEN 1000
#define HTML_PARSER_BIG_BUFFER_SIZE 1000
......
......@@ -2,7 +2,7 @@
SUBDIRS = doc
INCLUDES = -I@srcdir@ @Z_CFLAGS@ @CORBA_CFLAGS@
INCLUDES = -I@srcdir@/include @Z_CFLAGS@ @CORBA_CFLAGS@
noinst_PROGRAMS=testSAX testHTML testXPath testURI
......@@ -35,27 +35,28 @@ libxml_la_SOURCES = \
nanohttp.c \
nanoftp.c
xmlincdir = $(includedir)/libxml
xmlincdir = $(srcdir)/include/libxml
xmlinc_HEADERS = \
SAX.h \
entities.h \
encoding.h \
parser.h \
parserInternals.h \
xml-error.h \
HTMLparser.h \
HTMLtree.h \
debugXML.h \
tree.h \
xpath.h \
xmlIO.h \
xmlmemory.h \
nanohttp.h \
nanoftp.h \
uri.h \
valid.h \
xlink.h \
xmlversion.h
$(xmlincdir)/SAX.h \
$(xmlincdir)/entities.h \
$(xmlincdir)/encoding.h \
$(xmlincdir)/parser.h \
$(xmlincdir)/parserInternals.h \
$(xmlincdir)/xml-error.h \
$(xmlincdir)/HTMLparser.h \
$(xmlincdir)/HTMLtree.h \
$(xmlincdir)/debugXML.h \
$(xmlincdir)/tree.h \
$(xmlincdir)/xpath.h \
$(xmlincdir)/xmlIO.h \
$(xmlincdir)/xmlmemory.h \
$(xmlincdir)/nanohttp.h \
$(xmlincdir)/nanoftp.h \
$(xmlincdir)/uri.h \
$(xmlincdir)/valid.h \
$(xmlincdir)/xlink.h \
$(xmlincdir)/xmlversion.h
DEPS = $(top_builddir)/libxml.la
LDADDS = $(top_builddir)/libxml.la @Z_LIBS@ @M_LIBS@
......@@ -356,7 +357,8 @@ confexecdir=$(libdir)
confexec_DATA = xmlConf.sh
EXTRA_DIST = xmlConf.sh.in libxml.spec.in libxml.spec libxml.m4 \
example/Makefile.am example/gjobread.c example/gjobs.xml \
$(man_MANS) libxml-2.0.pc.in
$(man_MANS) libxml-2.0.pc.in include/libxml/*.h.in \
win32/README.MSDev win32/libxml2/libxml2.dsp
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libxml-2.0.pc
......
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.2)
AC_INIT(entities.h)
AC_INIT(entities.c)
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_HOST
LIBXML_MAJOR_VERSION=2
LIBXML_MINOR_VERSION=2
LIBXML_MICRO_VERSION=4
LIBXML_MICRO_VERSION=5
LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION
LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
......@@ -116,7 +116,7 @@ AC_CHECK_FUNC(isinf, , AC_CHECK_LIB(m, isinf,
[M_LIBS="-lm"; AC_DEFINE(HAVE_ISINF)]))
XML_LIBDIR='-L${libdir}'
XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}'
XML_INCLUDEDIR='-I${srcdir}/include -I${includedir}/libxml -I${includedir}'
XML_LIBS="-lxml $Z_LIBS $M_LIBS $LIBS"
dnl
......@@ -295,16 +295,22 @@ AC_SUBST(M_LIBS)
AC_SUBST(RDL_LIBS)
dnl
dnl create the libxml link needed to get dependencies right
dnl create the libxml and include links needed to get dependencies right
dnl
if test -f $srcdir/libxml
if test ! -d $srcdir/include/libxml
then
rm -f $srcdir/libxml libxml
rm -f $srcdir/include
rm -f $srcdir/libxml
(cd $srcdir ; ln -s . include)
(cd $srcdir ; ln -s . libxml)
(ln -s . libxml)
else
(cd $srcdir ; rm -f libxml ; ln -s . libxml)
(rm -f libxml ; ln -s . libxml)
fi
AC_OUTPUT(libxml.spec Makefile doc/Makefile example/Makefile xmlversion.h xml-config win32config.h libxml-2.0.pc)
if test ! -e include/libxml
then
rm -f include
rm -f libxml
(ln -s $srcdir/include include)
(ln -s $srcdir/include/libxml libxml)
fi
AC_OUTPUT(libxml.spec Makefile doc/Makefile example/Makefile include/libxml/xmlversion.h xml-config include/libxml/win32config.h libxml-2.0.pc)
......@@ -572,7 +572,8 @@ void xmlDebugDumpOneNode(FILE *output, xmlNodePtr node, int depth) {
return;
default:
fprintf(output, shift);
fprintf(output, "NODE_%d\n", node->type);
fprintf(output, "NODE_%d !!!\n", node->type);
return;
}
if (node->doc == NULL) {
fprintf(output, shift);
......
......@@ -18,6 +18,7 @@ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
scan:
@(if [ -L $(DOC_SOURCE_DIR)/libxml ] ; then rm -f $(DOC_SOURCE_DIR)/libxml ; fi)
@(if [ -L $(DOC_SOURCE_DIR)/include ] ; then rm -f $(DOC_SOURCE_DIR)/libxml ; fi)
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="acconfig.h config.h"
templates: scan
......
......@@ -115,7 +115,7 @@ SIZE="3"
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN15662"
NAME="AEN15895"
></A
><H2
>Name</H2
......@@ -123,7 +123,7 @@ NAME="AEN15662"
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN15665"
NAME="AEN15898"
></A
><H2
>Synopsis</H2
......@@ -315,7 +315,7 @@ HREF="FILE"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN15712"
NAME="AEN15945"
></A
><H2
>Description</H2
......@@ -325,14 +325,14 @@ NAME="AEN15712"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN15715"
NAME="AEN15948"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
NAME="AEN15717"
NAME="AEN15950"
></A
><H3
><A
......@@ -414,7 +414,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15737"
NAME="AEN15970"
></A
><H3
><A
......@@ -514,7 +514,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15761"
NAME="AEN15994"
></A
><H3
><A
......@@ -614,7 +614,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15785"
NAME="AEN16018"
></A
><H3
><A
......@@ -714,7 +714,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15809"
NAME="AEN16042"
></A
><H3
><A
......@@ -814,7 +814,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15833"
NAME="AEN16066"
></A
><H3
><A
......@@ -914,7 +914,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15857"
NAME="AEN16090"
></A
><H3
><A
......@@ -996,7 +996,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15877"
NAME="AEN16110"
></A
><H3
><A
......@@ -1078,7 +1078,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15897"
NAME="AEN16130"
></A
><H3
><A
......@@ -1160,7 +1160,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15917"
NAME="AEN16150"
></A
><H3
><A
......@@ -1242,7 +1242,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15937"
NAME="AEN16170"
></A
><H3
><A
......@@ -1324,7 +1324,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15957"
NAME="AEN16190"
></A
><H3
><A
......@@ -1397,7 +1397,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15975"
NAME="AEN16208"
></A
><H3
><A
......@@ -1431,33 +1431,20 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15980"
NAME="AEN16213"
></A
><H3
><A
NAME="XMLSHELLCTXTPTR"
></A
>xmlShellCtxtPtr</H3
><TABLE
BORDER="0"
BGCOLOR="#D6E8FF"
WIDTH="100%"
CELLPADDING="6"
><TR
><TD
><PRE
CLASS="PROGRAMLISTING"
>typedef xmlShellCtxt *xmlShellCtxtPtr;</PRE
></TD
></TR
></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15985"
NAME="AEN16217"
></A
><H3
><A
......@@ -1593,7 +1580,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN16018"
NAME="AEN16250"
></A
><H3
><A
......@@ -1657,7 +1644,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
> the initial document</TD
>&nbsp;</TD
></TR
><TR
><TD
......@@ -1674,7 +1661,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
> the output buffer</TD
>&nbsp;</TD
></TR
><TR
><TD
......@@ -1691,7 +1678,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
> the line reading function</TD
>&nbsp;</TD
></TR
><TR
><TD
......@@ -1708,7 +1695,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
> the output FILE*</TD
>&nbsp;</TD
></TR
></TABLE
><P
......
......@@ -115,7 +115,7 @@ SIZE="3"
><DIV
CLASS="REFNAMEDIV"
><A
NAME="AEN15196"
NAME="AEN15431"
></A
><H2
>Name</H2
......@@ -123,7 +123,7 @@ NAME="AEN15196"
><DIV
CLASS="REFSYNOPSISDIV"
><A
NAME="AEN15199"
NAME="AEN15434"
></A
><H2
>Synopsis</H2
......@@ -300,7 +300,7 @@ HREF="gnome-xml-encoding.html#XMLCHARENCODINGHANDLER"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN15241"
NAME="AEN15476"
></A
><H2
>Description</H2
......@@ -310,14 +310,14 @@ NAME="AEN15241"
><DIV
CLASS="REFSECT1"
><A
NAME="AEN15244"
NAME="AEN15479"
></A
><H2
>Details</H2
><DIV
CLASS="REFSECT2"
><A
NAME="AEN15246"
NAME="AEN15481"
></A
><H3
><A
......@@ -368,7 +368,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15251"
NAME="AEN15486"
></A
><H3
><A
......@@ -495,7 +495,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15281"
NAME="AEN15516"
></A
><H3
><A
......@@ -622,7 +622,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15311"
NAME="AEN15546"
></A
><H3
><A
......@@ -656,33 +656,20 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15316"
NAME="AEN15551"
></A
><H3
><A
NAME="XMLCHARENCODINGHANDLERPTR"
></A
>xmlCharEncodingHandlerPtr</H3
><TABLE
BORDER="0"
BGCOLOR="#D6E8FF"
WIDTH="100%"
CELLPADDING="6"
><TR
><TD
><PRE
CLASS="PROGRAMLISTING"
>typedef xmlCharEncodingHandler *xmlCharEncodingHandlerPtr;</PRE
></TD
></TR
></TABLE
><P
></P
></DIV
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15321"
NAME="AEN15555"
></A
><H3
><A
......@@ -713,7 +700,7 @@ in normal processing.</P
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15327"
NAME="AEN15561"
></A
><H3
><A
......@@ -742,7 +729,7 @@ unregisters all the encoding handlers and the aliases.</P
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15333"
NAME="AEN15567"
></A
><H3
><A
......@@ -795,7 +782,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
> the xmlCharEncodingHandlerPtr handler block</TD
>&nbsp;</TD
></TR
></TABLE
><P
......@@ -805,7 +792,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15349"
NAME="AEN15583"
></A
><H3
><A
......@@ -862,7 +849,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
> a string describing the char encoding.</TD
>&nbsp;</TD
></TR
><TR
><TD
......@@ -877,7 +864,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>the handler or NULL if not found</TD
>&nbsp;</TD
></TR
></TABLE
><P
......@@ -887,7 +874,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15370"
NAME="AEN15604"
></A
><H3
><A
......@@ -964,7 +951,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15389"
NAME="AEN15623"
></A
><H3
><A
......@@ -1026,7 +1013,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
> the encoding name as parsed, in UTF-8 format (ASCII actually)</TD
>&nbsp;</TD
></TR
><TR
><TD
......@@ -1043,7 +1030,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
> the alias name as parsed, in UTF-8 format (ASCII actually)</TD
>&nbsp;</TD
></TR
><TR
><TD
......@@ -1058,7 +1045,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>0 in case of success, -1 in case of error</TD
>&nbsp;</TD
></TR
></TABLE
><P
......@@ -1068,7 +1055,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15414"
NAME="AEN15648"
></A
><H3
><A
......@@ -1123,7 +1110,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
> the alias name as parsed, in UTF-8 format (ASCII actually)</TD
>&nbsp;</TD
></TR
><TR
><TD
......@@ -1138,7 +1125,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>0 in case of success, -1 in case of error</TD
>&nbsp;</TD
></TR
></TABLE
><P
......@@ -1148,7 +1135,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15434"
NAME="AEN15668"
></A
><H3
><A
......@@ -1198,7 +1185,7 @@ CLASS="PARAMETER"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
> the alias name as parsed, in UTF-8 format (ASCII actually)</TD
>&nbsp;</TD
></TR
><TR
><TD
......@@ -1213,7 +1200,7 @@ CLASS="EMPHASIS"
WIDTH="80%"
ALIGN="LEFT"
VALIGN="TOP"
>NULL if not found the original name otherwise</TD
>&nbsp;</TD
></TR
></TABLE
><P
......@@ -1223,7 +1210,7 @@ VALIGN="TOP"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15453"
NAME="AEN15687"
></A
><H3
><A
......@@ -1251,7 +1238,7 @@ CLASS="PROGRAMLISTING"
><HR><DIV
CLASS="REFSECT2"
><A
NAME="AEN15459"
NAME="AEN15693"
></A