* openat.c (openat): Use ?:, not if, to work around GCC bug 4210

[gnulib.git] / modules / gettext

diff --git a/modules/gettext b/modules/gettext
index f6b8fae..af3aa43 100644 (file)
--- a/modules/gettext
+++ b/modules/gettext
@@ -2,9 +2,9 @@ Description:
 Translate messages to user's native language.
 
 Files:
-lib/gettext.h
 m4/codeset.m4
 m4/gettext.m4
+m4/glibc2.m4
 m4/glibc21.m4
 m4/iconv.m4
 m4/intdiv0.m4
@@ -14,9 +14,6 @@ m4/inttypes_h.m4
 m4/inttypes-pri.m4
 m4/isc-posix.m4
 m4/lcmessage.m4
-m4/lib-ld.m4
-m4/lib-link.m4
-m4/lib-prefix.m4
 m4/longdouble.m4
 m4/longlong.m4
 m4/nls.m4
@@ -31,15 +28,26 @@ m4/ulonglong.m4
 m4/wchar_t.m4
 m4/wint_t.m4
 m4/xsize.m4
-config/config.rpath
+build-aux/config.rpath
 
 Depends-on:
+gettext-h
+havelib
 
 configure.ac:
 AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.14.5])
 
 Makefile.am:
-lib_SOURCES += gettext.h
+# 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"
@@ -49,4 +57,3 @@ LGPL
 
 Maintainer:
 Bruno Haible
-