X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffloorl.m4;h=f21285d24ee3ed9ef5ebbd71339f69b4c3985616;hb=4596125141aeea905bd7ed1a8768f11db7402e41;hp=792c09fe61efbc91b3266ca7061bca4208957720;hpb=b2e2010c7c902235b5efb5bd3c6529f61b093aa4;p=gnulib.git

diff --git a/m4/floorl.m4 b/m4/floorl.m4
index 792c09fe6..f21285d24 100644
--- a/m4/floorl.m4
+++ b/m4/floorl.m4
@@ -1,5 +1,5 @@
-# floorl.m4 serial 4
-dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+# floorl.m4 serial 8
+dnl Copyright (C) 2007, 2009-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.
@@ -20,13 +20,12 @@ AC_DEFUN([gl_FUNC_FLOORL],
       REPLACE_FLOORL=1
     fi
   else
-    REPLACE_FLOORL=1
+    HAVE_DECL_FLOORL=0
   fi
-  if test $REPLACE_FLOORL = 1; then
-    AC_LIBOBJ([floorl])
+  if test $HAVE_DECL_FLOORL = 0 || test $REPLACE_FLOORL = 1; then
+    dnl No libraries are needed to link lib/floorl.c.
     FLOORL_LIBM=
   fi
-  AC_SUBST([REPLACE_FLOORL])
   AC_SUBST([FLOORL_LIBM])
 ])
 
@@ -36,24 +35,26 @@ AC_DEFUN([gl_FUNC_FLOORL_LIBS],
 [
   gl_CACHE_VAL_SILENT([gl_cv_func_floorl_libm], [
     gl_cv_func_floorl_libm=?
-    AC_TRY_LINK([
-       #ifndef __NO_MATH_INLINES
-       # define __NO_MATH_INLINES 1 /* for glibc */
-       #endif
-       #include <math.h>
-       long double x;],
-      [x = floorl(x);],
+    AC_LINK_IFELSE(
+      [AC_LANG_PROGRAM(
+         [[#ifndef __NO_MATH_INLINES
+           # define __NO_MATH_INLINES 1 /* for glibc */
+           #endif
+           #include <math.h>
+           long double x;]],
+         [[x = floorl(x);]])],
       [gl_cv_func_floorl_libm=])
     if test "$gl_cv_func_floorl_libm" = "?"; then
       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;],
-        [x = floorl(x);],
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM(
+           [[#ifndef __NO_MATH_INLINES
+             # define __NO_MATH_INLINES 1 /* for glibc */
+             #endif
+             #include <math.h>
+             long double x;]],
+           [[x = floorl(x);]])],
         [gl_cv_func_floorl_libm="-lm"])
       LIBS="$save_LIBS"
     fi