outdated

[packages/xmlrpc-c.git] / xmlrpc-c-soname.patch

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 @@
 if test x"$enable_abyss_server" != xno; then
     AVAILABLE_MODULES="abyss-server $AVAILABLE_MODULES"
     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 @@
 INTEROP_CLIENT_SUBDIR=
 if test x"$enable_cplusplus" != xno; then
     AVAILABLE_MODULES="c++ $AVAILABLE_MODULES"
-    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
 
-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)
 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
 
-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
+lib_LTLIBRARIES = libxmlrpc-c_xmlparse.la
 
-libxmlrpc_xmlparse_la_SOURCES = xmlparse.c xmlparse.h
-libxmlrpc_xmlparse_la_LDFLAGS = @VERSION_INFO@
+libxmlrpc_c_xmlparse_la_SOURCES = xmlparse.c xmlparse.h
+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
 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
 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 @@
 fi
 
 the_libdirs="-L@libdir@"
-the_libs="-lxmlrpc @EXTRA_XML_LIBS@"
+the_libs="-lxmlrpc-c @EXTRA_XML_LIBS@"
 the_rpath=
 the_wl_rpath=
 cpp_libs=
@@ -54,17 +54,17 @@
 while test $# -gt 0; do
   case $1 in
     c++)
-      cpp_libs="-lxmlrpc_cpp "
+      cpp_libs="-lxmlrpc-c_cpp "
       ;;
     cgi-server)
-      the_libs="-lxmlrpc_cgi $the_libs"
+      the_libs="-lxmlrpc-c_cgi $the_libs"
       ;;
     abyss-server)
-      the_libs="-lxmlrpc_abyss_server -lxmlrpc_abyss $the_libs"
+      the_libs="-lxmlrpc-c_abyss_server -lxmlrpc-c_abyss $the_libs"
       ;;
     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"
       ;;