--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-08  Bruno Haible  <bruno@clisp.org>
+
+	getusershell: Move AC_LIBOBJ invocations to module description.
+	* m4/getusershell.m4 (gl_FUNC_GETUSERSHELL): Set HAVE_GETUSERSHELL.
+	Move AC_LIBOBJ invocation from here...
+	* modules/getusershell (configure.ac): ... to here.
+	(Depends-on): Update condition.
+
 2011-05-08  Bruno Haible  <bruno@clisp.org>
 
 	gettimeofday: Move AC_LIBOBJ invocations to module description.

--- a/m4/getusershell.m4
+++ b/m4/getusershell.m4
@@ -1,4 +1,4 @@
-# getusershell.m4 serial 6
+# getusershell.m4 serial 7
 dnl Copyright (C) 2002-2003, 2006, 2008-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,
@@ -14,13 +14,14 @@
   dnl Check whether the getusershell function exists.
   AC_CHECK_FUNCS_ONCE([getusershell])
   if test $ac_cv_func_getusershell = yes; then
+    HAVE_GETUSERSHELL=1
     dnl Check whether getusershell is declared.
     AC_CHECK_DECLS([getusershell])
     if test $ac_cv_have_decl_getusershell = no; then
       HAVE_DECL_GETUSERSHELL=0
     fi
   else
-    AC_LIBOBJ([getusershell])
+    HAVE_GETUSERSHELL=0
     dnl Assume that on platforms which declare it, the function exists.
     HAVE_DECL_GETUSERSHELL=0
   fi

--- a/modules/getusershell
+++ b/modules/getusershell
@@ -8,11 +8,14 @@
 Depends-on:
 unistd
 extensions
-fopen-safer     [test $ac_cv_func_getusershell = no]
-xalloc          [test $ac_cv_func_getusershell = no]
+fopen-safer     [test $HAVE_GETUSERSHELL = 0]
+xalloc          [test $HAVE_GETUSERSHELL = 0]
 
 configure.ac:
 gl_FUNC_GETUSERSHELL
+if test $HAVE_GETUSERSHELL = 0; then
+  AC_LIBOBJ([getusershell])
+fi
 gl_UNISTD_MODULE_INDICATOR([getusershell])
 
 Makefile.am: