X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fgettext;h=3da0e2e543507b2a3a062c4b20f5530bc16118fe;hb=43593319b31e6b0175b8eec4433bac744959822d;hp=ac4f8a546bdd6731fc74e6284a5d7dc0916aa202;hpb=fc574edfe56ce525275c4470e0b0b2a7ec72f9a0;p=gnulib.git

diff --git a/modules/gettext b/modules/gettext
index ac4f8a546..3da0e2e54 100644
--- a/modules/gettext
+++ b/modules/gettext
@@ -1,8 +1,12 @@
 Description:
 Translate messages to user's native language.
 
+Notice:
+You must add an invocation of AM_GNU_GETTEXT([external]) to configure.ac.
+
 Files:
 m4/codeset.m4
+m4/fcntl-o.m4
 m4/gettext.m4
 m4/glibc2.m4
 m4/glibc21.m4
@@ -10,12 +14,12 @@ m4/iconv.m4
 m4/intdiv0.m4
 m4/intl.m4
 m4/intldir.m4
+m4/intlmacosx.m4
 m4/intmax.m4
 m4/inttypes_h.m4
 m4/inttypes-pri.m4
 m4/lcmessage.m4
 m4/lock.m4
-m4/longdouble.m4
 m4/longlong.m4
 m4/nls.m4
 m4/po.m4
@@ -23,8 +27,8 @@ m4/printf-posix.m4
 m4/progtest.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
@@ -32,23 +36,25 @@ m4/xsize.m4
 build-aux/config.rpath
 
 Depends-on:
+extensions
 gettext-h
 havelib
 
 configure.ac:
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.16.1])
+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"
@@ -57,7 +63,7 @@ Link:
 $(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible