sniper Wed Jul 13 11:15:58 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src acinclude.m4
Log:
MFH
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.271.2.18&r2=1.271.2.19&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.271.2.18 php-src/acinclude.m4:1.271.2.19
--- php-src/acinclude.m4:1.271.2.18 Mon Jun 20 07:48:22 2005
+++ php-src/acinclude.m4 Wed Jul 13 11:15:56 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.271.2.18 2005/06/20 11:48:22 sniper Exp $ -*-
autoconf -*-
+dnl $Id: acinclude.m4,v 1.271.2.19 2005/07/13 15:15:56 sniper Exp $ -*-
autoconf -*-
dnl
dnl This file contains local autoconf functions.
@@ -1086,20 +1086,32 @@
rm -rf conftest*
])
-AC_DEFUN([PHP_REGEX],[
-
-if test "$REGEX_TYPE" = "php"; then
- AC_DEFINE(HSREGEX,1,[ ])
- AC_DEFINE(REGEX,1,[ ])
- PHP_ADD_SOURCES(regex, regcomp.c regexec.c regerror.c regfree.c)
-elif test "$REGEX_TYPE" = "system"; then
- AC_DEFINE(REGEX,0,[ ])
-fi
-AC_MSG_CHECKING([which regex library to use])
-AC_MSG_RESULT([$REGEX_TYPE])
+dnl
+dnl PHP_REGEX
+dnl
+AC_DEFUN([PHP_REGEX],[
+ if test "$REGEX_TYPE" = "php"; then
+ AC_DEFINE(HAVE_REGEX_T_RE_MAGIC, 1, [ ])
+ AC_DEFINE(HSREGEX,1,[ ])
+ AC_DEFINE(REGEX,1,[ ])
+ PHP_ADD_SOURCES(regex, regcomp.c regexec.c regerror.c regfree.c)
+ elif test "$REGEX_TYPE" = "system"; then
+ AC_DEFINE(REGEX,0,[ ])
+ dnl Check if field re_magic exists in struct regex_t
+ AC_CACHE_CHECK([whether field re_magic exists in struct regex_t],
ac_cv_regex_t_re_magic, [
+ AC_TRY_COMPILE([#include <regex.h>], [struct regex_t rt; rt.re_magic;],
+ [ac_cv_regex_t_re_magic=yes], [ac_cv_regex_t_re_magic=no])
+ ])
+ if test "$ac_cv_regex_t_re_magic" = "yes"; then
+ AC_DEFINE([HAVE_REGEX_T_RE_MAGIC], [ ], 1)
+ fi
+ fi
+ AC_MSG_CHECKING([which regex library to use])
+ AC_MSG_RESULT([$REGEX_TYPE])
])
+
dnl
dnl See if we have broken header files like SunOS has.
dnl
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
