X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fexpl.m4;h=8f1a9a97807f8cc2ae085256c10d8343ee6c5cc3;hb=466449b04ceeb8c245a7e364f9c2c812a5259c8f;hp=698a9fb8ad6c41bfed239066d194a26c61325fc5;hpb=73e329f11142c2804e42825e1590041d68dbb6e9;p=gnulib.git

diff --git a/m4/expl.m4 b/m4/expl.m4
index 698a9fb8a..8f1a9a978 100644
--- a/m4/expl.m4
+++ b/m4/expl.m4
@@ -1,5 +1,5 @@
-# expl.m4 serial 1
-dnl Copyright (C) 2010 Free Software Foundation, Inc.
+# expl.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_EXPL],
   AC_CACHE_CHECK([whether expl() can be used without linking with libm],
     [gl_cv_func_expl_no_libm],
     [
-      AC_TRY_LINK([#ifndef __NO_MATH_INLINES
-                   # define __NO_MATH_INLINES 1 /* for glibc */
-                   #endif
-                   #include <math.h>
-                   long double x;],
-                  [return expl (x) > 1.5;],
+      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 expl (x) > 1.5;]])],
         [gl_cv_func_expl_no_libm=yes],
         [gl_cv_func_expl_no_libm=no])
     ])
@@ -29,12 +31,14 @@ AC_DEFUN([gl_FUNC_EXPL],
       [
         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 expl (x) > 1.5;],
+        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 expl (x) > 1.5;]])],
           [gl_cv_func_expl_in_libm=yes],
           [gl_cv_func_expl_in_libm=no])
         LIBS="$save_LIBS"
@@ -51,7 +55,7 @@ AC_DEFUN([gl_FUNC_EXPL],
   else
     HAVE_DECL_EXPL=0
     HAVE_EXPL=0
-    AC_LIBOBJ([expl])
+    dnl Find libraries needed to link lib/expl.c.
     AC_REQUIRE([gl_FUNC_FLOORL])
     EXPL_LIBM="$FLOORL_LIBM"
   fi