Hi Perry, Perry Smith <[email protected]> writes:
>> /usr/work/src/gettext-0.18.3.1/gettext-tools/tests/gettextpo-1-prg.c:22: >> ../libgettextpo/float.h:150:7: error: redefinition of 'union >> gl_long_double_union' >> ../gnulib-lib/float.h:150:7: note: originally defined here >> ../libgettextpo/float.h:155:41: error: conflicting types for 'gl_LDBL_MAX' >> ../gnulib-lib/float.h:155:41: note: previous declaration of >> gl_LDBL_MAX' was here In principle, 'gnulib-lib' shouldn't be added to the include path, when compiling gettextpo-1-prg.c. I've pushed the attached patch.
>From d9479ba454161926511014c99706b1a4edd4d010 Mon Sep 17 00:00:00 2001 From: Daiki Ueno <[email protected]> Date: Fri, 30 Aug 2013 17:23:50 +0900 Subject: [PATCH] Don't add 'gnulib-lib' to include path when compiling libgettextpo tests. --- gettext-tools/tests/ChangeLog | 7 +++++++ gettext-tools/tests/Makefile.am | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog index 7a12a01..f9cb507 100644 --- a/gettext-tools/tests/ChangeLog +++ b/gettext-tools/tests/ChangeLog @@ -1,3 +1,10 @@ +2013-08-30 Daiki Ueno <[email protected]> + + * 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 <[email protected]> * 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 c03c606..e1e0df2 100644 --- 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) -- 1.8.3.1
Regards, -- Daiki Ueno
