X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fc-strtod.m4;h=ffeb45884168be406ed204d8b1974c9466655700;hb=95d2aaeab5b8caa01c776d3afa097220cd8982b9;hp=c212c5c9e38c0509947258754a26dc7930c37dee;hpb=184aaab6f9d672e5ba78820fbab68d89e0254470;p=gnulib.git

diff --git a/m4/c-strtod.m4 b/m4/c-strtod.m4
index c212c5c9e..ffeb45884 100644
--- a/m4/c-strtod.m4
+++ b/m4/c-strtod.m4
@@ -1,25 +1,43 @@
-# c-strtod.m4 serial 3
+# c-strtod.m4 serial 6
 
-# Copyright (C) 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Copyright (C) 2004, 2005 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.
 
 # Written by Paul Eggert.
 
+AC_DEFUN([gl_C99_STRTOLD],
+[
+  AC_CACHE_CHECK([whether strtold conforms to C99],
+    [gl_cv_func_c99_strtold],
+    [AC_COMPILE_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;
+	     }]],
+           [[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.])
+  fi
+])
+
 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])
   :
@@ -27,7 +45,11 @@ AC_DEFUN([gl_C_STRTOD],
 
 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_CHECK_DECLS_ONCE([strtold])
+  AC_REQUIRE([gl_C99_STRTOLD])
+  :
 ])