sniper Wed Jun 27 14:40:02 2007 UTC
Modified files:
/php-src acinclude.m4 configure.in
Log:
- Added PHP_CHECK_SIZEOF macro (special version of AC_CHECK_SIZEOF)
# Now types like ptrdiff_t, ssize_t and intmax_t get defined to something
# useful..
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.368&r2=1.369&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.368 php-src/acinclude.m4:1.369
--- php-src/acinclude.m4:1.368 Thu May 24 21:43:56 2007
+++ php-src/acinclude.m4 Wed Jun 27 14:40:02 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.368 2007/05/24 21:43:56 sniper Exp $
+dnl $Id: acinclude.m4,v 1.369 2007/06/27 14:40:02 sniper Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -1035,6 +1035,44 @@
dnl -------------------------------------------------------------------------
dnl
+dnl PHP_CHECK_SIZEOF(TYPE [, CROSS-SIZE])
+dnl Enhanced version of AC_CHECK_SIZEOF for checking more types
+dnl than just those defined in stdio.h
+dnl
+AC_DEFUN(PHP_CHECK_SIZEOF,
+[changequote(<<, >>)dnl
+dnl The name to #define.
+define(<<AC_TYPE_NAME>>, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
+dnl The cache variable name.
+define(<<AC_CV_NAME>>, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl
+changequote([, ])dnl
+AC_MSG_CHECKING(size of $1)
+AC_CACHE_VAL(AC_CV_NAME,
+[AC_TRY_RUN([#include <stdio.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+int main()
+{
+ FILE *f=fopen("conftestval", "w");
+ if (!f) return(1);
+ fprintf(f, "%d\n", sizeof($1));
+ return(0);
+ }], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$2], , ,
AC_CV_NAME=$2))])dnl
+AC_MSG_RESULT($AC_CV_NAME)
+AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in a $1.])
+undefine([AC_TYPE_NAME])dnl
+undefine([AC_CV_NAME])dnl
+])
+
+dnl
dnl PHP_CHECK_IN_ADDR_T
dnl
AC_DEFUN([PHP_CHECK_IN_ADDR_T], [
@@ -2713,6 +2751,9 @@
fi
])
+dnl
+dnl PHP_TEST_WRITE_STDOUT
+dnl
AC_DEFUN([PHP_TEST_WRITE_STDOUT],[
AC_CACHE_CHECK(whether writing to stdout works,ac_cv_write_stdout,[
AC_TRY_RUN([
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.628&r2=1.629&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.628 php-src/configure.in:1.629
--- php-src/configure.in:1.628 Mon Jun 25 14:23:21 2007
+++ php-src/configure.in Wed Jun 27 14:40:02 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.628 2007/06/25 14:23:21 dmitry Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.629 2007/06/27 14:40:02 sniper Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -422,15 +422,17 @@
PHP_STRUCT_FLOCK
PHP_SOCKLEN_T
-AC_CHECK_SIZEOF(intmax_t, 0)
AC_CHECK_SIZEOF(size_t, 8)
-AC_CHECK_SIZEOF(ssize_t, 8)
-AC_CHECK_SIZEOF(ptrdiff_t, 8)
AC_CHECK_SIZEOF(long long, 8)
AC_CHECK_SIZEOF(long long int, 8)
AC_CHECK_SIZEOF(long, 8)
AC_CHECK_SIZEOF(int, 4)
+dnl These are defined elsewhere than stdio.h
+PHP_CHECK_SIZEOF(intmax_t, 0)
+PHP_CHECK_SIZEOF(ssize_t, 8)
+PHP_CHECK_SIZEOF(ptrdiff_t, 8)
+
dnl Check for members of the stat structure
AC_STRUCT_ST_BLKSIZE
dnl AC_STRUCT_ST_BLOCKS will screw QNX because fileblocks.o does not exists
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
