summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2005-07-14 00:03:08 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2005-07-14 00:03:08 +0000
commit9cfc51e083fc55a83161344848fa0ffdc392e127 (patch)
tree768aa8e4791dbf1f5bcecd588b6ccd51e4a450ae
parent765f89353e6c7d13850d73f18854fbc756864756 (diff)
downloadcoreutils-9cfc51e083fc55a83161344848fa0ffdc392e127.tar.xz
Remove FESETROUND_LIBM; no longer needed.
-rw-r--r--ChangeLog7
-rw-r--r--m4/ChangeLog5
-rw-r--r--m4/lib-check.m411
-rw-r--r--src/Makefile.am7
4 files changed, 16 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index bbed7d5a7..87ed8c99b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
-2005-07-12 Jim Meyering <jim@meyering.net>
+2005-07-13 Paul Eggert <eggert@cs.ucla.edu>
* Version 5.3.1.
+ * src/Makefile.am (nanosec_libs): Remove $(FESETROUND_LIBM); no longer
+ needed. Problem reported by Jeff Bailey.
+
+2005-07-12 Jim Meyering <jim@meyering.net>
+
* Makefile.maint (copyright-check): Reflect rearrangement in
version-etc files.
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 66cfe45db..9ddb80431 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-13 Paul Eggert <eggert@cs.ucla.edu>
+
+ * lib-check.m4 (cu_LIB_CHECK): Remove no-longer-necessary check
+ for fesetround.
+
2005-07-08 Paul Eggert <eggert@cs.ucla.edu>
* jm-macros.m4 (gl_CHECK_ALL_HEADERS): Check for stropts.h.
diff --git a/m4/lib-check.m4 b/m4/lib-check.m4
index 2d9d0d0e2..3962d14be 100644
--- a/m4/lib-check.m4
+++ b/m4/lib-check.m4
@@ -1,4 +1,4 @@
-#serial 8
+#serial 9
dnl Misc lib-related macros for coreutils.
@@ -32,7 +32,7 @@ AC_DEFUN([cu_LIB_CHECK],
# Some programs need to link with -lm. printf does if it uses
# lib/strtod.c which uses pow. And seq uses the math functions,
- # floor, modf, rint. And sleep uses fesetround.
+ # floor, modf, rint.
# Check for these math functions used by seq.
AC_SUBST([SEQ_LIBM])
@@ -44,13 +44,6 @@ AC_DEFUN([cu_LIB_CHECK],
test "X$LIBS" = "X$cu_saved_libs" || SEQ_LIBM=-lm
LIBS=$cu_saved_libs
- AC_SUBST(FESETROUND_LIBM)
- cu_saved_libs=$LIBS
- AC_SEARCH_LIBS([fesetround], [m])
- AC_CHECK_FUNCS([fesetround])
- test "X$LIBS" = "X$cu_saved_libs" || FESETROUND_LIBM=-lm
- LIBS=$cu_saved_libs
-
# The -lsun library is required for YP support on Irix-4.0.5 systems.
# m88k/svr3 DolphinOS systems using YP need -lypsec for id.
AC_SEARCH_LIBS(yp_match, [sun ypsec])
diff --git a/src/Makefile.am b/src/Makefile.am
index c9e217150..d926349ad 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -81,10 +81,9 @@ printf_LDADD = $(LDADD) $(POW_LIB) $(LIBICONV)
# If necessary, add -lm to resolve use of floor, rint, modf.
seq_LDADD = $(LDADD) $(SEQ_LIBM)
-# If necessary, add -lm to resolve the `pow' reference in lib/strtod.c
-# or for the fesetround reference in programs using nanosec.c.
-nanosec_libs = \
- $(LDADD) $(FESETROUND_LIBM) $(POW_LIB) $(LIB_NANOSLEEP)
+# If necessary, add libraries to resolve the `pow' reference in lib/strtod.c
+# and the `nanosleep' reference in lib/xnanosleep.c.
+nanosec_libs = $(LDADD) $(POW_LIB) $(LIB_NANOSLEEP)
sleep_LDADD = $(nanosec_libs)
tail_LDADD = $(nanosec_libs)