mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

There's really no point in allowing using the system regex library.

Browse Source
This commit is contained in:
foobar 2002-04-08 07:47:17 +00:00
parent 23a3cc71e3
commit 77c058a06a
4 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
acinclude.m4
View File

@ -1025,17 +1025,9 @@ AC_DEFUN(PHP_CHECK_CC_OPTION,[
])
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

4
ext/ereg/ereg.c
View File

@ -98,11 +98,7 @@ PHP_MSHUTDOWN_FUNCTION(regex)
PHP_MINFO_FUNCTION(regex)
{
#if HSREGEX
php_info_print_table_row(2, "Regex Library", "Bundled library enabled");
#else
php_info_print_table_row(2, "Regex Library", "System library enabled");
#endif
}

26
ext/standard/config.m4
View File

@ -198,32 +198,6 @@ AC_FLUSH_IO
divert(5)dnl
AC_ARG_WITH(regex,
[ --with-regex=TYPE regex library type: system, apache, php],
[
case $withval in
system)
if test "$PHP_SAPI" = "apache" || test "$PHP_SAPI" = "apache2filter"; then
REGEX_TYPE=php
else
REGEX_TYPE=system
fi
;;
apache)
REGEX_TYPE=apache
;;
php)
REGEX_TYPE=php
;;
*)
REGEX_TYPE=php
AC_MSG_WARN(Invalid regex library type. Using default value: php)
;;
esac
],[
REGEX_TYPE=php
])
AC_CHECK_FUNCS(fnmatch glob)
if test "$PHP_SAPI" = "cgi"; then

4
ext/standard/reg.c
View File

@ -98,11 +98,7 @@ PHP_MSHUTDOWN_FUNCTION(regex)
PHP_MINFO_FUNCTION(regex)
{
#if HSREGEX
php_info_print_table_row(2, "Regex Library", "Bundled library enabled");
#else
php_info_print_table_row(2, "Regex Library", "System library enabled");
#endif
}