CVS update: php3

Date: Friday May 28, 1999 @ 17:12 Author: andrey Update of /repository/php3 In directory php:/tmp/cvs-serv20456 Modified Files: acconfig.h config.h.in configure.in Log Message: Updated PCRE library and PCRE module. Index: php3/acconfig.h diff -u php3/acconfig.h:1.96 php3/acconfig.h:1.97 --- php3/acconfig.h:1.96 Fri May 28 03:22:00 1999 +++ php3/acconfig.h Fri May 28 17:12:41 1999 @@ -1,3 +1,5 @@ +/* Define if you want to have PCRE support */ +#define HAVE_PCRE 0 /* Define if you have the libmhash library */ #undef HAVE_LIBMHASH Index: php3/config.h.in diff -u php3/config.h.in:1.163 php3/config.h.in:1.164 --- php3/config.h.in:1.163 Fri May 28 03:22:00 1999 +++ php3/config.h.in Fri May 28 17:12:41 1999 @@ -65,6 +65,9 @@ /* Define to `int' if <sys/types.h> doesn't define. */ #undef uid_t +/* Define if you want to have PCRE support */ +#define HAVE_PCRE 0 + /* Define if you have the libmhash library */ #undef HAVE_LIBMHASH Index: php3/configure.in diff -u php3/configure.in:1.376 php3/configure.in:1.377 --- php3/configure.in:1.376 Fri May 28 03:22:00 1999 +++ php3/configure.in Fri May 28 17:12:41 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.376 1999/05/28 07:22:00 jah Exp $ +dnl $Id: configure.in,v 1.377 1999/05/28 21:12:41 andrey Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -2588,34 +2588,16 @@ AC_MSG_CHECKING(whether to include PCRE support) AC_ARG_WITH(pcre-regex, [ --with-pcre-regex[=DIR] Include Perl Compatible Regular Expressions support],[ - case "$withval" in - no) - AC_MSG_RESULT(no) - ;; - yes) - PCRE_LIB="pcrelib/libpcre.a" - AC_DEFINE(HAVE_PCRE, 1) - AC_DEFINE(HAVE_BUNDLED_PCRE, 1) - AC_MSG_RESULT(yes) - ;; - *) - test -f $withval/pcre.h && PCRE_INCLUDE="-I$withval" - test -f $withval/libpcre.a && PCRE_LIB="$withval/libpcre.a" - - if test -n "$PCRE_INCLUDE" && test -n "$PCRE_LIB" ; then - INCLUDES="$PCRE_INCLUDE $INCLUDES" - AC_DEFINE(HAVE_PCRE, 1) - AC_DEFINE(HAVE_BUNDLED_PCRE, 0) - AC_MSG_RESULT(yes) - else - AC_MSG_ERROR(Unable to find pcre.h and libpcre.a in $withval) - fi - ;; + if test "$withval" = "yes"; then + PCRE_LIB="pcrelib/libpcre.a" + AC_DEFINE(HAVE_PCRE, 1) + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) esac ],[ PCRE_LIB="pcrelib/libpcre.a" AC_DEFINE(HAVE_PCRE, 1) - AC_DEFINE(HAVE_BUNDLED_PCRE, 1) AC_MSG_RESULT(yes) ]) AC_SUBST(PCRE_LIB) -- 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