rpms/xmlrpc-c
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- rediffed cmake patch against current version

Browse Source 
- made the xmlrpc-c-config compatible to the upstream version
- added compatibility symlinks for some header files (thx to Robert de
    Vries for reporting these two issues)
This commit is contained in:
ensc 2007-04-01 12:54:10 +00:00
parent ca20be98ad
commit 11d5a20030
2 changed files with 207 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

285
0001-make-cmake-transition.txt
View File

@ -1,64 +1,114 @@
From ca5754cd4b3f3fdf3b8b80bc2264aa4c1f2e76a4 Mon Sep 17 00:00:00 2001
From 0dd5200ebaf39dc37b7fc06e6b793c307b2d648b Mon Sep 17 00:00:00 2001
From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Date: Mon, 2 Oct 2006 13:37:48 +0200
Date: Sun, 1 Apr 2007 14:30:58 +0200
Subject: [PATCH] make -> cmake transition
---
CMakeLists.txt | 236 +++++++++++++++++++++++++++
cmake/try-attr.cc | 3
cmake/try-attr.cc | 3 +
cmake/va-list-is-array.c | 9 +
examples/CMakeLists.txt | 51 ++++++
examples/config.h | 1
examples/cpp/CMakeLists.txt | 20 ++
include/CMakeLists.txt | 3
include/xmlrpc-c/CMakeLists.txt | 31 ++++
examples/config.h | 1 +
examples/cpp/CMakeLists.txt | 20 +++
include/CMakeLists.txt | 3 +
include/xmlrpc-c/CMakeLists.txt | 52 ++++++
include/xmlrpc-c/config.h.cmake | 8 +
lib/CMakeLists.txt | 12 +
lib/abyss/CMakeLists.txt | 3
lib/abyss/src/CMakeLists.txt | 62 +++++++
lib/abyss/src/xmlrpc_abyss.pc.cmake | 10 +
lib/CMakeLists.txt | 12 ++
lib/abyss/CMakeLists.txt | 3 +
lib/abyss/src/CMakeLists.txt | 57 +++++++
lib/abyss/src/xmlrpc_abyss.pc.cmake | 12 ++
lib/curl_transport/CMakeLists.txt | 7 +
lib/expat/CMakeLists.txt | 9 +
lib/expat/gennmtab/CMakeLists.txt | 3
lib/expat/gennmtab/CMakeLists.txt | 3 +
lib/expat/xmlparse/CMakeLists.txt | 7 +
lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake | 10 +
lib/expat/xmltok/CMakeLists.txt | 20 ++
lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake | 12 ++
lib/expat/xmltok/CMakeLists.txt | 20 +++
lib/expat/xmltok/xmlrpc_xmltok.pc.cmake | 9 +
lib/libutil/CMakeLists.txt | 22 +++
lib/libutil/xmlrpc_util.pc.cmake | 10 +
lib/libwww_transport/CMakeLists.txt | 4
lib/util/CMakeLists.txt | 13 +
lib/wininet_transport/CMakeLists.txt | 4
lib/libwww_transport/CMakeLists.txt | 4 +
lib/util/CMakeLists.txt | 13 ++
lib/wininet_transport/CMakeLists.txt | 4 +
src/CMakeLists.txt | 106 ++++++++++++
src/cpp/CMakeLists.txt | 48 +++++
src/cpp/xmlrpc++.pc.cmake | 11 +
src/cpp/xmlrpc_client++.pc.cmake | 11 +
src/cpp/xmlrpc_cpp.pc.cmake | 11 +
src/cpp/xmlrpc_server++.pc.cmake | 11 +
src/cpp/xmlrpc_server_abyss++.pc.cmake | 11 +
src/cpp/CMakeLists.txt | 48 ++++++
src/cpp/xmlrpc++.pc.cmake | 12 ++
src/cpp/xmlrpc_client++.pc.cmake | 12 ++
src/cpp/xmlrpc_cpp.pc.cmake | 12 ++
src/cpp/xmlrpc_server++.pc.cmake | 12 ++
src/cpp/xmlrpc_server_abyss++.pc.cmake | 12 ++
src/test/CMakeLists.txt | 27 +++
src/xmlrpc.pc.cmake | 11 +
src/xmlrpc_client.pc.cmake | 11 +
src/xmlrpc_server.pc.cmake | 11 +
src/xmlrpc_server_abyss.pc.cmake | 11 +
src/xmlrpc_server_cgi.pc.cmake | 11 +
src/xmlrpc.pc.cmake | 12 ++
src/xmlrpc_client.pc.cmake | 12 ++
src/xmlrpc_server.pc.cmake | 12 ++
src/xmlrpc_server_abyss.pc.cmake | 12 ++
src/xmlrpc_server_cgi.pc.cmake | 12 ++
tools/CMakeLists.txt | 9 +
tools/binmode-rpc-kit/CMakeLists.txt | 2
tools/turbocharger/CMakeLists.txt | 1
tools/binmode-rpc-kit/CMakeLists.txt | 2 +
tools/turbocharger/CMakeLists.txt | 1 +
tools/xml-rpc-api2cpp/CMakeLists.txt | 15 ++
tools/xmlrpc/CMakeLists.txt | 15 ++
tools/xmlrpc/config.h | 1
tools/xmlrpc/config.h | 1 +
tools/xmlrpc_transport/CMakeLists.txt | 9 +
tools/xmlrpc_transport/config.h | 1
tools/xmlrpc_transport/config.h | 1 +
transport_config.h.cmake | 16 ++
version.h.cmake | 2
xmlrpc-c-config | 38 ++++
xmlrpc_config.h.cmake | 21 ++
50 files changed, 988 insertions(+), 0 deletions(-)
version.h.cmake | 2 +
xmlrpc-c-config | 67 ++++++++
xmlrpc_config.h.cmake | 21 +++
50 files changed, 1047 insertions(+), 0 deletions(-)
create mode 100644 CMakeLists.txt
create mode 100644 cmake/try-attr.cc
create mode 100644 cmake/va-list-is-array.c
create mode 100644 examples/CMakeLists.txt
create mode 100644 examples/config.h
create mode 100644 examples/cpp/CMakeLists.txt
create mode 100644 include/CMakeLists.txt
create mode 100644 include/xmlrpc-c/CMakeLists.txt
create mode 100644 include/xmlrpc-c/config.h.cmake
create mode 100644 lib/CMakeLists.txt
create mode 100644 lib/abyss/CMakeLists.txt
create mode 100644 lib/abyss/src/CMakeLists.txt
create mode 100644 lib/abyss/src/xmlrpc_abyss.pc.cmake
create mode 100644 lib/curl_transport/CMakeLists.txt
create mode 100644 lib/expat/CMakeLists.txt
create mode 100644 lib/expat/gennmtab/CMakeLists.txt
create mode 100644 lib/expat/xmlparse/CMakeLists.txt
create mode 100644 lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake
create mode 100644 lib/expat/xmltok/CMakeLists.txt
create mode 100644 lib/expat/xmltok/xmlrpc_xmltok.pc.cmake
create mode 100644 lib/libutil/CMakeLists.txt
create mode 100644 lib/libutil/xmlrpc_util.pc.cmake
create mode 100644 lib/libwww_transport/CMakeLists.txt
create mode 100644 lib/util/CMakeLists.txt
create mode 100644 lib/wininet_transport/CMakeLists.txt
create mode 100644 src/CMakeLists.txt
create mode 100644 src/cpp/CMakeLists.txt
create mode 100644 src/cpp/xmlrpc++.pc.cmake
create mode 100644 src/cpp/xmlrpc_client++.pc.cmake
create mode 100644 src/cpp/xmlrpc_cpp.pc.cmake
create mode 100644 src/cpp/xmlrpc_server++.pc.cmake
create mode 100644 src/cpp/xmlrpc_server_abyss++.pc.cmake
create mode 100644 src/test/CMakeLists.txt
create mode 100644 src/xmlrpc.pc.cmake
create mode 100644 src/xmlrpc_client.pc.cmake
create mode 100644 src/xmlrpc_server.pc.cmake
create mode 100644 src/xmlrpc_server_abyss.pc.cmake
create mode 100644 src/xmlrpc_server_cgi.pc.cmake
create mode 100644 tools/CMakeLists.txt
create mode 100644 tools/binmode-rpc-kit/CMakeLists.txt
create mode 100644 tools/turbocharger/CMakeLists.txt
create mode 100644 tools/xml-rpc-api2cpp/CMakeLists.txt
create mode 100644 tools/xmlrpc/CMakeLists.txt
create mode 100644 tools/xmlrpc/config.h
create mode 100644 tools/xmlrpc_transport/CMakeLists.txt
create mode 100644 tools/xmlrpc_transport/config.h
create mode 100644 transport_config.h.cmake
create mode 100644 version.h.cmake
create mode 100755 xmlrpc-c-config
create mode 100644 xmlrpc_config.h.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..18b390d
index 0000000..e4505f7
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,236 @@
@ -423,27 +473,41 @@ index 0000000..ebfdba5
+add_subdirectory(xmlrpc-c)
diff --git a/include/xmlrpc-c/CMakeLists.txt b/include/xmlrpc-c/CMakeLists.txt
new file mode 100644
index 0000000..903f623
index 0000000..b92ccf4
--- /dev/null
+++ b/include/xmlrpc-c/CMakeLists.txt
@@ -0,0 +1,31 @@
@@ -0,0 +1,52 @@
+# -*- cmake -*-
+
+macro(ensc_install_symlink src dst)
+ install(CODE "EXECUTE_PROCESS(COMMAND ln -s xmlrpc-c/${src} \$ENV{DESTDIR}${includedir}/${dst})")
+endmacro(ensc_install_symlink)
+
+list(APPEND headers
+ ${CMAKE_CURRENT_BINARY_DIR}/config.h
+ util.h base.h abyss.h server.h
+ server_abyss.h server_w32httpsys.h oldxmlrpc.h)
+
+list(APPEND compat_links "oldxmlrpc.h xmlrpc.h")
+list(APPEND compat_links "server.h xmlrpc_server.h")
+list(APPEND compat_links "server_abyss.h xmlrpc_server_abyss.h")
+list(APPEND compat_links "server_w32httpsys.h xmlrpc_server_w32httpsys.h")
+
+
+if(ENABLE_CPLUSPLUS)
+ list(APPEND headers
+ oldcppwrapper.hpp girerr.hpp girmem.hpp base.hpp
+ timeout.hpp xml.hpp registry.hpp server_abyss.hpp)
+
+ list(APPEND compat_links "oldcppwrapper.hpp XmlRpcCpp.h")
+endif(ENABLE_CPLUSPLUS)
+
+if(MUST_BUILD_CLIENT)
+ list(APPEND headers
+ client.h transport.h client_global.h)
+
+ list(APPEND compat_links "client.h xmlrpc_client.h")
+
+ if(ENABLE_CPLUSPLUS)
+ list(APPEND headers
+ client.hpp client_transport.hpp client_simple.hpp)
@ -453,11 +517,18 @@ index 0000000..903f623
+if(ENABLE_CGI_SERVER)
+ list(APPEND headers
+ server_cgi.h)
+
+ list(APPEND compat_links "server_cgi.h xmlrpc_cgi.h")
+endif(ENABLE_CGI_SERVER)
+
+install(FILES
+ ${headers}
+ DESTINATION ${includedir}/xmlrpc-c)
+
+foreach (ln ${compat_links})
+ separate_arguments(ln)
+ ensc_install_symlink(${ln})
+endforeach(ln)
diff --git a/include/xmlrpc-c/config.h.cmake b/include/xmlrpc-c/config.h.cmake
new file mode 100644
index 0000000..7b95a1d
@ -501,18 +572,14 @@ index 0000000..2358061
+SUBDIRS(src)
diff --git a/lib/abyss/src/CMakeLists.txt b/lib/abyss/src/CMakeLists.txt
new file mode 100644
index 0000000..a8fb5a9
index 0000000..cff8299
--- /dev/null
+++ b/lib/abyss/src/CMakeLists.txt
@@ -0,0 +1,62 @@
@@ -0,0 +1,57 @@
+## -*- cmake -*-
+
+set(xmlrpc_abyss_SOURCES
+ abyss_info.h
+ channel.c
+ channel.h
+ chanswitch.c
+ chanswitch.h
+ conf.c
+ conn.c
+ conn.h
@ -523,8 +590,7 @@ index 0000000..a8fb5a9
+ file.c
+ file.h
+ http.c
+ http.h
+ init.c
+ http.h
+ response.c
+ server.c
+ server.h
@ -569,12 +635,14 @@ index 0000000..a8fb5a9
+ensc_pkgconfig(xmlrpc_abyss)
diff --git a/lib/abyss/src/xmlrpc_abyss.pc.cmake b/lib/abyss/src/xmlrpc_abyss.pc.cmake
new file mode 100644
index 0000000..2a4f124
index 0000000..fae7af3
--- /dev/null
+++ b/lib/abyss/src/xmlrpc_abyss.pc.cmake
@@ -0,0 +1,10 @@
@@ -0,0 +1,12 @@
+bindir=@bindir@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: xmlrpc_abyss
+Description: XMLRPC Abyss base library
@ -635,12 +703,14 @@ index 0000000..f87008a
+ensc_pkgconfig(xmlrpc_xmlparse)
diff --git a/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake b/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake
new file mode 100644
index 0000000..71d77da
index 0000000..5b2a7e4
--- /dev/null
+++ b/lib/expat/xmlparse/xmlrpc_xmlparse.pc.cmake
@@ -0,0 +1,10 @@
@@ -0,0 +1,12 @@
+bindir=@bindir@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: xmlrpc_xmlparse
+Description: XMLRPC xmlparse library
@ -775,7 +845,7 @@ index 0000000..4f7408e
+endif(MUST_BUILD_WININET_CLIENT)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644
index 0000000..b201fa1
index 0000000..c96f206
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,106 @@
@ -826,7 +896,7 @@ index 0000000..b201fa1
+add_library(xmlrpc SHARED
+ trace.c ${xmlrpc_xml_parser}
+ xmlrpc_data.c xmlrpc_datetime.c xmlrpc_array.c xmlrpc_struct.c
+ xmlrpc_build.c xmlrpc_decompose.c xmlrpc_parse.c xmlrpc_serialize.c
+ xmlrpc_builddecomp.c xmlrpc_parse.c xmlrpc_serialize.c
+ xmlrpc_base64.c xmlrpc_utf8.c xmlrpc_authcookie.c)
+
+set_target_properties(xmlrpc
@ -941,10 +1011,11 @@ index 0000000..9ab2530
+ SOVERSION ${XMLRPC_C_SOVERSION})
diff --git a/src/cpp/xmlrpc++.pc.cmake b/src/cpp/xmlrpc++.pc.cmake
new file mode 100644
index 0000000..cda7f56
index 0000000..0bf5dc3
--- /dev/null
+++ b/src/cpp/xmlrpc++.pc.cmake
@@ -0,0 +1,11 @@
@@ -0,0 +1,12 @@
+bindir=@bindir@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
@ -955,13 +1026,14 @@ index 0000000..cda7f56
+
+Requires.private: xmlrpc
+Libs: -L${libdir} -lxmlrpc++
+Cflags: -I${includedir}
+Cflags: -I${includedir}
diff --git a/src/cpp/xmlrpc_client++.pc.cmake b/src/cpp/xmlrpc_client++.pc.cmake
new file mode 100644
index 0000000..188b3a6
index 0000000..0357491
--- /dev/null
+++ b/src/cpp/xmlrpc_client++.pc.cmake
@@ -0,0 +1,11 @@
@@ -0,0 +1,12 @@
+bindir=@bindir@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
@ -972,13 +1044,14 @@ index 0000000..188b3a6
+
+Requires.private: xmlrpc++ xmlrpc_client
+Libs: -L${libdir} -lxmlrpc_client++
+Cflags: -I${includedir}
+Cflags: -I${includedir}
diff --git a/src/cpp/xmlrpc_cpp.pc.cmake b/src/cpp/xmlrpc_cpp.pc.cmake
new file mode 100644
index 0000000..b8f5af3
index 0000000..7e21383
--- /dev/null
+++ b/src/cpp/xmlrpc_cpp.pc.cmake
@@ -0,0 +1,11 @@
@@ -0,0 +1,12 @@
+bindir=@bindir@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
@ -989,13 +1062,14 @@ index 0000000..b8f5af3
+
+Requires.private: xmlrpc xmlrpc_server xmlrpc_client
+Libs: -L${libdir} -lxmlrpc_cpp
+Cflags: -I${includedir}
+Cflags: -I${includedir}
diff --git a/src/cpp/xmlrpc_server++.pc.cmake b/src/cpp/xmlrpc_server++.pc.cmake
new file mode 100644
index 0000000..07b9e7b
index 0000000..7ddcca8
--- /dev/null
+++ b/src/cpp/xmlrpc_server++.pc.cmake
@@ -0,0 +1,11 @@
@@ -0,0 +1,12 @@
+bindir=@bindir@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
@ -1006,13 +1080,14 @@ index 0000000..07b9e7b
+
+Requires.private: xmlrpc++ xmlrpc_server
+Libs: -L${libdir} -lxmlrpc_server++
+Cflags: -I${includedir}
+Cflags: -I${includedir}
diff --git a/src/cpp/xmlrpc_server_abyss++.pc.cmake b/src/cpp/xmlrpc_server_abyss++.pc.cmake
new file mode 100644
index 0000000..d9eb456
index 0000000..f0e4cd0
--- /dev/null
+++ b/src/cpp/xmlrpc_server_abyss++.pc.cmake
@@ -0,0 +1,11 @@
@@ -0,0 +1,12 @@
+bindir=@bindir@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
@ -1023,17 +1098,17 @@ index 0000000..d9eb456
+
+Requires.private: xmlrpc_server_abyss xmlrpc_server++
+Libs: -L${libdir} -lxmlrpc_server_abyss++
+Cflags: -I${includedir}
+Cflags: -I${includedir}
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
new file mode 100644
index 0000000..3deb9cb
index 0000000..1ad605b
--- /dev/null
+++ b/src/test/CMakeLists.txt
@@ -0,0 +1,27 @@
+# -*- cmake -*-
+
+set(test_SOURCES
+ test.c abyss.c cgi.c method_registry.c parse_xml.c serialize.c server_abyss.c
+ test.c cgi.c method_registry.c parse_xml.c serialize.c server_abyss.c
+ value.c xml_data.c)
+
+if(MUST_BUILD_CLIENT)
@ -1059,10 +1134,11 @@ index 0000000..3deb9cb
+add_test(runtests src-test)
diff --git a/src/xmlrpc.pc.cmake b/src/xmlrpc.pc.cmake
new file mode 100644
index 0000000..fd0c872
index 0000000..4c92f93
--- /dev/null
+++ b/src/xmlrpc.pc.cmake
@@ -0,0 +1,11 @@
@@ -0,0 +1,12 @@
+bindir=@bindir@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
@ -1073,13 +1149,14 @@ index 0000000..fd0c872
+
+Requires.private: @xmlrpc_pkgconfig_req@ xmlrpc_util
+Libs: -L${libdir} -lxmlrpc @xmlrpc_pkgconfig_libs@
+Cflags: -I${includedir}
+Cflags: -I${includedir}
diff --git a/src/xmlrpc_client.pc.cmake b/src/xmlrpc_client.pc.cmake
new file mode 100644
index 0000000..16bdd22
index 0000000..8e74c44
--- /dev/null
+++ b/src/xmlrpc_client.pc.cmake
@@ -0,0 +1,11 @@
@@ -0,0 +1,12 @@
+bindir=@bindir@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
@ -1090,13 +1167,14 @@ index 0000000..16bdd22
+
+Requires.private: xmlrpc @xmlrpc_client_pkgconfig_req@
+Libs: -L${libdir} -lxmlrpc_client @client_libwww_LIBS@ @client_wininet_LIBS@
+Cflags: -I${includedir}
+Cflags: -I${includedir}
diff --git a/src/xmlrpc_server.pc.cmake b/src/xmlrpc_server.pc.cmake
new file mode 100644
index 0000000..ca7224c
index 0000000..cb7d4cd
--- /dev/null
+++ b/src/xmlrpc_server.pc.cmake
@@ -0,0 +1,11 @@
@@ -0,0 +1,12 @@
+bindir=@bindir@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
@ -1107,13 +1185,14 @@ index 0000000..ca7224c
+
+Requires.private: xmlrpc
+Libs: -L${libdir} -lxmlrpc_server
+Cflags: -I${includedir}
+Cflags: -I${includedir}
diff --git a/src/xmlrpc_server_abyss.pc.cmake b/src/xmlrpc_server_abyss.pc.cmake
new file mode 100644
index 0000000..7fbecc9
index 0000000..0357ff9
--- /dev/null
+++ b/src/xmlrpc_server_abyss.pc.cmake
@@ -0,0 +1,11 @@
@@ -0,0 +1,12 @@
+bindir=@bindir@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
@ -1124,13 +1203,14 @@ index 0000000..7fbecc9
+
+Requires.private: xmlrpc_server xmlrpc_abyss
+Libs: -L${libdir} -lxmlrpc_server_abyss
+Cflags: -I${includedir}
+Cflags: -I${includedir}
diff --git a/src/xmlrpc_server_cgi.pc.cmake b/src/xmlrpc_server_cgi.pc.cmake
new file mode 100644
index 0000000..8042912
index 0000000..8786b75
--- /dev/null
+++ b/src/xmlrpc_server_cgi.pc.cmake
@@ -0,0 +1,11 @@
@@ -0,0 +1,12 @@
+bindir=@bindir@
+prefix=@prefix@
+libdir=@libdir@
+includedir=@includedir@
@ -1141,7 +1221,7 @@ index 0000000..8042912
+
+Requires.private: xmlrpc_server
+Libs: -L${libdir} -lxmlrpc_server_cgi
+Cflags: -I${includedir}
+Cflags: -I${includedir}
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
new file mode 100644
index 0000000..14010f4
@ -1275,10 +1355,10 @@ index 0000000..35beafc
+#define XMLRPC_C_VERSION "@XMLRPC_C_VERSION@"
diff --git a/xmlrpc-c-config b/xmlrpc-c-config
new file mode 100755
index 0000000..e8ba549
index 0000000..8f4f51b
--- /dev/null
+++ b/xmlrpc-c-config
@@ -0,0 +1,38 @@
@@ -0,0 +1,67 @@
+#! /bin/sh
+
+comp=
@ -1316,6 +1396,35 @@ index 0000000..e8ba549
+ test -z "$need_server" || comp="$comp xmlrpc_server++"
+fi
+
+dummy_comp=xmlrpc_client
+
+case $1 in
+ (--features|--modules)
+ echo "c++ abyss-server curl-client"
+ exit 0
+ ;;
+ (--version)
+ set -- --modversion
+ ;;
+ (--exec-prefix)
+ set -- --variable=prefix
+ ;;
+ (--*dir|--prefix)
+ set -- --variable=${1##--}
+ ;;
+ (--ldflags)
+ set -- --libs-only-L
+ ;;
+ (--ldadd)
+ set -- --libs-only-l
+ ;;
+ (*)
+ dummy_comp=
+ ;;
+esac
+
+test x"$comp" != x || comp=$dummy_comp
+
+exec pkg-config "$@" $comp
diff --git a/xmlrpc_config.h.cmake b/xmlrpc_config.h.cmake
new file mode 100644
@ -1345,5 +1454,5 @@ index 0000000..98b37ef
+
+#endif
--
1.4.2.1
1.5.0.5

21
xmlrpc-c.spec
View File

@ -1,11 +1,9 @@
%global _includedir %_includedir/%name
%{!?release_func:%global release_func() %1%{?dist}}
Summary: A lightweight RPC library based on XML and HTTP
Name: xmlrpc-c
Version: 1.06.11
Release: %release_func 1
Release: %release_func 2
License: BSD/PSF -- see COPYING
Group: System Environment/Libraries
URL: http://xmlrpc-c.sourceforge.net/
@ -54,13 +52,7 @@ This package contains some handy XML-RPC demo applications.
%prep
%setup -q
%patch6 -p1 -b .sizet
cat %PATCH100 | patch -p1
sed -i -e '/\(chan\|init\.c\)/d' lib/abyss/src/CMakeLists.txt
sed -i -e 's!xmlrpc_decompose.c!xmlrpc_builddecomp.c!g;
s!xmlrpc_build.c!!g;' src/CMakeLists.txt
sed -i -e 's! abyss.c!!g;' src/test/CMakeLists.txt
%patch100 -p1
## not needed...
rm doc/{INSTALL,configure_doc}
@ -105,7 +97,8 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,-)
%_bindir/xmlrpc-c-config
%_includedir
%_includedir/xmlrpc-c
%_includedir/*.h
%_libdir/pkgconfig/*.pc
%_libdir/*.so
@ -121,6 +114,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Sun Apr 1 2007 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 1.06.11-2
- rediffed cmake patch against current version
- made the xmlrpc-c-config compatible to the upstream version
- added compatibility symlinks for some header files (thx to Robert de
Vries for reporting these two issues)
* Sat Mar 17 2007 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 1.06.11-1
- updated to 1.06.11