---- xmlrpc-c-0.9.10-old/configure.in Sat Jun 30 21:43:48 2001
-+++ xmlrpc-c-0.9.10/configure.in Thu May 23 17:33:36 2002
-@@ -70,6 +70,39 @@
- AC_SUBST(AUTH_CLIENT)
- AC_SUBST(QUERY_MEERKAT)
+--- xmlrpc-c-1.03.10/lib/Makefile~ 2004-12-14 04:28:16.000000000 +0100
++++ xmlrpc-c-1.03.10/lib/Makefile 2006-01-11 17:08:49.324799750 +0100
+@@ -18,7 +18,7 @@
+ ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes)
+ SUBDIRS += libwww_transport
+ endif
+-ifneq ($(ENABLE_LIBXML2),yes)
++ifneq ($(ENABLE_LIBXML2_BACKEND),yes)
+ SUBDIRS += expat
+ endif
-+AM_CONDITIONAL(ENABLE_LIBXML2, false)
-+
-+dnl Check to see if we should build the libxml2 backend.
-+AC_MSG_CHECKING(whether to build the libxml2 backend)
-+AC_ARG_ENABLE(libxml2-backend, [\
-+ --enable-libxml2-backend Use libxml2 instead of built-in expat], ,
-+enable_libxml2_backend=no)
-+AC_MSG_RESULT($enable_libxml2_backend)
-+
-+dnl If we're using the libxml2 backend, look for pkg-config
-+if test x"$enable_libxml2_backend" != xno; then
-+ AC_MSG_CHECKING(for pkg-config)
-+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+ if test x$PKG_CONFIG = xno; then
-+ AC_MSG_ERROR([*** pkg-config not found. See http://www.freedesktop.org/software/pkgconfig/])
-+ fi
-+
-+dnl Set up the appropriate Makefile substitutions
-+ LIBXML2_CFLAGS=`pkg-config --cflags libxml-2.0`
-+ AC_SUBST(LIBXML2_CFLAGS)
-+ CFLAGS="$CFLAGS $LIBXML2_CFLAGS"
-+
-+ LIBXML2_LIBS=`pkg-config --libs libxml-2.0`
-+ AC_SUBST(LIBXML2_LIBS)
-+
-+ AM_CONDITIONAL(ENABLE_LIBXML2, true)
-+ EXTRA_XML_LIBS="$LIBXML2_LIBS"
-+else
-+ EXTRA_XML_LIBS="-lxmlrpc_xmlparse -lxmlrpc_xmltok"
-+fi
-+
-+AC_SUBST(EXTRA_XML_LIBS)
-+
- dnl Check to see if we should build our Abyss server module.
- AC_MSG_CHECKING(whether to build Abyss server module)
- AC_ARG_ENABLE(abyss-server, [\
-
-diff -urpP xmlrpc-c-0.9.10-old/examples/Makefile.am xmlrpc-c-0.9.10/examples/Makefile.am
---- xmlrpc-c-0.9.10-old/examples/Makefile.am Tue Apr 24 19:43:46 2001
-+++ xmlrpc-c-0.9.10/examples/Makefile.am Thu May 2 17:23:09 2002
-@@ -13,10 +13,15 @@ EXTRA_PROGRAMS = synch_client asynch_cl
-
- INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../src
-
--LIBEXPAT = ../lib/expat/xmlparse/libxmlrpc_xmlparse.la \
-- ../lib/expat/xmltok/libxmlrpc_xmltok.la
-+if ENABLE_LIBXML2
-+LIBXML = $(LIBXML2_LIBS)
-+else
-+LIBXML = ../lib/expat/xmlparse/libxmlrpc_xmlparse.la \
-+ ../lib/expat/xmltok/libxmlrpc_xmltok.la
-+endif
-+
- LIBABYSS = ../lib/abyss/src/libxmlrpc_abyss.la
--LIBXMLRPC = ../src/libxmlrpc.la $(LIBEXPAT)
-+LIBXMLRPC = ../src/libxmlrpc.la $(LIBXML)
- LIBCLIENT = ../src/libxmlrpc_client.la @LIBWWW_LDADD@ $(LIBXMLRPC)
- LIBSERVER = ../src/libxmlrpc_abyss_server.la $(LIBABYSS) $(LIBXMLRPC)
- LIBCGI = ../src/libxmlrpc_cgi.la $(LIBXMLRPC)
-
-diff -urpP xmlrpc-c-0.9.10-old/examples/interop-client/Makefile.am xmlrpc-c-0.9.10/examples/interop-client/Makefile.am
---- xmlrpc-c-0.9.10-old/examples/interop-client/Makefile.am Tue Apr 24 11:29:37 2001
-+++ xmlrpc-c-0.9.10/examples/interop-client/Makefile.am Thu May 2 17:31:42 2002
-@@ -6,9 +6,14 @@ noinst_PROGRAMS = interop-client
-
- INCLUDES = -I$(srcdir)/../../src
-
--LIBEXPAT = ../../lib/expat/xmlparse/libxmlrpc_xmlparse.la \
-- ../../lib/expat/xmltok/libxmlrpc_xmltok.la
--LIBXMLRPC = ../../src/libxmlrpc.la $(LIBEXPAT)
-+if ENABLE_LIBXML2
-+LIBXML = $(LIBXML2_LIBS)
-+else
-+LIBXML = ../../lib/expat/xmlparse/libxmlrpc_xmlparse.la \
-+ ../../lib/expat/xmltok/libxmlrpc_xmltok.la
-+endif
-+
-+LIBXMLRPC = ../../src/libxmlrpc.la $(LIBXML)
- LIBCLIENT = ../../src/libxmlrpc_client.la @LIBWWW_LDADD@ $(LIBXMLRPC)
-
- interop_client_SOURCES = interop-client.cc \
-
-diff -urpP xmlrpc-c-0.9.10-old/lib/Makefile.am xmlrpc-c-0.9.10/lib/Makefile.am
---- xmlrpc-c-0.9.10-old/lib/Makefile.am Sat Mar 17 15:34:43 2001
-+++ xmlrpc-c-0.9.10/lib/Makefile.am Thu May 2 17:23:09 2002
-@@ -1 +1,7 @@
--SUBDIRS = expat @ABYSS_SUBDIR@
-+ABYSS_SUBDIR = @ABYSS_SUBDIR@
-+
-+if ENABLE_LIBXML2
-+SUBDIRS = $(ABYSS_SUBDIR)
-+else
-+SUBDIRS = expat $(ABYSS_SUBDIR)
-+endif
-
-diff -urpP xmlrpc-c-0.9.10-old/src/Makefile.am xmlrpc-c-0.9.10/src/Makefile.am
---- xmlrpc-c-0.9.10-old/src/Makefile.am Sat Jun 30 22:17:37 2001
-+++ xmlrpc-c-0.9.10/src/Makefile.am Thu May 2 17:23:09 2002
-@@ -34,15 +34,24 @@ noinst_SCRIPTS = efrpctest_wrapper
- # Our test programs.
- TESTS = rpctest @EFRPCTEST_WRAPPER@ @CPPTEST@
-
--INCLUDES = -I.. -I$(srcdir)/../lib/expat/xmlparse -I$(srcdir)/../lib/abyss/src
-+if ENABLE_LIBXML2
-+LIBXML_INCLUDES = $(LIBXML2_CFLAGS)
-+LIBXML = $(LIBXML2_LIBS)
-+LIBXML_FILES = xmlrpc_libxml2.c
-+else
-+LIBXML_INCLUDES = -I$(srcdir)/../lib/expat/xmlparse
-+LIBXML = ../lib/expat/xmlparse/libxmlrpc_xmlparse.la \
-+ ../lib/expat/xmltok/libxmlrpc_xmltok.la
-+LIBXML_FILES = xmlrpc_expat.c
-+endif
-+
-+INCLUDES = -I.. -I$(srcdir)/../lib/abyss/src $(LIBXML_INCLUDES)
-
--LIBEXPAT = ../lib/expat/xmlparse/libxmlrpc_xmlparse.la \
-- ../lib/expat/xmltok/libxmlrpc_xmltok.la
- LIBABYSS = ../lib/abyss/src/libxmlrpc_abyss.la
-
- # A library containing just the XML-RPC core.
- libxmlrpc_la_SOURCES = xmlrpc_support.c xmlrpc_data.c xmlrpc_struct.c \
-- xmlrpc_xmlparser.h xmlrpc_expat.c xmlrpc_parse.c \
-+ xmlrpc_xmlparser.h $(LIBXML_FILES) xmlrpc_parse.c \
- xmlrpc_serialize.c xmlrpc_registry.c xmlrpc_base64.c \
- xmlrpc_utf8.c
- libxmlrpc_la_LDFLAGS = @VERSION_INFO@
-@@ -64,31 +73,31 @@ libxmlrpc_cpp_a_SOURCES = XmlRpcCpp.cc
-
- # The test suites for the XML-RPC core.
- rpctest_SOURCES = rpctest.c
--rpctest_LDADD = libxmlrpc.la $(LIBEXPAT)
-+rpctest_LDADD = libxmlrpc.la $(LIBXML)
-
- # The test suites for the XML-RPC core w/Electric Fence.
- efrpctest_SOURCES = rpctest.c
--efrpctest_LDADD = libxmlrpc.la $(LIBEXPAT) -lefence
-+efrpctest_LDADD = libxmlrpc.la $(LIBXML) -lefence
-
- # The test suites for our C++ core.
- cpptest_SOURCES = cpptest.cc XmlRpcCpp.cc XmlRpcCpp.h
--cpptest_LDADD = libxmlrpc_cpp.a libxmlrpc.la $(LIBEXPAT)
-+cpptest_LDADD = libxmlrpc_cpp.a libxmlrpc.la $(LIBXML)
-
- # A test program for the client library.
- clienttest_SOURCES = clienttest.c
- clienttest_LDADD = libxmlrpc_client.la @LIBWWW_LDADD@ \
-- libxmlrpc.la $(LIBEXPAT)
-+ libxmlrpc.la $(LIBXML)
- clienttest_LDFLAGS = @LIBWWW_RPATH@
-
- # A test program for the server library.
- servertest_SOURCES = servertest.c
- servertest_LDADD = libxmlrpc_abyss_server.la $(LIBABYSS) \
-- libxmlrpc.la $(LIBEXPAT)
-+ libxmlrpc.la $(LIBXML)
-
- # A server which attempts to pass the UserLand validator1 suite.
- validatee_SOURCES = validatee.c
- validatee_LDADD = libxmlrpc_abyss_server.la $(LIBABYSS) \
-- libxmlrpc.la $(LIBEXPAT)
-+ libxmlrpc.la $(LIBXML)
-
- # Handle our wrapper script.
- efrpctest_wrapper: $(srcdir)/efrpctest_wrapper.sh
-
-diff -urpP xmlrpc-c-0.9.10-old/src/xmlrpc_libxml2.c xmlrpc-c-0.9.10/src/xmlrpc_libxml2.c
---- xmlrpc-c-0.9.10-old/src/xmlrpc_libxml2.c Wed Dec 31 19:00:00 1969
-+++ xmlrpc-c-0.9.10/src/xmlrpc_libxml2.c Thu May 2 17:23:09 2002
-@@ -0,0 +1,411 @@
-+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-+/* Copyright (C) 2001 by First Peer, Inc. All rights reserved.
-+** Copyright (C) 2002 Ximian, Inc.
-+**
-+** Redistribution and use in source and binary forms, with or without
-+** modification, are permitted provided that the following conditions
-+** are met:
-+** 1. Redistributions of source code must retain the above copyright
-+** notice, this list of conditions and the following disclaimer.
-+** 2. Redistributions in binary form must reproduce the above copyright
-+** notice, this list of conditions and the following disclaimer in the
-+** documentation and/or other materials provided with the distribution.
-+** 3. The name of the author may not be used to endorse or promote products
-+** derived from this software without specific prior written permission.
-+**
-+** THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-+** ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+** ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-+** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-+** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-+** OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-+** HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+** LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-+** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-+** SUCH DAMAGE. */
-+
-+#ifndef HAVE_WIN32_CONFIG_H
-+#include "xmlrpc_config.h"
-+#else
-+#include "xmlrpc_win32_config.h"
-+#endif
-+
-+#include <stddef.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <libxml/parser.h>
-+
-+#define XMLRPC_WANT_INTERNAL_DECLARATIONS
-+#include "xmlrpc.h"
-+#include "xmlrpc_xmlparser.h"
-+
-+/* Define the contents of our internal structure. */
-+struct _xml_element {
-+ struct _xml_element *_parent;
-+ char *_name;
-+ xmlrpc_mem_block _cdata; /* char */
-+ xmlrpc_mem_block _children; /* xml_element* */
-+};
-+
-+#define XMLRPC_ASSERT_ELEM_OK(elem) \
-+ XMLRPC_ASSERT((elem) != NULL && (elem)->_name != XMLRPC_BAD_POINTER)
-+
-+
-+/*=========================================================================
-+** xml_element_new
-+**=========================================================================
-+** Create a new xml_element. This routine isn't exported, because the
-+** arguments are implementation-dependent.
-+*/
-+
-+static xml_element *xml_element_new (xmlrpc_env *env, char *name)
-+{
-+ xml_element *retval;
-+ int name_valid, cdata_valid, children_valid;
-+
-+ XMLRPC_ASSERT_ENV_OK(env);
-+ XMLRPC_ASSERT(name != NULL);
-+
-+ /* Set up our error-handling preconditions. */
-+ retval = NULL;
-+ name_valid = cdata_valid = children_valid = 0;
-+
-+ /* Allocate our xml_element structure. */
-+ retval = (xml_element*) malloc(sizeof(xml_element));
-+ XMLRPC_FAIL_IF_NULL(retval, env, XMLRPC_INTERNAL_ERROR,
-+ "Couldn't allocate memory for XML element");
-+
-+ /* Set our parent field to NULL. */
-+ retval->_parent = NULL;
-+
-+ /* Copy over the element name. */
-+ retval->_name = (char*) malloc(strlen(name) + 1);
-+ XMLRPC_FAIL_IF_NULL(retval->_name, env, XMLRPC_INTERNAL_ERROR,
-+ "Couldn't allocate memory for XML element");
-+ name_valid = 1;
-+ strcpy(retval->_name, name);
-+
-+ /* Initialize a block to hold our CDATA. */
-+ XMLRPC_TYPED_MEM_BLOCK_INIT(char, env, &retval->_cdata, 0);
-+ XMLRPC_FAIL_IF_FAULT(env);
-+ cdata_valid = 1;
-+
-+ /* Initialize a block to hold our child elements. */
-+ XMLRPC_TYPED_MEM_BLOCK_INIT(xml_element*, env, &retval->_children, 0);
-+ XMLRPC_FAIL_IF_FAULT(env);
-+ children_valid = 1;
-+
-+ cleanup:
-+ if (env->fault_occurred) {
-+ if (retval) {
-+ if (name_valid)
-+ free(retval->_name);
-+ if (cdata_valid)
-+ xmlrpc_mem_block_clean(&retval->_cdata);
-+ if (children_valid)
-+ xmlrpc_mem_block_clean(&retval->_children);
-+ free(retval);
-+ }
-+ return NULL;
-+ } else {
-+ return retval;
-+ }
-+}
-+
-+
-+/*=========================================================================
-+** xml_element_free
-+**=========================================================================
-+** Blow away an existing element & all of its child elements.
-+*/
-+
-+void xml_element_free (xml_element *elem)
-+{
-+ xmlrpc_mem_block *children;
-+ int size, i;
-+ xml_element **contents;
-+
-+ XMLRPC_ASSERT_ELEM_OK(elem);
-+
-+ free(elem->_name);
-+ elem->_name = XMLRPC_BAD_POINTER;
-+ xmlrpc_mem_block_clean(&elem->_cdata);
-+
-+ /* Deallocate all of our children recursively. */
-+ children = &elem->_children;
-+ contents = XMLRPC_TYPED_MEM_BLOCK_CONTENTS(xml_element*, children);
-+ size = XMLRPC_TYPED_MEM_BLOCK_SIZE(xml_element*, children);
-+ for (i = 0; i < size; i++)
-+ xml_element_free(contents[i]);
-+
-+ xmlrpc_mem_block_clean(&elem->_children);
-+ free(elem);
-+}
-+
-+
-+/*=========================================================================
-+** Miscellaneous Accessors
-+**=========================================================================
-+** Return the fields of the xml_element. See the header for more
-+** documentation on each function works.
-+*/
-+
-+char *xml_element_name (xml_element *elem)
-+{
-+ XMLRPC_ASSERT_ELEM_OK(elem);
-+ return elem->_name;
-+}
-+
-+/* The result of this function is NOT VALID until the end_element handler
-+** has been called! */
-+size_t xml_element_cdata_size (xml_element *elem)
-+{
-+ XMLRPC_ASSERT_ELEM_OK(elem);
-+ return XMLRPC_TYPED_MEM_BLOCK_SIZE(char, &elem->_cdata) - 1;
-+}
-+
-+char *xml_element_cdata (xml_element *elem)
-+{
-+ XMLRPC_ASSERT_ELEM_OK(elem);
-+ return XMLRPC_TYPED_MEM_BLOCK_CONTENTS(char, &elem->_cdata);
-+}
-+
-+size_t xml_element_children_size (xml_element *elem)
-+{
-+ XMLRPC_ASSERT_ELEM_OK(elem);
-+ return XMLRPC_TYPED_MEM_BLOCK_SIZE(xml_element*, &elem->_children);
-+}
-+
-+xml_element **xml_element_children (xml_element *elem)
-+{
-+ XMLRPC_ASSERT_ELEM_OK(elem);
-+ return XMLRPC_TYPED_MEM_BLOCK_CONTENTS(xml_element*, &elem->_children);
-+}
-+
-+
-+/*=========================================================================
-+** Internal xml_element Utility Functions
-+**=========================================================================
-+*/
-+
-+static void xml_element_append_cdata (xmlrpc_env *env,
-+ xml_element *elem,
-+ char *cdata,
-+ size_t size)
-+{
-+ XMLRPC_ASSERT_ENV_OK(env);
-+ XMLRPC_ASSERT_ELEM_OK(elem);
-+
-+ XMLRPC_TYPED_MEM_BLOCK_APPEND(char, env, &elem->_cdata, cdata, size);
-+}
-+
-+/* Whether or not this function succeeds, it takes ownership of the 'child'
-+** argument.
-+** WARNING - This is the exact opposite of the usual memory ownership
-+** rules for xmlrpc_value! So please pay attention. */
-+static void xml_element_append_child (xmlrpc_env *env,
-+ xml_element *elem,
-+ xml_element *child)
-+{
-+ XMLRPC_ASSERT_ENV_OK(env);
-+ XMLRPC_ASSERT_ELEM_OK(elem);
-+ XMLRPC_ASSERT_ELEM_OK(child);
-+ XMLRPC_ASSERT(child->_parent == NULL);
-+
-+ XMLRPC_TYPED_MEM_BLOCK_APPEND(xml_element*, env, &elem->_children,
-+ &child, 1);
-+ if (!env->fault_occurred)
-+ child->_parent = elem;
-+ else
-+ xml_element_free(child);
-+}
-+
-+
-+/*=========================================================================
-+** Our parse context. We pass this around as libxml user data.
-+**=========================================================================
-+*/
-+
-+typedef struct {
-+ xmlrpc_env *env;
-+ xml_element *root;
-+ xml_element *current;
-+} parse_context;
-+
-+
-+/*=========================================================================
-+** LibXML Event Handler Functions
-+**=========================================================================
-+*/
-+
-+static void
-+start_element (void *user_data, const xmlChar *name, const xmlChar **attrs)
-+{
-+ parse_context *context;
-+ xml_element *elem, *new_current;
-+
-+ XMLRPC_ASSERT(user_data != NULL && name != NULL);
-+
-+ /* Get our context and see if an error has already occured. */
-+ context = (parse_context*) user_data;
-+ if (!context->env->fault_occurred) {
-+
-+ /* Set up our error-handling preconditions. */
-+ elem = NULL;
-+
-+ /* Build a new element. */
-+ elem = xml_element_new(context->env, (char *) name);
-+ XMLRPC_FAIL_IF_FAULT(context->env);
-+
-+ /* Insert it in the appropriate place. */
-+ if (!context->root) {
-+ context->root = elem;
-+ context->current = elem;
-+ elem = NULL;
-+ } else {
-+ XMLRPC_ASSERT(context->current != NULL);
-+
-+ /* (We need to watch our error handling invariants very carefully
-+ ** here. Read the docs for xml_element_append_child. */
-+ new_current = elem;
-+ xml_element_append_child(context->env, context->current, elem);
-+ elem = NULL;
-+ XMLRPC_FAIL_IF_FAULT(context->env);
-+ context->current = new_current;
-+ }
-+
-+ cleanup:
-+ if (elem)
-+ xml_element_free(elem);
-+ }
-+}
-+
-+static void
-+end_element (void *user_data, const xmlChar *name)
-+{
-+ parse_context *context;
-+
-+ XMLRPC_ASSERT(user_data != NULL && name != NULL);
-+
-+ /* Get our context and see if an error has already occured. */
-+ context = (parse_context*) user_data;
-+ if (!context->env->fault_occurred) {
-+
-+ /* XXX - I think expat enforces these facts, but I want to be sure.
-+ ** If one of these assertion ever fails, it should be replaced by a
-+ ** non-assertion runtime error check. */
-+ XMLRPC_ASSERT(strcmp(name, context->current->_name) == 0);
-+ XMLRPC_ASSERT(context->current->_parent != NULL ||
-+ context->current == context->root);
-+
-+ /* Add a trailing '\0' to our cdata. */
-+ xml_element_append_cdata(context->env, context->current, "\0", 1);
-+ XMLRPC_FAIL_IF_FAULT(context->env);
-+
-+ /* Pop our "stack" of elements. */
-+ context->current = context->current->_parent;
-+
-+ cleanup:
-+ return;
-+ }
-+}
-+
-+static void character_data (void *user_data, const xmlChar *s, int len)
-+{
-+ parse_context *context;
-+
-+ XMLRPC_ASSERT(user_data != NULL && s != NULL && len >= 0);
-+
-+ /* Get our context and see if an error has already occured. */
-+ context = (parse_context*) user_data;
-+ if (!context->env->fault_occurred) {
-+
-+ XMLRPC_ASSERT(context->current != NULL);
-+
-+ xml_element_append_cdata(context->env, context->current, (char *) s, len);
-+ XMLRPC_FAIL_IF_FAULT(context->env);
-+
-+ cleanup:
-+ return;
-+ }
-+}
-+
-+
-+/*=========================================================================
-+** LibXML Driver
-+**=========================================================================
-+** XXX - We should allow the user to specify the encoding of our xml_data.
-+*/
-+
-+static xmlSAXHandler sax_handler = {
-+ NULL, /* internalSubset */
-+ NULL, /* isStandalone */
-+ NULL, /* hasInternalSubset */
-+ NULL, /* hasExternalSubset */
-+ NULL, /* resolveEntity */
-+ NULL, /* getEntity */
-+ NULL, /* entityDecl */
-+ NULL, /* notationDecl */
-+ NULL, /* attributeDecl */
-+ NULL, /* elementDecl */
-+ NULL, /* unparsedEntityDecl */
-+ NULL, /* setDocumentLocator */
-+ NULL, /* startDocument */
-+ NULL, /* endDocument */
-+ start_element, /* startElement */
-+ end_element, /* endElement */
-+ NULL, /* reference */
-+ character_data, /* characters */
-+ NULL, /* ignorableWhitespace */
-+ NULL, /* processingInstruction */
-+ NULL, /* comment */
-+ NULL, /* warning */
-+ NULL, /* error */
-+ NULL, /* fatalError */
-+};
-+
-+xml_element *xml_parse (xmlrpc_env *env, char *xml_data, int xml_len)
-+{
-+ parse_context context;
-+ xmlParserCtxt *parser;
-+ int err;
-+
-+ XMLRPC_ASSERT_ENV_OK(env);
-+ XMLRPC_ASSERT(xml_data != NULL && xml_len >= 0);
-+
-+ /* Set up our error-handling preconditions. */
-+ parser = NULL;
-+ context.root = NULL;
-+
-+ /* Set up the rest of our parse context. */
-+ context.env = env;
-+ context.current = NULL;
-+
-+ /* Set up our XML parser. */
-+ parser = xmlCreatePushParserCtxt(&sax_handler, &context, NULL, 0, NULL);
-+ XMLRPC_FAIL_IF_NULL(parser, env, XMLRPC_INTERNAL_ERROR,
-+ "Could not create expat parser");
-+
-+ /* Parse our data. */
-+ err = xmlParseChunk(parser, xml_data, xml_len, 1);
-+ if (err)
-+ XMLRPC_FAIL(env, XMLRPC_PARSE_ERROR, "XML parsing failed");
-+ XMLRPC_FAIL_IF_FAULT(env);
-+
-+ /* Perform some sanity checks. */
-+ XMLRPC_ASSERT(context.root != NULL);
-+ XMLRPC_ASSERT(context.current == NULL);
-+
-+ cleanup:
-+ if (parser)
-+ xmlFreeParserCtxt(parser);
-+
-+ if (env->fault_occurred) {
-+ if (context.root)
-+ xml_element_free(context.root);
-+ return NULL;
-+ } else {
-+ return context.root;
-+ }
-+}
-
-diff -urpP xmlrpc-c-0.9.10-old/tools/xml-rpc-api2cpp/Makefile.am xmlrpc-c-0.9.10/tools/xml-rpc-api2cpp/Makefile.am
---- xmlrpc-c-0.9.10-old/tools/xml-rpc-api2cpp/Makefile.am Tue Apr 3 17:35:25 2001
-+++ xmlrpc-c-0.9.10/tools/xml-rpc-api2cpp/Makefile.am Thu May 2 17:23:09 2002
-@@ -7,9 +7,14 @@ EXTRA_DIST = README
-
- bin_PROGRAMS = xml-rpc-api2cpp
-
--LIBEXPAT = ../../lib/expat/xmlparse/libxmlrpc_xmlparse.la \
-- ../../lib/expat/xmltok/libxmlrpc_xmltok.la
--LIBXMLRPC = ../../src/libxmlrpc.la $(LIBEXPAT)
-+if ENABLE_LIBXML2
-+LIBXML = $(LIBXML2_LIBS)
-+else
-+LIBXML = ../../lib/expat/xmlparse/libxmlrpc_xmlparse.la \
-+ ../../lib/expat/xmltok/libxmlrpc_xmltok.la
-+endif
-+
-+LIBXMLRPC = ../../src/libxmlrpc.la $(LIBXML)
- LIBCLIENT = ../../src/libxmlrpc_client.la @LIBWWW_LDADD@ $(LIBXMLRPC)
-
- xml_rpc_api2cpp_SOURCES = DataType.h DataType.cc \
---- xmlrpc-c-0.9.10-old/xmlrpc-c-config.in Sat Mar 17 16:02:32 2001
-+++ xmlrpc-c-0.9.10/xmlrpc-c-config.in Thu May 23 17:36:39 2002
-@@ -46,7 +46,7 @@
- fi
-
- the_libdirs="-L@libdir@"
--the_libs="-lxmlrpc -lxmlrpc_xmlparse -lxmlrpc_xmltok"
-+the_libs="-lxmlrpc @EXTRA_XML_LIBS@"
- the_rpath=
- the_wl_rpath=
- cpp_libs=
---- xmlrpc-c-0.9.10/src/xmlrpc.h 2001-06-27 12:35:01.000000000 -0400
-+++ xmlrpc-c-0.9.10/src/xmlrpc.h.joe 2003-05-28 16:02:57.000000000 -0400
-@@ -661,6 +661,20 @@
- char *xml_data,
- size_t xml_len);
+diff -ur xmlrpc-c-1.03.10/include/xmlrpc-c/server.h xmlrpc-c-1.03.10-disp/include/xmlrpc-c/server.h
+--- xmlrpc-c-1.03.10/include/xmlrpc-c/server.h 2005-04-19 00:24:55.000000000 +0200
++++ xmlrpc-c-1.03.10-disp/include/xmlrpc-c/server.h 2006-01-11 17:18:15.200164750 +0100
+@@ -127,7 +127,22 @@
+ const char * const xml_data,
+ size_t const xml_len);
+-/* Define a default method for the specified registry. This will be invoked
+/* Dispatches the call specified by method_name with parameters in the
+** param_array argument. This is useful if you want to make calls in
+** your registry without incurring the penalty inherent in XML serialization
+** and deserialization.
-+** The return value is the result of the method call; faults will be set in
++** The resultPP points to the result of the method call; faults will be set in
+** the provided xmlrpc_env.
+** The caller is responsible for cleaning up the return value in non-fault
+** cases. */
-+extern xmlrpc_value *
-+xmlrpc_registry_dispatch_call (xmlrpc_env *env,
-+ xmlrpc_registry *registry,
-+ char *method_name,
-+ xmlrpc_value *param_array);
++void
++xmlrpc_registry_dispatch_call(xmlrpc_env * const envP,
++ xmlrpc_registry * const registryP,
++ const char * const methodName,
++ xmlrpc_value * const paramArrayP,
++ xmlrpc_value ** const resultPP);
+
- /* Define a default method for the specified registry. This will be invoked
++ /* Define a default method for the specified registry. This will be invoked
** if no other method matches. The user_data pointer is property of the
** application, and will not be freed or manipulated by the registry. */
---- xmlrpc-c-0.9.10/src/xmlrpc_registry.c 2001-04-13 14:29:58.000000000 -0400
-+++ xmlrpc-c-0.9.10/src/xmlrpc_registry.c.joe 2003-05-28 16:03:05.000000000 -0400
-@@ -210,15 +210,16 @@
+ void
+Only in xmlrpc-c-1.03.10-disp/include/xmlrpc-c: server.h~
+diff -ur xmlrpc-c-1.03.10/src/xmlrpc_registry.c xmlrpc-c-1.03.10-disp/src/xmlrpc_registry.c
+--- xmlrpc-c-1.03.10/src/xmlrpc_registry.c 2005-04-19 00:25:00.000000000 +0200
++++ xmlrpc-c-1.03.10-disp/src/xmlrpc_registry.c 2006-01-11 17:18:38.665631250 +0100
+@@ -257,13 +257,6 @@
- /*=========================================================================
+
+-/*=========================================================================
-** dispatch_call
-+** xmlrpc_registry_dispatch_call
- **=========================================================================
+-**=========================================================================
-** An internal method which actually does the dispatch. This may get
-** prettified and exported at some point in the future.
-+** See xmlrpc.h for more information.
- */
+-*/
+-
+ static void
+ callPreinvokeMethodIfAny(xmlrpc_env * const envP,
+ xmlrpc_registry * const registryP,
+@@ -320,9 +313,15 @@
+ }
--static xmlrpc_value *
--dispatch_call(xmlrpc_env *env, xmlrpc_registry *registry,
-- char *method_name, xmlrpc_value *param_array)
-+xmlrpc_value *
-+xmlrpc_registry_dispatch_call (xmlrpc_env *env,
-+ xmlrpc_registry *registry,
-+ char *method_name,
-+ xmlrpc_value *param_array)
- {
- xmlrpc_value *method_info, *result;
- void *method_ptr, *user_data;
-@@ -320,7 +321,8 @@
- XMLRPC_FAIL_IF_FAULT(&fault);
- /* Perform the call. */
-- result = dispatch_call(&fault, registry, method_name, param_array);
-+ result = xmlrpc_registry_dispatch_call(&fault, registry,
-+ method_name, param_array);
- XMLRPC_FAIL_IF_FAULT(&fault);
++/*=========================================================================
++** xmlrpc_registry_dispatch_call
++**=========================================================================
++** See xmlrpc-c/server.h for more information.
++*/
+
+-static void
+-dispatch_call(xmlrpc_env * const envP,
++
++void
++xmlrpc_registry_dispatch_call(xmlrpc_env * const envP,
+ xmlrpc_registry * const registryP,
+ const char * const methodName,
+ xmlrpc_value * const paramArrayP,
+@@ -395,7 +394,7 @@
+ if (!fault.fault_occurred) {
+ xmlrpc_value * result;
+
+- dispatch_call(&fault, registryP, methodName, paramArray, &result);
++ xmlrpc_registry_dispatch_call(&fault, registryP, methodName, paramArray, &result);
- /* Serialize the result.
-@@ -397,7 +399,8 @@
- "Recursive system.multicall strictly forbidden");
+ if (!fault.fault_occurred) {
+ xmlrpc_serialize_response(envP, output, result);
+@@ -466,7 +465,7 @@
+ "Recursive system.multicall strictly forbidden");
/* Perform the call. */
-- result_val = dispatch_call(env, registry, method_name, param_array);
-+ result_val = xmlrpc_registry_dispatch_call(env, registry,
-+ method_name, param_array);
+- dispatch_call(env, registry, method_name, param_array, &result_val);
++ xmlrpc_registry_dispatch_call(env, registry, method_name, param_array, &result_val);
XMLRPC_FAIL_IF_FAULT(env);
/* Build our one-item result array. */
+Only in xmlrpc-c-1.03.10-disp/src: xmlrpc_registry.c~
-diff -ur xmlrpc-c-0.9.10/configure.in xmlrpc-c-0.9.10.-c/configure.in
---- xmlrpc-c-0.9.10/configure.in 2005-03-24 14:45:31.555022928 +0100
-+++ xmlrpc-c-0.9.10.-c/configure.in 2005-03-24 14:48:32.603499376 +0100
-@@ -54,7 +54,7 @@
- QUERY_MEERKAT=
- if test x"$enable_libwww_client" != xno; then
- AVAILABLE_MODULES="libwww-client $AVAILABLE_MODULES"
-- LIBXMLRPC_CLIENT_LA=libxmlrpc_client.la
-+ LIBXMLRPC_CLIENT_LA=libxmlrpc-c_client.la
- CLIENTTEST=clienttest
- XMLRPC_CLIENT_H=xmlrpc_client.h
- SYNCH_CLIENT=synch_client
-@@ -98,7 +98,7 @@
- AM_CONDITIONAL(ENABLE_LIBXML2, true)
- EXTRA_XML_LIBS="$LIBXML2_LIBS"
- else
-- EXTRA_XML_LIBS="-lxmlrpc_xmlparse -lxmlrpc_xmltok"
-+ EXTRA_XML_LIBS="-lxmlrpc-c_xmlparse -lxmlrpc-c_xmltok"
- fi
-
- AC_SUBST(EXTRA_XML_LIBS)
-@@ -120,7 +120,7 @@
+diff -ur xmlrpc-c-1.03.10/Makefile.common xmlrpc-c-1.03.10.soname/Makefile.common
+--- xmlrpc-c-1.03.10/Makefile.common 2005-06-06 02:27:10.000000000 +0200
++++ xmlrpc-c-1.03.10.soname/Makefile.common 2006-01-11 16:44:45.984603250 +0100
+@@ -70,11 +70,11 @@
+ $(BUILDDIR)/lib/util/casprintf.lo: FORCE
+ $(MAKE) -C $(dir $@) -f $(SRCDIR)/lib/util/Makefile $(notdir $@)
+
+-$(BUILDDIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la: FORCE
++$(BUILDDIR)/lib/expat/xmlparse/libxmlrpc-c_xmlparse.la: FORCE
+ $(MAKE) -C $(dir $@) -f $(SRCDIR)/lib/expat/xmlparse/Makefile \
+ $(notdir $@)
+
+-$(BUILDDIR)/lib/expat/xmltok/libxmlrpc_xmltok.la: FORCE
++$(BUILDDIR)/lib/expat/xmltok/libxmlrpc-c_xmltok.la: FORCE
+ $(MAKE) -C $(dir $@) -f $(SRCDIR)/lib/expat/xmltok/Makefile \
+ $(notdir $@)
+
+@@ -90,15 +90,15 @@
+ $(MAKE) -C $(dir $@) -f $(SRCDIR)/lib/libwww_transport/Makefile \
+ $(notdir $@)
+
+-$(BUILDDIR)/src/libxmlrpc.la: FORCE
++$(BUILDDIR)/src/libxmlrpc-c.la: FORCE
+ $(MAKE) -C $(dir $@) -f $(SRCDIR)/src/Makefile \
+ $(notdir $@)
+
+-$(BUILDDIR)/src/libxmlrpc_client.la: FORCE
++$(BUILDDIR)/src/libxmlrpc-c_client.la: FORCE
+ $(MAKE) -C $(dir $@) -f $(SRCDIR)/src/Makefile \
+ $(notdir $@)
+
+-$(BUILDDIR)/src/libxmlrpc_server.la: FORCE
++$(BUILDDIR)/src/libxmlrpc-c_server.la: FORCE
+ $(MAKE) -C $(dir $@) -f $(SRCDIR)/src/Makefile \
+ $(notdir $@)
+
+Only in xmlrpc-c-1.03.10.soname: Makefile.common~
+diff -ur xmlrpc-c-1.03.10/configure.in xmlrpc-c-1.03.10.soname/configure.in
+--- xmlrpc-c-1.03.10/configure.in 2006-01-11 16:54:42.321872000 +0100
++++ xmlrpc-c-1.03.10.soname/configure.in 2006-01-11 16:45:17.102548000 +0100
+@@ -103,7 +103,7 @@
+
+ dnl Set up the appropriate Makefile substitutions.
+
+-LIBXMLRPC_CLIENT_LA=libxmlrpc_client.la
++LIBXMLRPC_CLIENT_LA=libxmlrpc-c_client.la
+ AC_SUBST(LIBXMLRPC_CLIENT_LA)
+ CLIENTTEST=clienttest
+ AC_SUBST(CLIENTTEST)
+@@ -149,7 +149,7 @@
if test x"$enable_abyss_server" != xno; then
- AVAILABLE_MODULES="abyss-server $AVAILABLE_MODULES"
+ FEATURE_LIST="abyss-server $FEATURE_LIST"
ABYSS_SUBDIR=abyss
- LIBXMLRPC_ABYSS_SERVER_LA=libxmlrpc_abyss_server.la
+ LIBXMLRPC_ABYSS_SERVER_LA=libxmlrpc-c_abyss_server.la
SERVERTEST=servertest
VALIDATEE=validatee
XMLRPC_ABYSS_H=xmlrpc_abyss.h
-@@ -147,7 +147,7 @@
- INTEROP_CGI=
- if test x"$enable_cgi_server" != xno; then
- AVAILABLE_MODULES="cgi-server $AVAILABLE_MODULES"
-- LIBXMLRPC_CGI_LA=libxmlrpc_cgi.la
-+ LIBXMLRPC_CGI_LA=libxmlrpc-c_cgi.la
- XMLRPC_CGI_H=xmlrpc_cgi.h
- SAMPLE_CGI_CGI=sample-cgi.cgi
- INTEROP_CGI=interop.cgi
-@@ -173,7 +173,7 @@
+@@ -189,7 +189,7 @@
INTEROP_CLIENT_SUBDIR=
if test x"$enable_cplusplus" != xno; then
- AVAILABLE_MODULES="c++ $AVAILABLE_MODULES"
+ FEATURE_LIST="c++ $FEATURE_LIST"
- LIBXMLRPC_CPP_A=libxmlrpc_cpp.a
+ LIBXMLRPC_CPP_A=libxmlrpc-c_cpp.a
CPPTEST=cpptest
XMLRPCCPP_H=XmlRpcCpp.h
-diff -ur xmlrpc-c-0.9.10/examples/Makefile.am xmlrpc-c-0.9.10.-c/examples/Makefile.am
---- xmlrpc-c-0.9.10/examples/Makefile.am 2005-03-24 14:45:31.555022928 +0100
-+++ xmlrpc-c-0.9.10.-c/examples/Makefile.am 2005-03-24 14:50:20.355118640 +0100
-@@ -16,15 +16,15 @@
- if ENABLE_LIBXML2
- LIBXML = $(LIBXML2_LIBS)
- else
--LIBXML = ../lib/expat/xmlparse/libxmlrpc_xmlparse.la \
-- ../lib/expat/xmltok/libxmlrpc_xmltok.la
-+LIBXML = ../lib/expat/xmlparse/libxmlrpc-c_xmlparse.la \
-+ ../lib/expat/xmltok/libxmlrpc-c_xmltok.la
- endif
+@@ -604,7 +604,7 @@
--LIBABYSS = ../lib/abyss/src/libxmlrpc_abyss.la
--LIBXMLRPC = ../src/libxmlrpc.la $(LIBXML)
--LIBCLIENT = ../src/libxmlrpc_client.la @LIBWWW_LDADD@ $(LIBXMLRPC)
--LIBSERVER = ../src/libxmlrpc_abyss_server.la $(LIBABYSS) $(LIBXMLRPC)
--LIBCGI = ../src/libxmlrpc_cgi.la $(LIBXMLRPC)
-+LIBABYSS = ../lib/abyss/src/libxmlrpc-c_abyss.la
-+LIBXMLRPC = ../src/libxmlrpc-c.la $(LIBXML)
-+LIBCLIENT = ../src/libxmlrpc-c_client.la @LIBWWW_LDADD@ $(LIBXMLRPC)
-+LIBSERVER = ../src/libxmlrpc-c_abyss_server.la $(LIBABYSS) $(LIBXMLRPC)
-+LIBCGI = ../src/libxmlrpc-c_cgi.la $(LIBXMLRPC)
-
- synch_client_SOURCES = synch_client.c
- synch_client_LDADD = $(LIBCLIENT)
-@@ -50,7 +50,7 @@
- query_meerkat_LDFLAGS = @LIBWWW_RPATH@
-
- meerkat_app_list_SOURCES = meerkat-app-list.cc
--meerkat_app_list_LDADD = ../src/libxmlrpc_cpp.a $(LIBCLIENT)
-+meerkat_app_list_LDADD = ../src/libxmlrpc-c_cpp.a $(LIBCLIENT)
- meerkat_app_list_LDFLAGS = @LIBWWW_RPATH@
-
- auth_client_SOURCES = auth_client.c
-diff -ur xmlrpc-c-0.9.10/examples/interop-client/Makefile.am xmlrpc-c-0.9.10.-c/examples/interop-client/Makefile.am
---- xmlrpc-c-0.9.10/examples/interop-client/Makefile.am 2005-03-24 14:45:31.555022928 +0100
-+++ xmlrpc-c-0.9.10.-c/examples/interop-client/Makefile.am 2005-03-24 14:49:57.680565696 +0100
-@@ -9,14 +9,14 @@
- if ENABLE_LIBXML2
- LIBXML = $(LIBXML2_LIBS)
+ EXTRA_XML_LIBS="$LIBXML2_LIBS"
else
--LIBXML = ../../lib/expat/xmlparse/libxmlrpc_xmlparse.la \
-- ../../lib/expat/xmltok/libxmlrpc_xmltok.la
-+LIBXML = ../../lib/expat/xmlparse/libxmlrpc-c_xmlparse.la \
-+ ../../lib/expat/xmltok/libxmlrpc-c_xmltok.la
- endif
+- EXTRA_XML_LIBS="-lxmlrpc_xmlparse -lxmlrpc_xmltok"
++ EXTRA_XML_LIBS="-lxmlrpc-c_xmlparse -lxmlrpc-c_xmltok"
+ fi
+
+ AC_SUBST(EXTRA_XML_LIBS)
+Only in xmlrpc-c-1.03.10.soname: configure.in~
+diff -ur xmlrpc-c-1.03.10/lib/abyss/src/Makefile xmlrpc-c-1.03.10.soname/lib/abyss/src/Makefile
+--- xmlrpc-c-1.03.10/lib/abyss/src/Makefile 2005-08-04 05:31:54.000000000 +0200
++++ xmlrpc-c-1.03.10.soname/lib/abyss/src/Makefile 2006-01-11 16:45:51.308685750 +0100
+@@ -20,12 +20,12 @@
+
+ INCLUDES = -I$(SRCDIR) -I$(SRCDIR)/include -I$(SRCDIR)/lib/util/include
+
+-LTLIBRARIES_TO_INSTALL = libxmlrpc_abyss.la
++LTLIBRARIES_TO_INSTALL = libxmlrpc-c_abyss.la
+
+ default: all
+
+ .PHONY: all
+-all: libxmlrpc_abyss.la
++all: libxmlrpc-c_abyss.la
+
+
+ ABYSS_OBJS = \
+@@ -41,7 +41,7 @@
+ conn.lo \
+
+
+-libxmlrpc_abyss.la: $(ABYSS_OBJS)
++libxmlrpc-c_abyss.la: $(ABYSS_OBJS)
+ $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
+
+ $(ABYSS_OBJS):%.lo:%.c
+Only in xmlrpc-c-1.03.10.soname/lib/abyss/src: Makefile~
+diff -ur xmlrpc-c-1.03.10/lib/expat/xmlparse/Makefile.in xmlrpc-c-1.03.10.soname/lib/expat/xmlparse/Makefile.in
+--- xmlrpc-c-1.03.10/lib/expat/xmlparse/Makefile.in 2004-10-16 23:41:28.000000000 +0200
++++ xmlrpc-c-1.03.10.soname/lib/expat/xmlparse/Makefile.in 2006-01-11 16:46:53.592578250 +0100
+@@ -106,10 +106,10 @@
--LIBXMLRPC = ../../src/libxmlrpc.la $(LIBXML)
--LIBCLIENT = ../../src/libxmlrpc_client.la @LIBWWW_LDADD@ $(LIBXMLRPC)
-+LIBXMLRPC = ../../src/libxmlrpc-c.la $(LIBXML)
-+LIBCLIENT = ../../src/libxmlrpc-c_client.la @LIBWWW_LDADD@ $(LIBXMLRPC)
-
- interop_client_SOURCES = interop-client.cc \
- InteropEchoProxy.cc InteropEchoProxy.h
--interop_client_LDADD = ../../src/libxmlrpc_cpp.a $(LIBCLIENT)
-+interop_client_LDADD = ../../src/libxmlrpc-c_cpp.a $(LIBCLIENT)
- interop_client_LDFLAGS = @LIBWWW_RPATH@
-diff -ur xmlrpc-c-0.9.10/lib/abyss/src/Makefile.am xmlrpc-c-0.9.10.-c/lib/abyss/src/Makefile.am
---- xmlrpc-c-0.9.10/lib/abyss/src/Makefile.am 2001-01-13 02:05:24.000000000 +0100
-+++ xmlrpc-c-0.9.10.-c/lib/abyss/src/Makefile.am 2005-03-24 14:50:50.055603480 +0100
-@@ -1,6 +1,6 @@
--lib_LTLIBRARIES = libxmlrpc_abyss.la
--libxmlrpc_abyss_la_SOURCES = conf.c data.c trace.c file.c thread.c http.c \
-+lib_LTLIBRARIES = libxmlrpc-c_abyss.la
-+libxmlrpc_c_abyss_la_SOURCES = conf.c data.c trace.c file.c thread.c http.c \
- socket.c server.c conn.c abyss.h
--libxmlrpc_abyss_la_LDFLAGS = @VERSION_INFO@
-+libxmlrpc_c_abyss_la_LDFLAGS = @VERSION_INFO@
-
- EXTRA_DIST = main.c Makefile.old Abyss.dsp Abyss.dsw
-diff -ur xmlrpc-c-0.9.10/lib/expat/xmlparse/Makefile.am xmlrpc-c-0.9.10.-c/lib/expat/xmlparse/Makefile.am
---- xmlrpc-c-0.9.10/lib/expat/xmlparse/Makefile.am 2001-01-13 02:04:29.000000000 +0100
-+++ xmlrpc-c-0.9.10.-c/lib/expat/xmlparse/Makefile.am 2005-03-24 14:51:10.348518488 +0100
-@@ -1,8 +1,8 @@
INCLUDES = -I$(srcdir)/../xmltok
-lib_LTLIBRARIES = libxmlrpc_xmlparse.la
+libxmlrpc_c_xmlparse_la_LDFLAGS = @VERSION_INFO@
EXTRA_DIST = xmlparse.dsp
-diff -ur xmlrpc-c-0.9.10/lib/expat/xmltok/Makefile.am xmlrpc-c-0.9.10.-c/lib/expat/xmltok/Makefile.am
---- xmlrpc-c-0.9.10/lib/expat/xmltok/Makefile.am 2001-01-13 02:03:46.000000000 +0100
-+++ xmlrpc-c-0.9.10.-c/lib/expat/xmltok/Makefile.am 2005-03-24 14:51:19.392143648 +0100
-@@ -1,7 +1,7 @@
--lib_LTLIBRARIES = libxmlrpc_xmltok.la
-+lib_LTLIBRARIES = libxmlrpc-c_xmltok.la
-
--libxmlrpc_xmltok_la_SOURCES = xmltok.c xmlrole.c nametab.h
--libxmlrpc_xmltok_la_LDFLAGS = @VERSION_INFO@
-+libxmlrpc_c_xmltok_la_SOURCES = xmltok.c xmlrole.c nametab.h
-+libxmlrpc_c_xmltok_la_LDFLAGS = @VERSION_INFO@
-
- EXTRA_DIST = ascii.h asciitab.h dllmain.c iasciitab.h latin1tab.h utf8tab.h \
- xmldef.h xmlrole.h xmltok.dsp xmltok.h xmltok_impl.c \
-diff -ur xmlrpc-c-0.9.10/src/Makefile.am xmlrpc-c-0.9.10.-c/src/Makefile.am
---- xmlrpc-c-0.9.10/src/Makefile.am 2005-03-24 14:45:31.557022624 +0100
-+++ xmlrpc-c-0.9.10.-c/src/Makefile.am 2005-03-24 14:52:35.482576144 +0100
-@@ -5,18 +5,18 @@
- CPPFLAGS = @CPPFLAGS@ @CPP_WARN_FLAGS@
-
- # Declare our libraries.
--lib_LTLIBRARIES = libxmlrpc.la \
-+lib_LTLIBRARIES = libxmlrpc-c.la \
- @LIBXMLRPC_CLIENT_LA@ \
- @LIBXMLRPC_ABYSS_SERVER_LA@ \
- @LIBXMLRPC_CGI_LA@
--EXTRA_LTLIBRARIES = libxmlrpc_client.la \
-- libxmlrpc_abyss_server.la \
-- libxmlrpc_cgi.la
-+EXTRA_LTLIBRARIES = libxmlrpc-c_client.la \
-+ libxmlrpc-c_abyss_server.la \
-+ libxmlrpc-c_cgi.la
-
- # We always statically-link our C++ code because it's tiny, and C++ is
- # no good at shared libraries, anyway.
- lib_LIBRARIES = @LIBXMLRPC_CPP_A@
--EXTRA_LIBRARIES = libxmlrpc_cpp.a
-+EXTRA_LIBRARIES = libxmlrpc-c_cpp.a
-
- # Declare our programs.
- noinst_PROGRAMS = rpctest @EFRPCTEST@ @CPPTEST@ \
-@@ -40,8 +40,8 @@
- LIBXML_FILES = xmlrpc_libxml2.c
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -122,8 +122,8 @@
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-libxmlrpc_xmlparse_la_LIBADD =
+-libxmlrpc_xmlparse_la_OBJECTS = xmlparse.lo
++libxmlrpc_c_xmlparse_la_LIBADD =
++libxmlrpc_c_xmlparse_la_OBJECTS = xmlparse.lo
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -136,8 +136,8 @@
+
+ TAR = gtar
+ GZIP_ENV = --best
+-SOURCES = $(libxmlrpc_xmlparse_la_SOURCES)
+-OBJECTS = $(libxmlrpc_xmlparse_la_OBJECTS)
++SOURCES = $(libxmlrpc_c_xmlparse_la_SOURCES)
++OBJECTS = $(libxmlrpc_c_xmlparse_la_OBJECTS)
+
+ all: all-redirect
+ .SUFFIXES:
+@@ -211,8 +211,8 @@
+
+ maintainer-clean-libtool:
+
+-libxmlrpc_xmlparse.la: $(libxmlrpc_xmlparse_la_OBJECTS) $(libxmlrpc_xmlparse_la_DEPENDENCIES)
+- $(LINK) -rpath $(libdir) $(libxmlrpc_xmlparse_la_LDFLAGS) $(libxmlrpc_xmlparse_la_OBJECTS) $(libxmlrpc_xmlparse_la_LIBADD) $(LIBS)
++libxmlrpc-c_xmlparse.la: $(libxmlrpc_c_xmlparse_la_OBJECTS) $(libxmlrpc_c_xmlparse_la_DEPENDENCIES)
++ $(LINK) -rpath $(libdir) $(libxmlrpc_c_xmlparse_la_LDFLAGS) $(libxmlrpc_c_xmlparse_la_OBJECTS) $(libxmlrpc_c_xmlparse_la_LIBADD) $(LIBS)
+
+ tags: TAGS
+
+Only in xmlrpc-c-1.03.10.soname/lib/expat/xmlparse: Makefile.in~
+diff -ur xmlrpc-c-1.03.10/lib/expat/xmltok/Makefile xmlrpc-c-1.03.10.soname/lib/expat/xmltok/Makefile
+--- xmlrpc-c-1.03.10/lib/expat/xmltok/Makefile 2005-05-05 23:37:43.000000000 +0200
++++ xmlrpc-c-1.03.10.soname/lib/expat/xmltok/Makefile 2006-01-11 16:47:09.233555750 +0100
+@@ -20,7 +20,7 @@
+ include $(SRCDIR)/Makefile.common
+
+ .PHONY: all
+-all: libxmlrpc_xmltok.la
++all: libxmlrpc-c_xmltok.la
+
+ .PHONY: clean
+ clean: clean-common
+@@ -41,11 +41,11 @@
+ .PHONY: dep
+ dep: dep-common
+
+-LTLIBRARIES_TO_INSTALL = libxmlrpc_xmltok.la
++LTLIBRARIES_TO_INSTALL = libxmlrpc-c_xmltok.la
+
+ LIBXMLRPC_XMLTOK_OBJS = xmltok.lo xmlrole.lo
+
+-libxmlrpc_xmltok.la: $(LIBXMLRPC_XMLTOK_OBJS)
++libxmlrpc-c_xmltok.la: $(LIBXMLRPC_XMLTOK_OBJS)
+ $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
+
+ $(LIBXMLRPC_XMLTOK_OBJS):%.lo:%.c
+Only in xmlrpc-c-1.03.10.soname/lib/expat/xmltok: Makefile~
+diff -ur xmlrpc-c-1.03.10/src/Makefile xmlrpc-c-1.03.10.soname/src/Makefile
+--- xmlrpc-c-1.03.10/src/Makefile 2005-07-01 05:13:03.000000000 +0200
++++ xmlrpc-c-1.03.10.soname/src/Makefile 2006-01-11 16:56:50.565886750 +0100
+@@ -37,8 +37,8 @@
+ LIBXML = $(LIBXML2_LIBS)
else
- LIBXML_INCLUDES = -I$(srcdir)/../lib/expat/xmlparse
--LIBXML = ../lib/expat/xmlparse/libxmlrpc_xmlparse.la \
-- ../lib/expat/xmltok/libxmlrpc_xmltok.la
-+LIBXML = ../lib/expat/xmlparse/libxmlrpc-c_xmlparse.la \
-+ ../lib/expat/xmltok/libxmlrpc-c_xmltok.la
- LIBXML_FILES = xmlrpc_expat.c
+ LIBXML_INCLUDES = -I$(SRCDIR)/lib/expat/xmlparse
+- LIBXML = $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la \
+- $(BUILDDIR)/lib/expat/xmltok/libxmlrpc_xmltok.la
++ LIBXML = $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc-c_xmlparse.la \
++ $(BUILDDIR)/lib/expat/xmltok/libxmlrpc-c_xmltok.la
+ endif
+
+ ABYSS_INCLUDES = -I$(SRCDIR)/lib/abyss/src
+@@ -72,15 +72,15 @@
+ $(TRANSPORT_INCLUDES) \
+ $(LIBXML_INCLUDES) \
+
+-TARGET_LTLIBRARIES = libxmlrpc.la libxmlrpc_server.la \
+- libxmlrpc_server_abyss.la
++TARGET_LTLIBRARIES = libxmlrpc-c.la libxmlrpc-c_server.la \
++ libxmlrpc-c_server_abyss.la
+
+ ifeq ($(MUST_BUILD_CLIENT),yes)
+- TARGET_LTLIBRARIES += libxmlrpc_client.la
++ TARGET_LTLIBRARIES += libxmlrpc-c_client.la
+ endif
+
+ ifeq ($(ENABLE_CGI_SERVER),yes)
+- TARGET_LTLIBRARIES += libxmlrpc_server_cgi.la
++ TARGET_LTLIBRARIES += libxmlrpc-c_server_cgi.la
endif
-@@ -50,26 +50,26 @@
- LIBABYSS = ../lib/abyss/src/libxmlrpc_abyss.la
-
- # A library containing just the XML-RPC core.
--libxmlrpc_la_SOURCES = xmlrpc_support.c xmlrpc_data.c xmlrpc_struct.c \
-+libxmlrpc_c_la_SOURCES = xmlrpc_support.c xmlrpc_data.c xmlrpc_struct.c \
- xmlrpc_xmlparser.h $(LIBXML_FILES) xmlrpc_parse.c \
- xmlrpc_serialize.c xmlrpc_registry.c xmlrpc_base64.c \
- xmlrpc_utf8.c
--libxmlrpc_la_LDFLAGS = @VERSION_INFO@
-+libxmlrpc_c_la_LDFLAGS = @VERSION_INFO@
-
- # A library containing the client-related components.
--libxmlrpc_client_la_SOURCES = xmlrpc_client.c
--libxmlrpc_client_la_LDFLAGS = @VERSION_INFO@ -rpath $(libdir)
-+libxmlrpc_c_client_la_SOURCES = xmlrpc_client.c
-+libxmlrpc_c_client_la_LDFLAGS = @VERSION_INFO@ -rpath $(libdir)
-
- # A library containing the server-related components.
--libxmlrpc_abyss_server_la_SOURCES = xmlrpc_abyss.c
--libxmlrpc_abyss_server_la_LDFLAGS = @VERSION_INFO@ -rpath $(libdir)
-+libxmlrpc_c_abyss_server_la_SOURCES = xmlrpc_abyss.c
-+libxmlrpc_c_abyss_server_la_LDFLAGS = @VERSION_INFO@ -rpath $(libdir)
-
- # A library supporting CGI-based servers.
--libxmlrpc_cgi_la_SOURCES = xmlrpc_cgi.c
--libxmlrpc_cgi_la_LDFLAGS = @VERSION_INFO@ -rpath $(libdir)
-+libxmlrpc_c_cgi_la_SOURCES = xmlrpc_cgi.c
-+libxmlrpc_c_cgi_la_LDFLAGS = @VERSION_INFO@ -rpath $(libdir)
-
- # A library containing our C++ wrappers.
--libxmlrpc_cpp_a_SOURCES = XmlRpcCpp.cc
-+libxmlrpc_c_cpp_a_SOURCES = XmlRpcCpp.cc
-
- # The test suites for the XML-RPC core.
- rpctest_SOURCES = rpctest.c
-@@ -73,31 +73,31 @@
-
- # The test suites for the XML-RPC core.
- rpctest_SOURCES = rpctest.c
--rpctest_LDADD = libxmlrpc.la $(LIBXML)
-+rpctest_LDADD = libxmlrpc-c.la $(LIBXML)
-
- # The test suites for the XML-RPC core w/Electric Fence.
- efrpctest_SOURCES = rpctest.c
--efrpctest_LDADD = libxmlrpc.la $(LIBXML) -lefence
-+efrpctest_LDADD = libxmlrpc-c.la $(LIBXML) -lefence
-
- # The test suites for our C++ core.
- cpptest_SOURCES = cpptest.cc XmlRpcCpp.cc XmlRpcCpp.h
--cpptest_LDADD = libxmlrpc_cpp.a libxmlrpc.la $(LIBXML)
-+cpptest_LDADD = libxmlrpc-c_cpp.a libxmlrpc-c.la $(LIBXML)
-
- # A test program for the client library.
- clienttest_SOURCES = clienttest.c
--clienttest_LDADD = libxmlrpc_client.la @LIBWWW_LDADD@ \
-- libxmlrpc.la $(LIBXML)
-+clienttest_LDADD = libxmlrpc-c_client.la @LIBWWW_LDADD@ \
-+ libxmlrpc-c.la $(LIBXML)
- clienttest_LDFLAGS = @LIBWWW_RPATH@
-
- # A test program for the server library.
- servertest_SOURCES = servertest.c
--servertest_LDADD = libxmlrpc_abyss_server.la $(LIBABYSS) \
-- libxmlrpc.la $(LIBXML)
-+servertest_LDADD = libxmlrpc-c_abyss_server.la $(LIBABYSS) \
-+ libxmlrpc-c.la $(LIBXML)
-
- # A server which attempts to pass the UserLand validator1 suite.
- validatee_SOURCES = validatee.c
--validatee_LDADD = libxmlrpc_abyss_server.la $(LIBABYSS) \
-- libxmlrpc.la $(LIBXML)
-+validatee_LDADD = libxmlrpc-c_abyss_server.la $(LIBABYSS) \
-+ libxmlrpc-c.la $(LIBXML)
-
- # Handle our wrapper script.
- efrpctest_wrapper: $(srcdir)/efrpctest_wrapper.sh
-diff -ur xmlrpc-c-0.9.10/xmlrpc-c-config.in xmlrpc-c-0.9.10.-c/xmlrpc-c-config.in
---- xmlrpc-c-0.9.10/xmlrpc-c-config.in 2005-03-24 14:45:31.560022168 +0100
-+++ xmlrpc-c-0.9.10.-c/xmlrpc-c-config.in 2005-03-24 14:49:11.112645096 +0100
-@@ -46,7 +46,7 @@
+ all: $(TARGET_LTLIBRARIES) $(SUBDIRS:%=%/all)
+@@ -89,19 +89,19 @@
+
+ LIBLDFLAGS = $(LDFLAGS_VERSINFO) -rpath $(LIBINST_DIR) $(LADD)
+
+-libxmlrpc.la: $(LIBXMLRPC_OBJS)
++libxmlrpc-c.la: $(LIBXMLRPC_OBJS)
+ $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
+
+-libxmlrpc_client.la: xmlrpc_client.lo $(TRANSPORT_OBJS) $(CASPRINTF_OBJ)
++libxmlrpc-c_client.la: xmlrpc_client.lo $(TRANSPORT_OBJS) $(CASPRINTF_OBJ)
+ $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
+
+-libxmlrpc_server.la: xmlrpc_registry.lo
++libxmlrpc-c_server.la: xmlrpc_registry.lo
+ $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
+
+-libxmlrpc_server_abyss.la: xmlrpc_server_abyss.lo
++libxmlrpc-c_server_abyss.la: xmlrpc_server_abyss.lo
+ $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
+
+-libxmlrpc_server_cgi.la: xmlrpc_server_cgi.lo
++libxmlrpc-c_server_cgi.la: xmlrpc_server_cgi.lo
+ $(LIBTOOL) --mode=link $(CCLD) -o $@ $(LIBLDFLAGS) $^
+
+ CFLAGS = $(CFLAGS_COMMON) $(CFLAGS_PERSONAL) $(CADD)
+Only in xmlrpc-c-1.03.10.soname/src: Makefile~
+diff -ur xmlrpc-c-1.03.10/src/cpp/Makefile xmlrpc-c-1.03.10.soname/src/cpp/Makefile
+--- xmlrpc-c-1.03.10/src/cpp/Makefile 2005-11-23 04:13:11.000000000 +0100
++++ xmlrpc-c-1.03.10.soname/src/cpp/Makefile 2006-01-11 16:55:43.925722000 +0100
+@@ -18,8 +18,8 @@
+ LIBXML = $(LIBXML2_LIBS)
+ else
+ LIBXML_INCLUDES = -I$(SRCDIR)/lib/expat/xmlparse
+- LIBXML = $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la \
+- $(BUILDDIR)/lib/expat/xmltok/libxmlrpc_xmltok.la
++ LIBXML = $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc-c_xmlparse.la \
++ $(BUILDDIR)/lib/expat/xmltok/libxmlrpc-c_xmltok.la
+ endif
+
+ ifeq ($(ENABLE_LIBXML2),yes)
+@@ -28,9 +28,9 @@
+ XMLRPC_XML_PARSER = xmlrpc_expat.lo
+ endif
+
+-LIBXMLRPC = $(BUILDDIR)/src/libxmlrpc.la
+-LIBXMLRPC_SERVER = $(BUILDDIR)/src/libxmlrpc_server.la
+-LIBXMLRPC_CLIENT = $(BUILDDIR)/src/libxmlrpc_client.la
++LIBXMLRPC = $(BUILDDIR)/src/libxmlrpc-c.la
++LIBXMLRPC_SERVER = $(BUILDDIR)/src/libxmlrpc-c_server.la
++LIBXMLRPC_CLIENT = $(BUILDDIR)/src/libxmlrpc-c_client.la
+
+ LIBXMLRPCPP_OBJS = girmem.o value.o fault.o outcome.o param_list.o xml.o
+ LIBXMLRPC_SERVERPP_OBJS = registry.o
+@@ -62,15 +62,15 @@
+ # it obfuscates the build process), I haven't figured out yet how to
+ # get the shared libraries to build for all the platforms.
+
+-# libxmlrpc_cpp.a is the legacy C++ wrapper library. The others are the
++# libxmlrpc-c_cpp.a is the legacy C++ wrapper library. The others are the
+ # more elaborate replacements.
+
+ TARGET_LIBRARIES = \
+- libxmlrpc_cpp.a \
+- libxmlrpc++.a \
+- libxmlrpc_server++.a \
+- libxmlrpc_server_abyss++.a \
+- libxmlrpc_client++.a \
++ libxmlrpc-c_cpp.a \
++ libxmlrpc-c++.a \
++ libxmlrpc-c_server++.a \
++ libxmlrpc-c_server_abyss++.a \
++ libxmlrpc-c_client++.a \
+
+ TARGET_PROGS = cpptest
+
+@@ -85,34 +85,34 @@
+
+ LDFLAGS += $(LADD)
+
+-cpptest:%:%.o libxmlrpc_server_abyss++.a libxmlrpc_server++.a \
+- libxmlrpc_client++.a libxmlrpc++.a libxmlrpc_cpp.a \
++cpptest:%:%.o libxmlrpc-c_server_abyss++.a libxmlrpc-c_server++.a \
++ libxmlrpc-c_client++.a libxmlrpc-c++.a libxmlrpc-c_cpp.a \
+ $(LIBXMLRPC) $(LIBXMLRPC_SERVER) $(LIBXMLRPC_CLIENT) $(LIBXML)
+ $(LIBTOOL) --mode=link $(CXXLD) -o $@ $(LDFLAGS) $^
+
+ LIBLDFLAGS = $(LADD)
+
+-libxmlrpc_cpp.a: XmlRpcCpp.o
++libxmlrpc-c_cpp.a: XmlRpcCpp.o
+ -rm -f $@
+ $(AR) cru $@ $^
+ $(RANLIB) $@
+
+-libxmlrpc++.a: $(LIBXMLRPCPP_OBJS)
++libxmlrpc-c++.a: $(LIBXMLRPCPP_OBJS)
+ -rm -f $@
+ $(AR) cru $@ $^
+ $(RANLIB) $@
+
+-libxmlrpc_server++.a: $(LIBXMLRPC_SERVERPP_OBJS)
++libxmlrpc-c_server++.a: $(LIBXMLRPC_SERVERPP_OBJS)
+ -rm -f $@
+ $(AR) cru $@ $^
+ $(RANLIB) $@
+
+-libxmlrpc_server_abyss++.a: $(LIBXMLRPC_SERVER_ABYSSPP_OBJS)
++libxmlrpc-c_server_abyss++.a: $(LIBXMLRPC_SERVER_ABYSSPP_OBJS)
+ -rm -f $@
+ $(AR) cru $@ $^
+ $(RANLIB) $@
+
+-libxmlrpc_client++.a: $(LIBXMLRPC_CLIENTPP_OBJS)
++libxmlrpc-c_client++.a: $(LIBXMLRPC_CLIENTPP_OBJS)
+ -rm -f $@
+ $(AR) cru $@ $^
+ $(RANLIB) $@
+Only in xmlrpc-c-1.03.10.soname/src/cpp: Makefile~
+diff -ur xmlrpc-c-1.03.10/tools/Makefile.common xmlrpc-c-1.03.10.soname/tools/Makefile.common
+--- xmlrpc-c-1.03.10/tools/Makefile.common 2005-10-06 18:15:38.000000000 +0200
++++ xmlrpc-c-1.03.10.soname/tools/Makefile.common 2006-01-11 16:57:25.844091500 +0100
+@@ -11,8 +11,8 @@
+ CLIENT_LDFLAGS += $(shell wininet-config --libs)
+ endif
+
+-LIBEXPAT = $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la \
+- $(BUILDDIR)/lib/expat/xmltok/libxmlrpc_xmltok.la
++LIBEXPAT = $(BUILDDIR)/lib/expat/xmlparse/libxmlrpc-c_xmlparse.la \
++ $(BUILDDIR)/lib/expat/xmltok/libxmlrpc-c_xmltok.la
+
+ ifeq ($(ENABLE_LIBXML2_BACKEND),yes)
+ LIBXML = $(LIBXML2_LIBS)
+@@ -20,10 +20,10 @@
+ LIBXML = $(LIBEXPAT)
+ endif
+
+-LIBXMLRPC = $(BUILDDIR)/src/libxmlrpc.la
+-LIBXMLRPC_CPP = $(BUILDDIR)/src/cpp/libxmlrpc_cpp.a
+-LIBXMLRPC_CLIENT = $(BUILDDIR)/src/libxmlrpc_client.la
+-LIBXMLRPC_SERVER = $(BUILDDIR)/src/libxmlrpc_server.la
++LIBXMLRPC = $(BUILDDIR)/src/libxmlrpc-c.la
++LIBXMLRPC_CPP = $(BUILDDIR)/src/cpp/libxmlrpc-c_cpp.a
++LIBXMLRPC_CLIENT = $(BUILDDIR)/src/libxmlrpc-c_client.la
++LIBXMLRPC_SERVER = $(BUILDDIR)/src/libxmlrpc-c_server.la
+
+ XMLRPC_LIBS = $(LIBXMLRPC) $(LIBXMLRPC_CPP) $(LIBXMLRPC_CLIENT) \
+ $(LIBXMLRPC_SERVER) $(LIBXML)
+Only in xmlrpc-c-1.03.10.soname/tools: Makefile.common~
+diff -ur xmlrpc-c-1.03.10/xmlrpc-c-config.in xmlrpc-c-1.03.10.soname/xmlrpc-c-config.in
+--- xmlrpc-c-1.03.10/xmlrpc-c-config.in 2005-08-04 05:31:52.000000000 +0200
++++ xmlrpc-c-1.03.10.soname/xmlrpc-c-config.in 2006-01-11 16:50:17.989352250 +0100
+@@ -54,13 +54,13 @@
+ if test "${ENABLE_LIBXML2_BACKEND}" = "yes"; then
+ LIBXML="@LIBXML2_LIBS@"
+ else
+- LIBXML="-lxmlrpc_xmlparse -lxmlrpc_xmltok"
++ LIBXML="-lxmlrpc-c_xmlparse -lxmlrpc-c_xmltok"
fi
+ needCpp=no
+
the_libdirs="-L@libdir@"
--the_libs="-lxmlrpc @EXTRA_XML_LIBS@"
-+the_libs="-lxmlrpc-c @EXTRA_XML_LIBS@"
+-the_libs="-lxmlrpc ${LIBXML}"
++the_libs="-lxmlrpc-c ${LIBXML}"
the_rpath=
the_wl_rpath=
cpp_libs=
-@@ -54,17 +54,17 @@
+@@ -68,37 +68,37 @@
while test $# -gt 0; do
case $1 in
c++)
-- cpp_libs="-lxmlrpc_cpp "
-+ cpp_libs="-lxmlrpc-c_cpp "
+- the_libs="-lxmlrpc_cpp $the_libs"
++ the_libs="-lxmlrpc-c_cpp $the_libs"
+
+ # Unfortunately, there is just one legacy CPP library for
+ # everything, and it needs all the C libraries -- base, client,
+ # and server. So all legacy C++ programs get linked with client
+ # and server libraries, whether they need them or not.
+
+- the_libs="-lxmlrpc_server_abyss $the_libs"
+- the_libs="-lxmlrpc_server $the_libs"
+- the_libs="-lxmlrpc_client $the_libs"
++ the_libs="-lxmlrpc-c_server_abyss $the_libs"
++ the_libs="-lxmlrpc-c_server $the_libs"
++ the_libs="-lxmlrpc-c_client $the_libs"
+ ;;
+ c++2)
+ needCpp=yes
+ the_libs="-lxmlrpc++ $the_libs"
+ ;;
+ cgi-server)
+- the_libs="-lxmlrpc_server $the_libs"
+- the_libs="-lxmlrpc_server_cgi $the_libs"
++ the_libs="-lxmlrpc-c_server $the_libs"
++ the_libs="-lxmlrpc-c_server_cgi $the_libs"
+ ;;
+ abyss-server)
+ the_libs="@LIBABYSS_LDADD@ $the_libs"
+- the_libs="-lxmlrpc_abyss $the_libs"
+- the_libs="-lxmlrpc_server $the_libs"
+- the_libs="-lxmlrpc_server_abyss $the_libs"
++ the_libs="-lxmlrpc-c_abyss $the_libs"
++ the_libs="-lxmlrpc-c_server $the_libs"
++ the_libs="-lxmlrpc-c_server_abyss $the_libs"
+ if test "${needCpp}" = "yes"; then
+- the_libs="-lxmlrpc_server++ $the_libs"
+- the_libs="-lxmlrpc_server_abyss++ $the_libs"
++ the_libs="-lxmlrpc-c_server++ $the_libs"
++ the_libs="-lxmlrpc-c_server_abyss++ $the_libs"
+ fi
+ ;;
+ client)
+- the_libs="-lxmlrpc_client $the_libs"
++ the_libs="-lxmlrpc-c_client $the_libs"
+
+ if test "${MUST_BUILD_WININET_CLIENT}" = "yes"; then
+ the_libs="@WININET_LDADD@ $the_libs"
+@@ -116,7 +116,7 @@
+ the_wl_rpath="@LIBWWW_WL_RPATH@ $the_wl_rpath"
+ fi
+ if test "${needCpp}" = "yes"; then
+- the_libs="-lxmlrpc_client++ $the_libs"
++ the_libs="-lxmlrpc-c_client++ $the_libs"
+ fi
+ ;;
+ --version)
+Only in xmlrpc-c-1.03.10.soname: xmlrpc-c-config.in~
+diff -ur xmlrpc-c-1.03.10/xmlrpc-c-config.test.in xmlrpc-c-1.03.10.soname/xmlrpc-c-config.test.in
+--- xmlrpc-c-1.03.10/xmlrpc-c-config.test.in 2005-06-12 02:06:11.000000000 +0200
++++ xmlrpc-c-1.03.10.soname/xmlrpc-c-config.test.in 2006-01-11 16:57:11.211177000 +0100
+@@ -26,15 +26,15 @@
+ if test "${ENABLE_LIBXML2_BACKEND}" = "yes"; then
+ LIBXML="@LIBXML2_LIBS@"
+ else
+- LIBXML="${BUILDDIR}/lib/expat/xmlparse/.libs/libxmlrpc_xmlparse.a"
++ LIBXML="${BUILDDIR}/lib/expat/xmlparse/.libs/libxmlrpc-c_xmlparse.a"
+ sopath="${BUILDDIR}/lib/expat/xmlparse/.libs:$sopath"
+- LIBXML="${LIBXML} ${BUILDDIR}/lib/expat/xmltok/.libs/libxmlrpc_xmltok.a"
++ LIBXML="${LIBXML} ${BUILDDIR}/lib/expat/xmltok/.libs/libxmlrpc-c_xmltok.a"
+ sopath="${BUILDDIR}/lib/expat/xmltok/.libs:$sopath"
+ fi
+
+ needCpp=no
+
+-the_libs="${BUILDDIR}/src/.libs/libxmlrpc.a ${LIBXML}"
++the_libs="${BUILDDIR}/src/.libs/libxmlrpc-c.a ${LIBXML}"
+ the_includes="-I${SRCDIR}/include"
+ sopath="${BUILDDIR}/src/.libs:$sopath"
+
+@@ -46,33 +46,33 @@
+ # and server. So all legacy C++ programs get linked with client
+ # and server libraries, whether they need them or not.
+
+- the_libs="${BUILDDIR}/src/.libs/libxmlrpc_server.a $the_libs"
+- the_libs="${BUILDDIR}/src/.libs/libxmlrpc_server_abyss.a $the_libs"
+- the_libs="${BUILDDIR}/src/.libs/libxmlrpc_client.a $the_libs"
+- the_libs="${BUILDDIR}/src/cpp/libxmlrpc_cpp.a $the_libs"
++ the_libs="${BUILDDIR}/src/.libs/libxmlrpc-c_server.a $the_libs"
++ the_libs="${BUILDDIR}/src/.libs/libxmlrpc-c_server_abyss.a $the_libs"
++ the_libs="${BUILDDIR}/src/.libs/libxmlrpc-c_client.a $the_libs"
++ the_libs="${BUILDDIR}/src/cpp/libxmlrpc-c_cpp.a $the_libs"
+ ;;
+ c++2)
+ needCpp=yes
+- the_libs="${BUILDDIR}/src/cpp/libxmlrpc++.a $the_libs"
++ the_libs="${BUILDDIR}/src/cpp/libxmlrpc-c++.a $the_libs"
;;
cgi-server)
-- the_libs="-lxmlrpc_cgi $the_libs"
-+ the_libs="-lxmlrpc-c_cgi $the_libs"
+- the_libs="${BUILDDIR}/src/.libs/libxmlrpc_server.a $the_libs"
+- the_libs="${BUILDDIR}/src/.libs/libxmlrpc_server_cgi.a $the_libs"
++ the_libs="${BUILDDIR}/src/.libs/libxmlrpc-c_server.a $the_libs"
++ the_libs="${BUILDDIR}/src/.libs/libxmlrpc-c_server_cgi.a $the_libs"
;;
abyss-server)
-- the_libs="-lxmlrpc_abyss_server -lxmlrpc_abyss $the_libs"
-+ the_libs="-lxmlrpc-c_abyss_server -lxmlrpc-c_abyss $the_libs"
+ the_libs="@LIBABYSS_LDADD@ $the_libs"
+- the_libs="${BUILDDIR}/lib/abyss/src/.libs/libxmlrpc_abyss.a $the_libs"
+- the_libs="${BUILDDIR}/src/.libs/libxmlrpc_server.a $the_libs"
+- the_libs="${BUILDDIR}/src/.libs/libxmlrpc_server_abyss.a $the_libs"
++ the_libs="${BUILDDIR}/lib/abyss/src/.libs/libxmlrpc-c_abyss.a $the_libs"
++ the_libs="${BUILDDIR}/src/.libs/libxmlrpc-c_server.a $the_libs"
++ the_libs="${BUILDDIR}/src/.libs/libxmlrpc-c_server_abyss.a $the_libs"
+ if test "${needCpp}" = "yes"; then
+- the_libs="${BUILDDIR}/src/cpp/libxmlrpc_server++.a $the_libs"
+- the_libs="${BUILDDIR}/src/cpp/libxmlrpc_server_abyss++.a $the_libs"
++ the_libs="${BUILDDIR}/src/cpp/libxmlrpc-c_server++.a $the_libs"
++ the_libs="${BUILDDIR}/src/cpp/libxmlrpc-c_server_abyss++.a $the_libs"
+ fi
+ the_includes="-I${SRCDIR}/lib/abyss/src $the_includes"
+ sopath="${BUILDDIR}/lib/abyss/src/.libs:$sopath"
;;
- libwww-client)
- the_libdirs="-L@LIBWWW_LIBDIR@ $the_libdirs"
-- the_libs="-lxmlrpc_client @LIBWWW_LDADD@ $the_libs"
-+ the_libs="-lxmlrpc-c_client @LIBWWW_LDADD@ $the_libs"
- the_rpath="@LIBWWW_RPATH@ $the_rpath"
- the_wl_rpath="@LIBWWW_WL_RPATH@ $the_wl_rpath"
+ client)
+- the_libs="${BUILDDIR}/src/.libs/libxmlrpc_client.a $the_libs"
++ the_libs="${BUILDDIR}/src/.libs/libxmlrpc-c_client.a $the_libs"
+ if test "${MUST_BUILD_WININET_CLIENT}" = "yes"; then
+ the_libs="@WININET_LDADD@ $the_libs"
+ the_rpath="@WININET_RPATH@ $the_rpath"
+@@ -89,7 +89,7 @@
+ the_wl_rpath="@LIBWWW_WL_RPATH@ $the_wl_rpath"
+ fi
+ if test "${needCpp}" = "yes"; then
+- the_libs="${BUILDDIR}/src/cpp/libxmlrpc_client++.a $the_libs"
++ the_libs="${BUILDDIR}/src/cpp/libxmlrpc-c_client++.a $the_libs"
+ fi
;;
+ --version)
+Only in xmlrpc-c-1.03.10.soname: xmlrpc-c-config.test.in~
Summary: XML-RPC C library - an implementation of the xmlrpc protocol
Summary(pl): Biblioteka XML-RPC C - implementacja protoko³u xmlrpc
Name: xmlrpc-c
-Version: 0.9.10
-Release: 3
+Version: 1.03.10
+Release: 1
License: XML-RPC C Library License
Group: Libraries
-Source0: http://dl.sourceforge.net/xmlrpc-c//%{name}-%{version}.tar.gz
-# Source0-md5: 847410fae881f0fb641a186db6c8c015
+Source0: http://dl.sourceforge.net/xmlrpc-c/%{name}-%{version}.tgz
+# Source0-md5: b7857fba0cbdc970d51c0b32efa6bfb9
Patch0: %{name}-fastdep.patch
Patch1: %{name}-libxml2-support.patch
-Patch2: %{name}-preinvoke.patch
-Patch3: %{name}-public-dispatch.patch
-Patch4: %{name}-soname.patch
+Patch2: %{name}-public-dispatch.patch
+Patch3: %{name}-soname.patch
URL: http://xmlrpc-c.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
+BuildRequires: curl-devel
BuildRequires: libxml2-devel
BuildRequires: w3c-libwww-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
rm -f missing
%{__libtoolize}
%{__aclocal}
%{__autoconf}
-%{__automake}
%configure \
- --disable-cplusplus \
- --disable-abyss-server \
- --disable-cgi-server \
+ --enable-abyss-server \
+ --enable-cgi-server \
+ --enable-cplusplus \
--enable-libxml2-backend \
- --enable-libwww-client
+ --enable-curl-client \
+ --enable-libwww-client \
+ --enable-unicode \
+ --enable-abyss-threads
+
%{__make}
%install
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+ln -s oldxmlrpc.h $RPM_BUILD_ROOT%{_includedir}/%{name}/xmlrpc.h
+ln -s oldcppwrapper.hpp $RPM_BUILD_ROOT%{_includedir}/%{name}/XmlRpcCpp.h
+ln -s server_cgi.h $RPM_BUILD_ROOT%{_includedir}/%{name}/xmlrpc_cgi.h
+ln -s client.h $RPM_BUILD_ROOT%{_includedir}/%{name}/xmlrpc_client.h
+ln -s server.h $RPM_BUILD_ROOT%{_includedir}/%{name}/xmlrpc_server.h
+ln -s server_abyss.h $RPM_BUILD_ROOT%{_includedir}/%{name}/xmlrpc_server_abyss.h
+ln -s server_w32httpsys.h $RPM_BUILD_ROOT%{_includedir}/%{name}/xmlrpc_server_w32httpsys.h
+
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc COPYING NEWS README BUGS PORTING REFACTORINGS SECURITY TESTING
+%doc README doc/{COPYING,CREDITS,HISTORY,SECURITY,TESTING,TODO}
%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%{_mandir}/man1/*
+%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
%files devel
%defattr(644,root,root,755)
+%doc doc/DEVELOPING
%attr(755,root,root) %{_libdir}/lib*.so
%{_libdir}/lib*.la
-%{_includedir}
-%{_mandir}/man7/*
+%{_libdir}/lib*\+\+.a
+%{_includedir}/%{name}
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/lib*[^\+\+].a
projects / packages / xmlrpc-c.git / commitdiff