X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fduplocale.m4;h=cfb7f4b53dc6ccc01c37faa40ecf4ae1d0173758;hb=6bddfff3ba873f16c5b9840c3ddf265408b9aef4;hp=4fc61375799652ca6e5b889d7f61e80be4abfb68;hpb=64865499c9cf8748356a0857a8481d74b394bd79;p=gnulib.git

diff --git a/m4/duplocale.m4 b/m4/duplocale.m4
index 4fc613757..cfb7f4b53 100644
--- a/m4/duplocale.m4
+++ b/m4/duplocale.m4
@@ -1,5 +1,5 @@
-# duplocale.m4 serial 4
-dnl Copyright (C) 2009-2010 Free Software Foundation, Inc.
+# duplocale.m4 serial 7
+dnl Copyright (C) 2009-2011 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.
@@ -31,17 +31,20 @@ int main ()
 }]])],
          [gl_cv_func_duplocale_works=yes],
          [gl_cv_func_duplocale_works=no],
-         [dnl Guess it works except on glibc < 2.12 and AIX.
+         [dnl Guess it works except on glibc < 2.12, uClibc, and AIX.
           case "$host_os" in
             aix*) gl_cv_func_duplocale_works="guessing no";;
             *-gnu*)
-              AC_EGREP_CPP([Unlucky GNU user], [
+              AC_EGREP_CPP([Unlucky], [
 #include <features.h>
 #ifdef __GNU_LIBRARY__
  #if (__GLIBC__ == 2 && __GLIBC_MINOR__ < 12)
   Unlucky GNU user
  #endif
 #endif
+#ifdef __UCLIBC__
+ Unlucky user
+#endif
                 ],
                 [gl_cv_func_duplocale_works="guessing no"],
                 [gl_cv_func_duplocale_works="guessing yes"])
@@ -56,11 +59,6 @@ int main ()
   else
     HAVE_DUPLOCALE=0
   fi
-  if test $REPLACE_DUPLOCALE = 1; then
-    gl_REPLACE_LOCALE_H
-    AC_LIBOBJ([duplocale])
-    gl_PREREQ_DUPLOCALE
-  fi
 ])
 
 # Prerequisites of lib/duplocale.c.