cvs: /php4 configure.in.in

sas Fri Jul 16 15:28:33 1999 EDT Modified files: /php4 configure.in.in Log: the regex check relies on a previously set APXS variable, so it needs to be after the apxs check Index: php4/configure.in.in diff -u php4/configure.in.in:1.49 php4/configure.in.in:1.50 --- php4/configure.in.in:1.49 Fri Jul 16 15:07:13 1999 +++ php4/configure.in.in Fri Jul 16 15:28:33 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in.in,v 1.49 1999/07/16 19:07:13 sas Exp $ -*- sh -*- +dnl $Id: configure.in.in,v 1.50 1999/07/16 19:28:33 sas Exp $ -*- sh -*- dnl Process this file with autoconf to produce a configure script. @@ -328,49 +328,6 @@ AC_SUBST(abs_srcdir) AC_SUBST(abs_builddir) -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.a - EXTRA_LIBS="-L$abs_builddir/regex -lregex $EXTRA_LIBS" - 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(for Apache module support via DSO through APXS) AC_ARG_WITH(apxs, [ --with-apxs[=FILE] Build shared Apache module. FILE is the optional @@ -591,6 +548,49 @@ AC_SUBST(PHP_LIBS) fi fi + +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.a + EXTRA_LIBS="-L$abs_builddir/regex -lregex $EXTRA_LIBS" + 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(for mod_charset compatibility option) AC_ARG_WITH(mod_charset,