diff options
| author | foobar <sniper@php.net> | 2002-04-08 07:47:17 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2002-04-08 07:47:17 +0000 |
| commit | 77c058a06a0f2f643a0343a9d5a670514f6274ce (patch) | |
| tree | eb7c08914364935ab52238113e56283fc3f47bc3 | |
| parent | 23a3cc71e3e321308fe6c28302a51a689dab1745 (diff) | |
| download | php-git-77c058a06a0f2f643a0343a9d5a670514f6274ce.tar.gz | |
There's really no point in allowing using the system regex library.
| -rw-r--r-- | acinclude.m4 | 8 | ||||
| -rw-r--r-- | ext/ereg/ereg.c | 4 | ||||
| -rw-r--r-- | ext/standard/config.m4 | 26 | ||||
| -rw-r--r-- | ext/standard/reg.c | 4 |
4 files changed, 0 insertions, 42 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 5efc878db5..20e18557e5 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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 diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c index 02e39e401f..0627589bbc 100644 --- a/ext/ereg/ereg.c +++ b/ext/ereg/ereg.c @@ -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 } diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 3a17c8280b..60db9df453 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -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 diff --git a/ext/standard/reg.c b/ext/standard/reg.c index 02e39e401f..0627589bbc 100644 --- a/ext/standard/reg.c +++ b/ext/standard/reg.c @@ -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 } |