From: Bruno Haible <bruno@clisp.org>
Date: Sat, 21 May 2011 16:28:15 +0000 (+0200)
Subject: remove: Move AC_LIBOBJ invocations to module description.
X-Git-Tag: v0.1~2445
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=2fe314d87dda467d8e58b73321b0eff3eb5825b1;p=gnulib.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 49a1c9ff3..c1d64b893 100644
--- 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.
diff --git a/m4/remove.m4 b/m4/remove.m4
index 1c314ea75..bc8f67893 100644
--- 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 @@ AC_DEFUN([gl_FUNC_REMOVE],
     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 @@ AC_DEFUN([gl_FUNC_REMOVE],
           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
 ])
diff --git a/modules/remove b/modules/remove
index 472380189..0caf48a7f 100644
--- a/modules/remove
+++ b/modules/remove
@@ -12,6 +12,9 @@ unlink          [test $REPLACE_REMOVE = 1]
 
 configure.ac:
 gl_FUNC_REMOVE
+if test $REPLACE_REMOVE = 1; then
+  AC_LIBOBJ([remove])
+fi
 gl_STDIO_MODULE_INDICATOR([remove])
 
 Makefile.am: