From: Sascha Schumann <sas@php.net>
Date: Sun, 12 May 2002 17:28:12 +0000 (+0000)
Subject: As far as I can tell, the AC_CHECK_MEMBER could not succeed,
X-Git-Tag: php-4.3.0dev-ZendEngine2-Preview1~82
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=226e1ed246bc5e1db71bacad985ab47763931d18;p=php

As far as I can tell, the AC_CHECK_MEMBER could not succeed,
because it does not include <sys/socket.h> which is necessary
for the definition of struct msghdr.  This include file is not
part of ac_includes_default.

Regardless, AC_CHECK_MEMBER is a autoconf-2.5x macro and thus we
expand it here for 2.13 compatibility.
---

diff --git a/ext/sockets/config.m4 b/ext/sockets/config.m4
index 3229fce907..cdfa985aef 100644
--- a/ext/sockets/config.m4
+++ b/ext/sockets/config.m4
@@ -7,10 +7,15 @@ PHP_ARG_ENABLE(sockets, whether to enable sockets support,
 
 if test "$PHP_SOCKETS" != "no"; then
 
-  AC_CHECK_FUNCS(hstrerror)
-  AC_CHECK_HEADERS(netdb.h netinet/tcp.h sys/un.h errno.h)
-  AC_CHECK_MEMBER(struct msghdr.msg_flags, , AC_DEFINE(MISSING_MSGHDR_MSGFLAGS, 1, [ ]))
-  AC_DEFINE(HAVE_SOCKETS, 1, [ ])
+  AC_CHECK_FUNCS([hstrerror])
+  AC_CHECK_HEADERS([netdb.h netinet/tcp.h sys/un.h errno.h])
+  AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>
+  ], [static struct msghdr tp; int n = (int) tp.msg_flags; return n],
+    [AC_DEFINE(MISSING_MSGHDR_MSGFLAGS, 1, [ ])]
+  )
+  AC_DEFINE([HAVE_SOCKETS], 1, [ ])
 
-  PHP_NEW_EXTENSION(sockets, sockets.c, $ext_shared)
+  PHP_NEW_EXTENSION([sockets], [sockets.c], [$ext_shared])
 fi