--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+	remove: Move AC_LIBOBJ invocations to module description.
+	* m4/remove.m4 (gl_FUNC_REMOVE): Move AC_LIBOBJ invocations from
+	here...
+	* modules/remove (configure.ac): ... to here.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
 	relocatable-lib: Move AC_LIBOBJ invocations to module description.
 	* m4/relocatable-lib.m4 (gl_RELOCATABLE_LIBRARY_SEPARATE): Remove
 	macro.

--- a/m4/remove.m4
+++ b/m4/remove.m4
@@ -1,4 +1,4 @@
-# remove.m4 serial 2
+# remove.m4 serial 3
 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,
@@ -14,7 +14,6 @@
     dnl If either underlying syscall is broken, then remove likely has
     dnl the same bug; blindly use our replacement.
     REPLACE_REMOVE=1
-    AC_LIBOBJ([remove])
   else
     dnl C89 requires remove(), but only POSIX requires it to handle
     dnl directories.  On mingw, directories fails with EPERM.
@@ -32,8 +31,7 @@
           esac])
        rm -rf conftest.dir])
     case $gl_cv_func_remove_dir_works in
-      *no*) REPLACE_REMOVE=1
-        AC_LIBOBJ([remove]);;
+      *no*) REPLACE_REMOVE=1;;
     esac
   fi
 ])

--- a/modules/remove
+++ b/modules/remove
@@ -12,6 +12,9 @@
 
 configure.ac:
 gl_FUNC_REMOVE
+if test $REPLACE_REMOVE = 1; then
+  AC_LIBOBJ([remove])
+fi
 gl_STDIO_MODULE_INDICATOR([remove])
 
 Makefile.am: