# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1366867591 25200
# Node ID 66c5e33ff0bad9c1e187279687a41db2e6c89ba2
# Parent  239b8a8792bf2ef554a208f0e368e10cf51aaaa3
gettext: now it's your responsibility to add -I$(top_builddir)/intl

Formerly, it was your responsibility to do this for all Makefile.ams
other than Gnulib's.  Now it's your responsibility to do it for
Gnulib's Makefile.am, too.
* NEWS: Document this.
* modules/gettext (AM_CPPFLAGS): Don't append -$(top_builddir)/intl.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2013-04-30  Paul Eggert  <eggert@cs.ucla.edu>
 
+	gettext: now it's your responsibility to add -I$(top_builddir)/intl
+	Formerly, it was your responsibility to do this for all Makefile.ams
+	other than Gnulib's.  Now it's your responsibility to do it for
+	Gnulib's Makefile.am, too.
+	* NEWS: Document this.
+	* modules/gettext (AM_CPPFLAGS): Don't append -$(top_builddir)/intl.
+
 	acl: include errno.h to get errno
 	Reported by Daiki Ueno in
 	<http://lists.gnu.org/archive/html/bug-gnulib/2013-04/msg00073.html>.
diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,10 @@
 
 Date        Modules         Changes
 
+2013-04-24  gettext         If your project uses 'gettextize --intl' it is now
+                            your responsibility to put -I$(top_builddir)/intl
+                            into the Makefile.am for gnulib.
+
 2012-06-27  elisp-comp      The module 'elisp-comp' is removed; the script is
                             not independently useful outside of automake.
 
diff --git a/modules/gettext b/modules/gettext
--- a/modules/gettext
+++ b/modules/gettext
@@ -45,15 +45,16 @@
 AM_GNU_GETTEXT_VERSION([0.18.1])
 
 Makefile.am:
-# This is for those projects which use "gettextize --intl" to put a source-code
-# copy of libintl into their package. In such projects, every Makefile.am needs
+# If your project uses "gettextize --intl" to put a source-code
+# copy of libintl into the package, every Makefile.am needs
 # -I$(top_builddir)/intl, so that <libintl.h> can be found in this directory.
-# For the Makefile.ams in other directories it is the maintainer's
-# responsibility; for the one from gnulib we do it here.
-# This option has no effect when the user disables NLS (because then the intl
-# directory contains no libintl.h file) or when the project does not use
-# "gettextize --intl".
-AM_CPPFLAGS += -I$(top_builddir)/intl
+# Here's one way to do this:
+#AM_CPPFLAGS += -I$(top_builddir)/intl
+# This option has no effect when the user disables NLS (because then
+# the intl directory contains no libintl.h file).  This option is not
+# enabled by default because the intl directory might not exist if
+# your project does not use "gettext --intl", and some compilers
+# complain about -I options applied to nonexistent directories.
 
 Include:
 "gettext.h"