From: Bruno Haible <bruno@clisp.org>
Date: Mon, 12 Jul 2010 21:36:34 +0000 (+0200)
Subject: Unify tests that set gl_cv_func_ldexp_no_libm.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12eef17ca76576859dbf462f2e4a3f940f3698ae;p=pspp
Unify tests that set gl_cv_func_ldexp_no_libm.
---
diff --git a/ChangeLog b/ChangeLog
index c3f530b5da..234af7425f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-07-12 Bruno Haible <bruno@clisp.org>
+
+ Unify tests that set gl_cv_func_ldexp_no_libm.
+ * m4/ldexp.m4: New file, based on m4/mathfunc.m4.
+ * m4/strtod.m4 (gl_PREREQ_STRTOD): Require gl_CHECK_LDEXP_NO_LIBM.
+ * modules/ldexp (Files): Remove m4/mathfunc.m4. Add m4/ldexp.m4.
+ (configure.ac): Simply invoke gl_FUNC_LDEXP.
+ * modules/strtod (Files): Add m4/ldexp.m4.
+
2010-07-12 Bruno Haible <bruno@clisp.org>
Unify tests that set gl_cv_func_frexpl_no_libm.
diff --git a/m4/ldexp.m4 b/m4/ldexp.m4
new file mode 100644
index 0000000000..7484cb7e3d
--- /dev/null
+++ b/m4/ldexp.m4
@@ -0,0 +1,54 @@
+# ldexp.m4 serial 1
+dnl Copyright (C) 2010 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_FUNC_LDEXP],
+[
+ AC_REQUIRE([gl_CHECK_LDEXP_NO_LIBM])
+ LDEXP_LIBM=
+ if test $gl_cv_func_ldexp_no_libm = no; then
+ AC_CACHE_CHECK([whether ldexp() can be used with libm],
+ [gl_cv_func_ldexp_in_libm],
+ [
+ save_LIBS="$LIBS"
+ LIBS="$LIBS -lm"
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[#ifndef __NO_MATH_INLINES
+ # define __NO_MATH_INLINES 1 /* for glibc */
+ #endif
+ #include <math.h>
+ double (*funcptr) (double, int) = ldexp;
+ double x;]],
+ [[return ldexp (x, -1) > 0;]])],
+ [gl_cv_func_ldexp_in_libm=yes],
+ [gl_cv_func_ldexp_in_libm=no])
+ LIBS="$save_LIBS"
+ ])
+ if test $gl_cv_func_ldexp_in_libm = yes; then
+ LDEXP_LIBM=-lm
+ fi
+ fi
+ AC_SUBST([LDEXP_LIBM])
+])
+
+dnl Test whether ldexp() can be used without linking with libm.
+dnl Set gl_cv_func_ldexp_no_libm to 'yes' or 'no' accordingly.
+AC_DEFUN([gl_CHECK_LDEXP_NO_LIBM],
+[
+ AC_CACHE_CHECK([whether ldexp() can be used without linking with libm],
+ [gl_cv_func_ldexp_no_libm],
+ [
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[#ifndef __NO_MATH_INLINES
+ # define __NO_MATH_INLINES 1 /* for glibc */
+ #endif
+ #include <math.h>
+ double (*funcptr) (double, int) = ldexp;
+ double x;]],
+ [[return ldexp (x, -1) > 0;]])],
+ [gl_cv_func_ldexp_no_libm=yes],
+ [gl_cv_func_ldexp_no_libm=no])
+ ])
+])
diff --git a/m4/strtod.m4 b/m4/strtod.m4
index 05d36bd4b3..8f90ed7904 100644
--- a/m4/strtod.m4
+++ b/m4/strtod.m4
@@ -1,4 +1,4 @@
-# strtod.m4 serial 15
+# strtod.m4 serial 16
dnl Copyright (C) 2002-2003, 2006-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -119,18 +119,8 @@ numeric_equal (double x, double y)
])
# Prerequisites of lib/strtod.c.
-# FIXME: This implementation is a copy of printf-frexp.m4 and should be shared.
AC_DEFUN([gl_PREREQ_STRTOD], [
- AC_CACHE_CHECK([whether ldexp can be used without linking with libm],
- [gl_cv_func_ldexp_no_libm],
- [
- AC_TRY_LINK([#include <math.h>
- double x;
- int y;],
- [return ldexp (x, y) < 1;],
- [gl_cv_func_ldexp_no_libm=yes],
- [gl_cv_func_ldexp_no_libm=no])
- ])
+ AC_REQUIRE([gl_CHECK_LDEXP_NO_LIBM])
if test $gl_cv_func_ldexp_no_libm = yes; then
AC_DEFINE([HAVE_LDEXP_IN_LIBC], [1],
[Define if the ldexp function is available in libc.])
diff --git a/modules/ldexp b/modules/ldexp
index 20818ededd..025d9817f4 100644
--- a/modules/ldexp
+++ b/modules/ldexp
@@ -2,12 +2,12 @@ Description:
ldexp() function: multiply a 'double' by a power of 2.
Files:
-m4/mathfunc.m4
+m4/ldexp.m4
Depends-on:
configure.ac:
-gl_MATHFUNC([ldexp], [double], [(double, int)])
+gl_FUNC_LDEXP
Makefile.am:
diff --git a/modules/strtod b/modules/strtod
index d4f64c13d4..056ff4263d 100644
--- a/modules/strtod
+++ b/modules/strtod
@@ -4,6 +4,7 @@ strtod() function: convert string to 'double'.
Files:
lib/strtod.c
m4/strtod.m4
+m4/ldexp.m4
Depends-on:
c-ctype