cvs: php4 / acinclude.m4 /ext/standard config.m4 reg.c

sniper Mon Apr 8 03:47:17 2002 EDT Modified files: /php4 acinclude.m4 /php4/ext/standard config.m4 reg.c Log: There's really no point in allowing using the system regex library. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.180 php4/acinclude.m4:1.181 --- php4/acinclude.m4:1.180 Sat Apr 6 08:42:40 2002 +++ php4/acinclude.m4 Mon Apr 8 03:47:13 2002 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.180 2002/04/06 13:42:40 sas Exp $ +dnl $Id: acinclude.m4,v 1.181 2002/04/08 07:47:13 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -1025,17 +1025,9 @@ ]) 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 Index: php4/ext/standard/config.m4 diff -u php4/ext/standard/config.m4:1.35 php4/ext/standard/config.m4:1.36 --- php4/ext/standard/config.m4:1.35 Mon Apr 8 02:45:52 2002 +++ php4/ext/standard/config.m4 Mon Apr 8 03:47:17 2002 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.35 2002/04/08 06:45:52 sniper Exp $ -*- sh -*- +dnl $Id: config.m4,v 1.36 2002/04/08 07:47:17 sniper Exp $ -*- sh -*- divert(3)dnl @@ -198,32 +198,6 @@ 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 Index: php4/ext/standard/reg.c diff -u php4/ext/standard/reg.c:1.59 php4/ext/standard/reg.c:1.60 --- php4/ext/standard/reg.c:1.59 Mon Mar 11 02:11:54 2002 +++ php4/ext/standard/reg.c Mon Apr 8 03:47:17 2002 @@ -17,7 +17,7 @@ | Jaakko Hyvätti <jaakko@hyvatti.iki.fi> | +----------------------------------------------------------------------+ */ -/* $Id: reg.c,v 1.59 2002/03/11 07:11:54 yohgaki Exp $ */ +/* $Id: reg.c,v 1.60 2002/04/08 07:47:17 sniper Exp $ */ #include <stdio.h> #include "php.h" @@ -98,11 +98,7 @@ 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 }