summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--m4/getloadavg.m410
-rw-r--r--modules/getloadavg2
3 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 58cb1541ec..b2d238ec4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2011-05-28 Bruno Haible <bruno@clisp.org>
+ getloadavg: Remove an unreliable safety check.
+ * m4/getloadavg.m4 (gl_GETLOADAVG): Drop argument. Remove test whether
+ getloadavg.c is in place.
+ * modules/getloadavg (configure.ac): Drop argument of gl_GETLOADAVG.
+ Reported by Sam Steingold <sds@gnu.org>.
+
+2011-05-28 Bruno Haible <bruno@clisp.org>
+
doc: Cleanup yet another file produced by texinfo.tex.
* doc/Makefile (mostlyclean): Remove also gnulib.cn.
diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4
index e58d29b238..0e44b694e4 100644
--- a/m4/getloadavg.m4
+++ b/m4/getloadavg.m4
@@ -7,23 +7,19 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 2
+#serial 3
# Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent.
# New applications should use gl_GETLOADAVG instead.
-# gl_GETLOADAVG(LIBOBJDIR)
-# ------------------------
+# gl_GETLOADAVG
+# -------------
AC_DEFUN([gl_GETLOADAVG],
[AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
# Persuade glibc <stdlib.h> to declare getloadavg().
AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
-# Make sure getloadavg.c is where it belongs, at configure-time.
-test -f "$srcdir/$1/getloadavg.c" ||
- AC_MSG_ERROR([$srcdir/$1/getloadavg.c is missing])
-
gl_save_LIBS=$LIBS
# getloadvg is present in libc on glibc >= 2.2, MacOS X, FreeBSD >= 2.0,
diff --git a/modules/getloadavg b/modules/getloadavg
index 9db688b4cf..c17281c7c8 100644
--- a/modules/getloadavg
+++ b/modules/getloadavg
@@ -12,7 +12,7 @@ stdbool
stdlib
configure.ac:
-gl_GETLOADAVG([$gl_source_base])
+gl_GETLOADAVG
gl_STDLIB_MODULE_INDICATOR([getloadavg])
Makefile.am: