X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=m4%2Ftanl.m4;h=7694a6c721ca9eafc52cbe0a0ecbb35dfa92f915;hb=df8a96fcfa9c99e4de7329f55365b6a3c36feba7;hp=0af27f733bf6ac793a5cb5cbc9afefefa4a7a3f8;hpb=ec062d7a2671739dd977ebde3965fc93f8678a2e;p=gnulib.git

diff --git a/m4/tanl.m4 b/m4/tanl.m4
index 0af27f733..7694a6c72 100644
--- a/m4/tanl.m4
+++ b/m4/tanl.m4
@@ -1,5 +1,5 @@
-# tanl.m4 serial 3
-dnl Copyright (C) 2010 Free Software Foundation, Inc.
+# tanl.m4 serial 7
+dnl Copyright (C) 2010-2012 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_TANL],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
+  AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
+
   dnl Persuade glibc <math.h> to declare tanl().
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
@@ -20,8 +22,10 @@ AC_DEFUN([gl_FUNC_TANL],
              # define __NO_MATH_INLINES 1 /* for glibc */
              #endif
              #include <math.h>
+             long double (*funcptr) (long double) = tanl;
              long double x;]],
-           [[return tanl (x) > 0.4;]])],
+           [[return funcptr (x) > 0.4
+                    || tanl (x) > 0.4;]])],
         [gl_cv_func_tanl_no_libm=yes],
         [gl_cv_func_tanl_no_libm=no])
     ])
@@ -37,8 +41,10 @@ AC_DEFUN([gl_FUNC_TANL],
                # define __NO_MATH_INLINES 1 /* for glibc */
                #endif
                #include <math.h>
+               long double (*funcptr) (long double) = tanl;
                long double x;]],
-             [[return tanl (x) > 0.4;]])],
+             [[return funcptr (x) > 0.4
+                      || tanl (x) > 0.4;]])],
           [gl_cv_func_tanl_in_libm=yes],
           [gl_cv_func_tanl_in_libm=no])
         LIBS="$save_LIBS"
@@ -51,30 +57,34 @@ AC_DEFUN([gl_FUNC_TANL],
      || test $gl_cv_func_tanl_in_libm = yes; then
     dnl Also check whether it's declared.
     dnl MacOS X 10.3 has tanl() in libc but doesn't declare it in <math.h>.
-    AC_CHECK_DECL([tanl], , [HAVE_DECL_TANL=0], [#include <math.h>])
+    AC_CHECK_DECL([tanl], , [HAVE_DECL_TANL=0], [[#include <math.h>]])
   else
     HAVE_DECL_TANL=0
     HAVE_TANL=0
-    AC_LIBOBJ([tanl])
-    AC_LIBOBJ([trigl])
-    AC_REQUIRE([gl_FUNC_ISNANL])
-    AC_REQUIRE([gl_FUNC_FLOOR])
-    AC_REQUIRE([gl_FUNC_FLOORL])
-    dnl Append $ISNANL_LIBM to TANL_LIBM, avoiding gratuitous duplicates.
-    case " $TANL_LIBM " in
-      *" $ISNANL_LIBM "*) ;;
-      *) TANL_LIBM="$TANL_LIBM $ISNANL_LIBM" ;;
-    esac
-    dnl Append $FLOOR_LIBM to TANL_LIBM, avoiding gratuitous duplicates.
-    case " $TANL_LIBM " in
-      *" $FLOOR_LIBM "*) ;;
-      *) TANL_LIBM="$TANL_LIBM $FLOOR_LIBM" ;;
-    esac
-    dnl Append $FLOORL_LIBM to TANL_LIBM, avoiding gratuitous duplicates.
-    case " $TANL_LIBM " in
-      *" $FLOORL_LIBM "*) ;;
-      *) TANL_LIBM="$TANL_LIBM $FLOORL_LIBM" ;;
-    esac
+    dnl Find libraries needed to link lib/tanl.c, lib/trigl.c.
+    if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1; then
+      AC_REQUIRE([gl_FUNC_TAN])
+      TANL_LIBM="$TAN_LIBM"
+    else
+      AC_REQUIRE([gl_FUNC_ISNANL])
+      AC_REQUIRE([gl_FUNC_FLOOR])
+      AC_REQUIRE([gl_FUNC_FLOORL])
+      dnl Append $ISNANL_LIBM to TANL_LIBM, avoiding gratuitous duplicates.
+      case " $TANL_LIBM " in
+        *" $ISNANL_LIBM "*) ;;
+        *) TANL_LIBM="$TANL_LIBM $ISNANL_LIBM" ;;
+      esac
+      dnl Append $FLOOR_LIBM to TANL_LIBM, avoiding gratuitous duplicates.
+      case " $TANL_LIBM " in
+        *" $FLOOR_LIBM "*) ;;
+        *) TANL_LIBM="$TANL_LIBM $FLOOR_LIBM" ;;
+      esac
+      dnl Append $FLOORL_LIBM to TANL_LIBM, avoiding gratuitous duplicates.
+      case " $TANL_LIBM " in
+        *" $FLOORL_LIBM "*) ;;
+        *) TANL_LIBM="$TANL_LIBM $FLOORL_LIBM" ;;
+      esac
+    fi
   fi
   AC_SUBST([TANL_LIBM])
 ])