Move -DSUPPORT_UTF8 flag into the appropriate Makefile so as not to pollute

the global namespace.

diff --git a/ext/pcre/config.m4 b/ext/pcre/config.m4
index 5bfbc9ceab3f284d0c4058243e75c456cdb214be..b903b19c42db70248feb88334303a2e043768bd0 100644 (file)
--- a/ext/pcre/config.m4
+++ b/ext/pcre/config.m4
@@ -16,7 +16,6 @@ if test "$PHP_PCRE_REGEX" != "no"; then
     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, [ ])

diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
index 5bfbc9ceab3f284d0c4058243e75c456cdb214be..b903b19c42db70248feb88334303a2e043768bd0 100644 (file)
--- a/ext/pcre/config0.m4
+++ b/ext/pcre/config0.m4
@@ -16,7 +16,6 @@ if test "$PHP_PCRE_REGEX" != "no"; then
     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, [ ])

diff --git a/ext/pcre/pcrelib/Makefile.in b/ext/pcre/pcrelib/Makefile.in
index d09d64b73a13fbd9c145eac8615157a5820c2f6d..6f7bb73cf0d7f17d3ad2a6c73d5417686ad3f089 100644 (file)
--- a/ext/pcre/pcrelib/Makefile.in
+++ b/ext/pcre/pcrelib/Makefile.in
@@ -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