X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fglibc21.m4;h=c938fb1a0c3ecf70a8ce142d7ca998b9624c2360;hb=80a029602f5b2707ca8d2487843ecb9e0df74a6a;hp=03d9e44865543ef69e2f91f261110a63e49641b3;hpb=221393c0c15a6a27941d52bd263cee812ca12e1d;p=gnulib.git

diff --git a/m4/glibc21.m4 b/m4/glibc21.m4
index 03d9e4486..c938fb1a0 100644
--- a/m4/glibc21.m4
+++ b/m4/glibc21.m4
@@ -1,26 +1,34 @@
-#serial 1
+# glibc21.m4 serial 5
+dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2012 Free Software Foundation,
+dnl 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.1 or newer.
+# Test for the GNU C Library, version 2.1 or newer, or uClibc.
 # From Bruno Haible.
 
-AC_DEFUN(jm_GLIBC21,
+AC_DEFUN([gl_GLIBC21],
   [
-    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
-      ac_cv_gnu_library_2_1,
-      [AC_EGREP_CPP([Lucky GNU user],
-	[
+    AC_CACHE_CHECK([whether we are using the GNU C Library >= 2.1 or uClibc],
+      [ac_cv_gnu_library_2_1],
+      [AC_EGREP_CPP([Lucky],
+        [
 #include <features.h>
 #ifdef __GNU_LIBRARY__
  #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
   Lucky GNU user
  #endif
 #endif
-	],
-	ac_cv_gnu_library_2_1=yes,
-	ac_cv_gnu_library_2_1=no)
+#ifdef __UCLIBC__
+ Lucky user
+#endif
+        ],
+        [ac_cv_gnu_library_2_1=yes],
+        [ac_cv_gnu_library_2_1=no])
       ]
     )
-    AC_DEFINE_UNQUOTED(GLIBC21, $ac_cv_gnu_library_2_1,
-                       [we use GNU C Library 2.1 or newer])
+    AC_SUBST([GLIBC21])
+    GLIBC21="$ac_cv_gnu_library_2_1"
   ]
 )