Mercurial > hg > octave-nkf > gnulib-hg

changeset 15002:702e3c427a51

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Sat, 21 May 2011 10:52:34 +0200
parents 038c814724c1
children e9d6250b22fe
files ChangeLog m4/floor.m4 modules/floor
diffstat 3 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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 @@
     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])
--- a/modules/floor
+++ b/modules/floor
@@ -11,6 +11,9 @@
 
 configure.ac:
 gl_FUNC_FLOOR
+if test $REPLACE_FLOOR = 1; then
+  AC_LIBOBJ([floor])
+fi
 gl_MATH_MODULE_INDICATOR([floor])
 
 Makefile.am: