sniper Fri Apr 4 10:42:54 2003 EDT
Modified files:
/php4 configure.in
/php4/ext/sockets config.m4
Log:
- Checks specific to some extension belong in the extension's config.m4
Index: php4/configure.in
diff -u php4/configure.in:1.440 php4/configure.in:1.441
--- php4/configure.in:1.440 Fri Apr 4 08:02:42 2003
+++ php4/configure.in Fri Apr 4 10:42:54 2003
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.440 2003/04/04 13:02:42 moriyoshi Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.441 2003/04/04 15:42:54 sniper Exp $ -*- sh -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -425,15 +425,6 @@
ac_cv_sockaddr_storage=yes, ac_cv_sockaddr_storage=no)])
if test "$ac_cv_sockaddr_storage" = yes; then
AC_DEFINE(HAVE_SOCKADDR_STORAGE,1,[Whether you have struct sockaddr_storage])
-fi
-
-dnl Check for struct sockaddr_storage
-AC_CACHE_CHECK([for struct cmsghdr], ac_cv_cmsghdr,
-[AC_TRY_COMPILE([ #include <sys/types.h>
-#include <sys/socket.h>], [struct cmsghdr s; s],
- ac_cv_cmsghdr=yes, ac_cv_cmsghdr=no)])
-if test "$ac_cv_cmsghdr" = yes; then
- AC_DEFINE(HAVE_CMSGHDR,1,[Whether you have struct cmsghdr])
fi
dnl Check if sockaddr data structure includes an "sa_len" member
Index: php4/ext/sockets/config.m4
diff -u php4/ext/sockets/config.m4:1.11 php4/ext/sockets/config.m4:1.12
--- php4/ext/sockets/config.m4:1.11 Wed Sep 4 10:30:36 2002
+++ php4/ext/sockets/config.m4 Fri Apr 4 10:42:54 2003
@@ -1,11 +1,22 @@
dnl
-dnl $Id: config.m4,v 1.11 2002/09/04 14:30:36 sniper Exp $
+dnl $Id: config.m4,v 1.12 2003/04/04 15:42:54 sniper Exp $
dnl
PHP_ARG_ENABLE(sockets, whether to enable sockets support,
[ --enable-sockets Enable sockets support])
if test "$PHP_SOCKETS" != "no"; then
+ dnl Check for struct cmsghdr
+ AC_CACHE_CHECK([for struct cmsghdr], ac_cv_cmsghdr,
+ [
+ AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>], [struct cmsghdr s; s], ac_cv_cmsghdr=yes, ac_cv_cmsghdr=no)
+ ])
+
+ if test "$ac_cv_cmsghdr" = yes; then
+ AC_DEFINE(HAVE_CMSGHDR,1,[Whether you have struct cmsghdr])
+ fi
AC_CHECK_FUNCS([hstrerror])
AC_CHECK_HEADERS([netdb.h netinet/tcp.h sys/un.h errno.h])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php