Add ICU_CFLAGS to global CPPFLAGS

The original code only added ICU_CFLAGS to the backend build.  But it is
also needed for building external modules that include pg_locale.h.  So
add it to the global CPPFLAGS.  (This is only relevant if ICU is not in
a compiler default path, so it apparently hasn't bitten many.)

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 7af91e2d586c2a34b781a12fc9aa5a6b0fc6b660..dc8a89af8e229ef25d1cefc17c31afae22140270 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -232,6 +232,8 @@ PTHREAD_LIBS                = @PTHREAD_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 
+override CPPFLAGS := $(CPPFLAGS) $(ICU_CFLAGS)
+
 ifdef PGXS
 override CPPFLAGS := -I$(includedir_server) -I$(includedir_internal) $(CPPFLAGS)
 else # not PGXS

diff --git a/src/backend/common.mk b/src/backend/common.mk
index 0b57543bc4a1672690dd7aa24d37fce12888a8ec..5d599dbd0ca2519436702a934e2fb666aa53aaf3 100644 (file)
--- a/src/backend/common.mk
+++ b/src/backend/common.mk
@@ -8,8 +8,6 @@
 # this directory and SUBDIRS to subdirectories containing more things
 # to build.
 
-override CPPFLAGS := $(CPPFLAGS) $(ICU_CFLAGS)
-
 ifdef PARTIAL_LINKING
 # old style: linking using SUBSYS.o
 subsysfilename = SUBSYS.o

diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile
index 518178ff39606cd10d37cd9c2781283518fd6d80..50cbace41da73723dc7eafd05b51a2eaa30e52b6 100644 (file)
--- a/src/backend/snowball/Makefile
+++ b/src/backend/snowball/Makefile
@@ -14,8 +14,7 @@ top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -I$(top_srcdir)/src/include/snowball \
-       -I$(top_srcdir)/src/include/snowball/libstemmer $(CPPFLAGS) \
-       $(ICU_CFLAGS)
+       -I$(top_srcdir)/src/include/snowball/libstemmer $(CPPFLAGS)
 
 OBJS= $(WIN32RES) dict_snowball.o api.o utilities.o \
        stem_ISO_8859_1_danish.o \