cvs: /php4/sapi/apache config.m4 libphp4.module.in

sas Sat Feb 12 06:48:39 2000 EDT Modified files: /php4/sapi/apache config.m4 libphp4.module.in Log: Never use Apache regex stuff Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.20 php4/sapi/apache/config.m4:1.21 --- php4/sapi/apache/config.m4:1.20 Thu Feb 10 11:41:20 2000 +++ php4/sapi/apache/config.m4 Sat Feb 12 06:48:09 2000 @@ -186,7 +186,6 @@ ]) INCLUDES="$INCLUDES $APACHE_INCLUDE" -dnl## PHP_SUBST(APACHE_INCLUDE) fi if test "x$APXS" != "x" -a "uname -sv" = "AIX 4" -a "$GCC" != "yes"; then @@ -211,21 +210,7 @@ AC_MSG_RESULT(no) ]) -if test "$with_regex" = "apache" && test -z "$APACHE_HAS_REGEX"; then - with_regex=php -fi - -if test -z "$with_regex" && test -n "$APACHE_HAS_REGEX"; then - with_regex=apache -fi - if test -n "$APACHE_MODULE"; then - if test "$with_regex" = "apache"; then - APACHE_WANT_HSREGEX=yes - else - APACHE_WANT_HSREGEX=no - fi - PHP_SUBST(APACHE_WANT_HSREGEX) PHP_APACHE_CHECK_RDYNAMIC PHP_OUTPUT(sapi/apache/libphp4.module) PHP_BUILD_STATIC Index: php4/sapi/apache/libphp4.module.in diff -u php4/sapi/apache/libphp4.module.in:1.5 php4/sapi/apache/libphp4.module.in:1.6 --- php4/sapi/apache/libphp4.module.in:1.5 Sun Dec 19 13:02:53 1999 +++ php4/sapi/apache/libphp4.module.in Sat Feb 12 06:48:09 2000 @@ -1,6 +1,6 @@ Name: php4_module ConfigStart - RULE_WANTHSREGEX=@APACHE_WANT_HSREGEX@ + RULE_WANTHSREGEX=no LIBS="@NATIVE_RPATHS@ @PHP_LDFLAGS@ @PHP_LIBS@ @EXTRA_LIBS@ $LIBS" RULE_HIDE=yes CFLAGS="$CFLAGS -I@abs_srcdir@ -I@abs_srcdir@/Zend -I@abs_builddir@/Zend -I@abs_builddir@"