X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flogl.m4;h=dfc301a921a6a0831859156e2d45b8a8b9c5eff8;hb=17f0ec6;hp=196dcbdaa118c82ed0ce4671d13e5b538db456ac;hpb=73e329f11142c2804e42825e1590041d68dbb6e9;p=gnulib.git

diff --git a/m4/logl.m4 b/m4/logl.m4
index 196dcbdaa..dfc301a92 100644
--- a/m4/logl.m4
+++ b/m4/logl.m4
@@ -1,5 +1,5 @@
-# logl.m4 serial 1
-dnl Copyright (C) 2010 Free Software Foundation, Inc.
+# logl.m4 serial 4
+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_LOGL],
   AC_CACHE_CHECK([whether logl() can be used without linking with libm],
     [gl_cv_func_logl_no_libm],
     [
-      AC_TRY_LINK([#ifndef __NO_MATH_INLINES
-                   # define __NO_MATH_INLINES 1 /* for glibc */
-                   #endif
-                   #include <math.h>
-                   long double x;],
-                  [return logl (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 logl (x) > 1;]])],
         [gl_cv_func_logl_no_libm=yes],
         [gl_cv_func_logl_no_libm=no])
     ])
@@ -29,12 +31,14 @@ AC_DEFUN([gl_FUNC_LOGL],
       [
         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 logl (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 logl (x) > 1;]])],
           [gl_cv_func_logl_in_libm=yes],
           [gl_cv_func_logl_in_libm=no])
         LIBS="$save_LIBS"
@@ -51,11 +55,25 @@ AC_DEFUN([gl_FUNC_LOGL],
   else
     HAVE_DECL_LOGL=0
     HAVE_LOGL=0
-    AC_LIBOBJ([logl])
+    dnl Find libraries needed to link lib/logl.c.
     AC_REQUIRE([gl_FUNC_FREXPL])
     AC_REQUIRE([gl_FUNC_ISNANL])
     AC_REQUIRE([gl_FUNC_FLOORL])
-    LOGL_LIBM="$FREXPL_LIBM $ISNANL_LIBM $FLOORL_LIBM"
+    dnl Append $FREXPL_LIBM to LOGL_LIBM, avoiding gratuitous duplicates.
+    case " $LOGL_LIBM " in
+      *" $FREXPL_LIBM "*) ;;
+      *) LOGL_LIBM="$LOGL_LIBM $FREXPL_LIBM" ;;
+    esac
+    dnl Append $ISNANL_LIBM to LOGL_LIBM, avoiding gratuitous duplicates.
+    case " $LOGL_LIBM " in
+      *" $ISNANL_LIBM "*) ;;
+      *) LOGL_LIBM="$LOGL_LIBM $ISNANL_LIBM" ;;
+    esac
+    dnl Append $FLOORL_LIBM to LOGL_LIBM, avoiding gratuitous duplicates.
+    case " $LOGL_LIBM " in
+      *" $FLOORL_LIBM "*) ;;
+      *) LOGL_LIBM="$LOGL_LIBM $FLOORL_LIBM" ;;
+    esac
   fi
   AC_SUBST([LOGL_LIBM])
 ])