cvs: php4 /ext/standard config.m4
| From: | Jani Taskinen | Date: | Mon, 08 Apr 2002 06:45:54 +0000 |
| Subject: | cvs: php4 /ext/standard config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-10963@lists.php.net to get a copy of this message | ||
sniper Mon Apr 8 02:45:54 2002 EDT
Modified files:
/php4/ext/standard config.m4
Log:
Using system regex lib seems not to work quite well when compiled with Apache.
Index: php4/ext/standard/config.m4
diff -u php4/ext/standard/config.m4:1.34 php4/ext/standard/config.m4:1.35
--- php4/ext/standard/config.m4:1.34 Tue Mar 26 06:05:18 2002
+++ php4/ext/standard/config.m4 Mon Apr 8 02:45:52 2002
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.34 2002/03/26 11:05:18 sas Exp $ -*- sh -*-
+dnl $Id: config.m4,v 1.35 2002/04/08 06:45:52 sniper Exp $ -*- sh -*-
divert(3)dnl
@@ -203,7 +203,11 @@
[
case $withval in
system)
- REGEX_TYPE=system
+ if test "$PHP_SAPI" = "apache" || test "$PHP_SAPI" =
"apache2filter"; then
+ REGEX_TYPE=php
+ else
+ REGEX_TYPE=system
+ fi
;;
apache)
REGEX_TYPE=apache
@@ -220,15 +224,6 @@
REGEX_TYPE=php
])
-AC_ARG_WITH(system-regex,
-[ --with-system-regex (deprecated) Use system regex library],[
- if test "$withval" = "yes"; then
- REGEX_TYPE=system
- else
- REGEX_TYPE=php
- fi
-])
-
AC_CHECK_FUNCS(fnmatch glob)
if test "$PHP_SAPI" = "cgi"; then