* m4/isnand.m4 (gl_FUNC_ISNAND):
* m4/isnanf.m4 (gl_FUNC_ISNANF):
* m4/isnanl.m4 (gl_FUNC_ISNANL):
Slightly simplify shell ‘if’.  This should simplify future changes.
---
 ChangeLog    | 6 ++++++
 m4/isnand.m4 | 5 ++---
 m4/isnanf.m4 | 5 ++---
 m4/isnanl.m4 | 5 ++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3ace239450..f09de5233e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2023-10-05  Paul Eggert  <[email protected]>
 
+       isnan: slightly simplify configuration
+       * m4/isnand.m4 (gl_FUNC_ISNAND):
+       * m4/isnanf.m4 (gl_FUNC_ISNANF):
+       * m4/isnanl.m4 (gl_FUNC_ISNANL):
+       Slightly simplify shell ‘if’.  This should simplify future changes.
+
        totalorder: speed up configuration
        * m4/totalorder.m4 (gl_FUNC_TOTALORDERF, gl_FUNC_TOTALORDER)
        (gl_FUNC_TOTALORDERL): Avoid unnecessary call to AC_SEARCH_LIBS,
diff --git a/m4/isnand.m4 b/m4/isnand.m4
index 95346f420b..b106a5dce4 100644
--- a/m4/isnand.m4
+++ b/m4/isnand.m4
@@ -1,4 +1,4 @@
-# isnand.m4 serial 12
+# isnand.m4 serial 13
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -18,8 +18,7 @@ AC_DEFUN([gl_FUNC_ISNAND],
     fi
   fi
   dnl The variable gl_func_isnand set here is used by isnan.m4.
-  if test $gl_cv_func_isnand_no_libm = yes \
-     || test $gl_cv_func_isnand_in_libm = yes; then
+  if test $gl_cv_func_isnand_no_libm = yes || test "$ISNAND_LIBM"; then
     gl_func_isnand=yes
   else
     gl_func_isnand=no
diff --git a/m4/isnanf.m4 b/m4/isnanf.m4
index f96e5e2060..f30893c629 100644
--- a/m4/isnanf.m4
+++ b/m4/isnanf.m4
@@ -1,4 +1,4 @@
-# isnanf.m4 serial 19
+# isnanf.m4 serial 20
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -18,8 +18,7 @@ AC_DEFUN([gl_FUNC_ISNANF],
     fi
   fi
   dnl The variable gl_func_isnanf set here is used by isnan.m4.
-  if test $gl_cv_func_isnanf_no_libm = yes \
-     || test $gl_cv_func_isnanf_in_libm = yes; then
+  if test $gl_cv_func_isnanf_no_libm = yes || test "$ISNANF_LIBM"; then
     save_LIBS="$LIBS"
     LIBS="$LIBS $ISNANF_LIBM"
     gl_ISNANF_WORKS
diff --git a/m4/isnanl.m4 b/m4/isnanl.m4
index 1b1c035665..203ab325f5 100644
--- a/m4/isnanl.m4
+++ b/m4/isnanl.m4
@@ -1,4 +1,4 @@
-# isnanl.m4 serial 23
+# isnanl.m4 serial 24
 dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -16,8 +16,7 @@ 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
+  if test $gl_cv_func_isnanl_no_libm = yes || test "$ISNANL_LIBM"; then
     save_LIBS="$LIBS"
     LIBS="$LIBS $ISNANL_LIBM"
     gl_FUNC_ISNANL_WORKS
-- 
2.39.2


Reply via email to