X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/2e65b52f8a2e5f82ddc8da471d989f14468f8b90..2fd79c4daa9fcfa7c4c63c88a8e87a27c425dd6c:/m4/isnand.m4

diff --git a/m4/isnand.m4 b/m4/isnand.m4
index 31764f72d..36e4ea307 100644
--- a/m4/isnand.m4
+++ b/m4/isnand.m4
@@ -1,5 +1,5 @@
-# isnand.m4 serial 7
-dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
+# isnand.m4 serial 11
+dnl Copyright (C) 2007-2014 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.
@@ -24,7 +24,6 @@ AC_DEFUN([gl_FUNC_ISNAND],
   else
     gl_func_isnand=no
     HAVE_ISNAND=0
-    gl_BUILD_ISNAND
   fi
   AC_SUBST([ISNAND_LIBM])
 ])
@@ -34,19 +33,17 @@ dnl Check how to get or define isnand() without linking with libm.
 AC_DEFUN([gl_FUNC_ISNAND_NO_LIBM],
 [
   gl_HAVE_ISNAND_NO_LIBM
+  gl_func_isnand_no_libm=$gl_cv_func_isnand_no_libm
   if test $gl_cv_func_isnand_no_libm = yes; then
     AC_DEFINE([HAVE_ISNAND_IN_LIBC], [1],
       [Define if the isnan(double) function is available in libc.])
-  else
-    gl_BUILD_ISNAND
   fi
 ])
 
-dnl Pull in replacement isnand definition. It does not need -lm.
-AC_DEFUN([gl_BUILD_ISNAND],
+dnl Prerequisites of replacement isnand definition. It does not need -lm.
+AC_DEFUN([gl_PREREQ_ISNAND],
 [
-  AC_LIBOBJ([isnand])
-  gl_DOUBLE_EXPONENT_LOCATION
+  AC_REQUIRE([gl_DOUBLE_EXPONENT_LOCATION])
 ])
 
 dnl Test whether isnand() can be used with libm.
@@ -63,7 +60,7 @@ AC_DEFUN([gl_HAVE_ISNAND_IN_LIBM],
            [[#include <math.h>
              #if __GNUC__ >= 4
              # undef isnand
-             # define isnand(x) __builtin_isnand ((double)(x))
+             # define isnand(x) __builtin_isnan ((double)(x))
              #elif defined isnan
              # undef isnand
              # define isnand(x) isnan ((double)(x))