Support for packages that use "gettextize --intl". From Claudio Fontana.

diff --git a/ChangeLog b/ChangeLog
index bc0484c7b651c787782398172a6707c3de0d2f0c..3d73585850f603addd53482dbeee58ce930bfbeb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-23  Claudio Fontana  <claudio@gnu.org>
+            Bruno Haible  <bruno@clisp.org>
+
+       * modules/gettext (Makefile.am): Add a -I flag for <libintl.h>.
+       * gnulib-tool (func_emit_lib_Makefile_am): Emit empty default value
+       for AM_CPPFLAGS.
+
 2006-04-23  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool (func_usage): Fix --import description. Document --update.

diff --git a/gnulib-tool b/gnulib-tool
index 9b2cfdf49094ee467e28b8d5e504e6c1b812f716..b7a6dea7b6d170f381f22386797dc17363925e79 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2006-04-24 11:30:00 $'
+cvsdatestamp='$Date: 2006-04-24 11:35:07 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -745,6 +745,8 @@ func_emit_lib_Makefile_am ()
   echo "DISTCLEANFILES ="
   echo "MAINTAINERCLEANFILES ="
   echo
+  echo "AM_CPPFLAGS ="
+  echo
   for module in $modules; do
     func_verify_nontests_module
     if test -n "$module"; then

diff --git a/modules/gettext b/modules/gettext
index b8f03da6b6cdd7d85433f32e9caac63c6e9dce0b..af3aa435fc82d9aa7ca7c88fa368c0b24a1f49f8 100644 (file)
--- a/modules/gettext
+++ b/modules/gettext
@@ -39,6 +39,15 @@ AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.14.5])
 
 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
+# -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
 
 Include:
 "gettext.h"