AC_OUTPUT(Makefile libphp4.module
scripts/mkextlib regex/Makefile ext/Makefile
+ ext/pcre/pcrelib/Makefile
@@EXT_MAKEFILES@@ build-defs.h, [
], [
# $Id$
-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@
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)
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)
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)
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)
+++ /dev/null
-# Make file for PCRE (Perl-Compatible Regular Expression) library.
-
-# Edit CC, CFLAGS, and RANLIB for your system.
-
-# It is believed that RANLIB=ranlib is required for AIX, BSDI, FreeBSD, Linux,
-# MIPS RISCOS, NetBSD, OpenBSD, Digital Unix, and Ultrix.
-
-# Use CFLAGS = -DUSE_BCOPY on SunOS4 and any other system that lacks the
-# memmove() function, but has bcopy().
-
-# Use CFLAGS = -DSTRERROR_FROM_ERRLIST on SunOS4 and any other system that
-# lacks the strerror() function, but can provide the equivalent by indexing
-# into errlist.
-
-AR = ar cq
-CC = gcc -O2 -Wall
-CFLAGS =
-RANLIB = @true
-
-##########################################################################
-
-OBJ = maketables.o get.o study.o pcre.o
-
-all: libpcre.a libpcreposix.a pcretest pgrep
-
-pgrep: libpcre.a pgrep.o
- $(CC) $(CFLAGS) -o pgrep pgrep.o libpcre.a
-
-pcretest: libpcre.a libpcreposix.a pcretest.o
- $(PURIFY) $(CC) $(CFLAGS) -o pcretest pcretest.o libpcre.a libpcreposix.a
-
-libpcre.a: $(OBJ)
- -rm -f libpcre.a
- $(AR) libpcre.a $(OBJ)
- $(RANLIB) libpcre.a
-
-libpcreposix.a: pcreposix.o
- -rm -f libpcreposix.a
- $(AR) libpcreposix.a pcreposix.o
- $(RANLIB) libpcreposix.a
-
-pcre.o: chartables.c pcre.c pcre.h internal.h Makefile
- $(CC) -c $(CFLAGS) pcre.c
-
-pcreposix.o: pcreposix.c pcreposix.h internal.h pcre.h Makefile
- $(CC) -c $(CFLAGS) pcreposix.c
-
-maketables.o: maketables.c pcre.h internal.h Makefile
- $(CC) -c $(CFLAGS) maketables.c
-
-get.o: get.c pcre.h internal.h Makefile
- $(CC) -c $(CFLAGS) get.c
-
-study.o: study.c pcre.h internal.h Makefile
- $(CC) -c $(CFLAGS) study.c
-
-pcretest.o: pcretest.c pcre.h Makefile
- $(CC) -c $(CFLAGS) pcretest.c
-
-pgrep.o: pgrep.c pcre.h Makefile
- $(CC) -c $(CFLAGS) pgrep.c
-
-# An auxiliary program makes the default character table source
-
-chartables.c: dftables
- ./dftables >chartables.c
-
-dftables: dftables.c maketables.c pcre.h internal.h Makefile
- $(CC) -o dftables $(CFLAGS) dftables.c
-
-# We deliberately omit dftables and chartables.c from 'make clean'; once made
-# chartables.c shouldn't change, and if people have edited the tables by hand,
-# you don't want to throw them away.
-
-clean:; -rm -f *.o *.a pcretest pgrep
-
-runtest: all
- ./RunTest
-
-# End
--- /dev/null
+noinst_LIBRARIES = libpcre.a
+libpcre_a_SOURCES = maketables.c get.c study.c pcre.c
if (*nameBufp != NULL) {
efree(*nameBufp);
}
- *nameBufp = php3i_pval_strdup(data);
+ convert_to_string(data);
+ *nameBufp = estrndup(data->value.str.val, data->value.str.len);
} else {
if (*nameBufp != NULL) {
efree(*nameBufp);
static pval *
xml_call_handler(xml_parser *parser, char *funcName, int argc, pval **argv)
{
+ ELS_FETCH();
+
if (parser && funcName) {
pval *retval, *func;
int i;
- HashTable *function_table;
func = php3i_string_pval(funcName);
retval = emalloc(sizeof(pval));
/* We cannot call internal variables from a function module as
it breaks any chance of compiling it as a module on windows.
Instead, we create a callback function. */
- function_table=php3i_get_function_table();
- if (call_user_function(function_table, NULL, func, retval, argc, argv) == FAILURE) {
+ if (call_user_function(EG(function_table), NULL, func, retval, argc, argv) == FAILURE) {
php3tls_pval_destructor(retval);
efree(retval);
return NULL;
projects / php / commitdiff