Fix -I options for VPATH builds on cygwin or mingw.

diff --git a/gettext-tools/libgettextpo/ChangeLog b/gettext-tools/libgettextpo/ChangeLog
index a554a18cfd49f4281a0d48a9271211d7359b4b77..c0282a92306f24a45dee089858635a0c56e1078a 100644 (file)
--- a/gettext-tools/libgettextpo/ChangeLog
+++ b/gettext-tools/libgettextpo/ChangeLog
@@ -2,6 +2,13 @@
 
        * gettext-0.16 released.
 
+2006-10-24  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (AM_CPPFLAGS): Add also $(top_srcdir). Needed so that
+       woe32dll/export.h is found while compiling gettextpo-exports.c in a
+       VPATH build.
+       Reported by Charles Wilson <cygwin@cwilson.fastmail.fm>.
+
 2006-10-24  Bruno Haible  <bruno@clisp.org>
 
        * gettext-po.h.in (LIBGETTEXTPO_VERSION): Bump version number.

diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am
index 5fe9fe941dc17f95eea89584e3d16b70afc4f0aa..d8444bd9a92099ef9d14a60021b1e1f7c3c714cd 100644 (file)
--- a/gettext-tools/libgettextpo/Makefile.am
+++ b/gettext-tools/libgettextpo/Makefile.am
@@ -35,6 +35,7 @@ nodist_noinst_HEADERS = config.h
 
 AM_CPPFLAGS = \
   -I. -I$(srcdir) \
+  -I.. -I$(top_srcdir) \
   -I../src -I$(top_srcdir)/src \
   -I../intl -I$(top_srcdir)/../gettext-runtime/intl
 

diff --git a/gettext-tools/src/ChangeLog b/gettext-tools/src/ChangeLog
index 4fa2db168ae23169da8d275c87df14d6c261be21..ae926382093034ef27fd7e2cb37e84a7a8e50c0e 100644 (file)
--- a/gettext-tools/src/ChangeLog
+++ b/gettext-tools/src/ChangeLog
@@ -2,6 +2,13 @@
 
        * gettext-0.16 released.
 
+2006-10-24  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (AM_CPPFLAGS): Add also $(top_srcdir). Needed so that
+       woe32dll/export.h is found while compiling gettextsrc-exports.c in a
+       VPATH build.
+       Reported by Charles Wilson <cygwin@cwilson.fastmail.fm>.
+
 2006-10-24  Bruno Haible  <bruno@clisp.org>
 
        * msgmerge.c (struct definitions_ty): Remove semicolon after

diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
index 752919797fa5c38f5e3a8289fe4eb25e42168e96..1cc0ca1bc6c3796ff1a5b0c342b791b6b86aba35 100644 (file)
--- a/gettext-tools/src/Makefile.am
+++ b/gettext-tools/src/Makefile.am
@@ -64,7 +64,7 @@ pkglibdir = $(libdir)/gettext
 
 AM_CPPFLAGS = \
   -I. -I$(srcdir) \
-  -I.. \
+  -I.. -I$(top_srcdir) \
   -I$(top_srcdir)/libgrep \
   -I$(top_srcdir)/libuniname \
   -I../gnulib-lib -I$(top_srcdir)/gnulib-lib \

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index db0a62302465a7d9a995f03c2c3c314e4042c550..da11f2cb32bc2c4dfcf71e8557ec346245b64cd6 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -2,6 +2,13 @@
 
        * gettext-0.16 released.
 
+2006-10-24  Bruno Haible  <bruno@clisp.org>
+
+       * modules/gettext-tools-misc (Makefile.am): Add also $(top_srcdir) to
+       AM_CPPFLAGS. Needed so that woe32dll/export.h is found while compiling
+       gettextlib-exports.c in a VPATH build.
+       Reported by Charles Wilson <cygwin@cwilson.fastmail.fm>.
+
 2006-10-24  Bruno Haible  <bruno@clisp.org>
 
        * modules/gettext-tools/misc (Makefile.am): Use rm -f instead of

diff --git a/gnulib-local/modules/gettext-tools-misc b/gnulib-local/modules/gettext-tools-misc
index dd66806229f1f90fd6cb72a227c3ffb05cbef96d..9dcd2330294931af1190b1b4b7a1fa58f50a0068 100644 (file)
--- a/gnulib-local/modules/gettext-tools-misc
+++ b/gnulib-local/modules/gettext-tools-misc
@@ -15,6 +15,8 @@ AUTOMAKE_OPTIONS += no-dependencies
 
 # Hmm... is this still necessary?
 AM_CPPFLAGS += -I$(top_builddir)/intl -I$(top_srcdir)/intl
+# Needed so that config.h and woe32dll/export.h are found.
+AM_CPPFLAGS += -I$(top_builddir) -I$(top_srcdir)
 
 # Parametrization of the 'relocatable' module.
 AM_CPPFLAGS += -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1