diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2024-03-24 08:54:48 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2024-03-24 08:54:48 +0100 |
commit | 163a663518f33bab48b28431972e580b366b4d49 (patch) | |
tree | f518ffabaca4a0b93f0103d617e803792d3b0b43 /gnulib-m4/isnanl.m4 | |
parent | 1b3a8d5ad2ea2f099d514d9dd51ebf926a628076 (diff) | |
parent | dd0000f7e25abe6c28d4329d324fd7fcab54094f (diff) |
Merge branch 'release/debian/1.2-1'HEADdebian/1.2-1master
Diffstat (limited to 'gnulib-m4/isnanl.m4')
-rw-r--r-- | gnulib-m4/isnanl.m4 | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/gnulib-m4/isnanl.m4 b/gnulib-m4/isnanl.m4 index fa49a644..9f7a5f13 100644 --- a/gnulib-m4/isnanl.m4 +++ b/gnulib-m4/isnanl.m4 @@ -1,10 +1,10 @@ -# isnanl.m4 serial 22 -dnl Copyright (C) 2007-2022 Free Software Foundation, Inc. +# isnanl.m4 serial 26 +dnl Copyright (C) 2007-2024 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. -AC_DEFUN([gl_FUNC_ISNANL], +AC_DEFUN_ONCE([gl_FUNC_ISNANL], [ AC_REQUIRE([gl_MATH_H_DEFAULTS]) ISNANL_LIBM= @@ -16,12 +16,11 @@ AC_DEFUN([gl_FUNC_ISNANL], fi fi dnl The variable gl_func_isnanl set here is used by isnan.m4. - if test $gl_cv_func_isnanl_no_libm = yes \ - || test $gl_cv_func_isnanl_in_libm = yes; then - save_LIBS="$LIBS" + if test $gl_cv_func_isnanl_no_libm = yes || test -n "$ISNANL_LIBM"; then + saved_LIBS="$LIBS" LIBS="$LIBS $ISNANL_LIBM" gl_FUNC_ISNANL_WORKS - LIBS="$save_LIBS" + LIBS="$saved_LIBS" case "$gl_cv_func_isnanl_works" in *yes) gl_func_isnanl=yes ;; *) gl_func_isnanl=no; ISNANL_LIBM= ;; @@ -88,7 +87,7 @@ AC_DEFUN([gl_HAVE_ISNANL_IN_LIBM], AC_CACHE_CHECK([whether isnan(long double) can be used with libm], [gl_cv_func_isnanl_in_libm], [ - save_LIBS="$LIBS" + saved_LIBS="$LIBS" LIBS="$LIBS -lm" AC_LINK_IFELSE( [AC_LANG_PROGRAM( @@ -104,7 +103,7 @@ AC_DEFUN([gl_HAVE_ISNANL_IN_LIBM], [[return isnanl (x);]])], [gl_cv_func_isnanl_in_libm=yes], [gl_cv_func_isnanl_in_libm=no]) - LIBS="$save_LIBS" + LIBS="$saved_LIBS" ]) ]) @@ -232,7 +231,7 @@ int main () [gl_cv_func_isnanl_works=yes], [gl_cv_func_isnanl_works=no], [case "$host_os" in - mingw*) # Guess yes on mingw, no on MSVC. + mingw* | windows*) # Guess yes on mingw, no on MSVC. AC_EGREP_CPP([Known], [ #ifdef __MINGW32__ Known |