CVS update: php3
| From: | rasmus | Date: | Fri, 12 Mar 1999 14:21:44 +0000 |
| Subject: | CVS update: php3 | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-4590@lists.php.net to get a copy of this message | ||
Date: Friday March 12, 1999 @ 9:21
Author: rasmus
Update of /repository/php3
In directory asf:/u/temp/cvs-serv27747
Modified Files:
configure.in
Log Message:
When using the apxs compile mechanism the configure script now checks to
see which regex library the Apache binary was compiled against and sets
the system-regex setting accordingly.
Index: php3/configure.in
diff -c php3/configure.in:1.333 php3/configure.in:1.334
*** php3/configure.in:1.333 Tue Mar 2 05:34:01 1999
--- php3/configure.in Fri Mar 12 09:21:43 1999
***************
*** 1,4 ****
! dnl $Id: configure.in,v 1.333 1999/03/02 10:34:01 sas Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
--- 1,4 ----
! dnl $Id: configure.in,v 1.334 1999/03/12 14:21:43 rasmus Exp $
dnl Process this file with autoconf to produce a configure script.
AC_INIT(main.c)
***************
*** 455,470 ****
AC_ARG_WITH(system-regex,
[ --with-system-regex Do not use the bundled regex library],
[
! REGEX_LIB=
! HSREGEX=no
! AC_MSG_RESULT(no)
! AC_DEFINE(REGEX,0)
],[
! REGEX_LIB=regex/libregex.a
! HSREGEX=yes
! AC_MSG_RESULT(yes)
! AC_DEFINE(HSREGEX)
! AC_DEFINE(REGEX,1)
])
AC_SUBST(REGEX_LIB)
AC_SUBST(HSREGEX)
--- 455,500 ----
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
! REGEX_LIB=regex/libregex.a
! HSREGEX=yes
! AC_MSG_RESULT(yes)
! AC_DEFINE(HSREGEX)
! AC_DEFINE(REGEX,1)
! else
! REGEX_LIB=
! HSREGEX=no
! AC_MSG_RESULT(no)
! AC_DEFINE(REGEX,0)
! fi
! else
! REGEX_LIB=
! HSREGEX=no
! AC_MSG_RESULT(no)
! AC_DEFINE(REGEX,0)
! fi
],[
! if test -n "$APXS"; then
! if test -n "$APXS -q CFLAGS | grep USE_HSREGEX"; then
! REGEX_LIB=regex/libregex.a
! HSREGEX=yes
! AC_MSG_RESULT(yes)
! AC_DEFINE(HSREGEX)
! AC_DEFINE(REGEX,1)
! else
! REGEX_LIB=
! HSREGEX=no
! AC_MSG_RESULT(no)
! AC_DEFINE(REGEX,0)
! fi
! else
! REGEX_LIB=regex/libregex.a
! HSREGEX=yes
! AC_MSG_RESULT(yes)
! AC_DEFINE(HSREGEX)
! AC_DEFINE(REGEX,1)
! fi
])
AC_SUBST(REGEX_LIB)
AC_SUBST(HSREGEX)
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net