floor: Respect rules for use of AC_LIBOBJ.

* m4/floor.m4 (gl_FUNC_FLOOR): Move AC_LIBOBJ invocation from here...
* modules/floor (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index c30c0595765ca69a0ff205dd9109410d7a276fe5..28f7104b46121a2907fa5ba660ba3338b1a5d811 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
+       floor: Respect rules for use of AC_LIBOBJ.
+       * m4/floor.m4 (gl_FUNC_FLOOR): Move AC_LIBOBJ invocation from here...
+       * modules/floor (configure.ac): ... to here.
+
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
        floorf: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/floor.m4 b/m4/floor.m4
index 568310785b7ce605d2d7ab37eff45642dec2a31e..62d19fed72ebd2d232695e5c31a1fa34d6ea1377 100644 (file)
--- a/m4/floor.m4
+++ b/m4/floor.m4
@@ -1,4 +1,4 @@
-# floor.m4 serial 5
+# floor.m4 serial 6
 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,
@@ -48,7 +48,7 @@ int main()
     fi
   ])
   if test $REPLACE_FLOOR = 1; then
-    AC_LIBOBJ([floor])
+    dnl No libraries are needed to link lib/floor.c.
     FLOOR_LIBM=
   fi
   AC_SUBST([FLOOR_LIBM])

diff --git a/modules/floor b/modules/floor
index 1393dadad4b6de29a84dbee6432a7c54438e249b..c4c71e9a3763103681d4e656ff7dfea6e1eef78e 100644 (file)
--- a/modules/floor
+++ b/modules/floor
@@ -11,6 +11,9 @@ float           [test $REPLACE_FLOOR = 1]
 
 configure.ac:
 gl_FUNC_FLOOR
+if test $REPLACE_FLOOR = 1; then
+  AC_LIBOBJ([floor])
+fi
 gl_MATH_MODULE_INDICATOR([floor])
 
 Makefile.am: