summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2002-04-08 06:45:52 +0000
committerfoobar <sniper@php.net>2002-04-08 06:45:52 +0000
commit23a3cc71e3e321308fe6c28302a51a689dab1745 (patch)
tree99ddfef2e3800c637ee5d42ba6baf5863a60009d /ext
parentcbed0567aa3ad8340ffbcce3d29afe493921b3b2 (diff)
downloadphp-git-23a3cc71e3e321308fe6c28302a51a689dab1745.tar.gz
Using system regex lib seems not to work quite well when compiled with Apache.
Diffstat (limited to 'ext')
-rw-r--r--ext/standard/config.m415
1 files changed, 5 insertions, 10 deletions
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index 9b45ce83b5..3a17c8280b 100644
--- a/ext/standard/config.m4
+++ b/ext/standard/config.m4
@@ -203,7 +203,11 @@ AC_ARG_WITH(regex,
[
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 @@ AC_ARG_WITH(regex,
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