X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fatanl.m4;h=65c90de8902310c58fba666d3ec0387bc6da141d;hb=cd56634a4a8179fd5a4419fbb3e27211b042ab1c;hp=3573a3cd8e35eef43520885db12c7fd7cffc66ed;hpb=ec062d7a2671739dd977ebde3965fc93f8678a2e;p=gnulib.git

diff --git a/m4/atanl.m4 b/m4/atanl.m4
index 3573a3cd8..65c90de89 100644
--- a/m4/atanl.m4
+++ b/m4/atanl.m4
@@ -1,5 +1,5 @@
-# atanl.m4 serial 3
-dnl Copyright (C) 2010 Free Software Foundation, Inc.
+# atanl.m4 serial 8
+dnl Copyright (C) 2010-2014 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_ATANL],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
+  AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
+
   dnl Persuade glibc <math.h> to declare atanl().
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
@@ -20,8 +22,10 @@ AC_DEFUN([gl_FUNC_ATANL],
              # define __NO_MATH_INLINES 1 /* for glibc */
              #endif
              #include <math.h>
+             long double (*funcptr) (long double) = atanl;
              long double x;]],
-           [[return atanl (x) > 1;]])],
+           [[return funcptr (x) > 1
+                    || atanl (x) > 1;]])],
         [gl_cv_func_atanl_no_libm=yes],
         [gl_cv_func_atanl_no_libm=no])
     ])
@@ -37,8 +41,10 @@ AC_DEFUN([gl_FUNC_ATANL],
                # define __NO_MATH_INLINES 1 /* for glibc */
                #endif
                #include <math.h>
+               long double (*funcptr) (long double) = atanl;
                long double x;]],
-             [[return atanl (x) > 1;]])],
+             [[return funcptr (x) > 1
+                      || atanl (x) > 1;]])],
           [gl_cv_func_atanl_in_libm=yes],
           [gl_cv_func_atanl_in_libm=no])
         LIBS="$save_LIBS"
@@ -50,18 +56,23 @@ AC_DEFUN([gl_FUNC_ATANL],
   if test $gl_cv_func_atanl_no_libm = yes \
      || test $gl_cv_func_atanl_in_libm = yes; then
     dnl Also check whether it's declared.
-    dnl MacOS X 10.3 has atanl() in libc but doesn't declare it in <math.h>.
-    AC_CHECK_DECL([atanl], , [HAVE_DECL_ATANL=0], [#include <math.h>])
+    dnl Mac OS X 10.3 has atanl() in libc but doesn't declare it in <math.h>.
+    AC_CHECK_DECL([atanl], , [HAVE_DECL_ATANL=0], [[#include <math.h>]])
   else
     HAVE_DECL_ATANL=0
     HAVE_ATANL=0
-    AC_LIBOBJ([atanl])
-    AC_REQUIRE([gl_FUNC_ISNANL])
-    dnl Append $ISNANL_LIBM to ATANL_LIBM, avoiding gratuitous duplicates.
-    case " $ATANL_LIBM " in
-      *" $ISNANL_LIBM "*) ;;
-      *) ATANL_LIBM="$ATANL_LIBM $ISNANL_LIBM" ;;
-    esac
+    dnl Find libraries needed to link lib/atanl.c.
+    if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1; then
+      AC_REQUIRE([gl_FUNC_ATAN])
+      ATANL_LIBM="$ATAN_LIBM"
+    else
+      AC_REQUIRE([gl_FUNC_ISNANL])
+      dnl Append $ISNANL_LIBM to ATANL_LIBM, avoiding gratuitous duplicates.
+      case " $ATANL_LIBM " in
+        *" $ISNANL_LIBM "*) ;;
+        *) ATANL_LIBM="$ATANL_LIBM $ISNANL_LIBM" ;;
+      esac
+    fi
   fi
   AC_SUBST([ATANL_LIBM])
 ])