From: Bruno Haible <bruno@clisp.org>
Date: Wed, 25 Oct 2006 11:46:05 +0000 (+0000)
Subject: Fix -I options for VPATH builds on cygwin or mingw.
X-Git-Tag: 0.16.x-branchpoint~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e18f48708676d339490f4c8df06ce7f98e2f24f;p=thirdparty%2Fgettext.git

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

diff --git a/gettext-tools/libgettextpo/ChangeLog b/gettext-tools/libgettextpo/ChangeLog
index a554a18cf..c0282a923 100644
--- 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 5fe9fe941..d8444bd9a 100644
--- 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 4fa2db168..ae9263820 100644
--- 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 752919797..1cc0ca1bc 100644
--- 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 db0a62302..da11f2cb3 100644
--- 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 dd6680622..9dcd23302 100644
--- 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