X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffloorl.m4;h=a90c69322d3e30c35bd88b4b6da70ac78500bbee;hb=39a489fa27ab3873e0fc0f65844413f46fcb2117;hp=5bd62d0bfe2cef156148a836b5a4265ebe0ba517;hpb=ec062d7a2671739dd977ebde3965fc93f8678a2e;p=gnulib.git

diff --git a/m4/floorl.m4 b/m4/floorl.m4
index 5bd62d0bf..a90c69322 100644
--- a/m4/floorl.m4
+++ b/m4/floorl.m4
@@ -1,5 +1,5 @@
-# floorl.m4 serial 7
-dnl Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
+# floorl.m4 serial 10
+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.
@@ -7,10 +7,13 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_FLOORL],
 [
   AC_REQUIRE([gl_MATH_H_DEFAULTS])
+  AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
+
   dnl Persuade glibc <math.h> to declare floorl().
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+
   dnl Test whether floorl() is declared.
-  AC_CHECK_DECLS([floorl], , , [#include <math.h>])
+  AC_CHECK_DECLS([floorl], , , [[#include <math.h>]])
   if test "$ac_cv_have_decl_floorl" = yes; then
     dnl Test whether floorl() can be used without libm.
     gl_FUNC_FLOORL_LIBS
@@ -23,8 +26,13 @@ AC_DEFUN([gl_FUNC_FLOORL],
     HAVE_DECL_FLOORL=0
   fi
   if test $HAVE_DECL_FLOORL = 0 || test $REPLACE_FLOORL = 1; then
-    AC_LIBOBJ([floorl])
-    FLOORL_LIBM=
+    dnl Find libraries needed to link lib/floorl.c.
+    if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1; then
+      AC_REQUIRE([gl_FUNC_FLOOR])
+      FLOORL_LIBM="$FLOOR_LIBM"
+    else
+      FLOORL_LIBM=
+    fi
   fi
   AC_SUBST([FLOORL_LIBM])
 ])