X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fisnand.m4;h=54b64a452d8d06a49d284d116e525b1f8cdca71d;hb=68d7dd97dc18a17bc23811e5bceb1441e783a215;hp=b000ab526ca5c9a10f24c87c830d3d60d2fa8d4d;hpb=ba755304261567ce2bb5672bc991c083a77a2911;p=gnulib.git

diff --git a/m4/isnand.m4 b/m4/isnand.m4
index b000ab526..54b64a452 100644
--- a/m4/isnand.m4
+++ b/m4/isnand.m4
@@ -1,5 +1,5 @@
-# isnand.m4 serial 9
-dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
+# isnand.m4 serial 11
+dnl Copyright (C) 2007-2012 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,8 +24,6 @@ AC_DEFUN([gl_FUNC_ISNAND],
   else
     gl_func_isnand=no
     HAVE_ISNAND=0
-    AC_LIBOBJ([isnand])
-    gl_PREREQ_ISNAND
   fi
   AC_SUBST([ISNAND_LIBM])
 ])
@@ -35,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
-    AC_LIBOBJ([isnand])
-    gl_PREREQ_ISNAND
   fi
 ])
 
 dnl Prerequisites of replacement isnand definition. It does not need -lm.
 AC_DEFUN([gl_PREREQ_ISNAND],
 [
-  gl_DOUBLE_EXPONENT_LOCATION
+  AC_REQUIRE([gl_DOUBLE_EXPONENT_LOCATION])
 ])
 
 dnl Test whether isnand() can be used with libm.