X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Facosl.m4;h=df8140ce32adc03111d2136e5745a3c903cf7a32;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=0e57df5b25e1a45f7277166ed61c15d09d12cdb0;hpb=73e329f11142c2804e42825e1590041d68dbb6e9;p=gnulib.git

diff --git a/m4/acosl.m4 b/m4/acosl.m4
index 0e57df5b2..df8140ce3 100644
--- a/m4/acosl.m4
+++ b/m4/acosl.m4
@@ -1,5 +1,5 @@
-# acosl.m4 serial 1
-dnl Copyright (C) 2010 Free Software Foundation, Inc.
+# acosl.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_ACOSL],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
+  AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
+
   dnl Persuade glibc <math.h> to declare acosl().
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
 
@@ -14,12 +16,16 @@ AC_DEFUN([gl_FUNC_ACOSL],
   AC_CACHE_CHECK([whether acosl() can be used without linking with libm],
     [gl_cv_func_acosl_no_libm],
     [
-      AC_TRY_LINK([#ifndef __NO_MATH_INLINES
-                   # define __NO_MATH_INLINES 1 /* for glibc */
-                   #endif
-                   #include <math.h>
-                   long double x;],
-                  [return acosl (x) > 1;],
+      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) = acosl;
+             long double x;]],
+           [[return funcptr (x) > 1
+                    || acosl (x) > 1;]])],
         [gl_cv_func_acosl_no_libm=yes],
         [gl_cv_func_acosl_no_libm=no])
     ])
@@ -29,12 +35,16 @@ AC_DEFUN([gl_FUNC_ACOSL],
       [
         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 acosl (x) > 1;],
+        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) = acosl;
+               long double x;]],
+             [[return funcptr (x) > 1
+                      || acosl (x) > 1;]])],
           [gl_cv_func_acosl_in_libm=yes],
           [gl_cv_func_acosl_in_libm=no])
         LIBS="$save_LIBS"
@@ -46,15 +56,29 @@ AC_DEFUN([gl_FUNC_ACOSL],
   if test $gl_cv_func_acosl_no_libm = yes \
      || test $gl_cv_func_acosl_in_libm = yes; then
     dnl Also check whether it's declared.
-    dnl MacOS X 10.3 has acosl() in libc but doesn't declare it in <math.h>.
-    AC_CHECK_DECL([acosl], , [HAVE_DECL_ACOSL=0], [#include <math.h>])
+    dnl Mac OS X 10.3 has acosl() in libc but doesn't declare it in <math.h>.
+    AC_CHECK_DECL([acosl], , [HAVE_DECL_ACOSL=0], [[#include <math.h>]])
   else
     HAVE_DECL_ACOSL=0
     HAVE_ACOSL=0
-    AC_LIBOBJ([acosl])
-    AC_REQUIRE([gl_FUNC_ASINL])
-    AC_REQUIRE([gl_FUNC_SQRTL])
-    ACOSL_LIBM="$ASINL_LIBM $SQRTL_LIBM"
+    dnl Find libraries needed to link lib/acosl.c.
+    if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1; then
+      AC_REQUIRE([gl_FUNC_ACOS])
+      ACOSL_LIBM="$ACOS_LIBM"
+    else
+      AC_REQUIRE([gl_FUNC_ASINL])
+      AC_REQUIRE([gl_FUNC_SQRTL])
+      dnl Append $ASINL_LIBM to ACOSL_LIBM, avoiding gratuitous duplicates.
+      case " $ACOSL_LIBM " in
+        *" $ASINL_LIBM "*) ;;
+        *) ACOSL_LIBM="$ACOSL_LIBM $ASINL_LIBM" ;;
+      esac
+      dnl Append $SQRTL_LIBM to ACOSL_LIBM, avoiding gratuitous duplicates.
+      case " $ACOSL_LIBM " in
+        *" $SQRTL_LIBM "*) ;;
+        *) ACOSL_LIBM="$ACOSL_LIBM $SQRTL_LIBM" ;;
+      esac
+    fi
   fi
   AC_SUBST([ACOSL_LIBM])
 ])