diff options
author | Stephen Kitt <skitt@debian.org> | 2016-05-27 10:11:04 +0200 |
---|---|---|
committer | Manuel A. Fernandez Montecelo <manuel.montezelo@gmail.com> | 2016-05-27 14:28:33 +0100 |
commit | 752fd7247bc223bcea35bd89cf56d1c08ead9ba6 (patch) | |
tree | b4a428f847a963738faaf24c8eff070fdb03a3a5 /gnulib-m4/isnand.m4 | |
parent | 9f7d4fa477ff2a51d7c932b13d57ac22dc033105 (diff) | |
parent | a9a31b1de5776a3b08a82101a4fa711294f0dd1d (diff) |
Imported Debian patch 0.9.6+really0.9.3-0.1debian/0.9.6+really0.9.3-0.1
Diffstat (limited to 'gnulib-m4/isnand.m4')
-rw-r--r-- | gnulib-m4/isnand.m4 | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/gnulib-m4/isnand.m4 b/gnulib-m4/isnand.m4 index 4d5c615..cd91628 100644 --- a/gnulib-m4/isnand.m4 +++ b/gnulib-m4/isnand.m4 @@ -1,5 +1,5 @@ -# isnand.m4 serial 11 -dnl Copyright (C) 2007-2015 Free Software Foundation, Inc. +# isnand.m4 serial 6 +dnl Copyright (C) 2007-2010 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,6 +24,7 @@ AC_DEFUN([gl_FUNC_ISNAND], else gl_func_isnand=no HAVE_ISNAND=0 + gl_BUILD_ISNAND fi AC_SUBST([ISNAND_LIBM]) ]) @@ -33,17 +34,19 @@ 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 Prerequisites of replacement isnand definition. It does not need -lm. -AC_DEFUN([gl_PREREQ_ISNAND], +dnl Pull in replacement isnand definition. It does not need -lm. +AC_DEFUN([gl_BUILD_ISNAND], [ - AC_REQUIRE([gl_DOUBLE_EXPONENT_LOCATION]) + AC_LIBOBJ([isnand]) + gl_DOUBLE_EXPONENT_LOCATION ]) dnl Test whether isnand() can be used with libm. @@ -55,18 +58,16 @@ AC_DEFUN([gl_HAVE_ISNAND_IN_LIBM], [ save_LIBS="$LIBS" LIBS="$LIBS -lm" - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include <math.h> - #if __GNUC__ >= 4 - # undef isnand - # define isnand(x) __builtin_isnan ((double)(x)) - #elif defined isnan - # undef isnand - # define isnand(x) isnan ((double)(x)) - #endif - double x;]], - [[return isnand (x);]])], + AC_TRY_LINK([#include <math.h> + #if __GNUC__ >= 4 + # undef isnand + # define isnand(x) __builtin_isnand ((double)(x)) + #elif defined isnan + # undef isnand + # define isnand(x) isnan ((double)(x)) + #endif + double x;], + [return isnand (x);], [gl_cv_func_isnand_in_libm=yes], [gl_cv_func_isnand_in_libm=no]) LIBS="$save_LIBS" @@ -78,18 +79,16 @@ AC_DEFUN([gl_HAVE_ISNAND_NO_LIBM], AC_CACHE_CHECK([whether isnan(double) can be used without linking with libm], [gl_cv_func_isnand_no_libm], [ - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include <math.h> - #if __GNUC__ >= 4 - # undef isnand - # define isnand(x) __builtin_isnan ((double)(x)) - #else - # undef isnand - # define isnand(x) isnan ((double)(x)) - #endif - double x;]], - [[return isnand (x);]])], + AC_TRY_LINK([#include <math.h> + #if __GNUC__ >= 4 + # undef isnand + # define isnand(x) __builtin_isnan ((double)(x)) + #else + # undef isnand + # define isnand(x) isnan ((double)(x)) + #endif + double x;], + [return isnand (x);], [gl_cv_func_isnand_no_libm=yes], [gl_cv_func_isnand_no_libm=no]) ]) |