summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorkaa@polly.local <>2007-05-10 17:07:27 +0400
committerkaa@polly.local <>2007-05-10 17:07:27 +0400
commit722b690743f6818c310b773cdf493993731055ed (patch)
treebe8821bdbfe0b8fcf93b97507eb15ff970427a28 /configure.in
parent50c89e7ae19c3ef926c1ba54b8caef1c77edf947 (diff)
parent51af6a4077133271cb3b925e918c27deb74d3647 (diff)
downloadmariadb-git-722b690743f6818c310b773cdf493993731055ed.tar.gz
Merge polly.local:/home/kaa/src/maint/bug28240/my50-bug24240
into polly.local:/home/kaa/src/maint/bug28240/my51-bug24240
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in18
1 files changed, 13 insertions, 5 deletions
diff --git a/configure.in b/configure.in
index 257a32bb70e..ac5bab19c11 100644
--- a/configure.in
+++ b/configure.in
@@ -1929,12 +1929,20 @@ case "$target" in
;;
esac
-# isinf() could be a function or a macro (HPUX)
-AC_MSG_CHECKING(for isinf with <math.h>)
+# Check that isinf() is available in math.h and can be used in both C and C++
+# code
+AC_MSG_CHECKING(for isinf in <math.h>)
AC_TRY_LINK([#include <math.h>], [float f = 0.0; int r = isinf(f); return r],
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_ISINF, [1], [isinf() macro or function]),
- AC_MSG_RESULT(no))
+ AC_MSG_RESULT(yes)
+ AC_MSG_CHECKING(whether isinf() can be used in C++ code)
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_LINK([#include <math.h>], [float f = 0.0; int r = isinf(f); return r],
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_ISINF, [1], [isinf() macro or function]),
+ AC_MSG_RESULT(no))
+ AC_LANG_RESTORE,
+ AC_MSG_RESULT(no))
CFLAGS="$ORG_CFLAGS"