Don't add 'gnulib-lib' to include path when compiling libgettextpo tests.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 7a12a0147edde51aa6e08e2cc90f79620f327eb3..f9cb507eba33269a2ac6ccd2b3d0a1e2338087f8 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,10 @@
+2013-08-30  Daiki Ueno  <ueno@gnu.org>
+
+       * Makefile.am (gettextpo_1_prg_CPPFLAGS): Don't add 'gnulib-lib'
+       to the include path.
+       Reported by Perry Smith in
+       <https://lists.gnu.org/archive/html/bug-gettext/2013-08/msg00053.html>.
+
 2013-08-13  Miguel Angel Arruga Vivas  <rosen644835@gmail.com>
 
        * xgettext-glade-5: Add a test for --extract-all option behavior.

diff --git a/gettext-tools/tests/Makefile.am b/gettext-tools/tests/Makefile.am
index c03c606058c58697040fa5c8f5abd1ff906bf39f..e1e0df26520f2b2a3f3780dc69ba7a76e75779af 100644 (file)
--- a/gettext-tools/tests/Makefile.am
+++ b/gettext-tools/tests/Makefile.am
@@ -235,7 +235,12 @@ fc4_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
 fc5_SOURCES = format-c-5-prg.c
 fc5_LDADD = ../gnulib-lib/libgettextlib.la $(LDADD)
 gettextpo_1_prg_SOURCES = gettextpo-1-prg.c
-gettextpo_1_prg_CPPFLAGS = -I../libgettextpo -I$(top_srcdir)/libgettextpo $(AM_CPPFLAGS)
+# Don't add 'gnulib-lib' to the include path here.  Some header files
+# there may interfere with the ones in 'libgettextpo'.
+gettextpo_1_prg_CPPFLAGS = \
+  -I.. \
+  -I../libgettextpo -I$(top_srcdir)/libgettextpo \
+  -I../intl
 # Don't add more libraries here. This test must check whether libgettextpo is
 # self contained.
 gettextpo_1_prg_LDADD = ../libgettextpo/libgettextpo.la $(LDADD)