diff options
author | Peter Kokot <peterkokot@gmail.com> | 2019-03-13 22:50:53 +0100 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2019-03-14 20:20:12 +0100 |
commit | 97d25c87d2f875426aa27495896f419412de7ab2 (patch) | |
tree | 0f2257f6790a487239d3a2ff11685365e9bb06a7 | |
parent | 3a857852a8dada5e60ba6d028878ecd6224b9c5d (diff) | |
download | php-git-97d25c87d2f875426aa27495896f419412de7ab2.tar.gz |
Clean build system
Changes:
- AC_TYPE_SIZE_T called on only one place (configure.ac)
- AC_FUNC_ALLOCA called on only one place (configure.ac)
- AC_TYPE_UID_T called on only one place (configure.ac)
- HAVE_STRSTR removed since strstr is part of C89 standard [1]
- Remove checks for strtol and strpbrk
- Checking for the presence of perror function is not needed anymore
since it is part of C89 standard and PHP calls it unconditionally.
- Checking for functions strdup, setenv, strerror, and memmove done only
on one place (configure.ac)
- outdated check for snprintf removed
1: https://port70.net/~nsz/c/c89/c89-draft.html
-rw-r--r-- | Zend/Zend.m4 | 5 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | ext/xmlrpc/libxmlrpc/acinclude.m4 | 10 | ||||
-rw-r--r-- | sapi/fpm/config.m4 | 2 | ||||
-rw-r--r-- | win32/build/config.w32.h.in | 1 |
5 files changed, 3 insertions, 17 deletions
diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index fe8632b25e..f382c53c46 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -22,8 +22,6 @@ unix.h \ cpuid.h \ dlfcn.h) -AC_TYPE_SIZE_T - AC_DEFUN([LIBZEND_DLSYM_CHECK],[ dnl dnl Ugly hack to check if dlsym() requires a leading underscore in symbol name. @@ -40,8 +38,7 @@ _LT_AC_TRY_DLOPEN_SELF([ ]) dnl Checks for library functions. -AC_FUNC_ALLOCA -AC_CHECK_FUNCS(strdup getpid kill strtod strtol finite fpclass sigsetjmp) +AC_CHECK_FUNCS(getpid kill strtod finite fpclass sigsetjmp) AC_CHECK_DECLS([isfinite, isnan, isinf], [], [], [[#include <math.h>]]) diff --git a/configure.ac b/configure.ac index 7fc0dc77f0..8fca2885b2 100644 --- a/configure.ac +++ b/configure.ac @@ -631,7 +631,6 @@ memmove \ mkstemp \ mmap \ nl_langinfo \ -perror \ poll \ ptsname \ putenv \ @@ -659,7 +658,6 @@ strdup \ strerror \ strnlen \ strptime \ -strstr \ strtok_r \ symlink \ tempnam \ diff --git a/ext/xmlrpc/libxmlrpc/acinclude.m4 b/ext/xmlrpc/libxmlrpc/acinclude.m4 index d73ae8cc35..0c63d95356 100644 --- a/ext/xmlrpc/libxmlrpc/acinclude.m4 +++ b/ext/xmlrpc/libxmlrpc/acinclude.m4 @@ -3,11 +3,7 @@ AC_DEFUN([XMLRPC_FUNCTION_CHECKS],[ # Standard XMLRPC list -AC_CHECK_FUNCS( \ - strtoul strtoull snprintf \ - strstr strpbrk strerror\ - memmove) - +AC_CHECK_FUNCS(strtoul strtoull) ]) AC_DEFUN([XMLRPC_HEADER_CHECKS],[ @@ -22,8 +18,4 @@ AC_CHECK_SIZEOF(char, 1) AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(long, 4) AC_CHECK_SIZEOF(long long, 8) -AC_TYPE_SIZE_T -AC_TYPE_UID_T - - ]) diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4 index b23a6746d1..2aed96046c 100644 --- a/sapi/fpm/config.m4 +++ b/sapi/fpm/config.m4 @@ -9,7 +9,7 @@ PHP_ARG_ENABLE([fpm],, dnl configure checks {{{ AC_DEFUN([AC_FPM_STDLIBS], [ - AC_CHECK_FUNCS(setenv clearenv setproctitle setproctitle_fast) + AC_CHECK_FUNCS(clearenv setproctitle setproctitle_fast) AC_SEARCH_LIBS(socket, socket) AC_SEARCH_LIBS(inet_addr, nsl) diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index 067305c763..b2d944c14d 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -86,7 +86,6 @@ #define HAVE_STRCASECMP 1 #define HAVE_STRDUP 1 #define HAVE_STRERROR 1 -#define HAVE_STRSTR 1 #define HAVE_TEMPNAM 1 #define HAVE_UTIME 1 #undef HAVE_DIRENT_H |