cvs: /php4 acinclude.m4 configure.in /php4/ext/standard config.m4 /php4/sapi/apache config.m4

sas Fri Nov 12 15:57:00 1999 EDT Modified files: /php4 acinclude.m4 configure.in /php4/ext/standard config.m4 /php4/sapi/apache config.m4 Log: Enable selective regex library compilation. Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.35 php4/acinclude.m4:1.36 --- php4/acinclude.m4:1.35 Mon Oct 4 11:18:01 1999 +++ php4/acinclude.m4 Fri Nov 12 15:56:29 1999 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.35 1999/10/04 15:18:01 sas Exp $ +dnl $Id: acinclude.m4,v 1.36 1999/11/12 20:56:29 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -144,6 +144,22 @@ fi ]) +AC_DEFUN(PHP_HSREGEX,[ +AC_MSG_CHECKING(whether to use bundled regex library) +AC_MSG_RESULT($HSREGEX) + +if test "$HSREGEX" = "yes"; then + REGEX_LIB=regex/libregex.la + AC_DEFINE(HSREGEX) + AC_DEFINE(REGEX,1) +else + REGEX_LIB= + AC_DEFINE(REGEX,0) +fi + +AC_SUBST(REGEX_LIB) +AC_SUBST(HSREGEX) +]) dnl dnl See if we have broken header files like SunOS has. Index: php4/configure.in diff -u php4/configure.in:1.25 php4/configure.in:1.26 --- php4/configure.in:1.25 Tue Nov 9 12:03:46 1999 +++ php4/configure.in Fri Nov 12 15:56:29 1999 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.25 1999/11/09 17:03:46 ssb Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.26 1999/11/12 20:56:29 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(0) @@ -386,49 +386,6 @@ ]) AC_MSG_RESULT($RESULT) -AC_MSG_CHECKING(whether to use bundled regex library) -AC_ARG_WITH(system-regex, -[ --with-system-regex Do not use the bundled regex library], -[ - if test -n "$APXS"; then - if test -n "$APXS -q CFLAGS | grep USE_HSREGEX"; then - HSREGEX=yes - else - HSREGEX=no - fi - else - if test "$withval" = "no"; then - HSREGEX=yes - else - HSREGEX=no - fi - fi -],[ - if test -n "$APXS"; then - if test -n "$APXS -q CFLAGS | grep USE_HSREGEX"; then - HSREGEX=yes - else - HSREGEX=no - fi - else - HSREGEX=yes - fi -]) -AC_MSG_RESULT($HSREGEX) - -if test "$HSREGEX" = "yes"; then - REGEX_LIB=regex/libregex.la - AC_DEFINE(HSREGEX) - AC_DEFINE(REGEX,1) -else - REGEX_LIB= - AC_DEFINE(REGEX,0) -fi - -AC_SUBST(REGEX_LIB) -AC_SUBST(HSREGEX) - - AC_MSG_CHECKING(whether to use a configuration file) AC_ARG_WITH(config-file-path, [ --with-config-file-path=PATH @@ -671,6 +628,8 @@ if test "$enable_debug" != "yes"; then AM_SET_LIBTOOL_VARIABLE([--silent]) fi + +PHP_HSREGEX dnl If we are using gcc and the user has not specified CFLAGS, add -O2. test -n "$auto_cflags" && test -n "$GCC" && CFLAGS="$CFLAGS -O2" Index: php4/ext/standard/config.m4 diff -u php4/ext/standard/config.m4:1.8 php4/ext/standard/config.m4:1.9 --- php4/ext/standard/config.m4:1.8 Wed Oct 20 12:17:30 1999 +++ php4/ext/standard/config.m4 Fri Nov 12 15:56:29 1999 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.8 1999/10/20 16:17:30 thies Exp $ -*- sh -*- +dnl $Id: config.m4,v 1.9 1999/11/12 20:56:29 sas Exp $ -*- sh -*- divert(1) @@ -123,6 +123,18 @@ divert(3) +AC_ARG_WITH(system-regex, +[ --with-system-regex Do not use the bundled regex library], +[ + if test "$withval" = "no"; then + HSREGEX=yes + else + HSREGEX=no + fi +],[ + HSREGEX=yes +]) + AC_CRYPT_CAP PHP_EXTENSION(standard) Index: php4/sapi/apache/config.m4 diff -u php4/sapi/apache/config.m4:1.9 php4/sapi/apache/config.m4:1.10 --- php4/sapi/apache/config.m4:1.9 Sat Oct 9 09:43:27 1999 +++ php4/sapi/apache/config.m4 Fri Nov 12 15:56:30 1999 @@ -16,6 +16,11 @@ XML_INCLUDE="$APXS_INCLUDEDIR/xml" fi AC_ADD_INCLUDE($APXS_INCLUDEDIR) + if test -n "$APXS -q CFLAGS | grep USE_HSREGEX"; then + HSREGEX=yes + else + HSREGEX=no + fi PHP_EXTENSION(apache) PHP_SAPI=apache APACHE_INSTALL="$APXS -i -a -n php4 $SAPI_SHARED" @@ -173,6 +178,7 @@ ]) if test -n "$APACHE_MODULE"; then + HSREGEX=no PHP_EXTENSION(apache) PHP_OUTPUT(sapi/apache/libphp4.module) PHP_BUILD_STATIC