X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fsqrtl.m4;h=5f095307bfab4feca0ceac9928587d4b2fb71d83;hb=44e24aa42fb9e808f25767f5ce555d6844efc1c8;hp=87ffc3719389a393efe31d1011f1e55ab15bbfb2;hpb=ff1db29caf822c7e7a41bd367779e52d9d8320ef;p=gnulib.git

diff --git a/m4/sqrtl.m4 b/m4/sqrtl.m4
index 87ffc3719..5f095307b 100644
--- a/m4/sqrtl.m4
+++ b/m4/sqrtl.m4
@@ -1,4 +1,4 @@
-# sqrtl.m4 serial 4
+# 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,
@@ -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])
 
@@ -51,35 +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
     dnl Find libraries needed to link lib/sqrtl.c.
-    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
+    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])
 ])