diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-04-23 20:18:38 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-04-23 20:18:38 +0200 |
| commit | fe54a667202fcd88fa725d62a64aad2ce575423e (patch) | |
| tree | 5d185278604c4d37f291aeeabec8aa080fb49152 | |
| parent | 4c25fc5479dd7e40a971aeaf34799aa77383cc3d (diff) | |
| parent | 96a9fb20522fd92295b6191ff57deaa671f0bea5 (diff) | |
| download | php-git-fe54a667202fcd88fa725d62a64aad2ce575423e.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Simplify libxmlrpc bundling and building
| -rw-r--r-- | ext/xmlrpc/config.m4 | 6 | ||||
| -rw-r--r-- | ext/xmlrpc/libxmlrpc/acinclude.m4 | 11 | ||||
| -rw-r--r-- | ext/xmlrpc/libxmlrpc/xmlrpc.m4 | 11 |
3 files changed, 0 insertions, 28 deletions
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 -]) |