From 1986f07d6455917aef9e0c9b76778e8d62cab871 Mon Sep 17 00:00:00 2001
From: Francesco Lannutti <nicolati@users.sourceforge.net>
Date: Sat, 17 Nov 2012 12:31:56 +0100
Subject: [PATCH] conditional compilation isnan isinf

---
 configure.ac               | 15 ++++-----------
 src/maths/misc/Makefile.am |  4 ++--
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 903707359..c6b5fd947 100644
--- a/configure.ac
+++ b/configure.ac
@@ -659,17 +659,10 @@ AC_CHECK_HEADERS([float.h limits.h values.h ieeefp.h])
 # Check for a few mathematical functions:
 AC_CHECK_FUNCS([erfc logb scalb scalbn asinh acosh atanh finite])
 # According POSIX we should look for macros first
-AC_CHECK_DECLS([isinf], [], [], [[#include <math.h>]])
-AC_CHECK_DECLS([isnan], [], [], [[#include <math.h>]])
-# But may be we have still functions
-if test "x$ac_cv_have_decl_isinf" != xyes; then
-    AC_CHECK_FUNC([isinf])
-fi
-AM_CONDITIONAL([HAVE_DECL_ISINF_WANTED], [test "x$ac_cv_have_decl_isinf" = xyes])
-if test "x$ac_cv_have_decl_isnan" != xyes; then
-    AC_CHECK_FUNC([isnan])
-fi
-AM_CONDITIONAL([HAVE_DECL_ISNAN_WANTED], [test "x$ac_cv_have_decl_isnan" = xyes])
+AC_CHECK_DECLS([isinf], [], [AC_CHECK_FUNC([isinf])], [[#include <math.h>]])
+AC_CHECK_DECLS([isnan], [], [AC_CHECK_FUNC([isnan])], [[#include <math.h>]])
+AM_CONDITIONAL([HAVE_DECL_ISINF], [test "x$ac_cv_have_decl_isinf" = xyes])
+AM_CONDITIONAL([HAVE_DECL_ISNAN], [test "x$ac_cv_have_decl_isnan" = xyes])
 
 # If user enables garbage collection, look for garbage collector
 if test "x$TCL_PACKAGE_PATH" = x; then
diff --git a/src/maths/misc/Makefile.am b/src/maths/misc/Makefile.am
index 3f2a6fb1b..fed79c8f3 100644
--- a/src/maths/misc/Makefile.am
+++ b/src/maths/misc/Makefile.am
@@ -16,11 +16,11 @@ libmathmisc_la_SOURCES = \
 	randnumb.c
 
 
-if !HAVE_DECL_ISINF_WANTED
+if !HAVE_DECL_ISINF
 libmathmisc_la_SOURCES += isinf.c
 endif
 
-if !HAVE_DECL_ISNAN_WANTED
+if !HAVE_DECL_ISNAN
 libmathmisc_la_SOURCES += isnan.c
 endif