X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fprintf-frexpl.m4;h=14ffe1fc1a7d05a04b5007ed69c4f23bfe21cc7a;hb=e69a17d02ee0bc09acf4498515fd6934160c9923;hp=e21ae36e61a329a28648b4f24a16b590399733e7;hpb=a8960f4f8bee1d141cc622303a8dc8ff1f27f7eb;p=gnulib.git

diff --git a/m4/printf-frexpl.m4 b/m4/printf-frexpl.m4
index e21ae36e6..14ffe1fc1 100644
--- a/m4/printf-frexpl.m4
+++ b/m4/printf-frexpl.m4
@@ -1,5 +1,5 @@
-# printf-frexpl.m4 serial 2
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# printf-frexpl.m4 serial 6
+dnl Copyright (C) 2007, 2009, 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.
@@ -8,42 +8,57 @@ dnl Check how to define printf_frexpl() without linking with libm.
 
 AC_DEFUN([gl_FUNC_PRINTF_FREXPL],
 [
-  AC_REQUIRE([gt_TYPE_LONGDOUBLE])
-  if test $gt_cv_c_long_double = yes; then
-    AC_CACHE_CHECK([whether frexpl can be used without linking with libm],
-      [gl_cv_func_frexpl_no_libm],
-      [
-        AC_TRY_LINK([#include <math.h>
-                     long double x;
-                     int y;],
-                    [return frexpl (x, &y) < 1;],
-          [gl_cv_func_frexpl_no_libm=yes],
-          [gl_cv_func_frexpl_no_libm=no])
-      ])
-    if test $gl_cv_func_frexpl_no_libm = yes; then
-      AC_DEFINE([HAVE_FREXPL_IN_LIBC], 1,
-        [Define if the frexpl function is available in libc.])
-      dnl Also check whether it's declared. glibc (2.3..2.5 at least) and
-      dnl MacOS X 10.3 have frexpl() in libc but don't declare it in <math.h>.
-      AC_CHECK_DECLS([frexpl])
-    fi
+  AC_REQUIRE([gl_MATH_H_DEFAULTS])
+  dnl Subset of gl_FUNC_FREXPL_NO_LIBM.
+  AC_CACHE_CHECK([whether frexpl can be used without linking with libm],
+    [gl_cv_func_frexpl_no_libm],
+    [
+      AC_TRY_LINK([#include <math.h>
+                   long double x;
+                   int y;],
+                  [return frexpl (x, &y) < 1;],
+        [gl_cv_func_frexpl_no_libm=yes],
+        [gl_cv_func_frexpl_no_libm=no])
+    ])
+  if test $gl_cv_func_frexpl_no_libm = yes; then
+    gl_FUNC_FREXPL_WORKS
+    case "$gl_cv_func_frexpl_works" in
+      *yes) gl_func_frexpl_no_libm=yes ;;
+      *)    gl_func_frexpl_no_libm=no; REPLACE_FREXPL=1 ;;
+    esac
+  else
+    gl_func_frexpl_no_libm=no
+    dnl Set REPLACE_FREXPL here because the system may have frexpl in libm.
+    REPLACE_FREXPL=1
+  fi
+  if test $gl_func_frexpl_no_libm = yes; then
+    AC_DEFINE([HAVE_FREXPL_IN_LIBC], [1],
+      [Define if the frexpl function is available in libc.])
+    dnl Also check whether it's declared.
+    dnl MacOS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>.
+    AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [#include <math.h>])
+  fi
 
-    AC_CACHE_CHECK([whether ldexpl can be used without linking with libm],
-      [gl_cv_func_ldexpl_no_libm],
-      [
-        AC_TRY_LINK([#include <math.h>
-                     long double x;
-                     int y;],
-                    [return ldexpl (x, y) < 1;],
-          [gl_cv_func_ldexpl_no_libm=yes],
-          [gl_cv_func_ldexpl_no_libm=no])
-      ])
-    if test $gl_cv_func_ldexpl_no_libm = yes; then
-      AC_DEFINE([HAVE_LDEXPL_IN_LIBC], 1,
-        [Define if the ldexpl function is available in libc.])
-      dnl Also check whether it's declared. glibc (2.3..2.5 at least) and
-      dnl MacOS X 10.3 have ldexpl() in libc but don't declare it in <math.h>.
-      AC_CHECK_DECLS([ldexpl])
-    fi
+  AC_CACHE_CHECK([whether ldexpl can be used without linking with libm],
+    [gl_cv_func_ldexpl_no_libm],
+    [
+      AC_TRY_LINK([#include <math.h>
+                   long double x;
+                   int y;],
+                  [return ldexpl (x, y) < 1;],
+        [gl_cv_func_ldexpl_no_libm=yes],
+        [gl_cv_func_ldexpl_no_libm=no])
+    ])
+  if test $gl_cv_func_ldexpl_no_libm = yes; then
+    gl_FUNC_LDEXPL_WORKS
+    case "$gl_cv_func_ldexpl_works" in
+      *yes)
+        AC_DEFINE([HAVE_LDEXPL_IN_LIBC], [1],
+          [Define if the ldexpl function is available in libc.])
+        dnl Also check whether it's declared.
+        dnl MacOS X 10.3 has ldexpl() in libc but doesn't declare it in <math.h>.
+        AC_CHECK_DECL([ldexpl], , [HAVE_DECL_LDEXPL=0], [#include <math.h>])
+        ;;
+    esac
   fi
 ])