From: Bruno Haible <bruno@clisp.org>
Date: Sat, 28 May 2011 20:06:11 +0000 (+0200)
Subject: getloadavg: Remove an unreliable safety check.
X-Git-Tag: stable/20110609~53
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=cb6151a644ebd975d0e1c8fe56a1869be8a1fcf1;p=gnulib.git

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>.
(cherry picked from commit 8d8a973ad831a93279c282e090d204413ed03f2f)
---

diff --git a/ChangeLog b/ChangeLog
index b6c1d1ece..8d2057305 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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-26  Simon Josefsson  <simon@josefsson.org>
 
 	* lib/gen-uni-tables.c: Say "gen-uni-tables.c" consistently.
diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4
index e58d29b23..0e44b694e 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 9db688b4c..c17281c7c 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: