Hello,

while trying to improve current support in gnulib for internal gettext,
I produced this patch, which I use successfully in the packages I
maintain to support per-package additions to AM_CPPFLAGS.

The patch is a unified p1 diff.
I suggest this for inclusion in the gnulib CVS.

CLaudio


diff -Naur gnulib/ChangeLog gnulib-new/ChangeLog
--- gnulib/ChangeLog    2006-01-30 17:13:01.000000000 +0100
+++ gnulib-new/ChangeLog        2006-01-30 17:07:27.000000000 +0100
@@ -1,3 +1,9 @@
+2006-01-30  Claudio Fontana <[EMAIL PROTECTED]>
+
+       * gnulib-tool (func_emit_lib_Makefile_am): emit AM_CPPFLAGS=
+         so modules can add to the AM_CPPFLAGS.
+       * modules/gettext: add intl directory to the AM_CPPFLAGS
+
 2006-01-26  Bruno Haible  <[EMAIL PROTECTED]>
 
        * gnulib-tool (func_import): Use "trap 'exit $?' instead of "trap :".
diff -Naur gnulib/gnulib-tool gnulib-new/gnulib-tool
--- gnulib/gnulib-tool  2006-01-30 17:13:01.000000000 +0100
+++ gnulib-new/gnulib-tool      2006-01-30 17:06:56.000000000 +0100
@@ -732,6 +732,7 @@
   echo
   echo "${libname}_${libext}_SOURCES ="
   echo "${libname}_${libext}_LIBADD = @${perhapsLT}LIBOBJS@"
+  echo "AM_CPPFLAGS ="
   echo "noinst_HEADERS ="
   echo "EXTRA_DIST ="
   echo "BUILT_SOURCES ="
diff -Naur gnulib/modules/gettext gnulib-new/modules/gettext
--- gnulib/modules/gettext      2006-01-30 17:13:01.000000000 +0100
+++ gnulib-new/modules/gettext  2006-01-30 17:13:54.000000000 +0100
@@ -39,6 +39,7 @@
 AM_GNU_GETTEXT_VERSION([0.14.5])
 
 Makefile.am:
+AM_CPPFLAGS += -I$(top_builddir)/intl
 
 Include:
 "gettext.h"
diff -Naur gnulib/ChangeLog gnulib-new/ChangeLog
--- gnulib/ChangeLog    2006-01-30 17:13:01.000000000 +0100
+++ gnulib-new/ChangeLog        2006-01-30 17:07:27.000000000 +0100
@@ -1,3 +1,9 @@
+2006-01-30  Claudio Fontana <[EMAIL PROTECTED]>
+
+       * gnulib-tool (func_emit_lib_Makefile_am): emit AM_CPPFLAGS=
+         so modules can add to the AM_CPPFLAGS.
+       * modules/gettext: add intl directory to the AM_CPPFLAGS
+
 2006-01-26  Bruno Haible  <[EMAIL PROTECTED]>
 
        * gnulib-tool (func_import): Use "trap 'exit $?' instead of "trap :".
diff -Naur gnulib/gnulib-tool gnulib-new/gnulib-tool
--- gnulib/gnulib-tool  2006-01-30 17:13:01.000000000 +0100
+++ gnulib-new/gnulib-tool      2006-01-30 17:06:56.000000000 +0100
@@ -732,6 +732,7 @@
   echo
   echo "${libname}_${libext}_SOURCES ="
   echo "${libname}_${libext}_LIBADD = @${perhapsLT}LIBOBJS@"
+  echo "AM_CPPFLAGS ="
   echo "noinst_HEADERS ="
   echo "EXTRA_DIST ="
   echo "BUILT_SOURCES ="
diff -Naur gnulib/modules/gettext gnulib-new/modules/gettext
--- gnulib/modules/gettext      2006-01-30 17:13:01.000000000 +0100
+++ gnulib-new/modules/gettext  2006-01-30 17:13:54.000000000 +0100
@@ -39,6 +39,7 @@
 AM_GNU_GETTEXT_VERSION([0.14.5])
 
 Makefile.am:
+AM_CPPFLAGS += -I$(top_builddir)/intl
 
 Include:
 "gettext.h"
_______________________________________________
bug-gnulib mailing list
bug-gnulib@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-gnulib

Reply via email to