X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fglibc2.m4;h=a5fe3cfc07164c4b5d299d7b106dcb30400234c2;hb=5e2a6b1f1f59b920775fdc38b81d1a389a5089ed;hp=fe58a0f326579afd27259d504ba4c75417a89294;hpb=f655fd5741580b9992c18a1b1e410fabb173aa28;p=gnulib.git

diff --git a/m4/glibc2.m4 b/m4/glibc2.m4
index fe58a0f32..a5fe3cfc0 100644
--- a/m4/glibc2.m4
+++ b/m4/glibc2.m4
@@ -1,5 +1,6 @@
-# glibc2.m4 serial 2
-dnl Copyright (C) 2000-2002, 2004, 2008 Free Software Foundation, Inc.
+# glibc2.m4 serial 3
+dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2011 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.
@@ -12,16 +13,16 @@ 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)
+ #if (__GLIBC__ >= 2) && !defined __UCLIBC__
   Lucky GNU user
  #endif
 #endif
-	],
-	[ac_cv_gnu_library_2=yes],
-	[ac_cv_gnu_library_2=no])
+        ],
+        [ac_cv_gnu_library_2=yes],
+        [ac_cv_gnu_library_2=no])
       ]
     )
     AC_SUBST([GLIBC2])