X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fgettext;h=5278b40168c51bce4fd84418a0fadecadf2956ce;hb=4b8c4902c5022e71ee1027cafc3a956e650de7fc;hp=b8f03da6b6cdd7d85433f32e9caac63c6e9dce0b;hpb=3a6c1c38e6cc3c0e8549897952bb40f1820d40eb;p=gnulib.git

diff --git a/modules/gettext b/modules/gettext
index b8f03da6b..5278b4016 100644
--- a/modules/gettext
+++ b/modules/gettext
@@ -8,43 +8,57 @@ m4/glibc2.m4
 m4/glibc21.m4
 m4/iconv.m4
 m4/intdiv0.m4
+m4/intl.m4
+m4/intldir.m4
+m4/intlmacosx.m4
 m4/intmax.m4
-m4/inttypes.m4
 m4/inttypes_h.m4
 m4/inttypes-pri.m4
-m4/isc-posix.m4
 m4/lcmessage.m4
-m4/longdouble.m4
+m4/lock.m4
 m4/longlong.m4
 m4/nls.m4
 m4/po.m4
 m4/printf-posix.m4
 m4/progtest.m4
-m4/signed.m4
 m4/size_max.m4
 m4/stdint_h.m4
+m4/threadlib.m4
 m4/uintmax_t.m4
-m4/ulonglong.m4
+m4/visibility.m4
 m4/wchar_t.m4
 m4/wint_t.m4
 m4/xsize.m4
 build-aux/config.rpath
 
 Depends-on:
+extensions
 gettext-h
 havelib
 
 configure.ac:
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.14.5])
+AM_GNU_GETTEXT_VERSION([0.17])
 
 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"
 
+Link:
+$(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
+
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible