Module 'gettext': New file glibc2.m4.

diff --git a/ChangeLog b/ChangeLog
index 6b8143d1ff05aa0592e22436661c5d5f949f177e..8077bf715abc4e28c0429e37b1de5ae93fcaa9c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-24  Bruno Haible  <bruno@clisp.org>
+
+       * modules/gettext (Files): Add m4/glibc2.m4.
+
 2005-02-22  Simon Josefsson  <jas@extundo.com>
 
        * modules/iconvme: New file.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 3e0a29e24252da2bf53dfc9ddf0e21e59d73c3e1..71f629c270dba391a5095e267fd8718330c32657 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -4,6 +4,7 @@
        * lib-link.m4, lib-prefix.m4, nls.m4, po.m4, printf-posix.m4:
        * progtest.m4:
        Update from GNU gettext 0.14.2.
+       * glibc2.m4: New file, from GNU gettext 0.14.2.
 
 2005-02-22  Simon Josefsson  <jas@extundo.com>
 

diff --git a/m4/glibc2.m4 b/m4/glibc2.m4
new file mode 100644 (file)
index 0000000..e8f5bfe
--- /dev/null
+++ b/m4/glibc2.m4
@@ -0,0 +1,30 @@
+# glibc2.m4 serial 1
+dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Test for the GNU C Library, version 2.0 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([gt_GLIBC2],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer,
+      ac_cv_gnu_library_2,
+      [AC_EGREP_CPP([Lucky GNU user],
+       [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ >= 2)
+  Lucky GNU user
+ #endif
+#endif
+       ],
+       ac_cv_gnu_library_2=yes,
+       ac_cv_gnu_library_2=no)
+      ]
+    )
+    AC_SUBST(GLIBC2)
+    GLIBC2="$ac_cv_gnu_library_2"
+  ]
+)

diff --git a/modules/gettext b/modules/gettext
index f6b8faec2e059079322d00bf52e8a9600e3d0bca..313b7a5e471d9bd6343a062eef6a1e1af742c2a8 100644 (file)
--- a/modules/gettext
+++ b/modules/gettext
@@ -5,6 +5,7 @@ Files:
 lib/gettext.h
 m4/codeset.m4
 m4/gettext.m4
+m4/glibc2.m4
 m4/glibc21.m4
 m4/iconv.m4
 m4/intdiv0.m4