From: Andrei Zmievski <andrei@php.net>
Date: Fri, 18 May 2001 15:34:58 +0000 (+0000)
Subject: Move -DSUPPORT_UTF8 flag into the appropriate Makefile so as not to pollute
X-Git-Tag: PRE_GRANULAR_GARBAGE_FIX~364
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ee951839602d39e3cee14ede9927849d24e6555;p=php

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 5bfbc9ceab..b903b19c42 100644
--- 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 5bfbc9ceab..b903b19c42 100644
--- 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 d09d64b73a..6f7bb73cf0 100644
--- 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