Clean headers checks

Some headers were checked multiple times in the main configure.ac file
and in the bundled extensions or SAPIs themselves. Also many of these
checks are then used accross other extensions or SAPIs so a central
configure.ac makes most sense for these checks.

diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index d8594874985c8beb5763aba010e5a0f722b2bba4..5b97e6c361f6ca415727369c139e407ea19f0c92 100644 (file)
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -126,16 +126,7 @@ dnl
 AC_DEFUN([LIBZEND_BASIC_CHECKS],[
 AC_REQUIRE([AC_PROG_CC])
 
-AC_CHECK_HEADERS(
-inttypes.h \
-stdint.h \
-malloc.h \
-unistd.h \
-sys/types.h \
-sys/time.h \
-unix.h \
-cpuid.h \
-dlfcn.h)
+AC_CHECK_HEADERS([cpuid.h])
 
 dnl
 dnl LIBZEND_DLSYM_CHECK

diff --git a/configure.ac b/configure.ac
index 450de11c16ad4233080d7c1d8eb7d5c5e47f5b8e..0680a0acfa873dc2ef5a85b35042d90fa4870acf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -436,12 +436,14 @@ ieeefp.h \
 langinfo.h \
 limits.h \
 locale.h \
+malloc.h \
 monetary.h \
 netdb.h \
 poll.h \
 pwd.h \
 resolv.h \
 signal.h \
+strings.h \
 syslog.h \
 sysexits.h \
 sys/ioctl.h \
@@ -457,6 +459,7 @@ sys/statfs.h \
 sys/statvfs.h \
 sys/vfs.h \
 sys/sysexits.h \
+sys/uio.h \
 sys/wait.h \
 sys/loadavg.h \
 termios.h \

diff --git a/ext/date/config0.m4 b/ext/date/config0.m4
index ebd86acc2e4822abf2f8e353a4f51f880a176bce..38389503e1ccddb768a36b1983cabc4c60d84b7d 100644 (file)
--- a/ext/date/config0.m4
+++ b/ext/date/config0.m4
@@ -1,8 +1,5 @@
 dnl Check for headers needed by timelib
-AC_CHECK_HEADERS([ \
-strings.h \
-io.h
-])
+AC_CHECK_HEADERS([io.h])
 
 dnl Check for strtoll, atoll
 AC_CHECK_FUNCS(strtoll atoll)

diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
index 4d8f3a5888d31912371a9e797adf3a80bbdc72a1..dc32c5b94fbfcadc6be3ab6b7b714323f6925642 100644 (file)
--- a/ext/opcache/config.m4
+++ b/ext/opcache/config.m4
@@ -21,8 +21,6 @@ if test "$PHP_OPCACHE" != "no"; then
     AC_DEFINE(HAVE_MPROTECT, 1, [Define if you have mprotect() function])
   ])
 
-  AC_CHECK_HEADERS([unistd.h sys/uio.h])
-
   AC_MSG_CHECKING(for sysvipc shared memory support)
   AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>

diff --git a/ext/sockets/config.m4 b/ext/sockets/config.m4
index 405b68d2884281dcc89578161dc25d142631a3c6..71cebdb3e2cc9194fd9624c5fddb2d5d22f3015c 100644 (file)
--- a/ext/sockets/config.m4
+++ b/ext/sockets/config.m4
@@ -17,7 +17,7 @@ if test "$PHP_SOCKETS" != "no"; then
   fi
 
   AC_CHECK_FUNCS([hstrerror socketpair if_nametoindex if_indextoname])
-  AC_CHECK_HEADERS([netdb.h netinet/tcp.h sys/un.h sys/sockio.h])
+  AC_CHECK_HEADERS([netinet/tcp.h sys/un.h sys/sockio.h])
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/types.h>
 #include <sys/socket.h>

diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index 891fca2ffa026c565cfd2b46e9d459ff9128b447..b0ec90900bf736a04334ad4834e758b5fa65d8e7 100644 (file)
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -448,7 +448,6 @@ AC_CHECK_HEADERS([net/if.h],[], [],
   #endif
   #include <net/if.h>
 ])
-AC_CHECK_HEADERS([netdb.h])
 AC_MSG_CHECKING([for usable getifaddrs])
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
   #include <sys/types.h>

diff --git a/sapi/fpm/config.m4 b/sapi/fpm/config.m4
index 67ffc105222f687eff651b4969a28f4d5f9a6f79..24d42d2bf06d2b1b366f8f536861602cc0dfaffd 100644 (file)
--- a/sapi/fpm/config.m4
+++ b/sapi/fpm/config.m4
@@ -11,11 +11,6 @@ AC_DEFUN([AC_FPM_STDLIBS],
 
   AC_SEARCH_LIBS(socket, socket)
   AC_SEARCH_LIBS(inet_addr, nsl)
-
-  AC_CHECK_HEADERS([fcntl.h unistd.h sys/uio.h])
-  AC_CHECK_HEADERS([sys/select.h sys/socket.h sys/time.h])
-  AC_CHECK_HEADERS([arpa/inet.h netinet/in.h])
-  AC_CHECK_HEADERS([sysexits.h])
 ])
 
 AC_DEFUN([AC_FPM_PRCTL],