--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
+	uname: Move AC_LIBOBJ invocations to module description.
+	* m4/uname.m4 (gl_FUNC_UNAME): Call AC_CHECK_FUNCS instead of
+	AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_UNAME invocations from
+	here...
+	* modules/uname (configure.ac): ... to here.
+
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
 	ttyname_r: Move AC_LIBOBJ invocations to module description.

--- a/m4/uname.m4
+++ b/m4/uname.m4
@@ -1,4 +1,4 @@
-# uname.m4 serial 10
+# uname.m4 serial 11
 dnl Copyright (C) 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,
@@ -7,10 +7,9 @@
 AC_DEFUN([gl_FUNC_UNAME],
 [
   AC_REQUIRE([gl_SYS_UTSNAME_H_DEFAULTS])
-  AC_REPLACE_FUNCS([uname])
+  AC_CHECK_FUNCS([uname])
   if test $ac_cv_func_uname = no; then
     HAVE_UNAME=0
-    gl_PREREQ_UNAME
   fi
 ])
 

--- a/modules/uname
+++ b/modules/uname
@@ -11,6 +11,10 @@
 
 configure.ac:
 gl_FUNC_UNAME
+if test $HAVE_UNAME = 0; then
+  AC_LIBOBJ([uname])
+  gl_PREREQ_UNAME
+fi
 gl_SYS_UTSNAME_MODULE_INDICATOR([uname])
 
 Makefile.am: