Re: new module 'isfinite'

[Bruno Haible]

Ben,

But I don't much like that the symbol HAVE_DECL_ISFINITE denotes something
different than whether the isfinite macro is declared. This will be confusing
in the future. OK to replace it by the inversion of REPLACE_ISFINITE, like
this?


2007-10-28  Bruno Haible  <address@hidden>

        * lib/math.in.h: Test REPLACE_ISFINITE instead of HAVE_DECL_ISFINITE.
        * m4/isfinite.m4 (gl_ISFINITE): Initialize REPLACE_ISFINITE instead of
        HAVE_DECL_ISFINITE.
        * m4/math_h.m4 (gl_MATH_H_DEFAULTS): Update.
        * modules/math (Makefile.am): Substitute REPLACE_ISFINITE instead of
        HAVE_DECL_ISFINITE.

--- lib/math.in.h.orig  2007-10-29 00:43:54.000000000 +0100
+++ lib/math.in.h       2007-10-29 00:40:13.000000000 +0100
@@ -337,7 +337,7 @@
 
 
 #if @GNULIB_ISFINITE@
-# if address@hidden@
+# if @REPLACE_ISFINITE@
 extern int gl_isfinitef (float x);
 extern int gl_isfinited (double x);
 extern int gl_isfinitel (long double x);
--- m4/isfinite.m4.orig 2007-10-29 00:43:54.000000000 +0100
+++ m4/isfinite.m4      2007-10-29 00:38:53.000000000 +0100
@@ -1,4 +1,4 @@
-# isfinite.m4 serial 1
+# isfinite.m4 serial 2
 dnl Copyright (C) 2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -15,10 +15,12 @@
   fi
   if test "$ac_cv_have_decl_isfinite" != yes ||
      test "$ISFINITE_LIBM" = missing; then
-    ISFINITE_LIBM=
-    HAVE_DECL_ISFINITE=0
+    REPLACE_ISFINITE=1
     AC_LIBOBJ([isfinite])
+    ISFINITE_LIBM=
+  else
+    REPLACE_ISFINITE=0
   fi
-  AC_SUBST([HAVE_DECL_ISFINITE])
+  AC_SUBST([REPLACE_ISFINITE])
   AC_SUBST([ISFINITE_LIBM])
 ])
--- m4/math_h.m4.orig   2007-10-29 00:43:54.000000000 +0100
+++ m4/math_h.m4        2007-10-29 00:41:15.000000000 +0100
@@ -19,22 +19,22 @@
 
 AC_DEFUN([gl_MATH_H_DEFAULTS],
 [
-  GNULIB_CEILF=0;   AC_SUBST([GNULIB_CEILF])
-  GNULIB_CEILL=0;   AC_SUBST([GNULIB_CEILL])
-  GNULIB_FLOORF=0;  AC_SUBST([GNULIB_FLOORF])
-  GNULIB_FLOORL=0;  AC_SUBST([GNULIB_FLOORL])
-  GNULIB_FREXP=0;   AC_SUBST([GNULIB_FREXP])
-  GNULIB_FREXPL=0;  AC_SUBST([GNULIB_FREXPL])
-  GNULIB_LDEXPL=0;  AC_SUBST([GNULIB_LDEXPL])
-  GNULIB_MATHL=0;   AC_SUBST([GNULIB_MATHL])
-  GNULIB_ROUND=0;   AC_SUBST([GNULIB_ROUND])
-  GNULIB_ROUNDF=0;  AC_SUBST([GNULIB_ROUNDF])
-  GNULIB_ROUNDL=0;  AC_SUBST([GNULIB_ROUNDL])
-  GNULIB_SIGNBIT=0; AC_SUBST([GNULIB_SIGNBIT])
-  GNULIB_TRUNC=0;   AC_SUBST([GNULIB_TRUNC])
-  GNULIB_TRUNCF=0;  AC_SUBST([GNULIB_TRUNCF])
-  GNULIB_TRUNCL=0;  AC_SUBST([GNULIB_TRUNCL])
+  GNULIB_CEILF=0;    AC_SUBST([GNULIB_CEILF])
+  GNULIB_CEILL=0;    AC_SUBST([GNULIB_CEILL])
+  GNULIB_FLOORF=0;   AC_SUBST([GNULIB_FLOORF])
+  GNULIB_FLOORL=0;   AC_SUBST([GNULIB_FLOORL])
+  GNULIB_FREXP=0;    AC_SUBST([GNULIB_FREXP])
+  GNULIB_FREXPL=0;   AC_SUBST([GNULIB_FREXPL])
   GNULIB_ISFINITE=0; AC_SUBST([GNULIB_ISFINITE])
+  GNULIB_LDEXPL=0;   AC_SUBST([GNULIB_LDEXPL])
+  GNULIB_MATHL=0;    AC_SUBST([GNULIB_MATHL])
+  GNULIB_ROUND=0;    AC_SUBST([GNULIB_ROUND])
+  GNULIB_ROUNDF=0;   AC_SUBST([GNULIB_ROUNDF])
+  GNULIB_ROUNDL=0;   AC_SUBST([GNULIB_ROUNDL])
+  GNULIB_SIGNBIT=0;  AC_SUBST([GNULIB_SIGNBIT])
+  GNULIB_TRUNC=0;    AC_SUBST([GNULIB_TRUNC])
+  GNULIB_TRUNCF=0;   AC_SUBST([GNULIB_TRUNCF])
+  GNULIB_TRUNCL=0;   AC_SUBST([GNULIB_TRUNCL])
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_DECL_ACOSL=1;  AC_SUBST([HAVE_DECL_ACOSL])
   HAVE_DECL_ASINL=1;  AC_SUBST([HAVE_DECL_ASINL])
@@ -57,9 +57,9 @@
   HAVE_DECL_TRUNC=1;  AC_SUBST([HAVE_DECL_TRUNC])
   HAVE_DECL_TRUNCF=1; AC_SUBST([HAVE_DECL_TRUNCF])
   HAVE_DECL_TRUNCL=1; AC_SUBST([HAVE_DECL_TRUNCL])
-  HAVE_DECL_ISFINITE=1; AC_SUBST([HAVE_DECL_ISFINITE])
   REPLACE_FREXP=0;    AC_SUBST([REPLACE_FREXP])
   REPLACE_FREXPL=0;   AC_SUBST([REPLACE_FREXPL])
+  REPLACE_ISFINITE=0; AC_SUBST([REPLACE_ISFINITE])
   REPLACE_LDEXPL=0;   AC_SUBST([REPLACE_LDEXPL])
   REPLACE_SIGNBIT=0;  AC_SUBST([REPLACE_SIGNBIT])
 ])
--- modules/math.orig   2007-10-29 00:43:54.000000000 +0100
+++ modules/math        2007-10-29 00:43:43.000000000 +0100
@@ -28,6 +28,7 @@
              -e 's|@''GNULIB_FLOORL''@|$(GNULIB_FLOORL)|g' \
              -e 's|@''GNULIB_FREXP''@|$(GNULIB_FREXP)|g' \
              -e 's|@''GNULIB_FREXPL''@|$(GNULIB_FREXPL)|g' \
+             -e 's|@''GNULIB_ISFINITE''@|$(GNULIB_ISFINITE)|g' \
              -e 's|@''GNULIB_LDEXPL''@|$(GNULIB_LDEXPL)|g' \
              -e 's|@''GNULIB_MATHL''@|$(GNULIB_MATHL)|g' \
              -e 's|@''GNULIB_ROUND''@|$(GNULIB_ROUND)|g' \
@@ -37,7 +38,6 @@
              -e 's|@''GNULIB_TRUNC''@|$(GNULIB_TRUNC)|g' \
              -e 's|@''GNULIB_TRUNCF''@|$(GNULIB_TRUNCF)|g' \
              -e 's|@''GNULIB_TRUNCL''@|$(GNULIB_TRUNCL)|g' \
-             -e 's|@''GNULIB_ISFINITE''@|$(GNULIB_ISFINITE)|g' \
              -e 's|@''HAVE_DECL_ACOSL''@|$(HAVE_DECL_ACOSL)|g' \
              -e 's|@''HAVE_DECL_ASINL''@|$(HAVE_DECL_ASINL)|g' \
              -e 's|@''HAVE_DECL_ATANL''@|$(HAVE_DECL_ATANL)|g' \
@@ -59,9 +59,9 @@
              -e 's|@''HAVE_DECL_TRUNC''@|$(HAVE_DECL_TRUNC)|g' \
              -e 's|@''HAVE_DECL_TRUNCF''@|$(HAVE_DECL_TRUNCF)|g' \
              -e 's|@''HAVE_DECL_TRUNCL''@|$(HAVE_DECL_TRUNCL)|g' \
-             -e 's|@''HAVE_DECL_ISFINITE''@|$(HAVE_DECL_ISFINITE)|g' \
              -e 's|@''REPLACE_FREXP''@|$(REPLACE_FREXP)|g' \
              -e 's|@''REPLACE_FREXPL''@|$(REPLACE_FREXPL)|g' \
+             -e 's|@''REPLACE_ISFINITE''@|$(REPLACE_ISFINITE)|g' \
              -e 's|@''REPLACE_LDEXPL''@|$(REPLACE_LDEXPL)|g' \
              -e 's|@''REPLACE_SIGNBIT''@|$(REPLACE_SIGNBIT)|g' \
              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \