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

diff --git a/acinclude.m4 b/acinclude.m4
index 5efc878db587a4084a97b6a5264e78a0e55ef63b..20e18557e5d908909911fe4c7d99dca39b951fda 100644 (file)
--- 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 02e39e401feaf58888060f56691c2fd4ba5c5a7b..0627589bbc1856e3d2ff360c49b3877d42b27d20 100644 (file)
--- 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 3a17c8280b9017cd215938756f92bb9e41d048ae..60db9df453898ecaa5939febb3f72e381f848772 100644 (file)
--- 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 02e39e401feaf58888060f56691c2fd4ba5c5a7b..0627589bbc1856e3d2ff360c49b3877d42b27d20 100644 (file)
--- 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
 }