[PHP4BETA] CVS update: php4/ext/pcre
| From: | sas | Date: | Thu, 27 May 1999 01:34:17 +0000 |
| Subject: | [PHP4BETA] CVS update: php4/ext/pcre | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-1110@lists.php.net to get a copy of this message | ||
Date: Wednesday May 26, 1999 @ 21:34
Author: sas
Update of /repository/php4/ext/pcre
In directory php:/tmp/cvs-serv19149/ext/pcre
Modified Files:
Makefile.am config.m4
Log Message:
- fix CGI build (at least)
Index: php4/ext/pcre/Makefile.am
diff -u php4/ext/pcre/Makefile.am:1.2 php4/ext/pcre/Makefile.am:1.3
--- php4/ext/pcre/Makefile.am:1.2 Wed May 26 17:47:56 1999
+++ php4/ext/pcre/Makefile.am Wed May 26 21:34:17 1999
@@ -1,7 +1,6 @@
-# $Id: Makefile.am,v 1.2 1999/05/26 21:47:56 andrey Exp $
+# $Id: Makefile.am,v 1.3 1999/05/27 01:34:17 sas Exp $
-INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend @PCRE_INCLUDE@
-LIBS=@LIBS@ @PCRE_LIB@
+INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
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.2 php4/ext/pcre/config.m4:1.3
--- php4/ext/pcre/config.m4:1.2 Wed May 26 17:47:56 1999
+++ php4/ext/pcre/config.m4 Wed May 26 21:34:17 1999
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.2 1999/05/26 21:47:56 andrey Exp $
+dnl $Id: config.m4,v 1.3 1999/05/27 01:34:17 sas Exp $
dnl config.m4 for extension pcre
dnl By default we'll compile and link against the bundled PCRE library
@@ -11,15 +11,15 @@
no)
AC_MSG_RESULT(no) ;;
yes)
- PCRE_LIB="-Lpcrelib -lpcre"
- PCRE_INCLUDE="-Ipcrelib"
+ EXTRA_LIBS="-Lext/pcre/pcrelib -lpcre $EXTRA_LIBS"
+ INCLUDES="-Ipcrelib $INCLUDES"
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"
+ test -f $withval/pcre.h && INCLUDES="-I$withval $INCLUDES"
+ test -f $withval/libpcre.a && EXTRA_LIBS="-L$withval -lpcre $EXTRA_LIBS"
if test -n "$PCRE_INCLUDE" && test -n "$PCRE_LIB" ; then
AC_DEFINE(HAVE_LIBPCRE, 1)
@@ -31,13 +31,11 @@
fi ;;
esac
],[
- PCRE_LIB="-Lpcrelib -lpcre"
- PCRE_INCLUDE="-Ipcrelib"
+ EXTRA_LIBS="-Lext/pcre/pcrelib -lpcre $EXTRA_LIBS"
+ INCLUDES="-Ipcrelib $INCLUDES"
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)
--
PHP 4 Beta