build: Fix build failure with a preinstalled libxml (regression from 2019-04-02).

* gettext-tools/src/Makefile.am (AM_CPPFLAGS): Remove -I options that point into
libtextstyle/lib.
(textstyle.h): New rule.
(BUILT_SOURCES, MOSTLYCLEANFILES): Add textstyle.h and textstyle/*.h.

diff --git a/.gitignore b/.gitignore
index 414b09602b4222226b4b3fa68df3d26d5925a6b5..cab298641f2f221daade208e26b4caec3622d60a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -783,6 +783,10 @@ core
 /gettext-tools/po/??@*.insert-header
 /gettext-tools/po/remove-potcdate.sed
 /gettext-tools/src/gettext.res
+/gettext-tools/src/textstyle.h
+/gettext-tools/src/textstyle/stdbool.h
+/gettext-tools/src/textstyle/version.h
+/gettext-tools/src/textstyle/woe32dll.h
 
 # Files generated by "make dist" and erased by "make mostlyclean"
 # (see MOSTLYCLEANFILES in Makefile.am):

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index afd25f21bb6e32f1b1ca59c1ee6e28adef892379..83994be0bc208a05ea0cfff4ab48985c77b30814 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -75,7 +75,6 @@ AM_CPPFLAGS = \
   -I.. -I$(top_srcdir) \
   -I$(top_srcdir)/libgrep \
   -I../gnulib-lib -I$(top_srcdir)/gnulib-lib \
-  -I../../libtextstyle/lib -I$(top_srcdir)/../libtextstyle/lib \
   -I../intl -I$(top_srcdir)/../gettext-runtime/intl
 DEFS = \
   -DLOCALEDIR=\"$(localedir)\" -DBISON_LOCALEDIR=\"$(BISON_LOCALEDIR)\" \
@@ -250,6 +249,14 @@ cldr_plurals_SOURCES = cldr-plural.y cldr-plural-exp.c cldr-plurals.c
 cldr_plurals_CFLAGS = $(AM_CFLAGS) $(INCXML)
 cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
 
+# How to get the include files of libtextstyle.
+textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
+       here=`pwd`; \
+       cd ../../libtextstyle/lib && \
+         $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
+BUILT_SOURCES    += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
+MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
+
 # How to build libgettextsrc.la.
 # Need ../gnulib-lib/libgettextlib.la.
 # Need $(LTLIBUNISTRING) because ulc_width_linebreaks, uc_width, etc. may be