[PHP4BETA] CVS update: php4/ext/pcre
| From: | andrey | Date: | Wed, 26 May 1999 21:47:56 +0000 |
| Subject: | [PHP4BETA] CVS update: php4/ext/pcre | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-1095@lists.php.net to get a copy of this message | ||
Date: Wednesday May 26, 1999 @ 17:47
Author: andrey
Update of /repository/php4/ext/pcre
In directory php:/tmp/cvs-serv8844
Modified Files:
Makefile.am config.m4 setup.stub
Log Message:
-Added PCRE library source
-Updated configuration process
Index: php4/ext/pcre/Makefile.am
diff -u php4/ext/pcre/Makefile.am:1.1 php4/ext/pcre/Makefile.am:1.2
--- php4/ext/pcre/Makefile.am:1.1 Fri May 21 09:17:23 1999
+++ php4/ext/pcre/Makefile.am Wed May 26 17:47:56 1999
@@ -1,6 +1,7 @@
-# $Id: Makefile.am,v 1.1 1999/05/21 13:17:23 andrey Exp $
+# $Id: Makefile.am,v 1.2 1999/05/26 21:47:56 andrey Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
+INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend @PCRE_INCLUDE@
+LIBS=@LIBS@ @PCRE_LIB@
noinst_LIBRARIES=libphpext_pcre.a
libphpext_pcre_a_SOURCES=pcre.c
-
+SUBDIRS=@PCRE_SUBDIR@
Index: php4/ext/pcre/config.m4
diff -u php4/ext/pcre/config.m4:1.1 php4/ext/pcre/config.m4:1.2
--- php4/ext/pcre/config.m4:1.1 Fri May 21 09:17:23 1999
+++ php4/ext/pcre/config.m4 Wed May 26 17:47:56 1999
@@ -1,18 +1,43 @@
-dnl $Id: config.m4,v 1.1 1999/05/21 13:17:23 andrey Exp $
+dnl $Id: config.m4,v 1.2 1999/05/26 21:47:56 andrey Exp $
dnl config.m4 for extension pcre
-AC_MSG_CHECKING(for PCRE support)
-AC_ARG_WITH(pcre,
-[ --with-pcre Include Perl Compatible Regular Expressions support],[
- if test "$withval" = "yes"; then
- PCRE_LIBS="-lpcre"
- AC_DEFINE(HAVE_LIBPCRE, 1)
- AC_MSG_RESULT(yes)
- PHP_EXTENSION(pcre)
- EXTRA_LIBS="$EXTRA_LIBS $PCRE_LIBS"
- else
- AC_MSG_RESULT(no)
- fi
+dnl By default we'll compile and link against the bundled PCRE library
+dnl if DIR is supplied, we'll use that for linking
+
+AC_MSG_CHECKING(whether to use PCRE library)
+AC_ARG_WITH(pcre-regex,
+[ --with-pcre-regex[=DIR] Enable Perl Compatible Regular Expressions support],[
+ case "$withval" in
+ no)
+ AC_MSG_RESULT(no) ;;
+ yes)
+ PCRE_LIB="-Lpcrelib -lpcre"
+ PCRE_INCLUDE="-Ipcrelib"
+ PCRE_SUBDIR="pcrelib"
+ AC_DEFINE(HAVE_LIBPCRE, 1)
+ AC_MSG_RESULT(yes)
+ PHP_EXTENSION(pcre) ;;
+ *)
+ test -f $withval/pcre.h && PCRE_INCLUDE="-I$withval"
+ test -f $withval/libpcre.a && PCRE_LIB="-L$withval -lpcre"
+
+ if test -n "$PCRE_INCLUDE" && test -n "$PCRE_LIB" ; then
+ AC_DEFINE(HAVE_LIBPCRE, 1)
+ PCRE_SUBDIR=
+ AC_MSG_RESULT(yes)
+ PHP_EXTENSION(pcre)
+ else
+ AC_MSG_ERROR(Unable to find pcre.h and libpcre.a in $withval)
+ fi ;;
+ esac
],[
- AC_MSG_RESULT(no)
+ PCRE_LIB="-Lpcrelib -lpcre"
+ PCRE_INCLUDE="-Ipcrelib"
+ PCRE_SUBDIR="pcrelib"
+ AC_DEFINE(HAVE_LIBPCRE, 1)
+ AC_MSG_RESULT(yes)
+ PHP_EXTENSION(pcre)
])
+AC_SUBST(PCRE_LIB)
+AC_SUBST(PCRE_INCLUDE)
+AC_SUBST(PCRE_SUBDIR)
Index: php4/ext/pcre/setup.stub
diff -u php4/ext/pcre/setup.stub:1.1 php4/ext/pcre/setup.stub:1.2
--- php4/ext/pcre/setup.stub:1.1 Fri May 21 09:17:23 1999
+++ php4/ext/pcre/setup.stub Wed May 26 17:47:56 1999
@@ -1,6 +1,6 @@
# $Source: /local/repository/php4/ext/pcre/setup.stub,v $
-# $Id: setup.stub,v 1.1 1999/05/21 13:17:23 andrey Exp $
+# $Id: setup.stub,v 1.2 1999/05/26 21:47:56 andrey Exp $
-define_option with-pcre 'pcre support?' yesnodir no \
+define_option with-pcre-regex 'pcre support?' yesnodir no \
' Whether to build the pcre extension.'
--
PHP 4 Beta