From 751c330d4573437e31865f225f86d307c0cc9c8c Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 12 Dec 2010 23:57:03 +0000 Subject: [PATCH] xmlrpc-c: fix autoreconf SVN-Revision: 24529 --- libs/xmlrpc-c/patches/001-config.mk.in.patch | 6 +++--- libs/xmlrpc-c/patches/002-automake-compat.patch | 13 +++++++++++++ .../patches/005-curl_transport_Makefile.patch | 6 +++--- 3 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 libs/xmlrpc-c/patches/002-automake-compat.patch diff --git a/libs/xmlrpc-c/patches/001-config.mk.in.patch b/libs/xmlrpc-c/patches/001-config.mk.in.patch index 4e4c43791..42e3b3bec 100644 --- a/libs/xmlrpc-c/patches/001-config.mk.in.patch +++ b/libs/xmlrpc-c/patches/001-config.mk.in.patch @@ -1,6 +1,6 @@ ---- a/config.mk.in 2009-02-20 13:00:04.000000000 +0300 -+++ b/config.mk.in 2009-02-24 15:26:52.000000000 +0300 -@@ -173,7 +173,7 @@ +--- a/config.mk.in ++++ b/config.mk.in +@@ -178,7 +178,7 @@ ifeq ($(patsubst linux-gnu%,linux-gnu,$( shlibfn = $(1:%=%.$(SHLIB_SUFFIX).$(MAJ).$(MIN)) shliblefn = $(1:%=%.$(SHLIB_SUFFIX)) # SHLIB_CLIB = -lc diff --git a/libs/xmlrpc-c/patches/002-automake-compat.patch b/libs/xmlrpc-c/patches/002-automake-compat.patch new file mode 100644 index 000000000..7503b7c33 --- /dev/null +++ b/libs/xmlrpc-c/patches/002-automake-compat.patch @@ -0,0 +1,13 @@ +--- a/configure.in ++++ b/configure.in +@@ -230,9 +230,7 @@ dnl Checks for programs. + dnl ======================================================================= + + AC_PROG_CC +-if test x"$enable_cplusplus" != xno; then +- AC_PROG_CXX +-fi ++AC_PROG_CXX + + + dnl ======================================================================= diff --git a/libs/xmlrpc-c/patches/005-curl_transport_Makefile.patch b/libs/xmlrpc-c/patches/005-curl_transport_Makefile.patch index 73236cb49..3b67f25ad 100644 --- a/libs/xmlrpc-c/patches/005-curl_transport_Makefile.patch +++ b/libs/xmlrpc-c/patches/005-curl_transport_Makefile.patch @@ -1,6 +1,6 @@ ---- a/lib/curl_transport/Makefile 2009-02-20 13:00:03.000000000 +0300 -+++ b/lib/curl_transport/Makefile 2009-02-20 16:54:45.000000000 +0300 -@@ -34,6 +34,7 @@ +--- a/lib/curl_transport/Makefile ++++ b/lib/curl_transport/Makefile +@@ -34,6 +34,7 @@ INCLUDES = \ -I$(BLDDIR)/include \ -I$(SRCDIR)/include \ -I$(SRCDIR)/lib/util/include \ -- 2.30.2