X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fc-strtod.m4;h=20c65b8258458c4546b1519f922d018fb30b5460;hb=d9c5af0679bed502b1f978f75cf8a4c41e104263;hp=ffeb45884168be406ed204d8b1974c9466655700;hpb=62a39c7d945eb4160c206242b85c624fb2fb21fd;p=gnulib.git

diff --git a/m4/c-strtod.m4 b/m4/c-strtod.m4
index ffeb45884..20c65b825 100644
--- a/m4/c-strtod.m4
+++ b/m4/c-strtod.m4
@@ -1,6 +1,6 @@
-# c-strtod.m4 serial 6
+# c-strtod.m4 serial 14
 
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004-2006, 2009-2011 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,45 +11,45 @@ AC_DEFUN([gl_C99_STRTOLD],
 [
   AC_CACHE_CHECK([whether strtold conforms to C99],
     [gl_cv_func_c99_strtold],
-    [AC_COMPILE_IFELSE(
+    [AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
           [[/* On HP-UX before 11.23, strtold returns a struct instead of
-		long double.  Reject implementations like that, by requiring
-		compatibility with the C99 prototype.  */
-	     #include <stdlib.h>
-	     static long double (*p) (char const *, char **) = strtold;
-	     static long double
-	     test (char const *nptr, char **endptr)
-	     {
-	       long double r;
-	       r = strtold (nptr, endptr);
-	       return r;
-	     }]],
+                long double.  Reject implementations like that, by requiring
+                compatibility with the C99 prototype.  */
+             #include <stdlib.h>
+             static long double (*p) (char const *, char **) = strtold;
+             static long double
+             test (char const *nptr, char **endptr)
+             {
+               long double r;
+               r = strtold (nptr, endptr);
+               return r;
+             }]],
            [[return test ("1.0", NULL) != 1 || p ("1.0", NULL) != 1;]])],
        [gl_cv_func_c99_strtold=yes],
        [gl_cv_func_c99_strtold=no])])
   if test $gl_cv_func_c99_strtold = yes; then
-    AC_DEFINE([HAVE_C99_STRTOLD], 1, [Define to 1 if strtold conforms to C99.])
+    AC_DEFINE([HAVE_C99_STRTOLD], [1], [Define to 1 if strtold conforms to C99.])
   fi
 ])
 
+dnl Prerequisites of lib/c-strtod.c.
 AC_DEFUN([gl_C_STRTOD],
 [
-  AC_LIBSOURCES([c-strtod.c, c-strtod.h])
-  AC_LIBOBJ([c-strtod])
-
-  dnl Prerequisites of lib/c-strtod.c.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  AC_CHECK_FUNCS([strtod_l])
+
+  AC_REQUIRE([AC_C_INLINE])
   :
 ])
 
+dnl Prerequisites of lib/c-strtold.c.
 AC_DEFUN([gl_C_STRTOLD],
 [
-  AC_LIBSOURCES([c-strtold.c, c-strtod.h])
-  AC_LIBOBJ([c-strtold])
-
-  dnl Prerequisites of lib/c-strtold.c.
-  AC_REQUIRE([gl_C_STRTOD])
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_REQUIRE([gl_C99_STRTOLD])
+  AC_CHECK_FUNCS([strtold_l])
+
+  AC_REQUIRE([AC_C_INLINE])
   :
 ])