From: Peter Kokot <peterkokot@gmail.com>
Date: Mon, 22 Apr 2019 22:20:50 +0000 (+0200)
Subject: Simplify libxmlrpc bundling and building
X-Git-Tag: php-7.4.0alpha1~428
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96a9fb20522fd92295b6191ff57deaa671f0bea5;p=php

Simplify libxmlrpc bundling and building

The xmlrpc library is a forked, modified and bundled into the PHP source
code. Instead of having a separate *nix build system files in the xmlrpc
library this patch removes unneeded build checks.

- AC_PROG_CC is not needed to be called by the extension itself since it
  is already part of the main configure.ac and the phpize's
  configure.ac.
- UNDEF_THREADS_HACK is not used in the current codebase.
- Symbols defined by XMLRPC_HEADER_CHECKS are not used in the current
  code.
- Symbols defined by XMLRPC_FUNCTION_CHECKS are not used in the current
  code.
- AC_PROG_RANLIB is already done by the TSRM's files and isn't needed
  for the xmlrpc extension to work.
- AC_PROG_LN_S is already done by the PHP main configure.ac and also
  isn't needed by the xmlrpc extension to be built.
---

diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
index f7d8ca45f7..5263557f3d 100644
--- a/ext/xmlrpc/config.m4
+++ b/ext/xmlrpc/config.m4
@@ -1,10 +1,5 @@
 dnl config.m4 for extension xmlrpc
 
-sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4)
-sinclude(ext/xmlrpc/libxmlrpc/xmlrpc.m4)
-sinclude(libxmlrpc/acinclude.m4)
-sinclude(libxmlrpc/xmlrpc.m4)
-
 PHP_ARG_WITH([xmlrpc],
   [for XMLRPC-EPI support],
   [AS_HELP_STRING([[--with-xmlrpc[=DIR]]],
@@ -80,7 +75,6 @@ if test "$PHP_XMLRPC" != "no"; then
 fi
 
 if test "$PHP_XMLRPC" = "yes"; then
-  XMLRPC_CHECKS
   PHP_NEW_EXTENSION(xmlrpc,xmlrpc-epi-php.c libxmlrpc/base64.c \
           libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \
           libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \
diff --git a/ext/xmlrpc/libxmlrpc/acinclude.m4 b/ext/xmlrpc/libxmlrpc/acinclude.m4
deleted file mode 100644
index 0b730fa36d..0000000000
--- a/ext/xmlrpc/libxmlrpc/acinclude.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-# Local macros for autoconf
-
-AC_DEFUN([XMLRPC_FUNCTION_CHECKS],[
-
-# Standard XMLRPC list
-AC_CHECK_FUNCS(strtoul strtoull)
-])
-
-AC_DEFUN([XMLRPC_HEADER_CHECKS],[
-AC_CHECK_HEADERS(xmlparse.h xmltok.h strings.h)
-])
diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.m4 b/ext/xmlrpc/libxmlrpc/xmlrpc.m4
deleted file mode 100644
index 5e9552b3c1..0000000000
--- a/ext/xmlrpc/libxmlrpc/xmlrpc.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-AC_DEFUN([XMLRPC_CHECKS],[
-
-AC_REQUIRE([AC_PROG_CC])
-AC_REQUIRE([AC_PROG_LN_S])
-AC_REQUIRE([AC_PROG_RANLIB])
-
-AC_DEFINE(UNDEF_THREADS_HACK,,[ ])
-
-XMLRPC_HEADER_CHECKS
-XMLRPC_FUNCTION_CHECKS
-])