Use REPLACE_ISFINITE instead of HAVE_DECL_ISFINITE.

diff --git a/ChangeLog b/ChangeLog
index 911a8cf720a044d08c5ef31f6262c53574164dc7..18f5b2df4ec724cbf8d813a3c1992c4f714b9d96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-10-28  Bruno Haible  <bruno@clisp.org>
+
+       * 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.
+
 2007-10-28  Bruno Haible  <bruno@clisp.org>
 
        * lib/stdint.in.h (_STDINT_MAX): Subtract 1 from an unused signed

diff --git a/lib/math.in.h b/lib/math.in.h
index c40ae9c59221237eb2704801d6e02d15010246c9..9e0d6ab723659af6ae68a22389230381b70c4463 100644 (file)
--- a/lib/math.in.h
+++ b/lib/math.in.h
@@ -337,7 +337,7 @@ extern long double truncl (long double x);
 
 
 #if @GNULIB_ISFINITE@
-# if !@HAVE_DECL_ISFINITE@
+# if @REPLACE_ISFINITE@
 extern int gl_isfinitef (float x);
 extern int gl_isfinited (double x);
 extern int gl_isfinitel (long double x);

diff --git a/m4/isfinite.m4 b/m4/isfinite.m4
index e87fb8e288939d25b19afb0f50805278e40cdaf3..acffccbfdc875aab67c1c80db00aef112a0e5c3e 100644 (file)
--- a/m4/isfinite.m4
+++ b/m4/isfinite.m4
@@ -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,10 @@ AC_DEFUN([gl_ISFINITE],
   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=
   fi
-  AC_SUBST([HAVE_DECL_ISFINITE])
+  AC_SUBST([REPLACE_ISFINITE])
   AC_SUBST([ISFINITE_LIBM])
 ])

diff --git a/m4/math_h.m4 b/m4/math_h.m4
index 530ca44dd108085af6f82d3e7036edb02e8e4d37..eaa32bf67e8077287a5d967095aadeb09dfe2a7a 100644 (file)
--- a/m4/math_h.m4
+++ b/m4/math_h.m4
@@ -25,6 +25,7 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   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])
@@ -34,7 +35,6 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   GNULIB_TRUNC=0;    AC_SUBST([GNULIB_TRUNC])
   GNULIB_TRUNCF=0;   AC_SUBST([GNULIB_TRUNCF])
   GNULIB_TRUNCL=0;   AC_SUBST([GNULIB_TRUNCL])
-  GNULIB_ISFINITE=0; AC_SUBST([GNULIB_ISFINITE])
   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])
@@ -53,13 +53,13 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   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_CEILF=0;      AC_SUBST([REPLACE_CEILF])
   REPLACE_CEILL=0;      AC_SUBST([REPLACE_CEILL])
   REPLACE_FLOORF=0;     AC_SUBST([REPLACE_FLOORF])
   REPLACE_FLOORL=0;     AC_SUBST([REPLACE_FLOORL])
   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])
 ])

diff --git a/modules/math b/modules/math
index 12d8c87eb145f46d4d713b366fca81f11122915d..29135c07c31badd4d4a3fa83b932d99c5a01f28b 100644 (file)
--- a/modules/math
+++ b/modules/math
@@ -28,6 +28,7 @@ math.h: math.in.h
              -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 @@ math.h: math.in.h
              -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' \
@@ -55,13 +55,13 @@ math.h: math.in.h
              -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_CEILF''@|$(REPLACE_CEILF)|g' \
              -e 's|@''REPLACE_CEILL''@|$(REPLACE_CEILL)|g' \
              -e 's|@''REPLACE_FLOORF''@|$(REPLACE_FLOORF)|g' \
              -e 's|@''REPLACE_FLOORL''@|$(REPLACE_FLOORL)|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)' \