cvs: php4 /ext/pcre config.m4 /ext/pcre/pcrelib Makefile.in
| From: | Andrei Zmievski | Date: | Fri, 18 May 2001 15:34:58 +0000 |
| Subject: | cvs: php4 /ext/pcre config.m4 /ext/pcre/pcrelib Makefile.in | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5819@lists.php.net to get a copy of this message | ||
andrei Fri May 18 08:34:58 2001 EDT
Modified files:
/php4/ext/pcre config.m4
/php4/ext/pcre/pcrelib Makefile.in
Log:
Move -DSUPPORT_UTF8 flag into the appropriate Makefile so as not to pollute
the global namespace.
Index: php4/ext/pcre/config.m4
diff -u php4/ext/pcre/config.m4:1.24 php4/ext/pcre/config.m4:1.25
--- php4/ext/pcre/config.m4:1.24 Sat May 12 04:08:54 2001
+++ php4/ext/pcre/config.m4 Fri May 18 08:34:57 2001
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.24 2001/05/12 11:08:54 sas Exp $
+dnl $Id: config.m4,v 1.25 2001/05/18 15:34:57 andrei Exp $
dnl config.m4 for extension pcre
dnl By default we'll compile and link against the bundled PCRE library
@@ -16,7 +16,6 @@
PCRE_LIBADD=pcrelib/libpcre.la
PCRE_SHARED_LIBADD=pcrelib/libpcre.la
PCRE_SUBDIRS=pcrelib
- CPPFLAGS="$CPPFLAGS -DSUPPORT_UTF8"
PHP_SUBST(PCRE_LIBADD)
PHP_SUBST(PCRE_SUBDIRS)
AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
Index: php4/ext/pcre/pcrelib/Makefile.in
diff -u php4/ext/pcre/pcrelib/Makefile.in:1.8 php4/ext/pcre/pcrelib/Makefile.in:1.9
--- php4/ext/pcre/pcrelib/Makefile.in:1.8 Mon May 1 15:38:31 2000
+++ php4/ext/pcre/pcrelib/Makefile.in Fri May 18 08:34:58 2001
@@ -2,4 +2,6 @@
LTLIBRARY_NAME = libpcre.la
LTLIBRARY_SOURCES = maketables.c get.c study.c pcre.c
+EXTRA_INCLUDES = -DSUPPORT_UTF8
+
include $(top_srcdir)/build/dynlib.mk