rmdir: Respect rules for use of AC_LIBOBJ.

* m4/rmdir.m4 (gl_FUNC_RMDIR): Move AC_LIBOBJ invocation from here...
* modules/rmdir (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 24caa7687c3f9ab959b251e17745462f6d10c81b..4b21cf3c3e3b3f9ad2c03809deeb38793435331b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
+       rmdir: Respect rules for use of AC_LIBOBJ.
+       * m4/rmdir.m4 (gl_FUNC_RMDIR): Move AC_LIBOBJ invocation from here...
+       * modules/rmdir (configure.ac): ... to here.
+
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
        renameat: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/rmdir.m4 b/m4/rmdir.m4
index 41705a1ee442b7ae8bdfac2d993ab702d609176f..5284c7ef002b85e8d9444130de6eea71185910c8 100644 (file)
--- a/m4/rmdir.m4
+++ b/m4/rmdir.m4
@@ -1,4 +1,4 @@
-# rmdir.m4 serial 10
+# rmdir.m4 serial 11
 dnl Copyright (C) 2002, 2005, 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,
@@ -30,6 +30,5 @@ AC_DEFUN([gl_FUNC_RMDIR],
      rm -rf conftest.dir conftest.file])
   if test x"$gl_cv_func_rmdir_works" != xyes; then
     REPLACE_RMDIR=1
-    AC_LIBOBJ([rmdir])
   fi
 ])

diff --git a/modules/rmdir b/modules/rmdir
index 95e7b1df6a405d9df88c6b07521d987a73f5a56b..59a9dbacc63b44005cd89f26a29708dd6f760b00 100644 (file)
--- a/modules/rmdir
+++ b/modules/rmdir
@@ -12,6 +12,9 @@ sys_stat        [test $REPLACE_RMDIR = 1]
 
 configure.ac:
 gl_FUNC_RMDIR
+if test $REPLACE_RMDIR = 1; then
+  AC_LIBOBJ([rmdir])
+fi
 gl_UNISTD_MODULE_INDICATOR([rmdir])
 
 Makefile.am: