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

diff --git a/m4/acosl.m4 b/m4/acosl.m4
index 0e57df5b2..1385358ce 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 3
+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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -14,12 +14,14 @@ 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 x;]],
+           [[return acosl (x) > 1;]])],
         [gl_cv_func_acosl_no_libm=yes],
         [gl_cv_func_acosl_no_libm=no])
     ])
@@ -29,12 +31,14 @@ 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 x;]],
+             [[return acosl (x) > 1;]])],
           [gl_cv_func_acosl_in_libm=yes],
           [gl_cv_func_acosl_in_libm=no])
         LIBS="$save_LIBS"
@@ -54,7 +58,16 @@ AC_DEFUN([gl_FUNC_ACOSL],
     AC_LIBOBJ([acosl])
     AC_REQUIRE([gl_FUNC_ASINL])
     AC_REQUIRE([gl_FUNC_SQRTL])
-    ACOSL_LIBM="$ASINL_LIBM $SQRTL_LIBM"
+    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
   AC_SUBST([ACOSL_LIBM])
 ])