X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fsqrtl.m4;h=5f095307bfab4feca0ceac9928587d4b2fb71d83;hb=9723bfe9bb9af8309314ad6230f7661000ba03b1;hp=7a29f9ad4f9b8d4eb1d19efb7ce5adfd3a57835e;hpb=73e329f11142c2804e42825e1590041d68dbb6e9;p=gnulib.git

diff --git a/m4/sqrtl.m4 b/m4/sqrtl.m4
index 7a29f9ad4..5f095307b 100644
--- a/m4/sqrtl.m4
+++ b/m4/sqrtl.m4
@@ -1,5 +1,5 @@
-# sqrtl.m4 serial 1
-dnl Copyright (C) 2010 Free Software Foundation, Inc.
+# sqrtl.m4 serial 6
+dnl Copyright (C) 2010-2011 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.
@@ -7,6 +7,8 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_SQRTL],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
+  AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
+
   dnl Persuade glibc <math.h> to declare sqrtl().
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
@@ -14,12 +16,14 @@ AC_DEFUN([gl_FUNC_SQRTL],
   AC_CACHE_CHECK([whether sqrtl() can be used without linking with libm],
     [gl_cv_func_sqrtl_no_libm],
     [
-      AC_TRY_LINK([#ifndef __NO_MATH_INLINES
-                   # define __NO_MATH_INLINES 1 /* for glibc */
-                   #endif
-                   #include <math.h>
-                   long double x;],
-                  [return sqrtl (x) > 0.4;],
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[#ifndef __NO_MATH_INLINES
+             # define __NO_MATH_INLINES 1 /* for glibc */
+             #endif
+             #include <math.h>
+             long double x;]],
+           [[return sqrtl (x) > 0.4;]])],
         [gl_cv_func_sqrtl_no_libm=yes],
         [gl_cv_func_sqrtl_no_libm=no])
     ])
@@ -29,12 +33,14 @@ AC_DEFUN([gl_FUNC_SQRTL],
       [
         save_LIBS="$LIBS"
         LIBS="$LIBS -lm"
-        AC_TRY_LINK([#ifndef __NO_MATH_INLINES
-                     # define __NO_MATH_INLINES 1 /* for glibc */
-                     #endif
-                     #include <math.h>
-                     long double x;],
-                    [return sqrtl (x) > 0.4;],
+        AC_LINK_IFELSE(
+          [AC_LANG_PROGRAM(
+             [[#ifndef __NO_MATH_INLINES
+               # define __NO_MATH_INLINES 1 /* for glibc */
+               #endif
+               #include <math.h>
+               long double x;]],
+             [[return sqrtl (x) > 0.4;]])],
           [gl_cv_func_sqrtl_in_libm=yes],
           [gl_cv_func_sqrtl_in_libm=no])
         LIBS="$save_LIBS"
@@ -47,16 +53,40 @@ AC_DEFUN([gl_FUNC_SQRTL],
      || test $gl_cv_func_sqrtl_in_libm = yes; then
     dnl Also check whether it's declared.
     dnl MacOS X 10.3 has sqrtl() in libc but doesn't declare it in <math.h>.
-    AC_CHECK_DECL([sqrtl], , [HAVE_DECL_SQRTL=0], [#include <math.h>])
+    AC_CHECK_DECL([sqrtl], , [HAVE_DECL_SQRTL=0], [[#include <math.h>]])
   else
     HAVE_DECL_SQRTL=0
     HAVE_SQRTL=0
-    AC_LIBOBJ([sqrtl])
-    AC_REQUIRE([gl_FUNC_ISNANL])
-    AC_REQUIRE([gl_FUNC_FREXPL])
-    AC_REQUIRE([gl_FUNC_LDEXPL])
-    AC_REQUIRE([gl_FUNC_SQRT])
-    SQRTL_LIBM="$ISNANL_LIBM $FREXPL_LIBM $LDEXPL_LIBM $SQRT_LIBM"
+    dnl Find libraries needed to link lib/sqrtl.c.
+    if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1; then
+      AC_REQUIRE([gl_FUNC_SQRT])
+      SQRTL_LIBM="$SQRT_LIBM"
+    else
+      AC_REQUIRE([gl_FUNC_ISNANL])
+      AC_REQUIRE([gl_FUNC_FREXPL])
+      AC_REQUIRE([gl_FUNC_LDEXPL])
+      AC_REQUIRE([gl_FUNC_SQRT])
+      dnl Append $ISNANL_LIBM to SQRTL_LIBM, avoiding gratuitous duplicates.
+      case " $SQRTL_LIBM " in
+        *" $ISNANL_LIBM "*) ;;
+        *) SQRTL_LIBM="$SQRTL_LIBM $ISNANL_LIBM" ;;
+      esac
+      dnl Append $FREXPL_LIBM to SQRTL_LIBM, avoiding gratuitous duplicates.
+      case " $SQRTL_LIBM " in
+        *" $FREXPL_LIBM "*) ;;
+        *) SQRTL_LIBM="$SQRTL_LIBM $FREXPL_LIBM" ;;
+      esac
+      dnl Append $LDEXPL_LIBM to SQRTL_LIBM, avoiding gratuitous duplicates.
+      case " $SQRTL_LIBM " in
+        *" $LDEXPL_LIBM "*) ;;
+        *) SQRTL_LIBM="$SQRTL_LIBM $LDEXPL_LIBM" ;;
+      esac
+      dnl Append $SQRT_LIBM to SQRTL_LIBM, avoiding gratuitous duplicates.
+      case " $SQRTL_LIBM " in
+        *" $SQRT_LIBM "*) ;;
+        *) SQRTL_LIBM="$SQRTL_LIBM $SQRT_LIBM" ;;
+      esac
+    fi
   fi
   AC_SUBST([SQRTL_LIBM])
 ])