X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fcosl.m4;h=b8eb67483f22f9ee69f4e9c23c722a0a450156ce;hb=e1c466d11a91615c413789ea8bc3ec358f2c6aa9;hp=74c9e7c6d591da9eb490f1d23fb7f9b375ac9332;hpb=692679fcbebba0095bae0f1f1a99bd1f0f5a0476;p=gnulib.git

diff --git a/m4/cosl.m4 b/m4/cosl.m4
index 74c9e7c6d..b8eb67483 100644
--- a/m4/cosl.m4
+++ b/m4/cosl.m4
@@ -1,5 +1,5 @@
-# cosl.m4 serial 2
-dnl Copyright (C) 2010 Free Software Foundation, Inc.
+# cosl.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_COSL],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
+  AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
+
   dnl Persuade glibc <math.h> to declare cosl().
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
@@ -14,12 +16,16 @@ AC_DEFUN([gl_FUNC_COSL],
   AC_CACHE_CHECK([whether cosl() can be used without linking with libm],
     [gl_cv_func_cosl_no_libm],
     [
-      AC_TRY_LINK([#ifndef __NO_MATH_INLINES
-                   # define __NO_MATH_INLINES 1 /* for glibc */
-                   #endif
-                   #include <math.h>
-                   long double x;],
-                  [return cosl (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 (*funcptr) (long double) = cosl;
+             long double x;]],
+           [[return funcptr (x) > 0.4
+                    || cosl (x) > 0.4;]])],
         [gl_cv_func_cosl_no_libm=yes],
         [gl_cv_func_cosl_no_libm=no])
     ])
@@ -29,12 +35,16 @@ AC_DEFUN([gl_FUNC_COSL],
       [
         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 cosl (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 (*funcptr) (long double) = cosl;
+               long double x;]],
+             [[return funcptr (x) > 0.4
+                      || cosl (x) > 0.4;]])],
           [gl_cv_func_cosl_in_libm=yes],
           [gl_cv_func_cosl_in_libm=no])
         LIBS="$save_LIBS"
@@ -46,32 +56,35 @@ AC_DEFUN([gl_FUNC_COSL],
   if test $gl_cv_func_cosl_no_libm = yes \
      || test $gl_cv_func_cosl_in_libm = yes; then
     dnl Also check whether it's declared.
-    dnl MacOS X 10.3 has cosl() in libc but doesn't declare it in <math.h>.
-    AC_CHECK_DECL([cosl], , [HAVE_DECL_COSL=0], [#include <math.h>])
+    dnl Mac OS X 10.3 has cosl() in libc but doesn't declare it in <math.h>.
+    AC_CHECK_DECL([cosl], , [HAVE_DECL_COSL=0], [[#include <math.h>]])
   else
     HAVE_DECL_COSL=0
     HAVE_COSL=0
-    AC_LIBOBJ([cosl])
-    AC_LIBOBJ([sincosl])
-    AC_LIBOBJ([trigl])
-    AC_REQUIRE([gl_FUNC_ISNANL])
-    AC_REQUIRE([gl_FUNC_FLOOR])
-    AC_REQUIRE([gl_FUNC_FLOORL])
-    dnl Append $ISNANL_LIBM to COSL_LIBM, avoiding gratuitous duplicates.
-    case " $COSL_LIBM " in
-      *" $ISNANL_LIBM "*) ;;
-      *) COSL_LIBM="$COSL_LIBM $ISNANL_LIBM" ;;
-    esac
-    dnl Append $FLOOR_LIBM to COSL_LIBM, avoiding gratuitous duplicates.
-    case " $COSL_LIBM " in
-      *" $FLOOR_LIBM "*) ;;
-      *) COSL_LIBM="$COSL_LIBM $FLOOR_LIBM" ;;
-    esac
-    dnl Append $FLOORL_LIBM to COSL_LIBM, avoiding gratuitous duplicates.
-    case " $COSL_LIBM " in
-      *" $FLOORL_LIBM "*) ;;
-      *) COSL_LIBM="$COSL_LIBM $FLOORL_LIBM" ;;
-    esac
+    dnl Find libraries needed to link lib/cosl.c, lib/sincosl.c, lib/trigl.c.
+    if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1; then
+      AC_REQUIRE([gl_FUNC_COS])
+      COSL_LIBM="$COS_LIBM"
+    else
+      AC_REQUIRE([gl_FUNC_ISNANL])
+      AC_REQUIRE([gl_FUNC_FLOOR])
+      AC_REQUIRE([gl_FUNC_FLOORL])
+      dnl Append $ISNANL_LIBM to COSL_LIBM, avoiding gratuitous duplicates.
+      case " $COSL_LIBM " in
+        *" $ISNANL_LIBM "*) ;;
+        *) COSL_LIBM="$COSL_LIBM $ISNANL_LIBM" ;;
+      esac
+      dnl Append $FLOOR_LIBM to COSL_LIBM, avoiding gratuitous duplicates.
+      case " $COSL_LIBM " in
+        *" $FLOOR_LIBM "*) ;;
+        *) COSL_LIBM="$COSL_LIBM $FLOOR_LIBM" ;;
+      esac
+      dnl Append $FLOORL_LIBM to COSL_LIBM, avoiding gratuitous duplicates.
+      case " $COSL_LIBM " in
+        *" $FLOORL_LIBM "*) ;;
+        *) COSL_LIBM="$COSL_LIBM $FLOORL_LIBM" ;;
+      esac
+    fi
   fi
   AC_SUBST([COSL_LIBM])
 ])