unlink: Respect rules for use of AC_LIBOBJ.

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

diff --git a/ChangeLog b/ChangeLog
index e395bb53f0cedb8301f12c913b10157ae7e70fdf..b3264eecbca9bb9e8ef109a2bcc1758b69f226b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
+       unlink: Respect rules for use of AC_LIBOBJ.
+       * m4/unlink.m4 (gl_FUNC_UNLINK): Move AC_LIBOBJ invocation from here...
+       * modules/unlink (configure.ac): ... to here.
+
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
        uname: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/unlink.m4 b/m4/unlink.m4
index a49a692878d0a844de254bcd43fa1803bdfdbfda..49cd3bb80aa9247476a5cacdc4b046c821b98c6f 100644 (file)
--- a/m4/unlink.m4
+++ b/m4/unlink.m4
@@ -1,4 +1,4 @@
-# unlink.m4 serial 7
+# unlink.m4 serial 8
 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,
@@ -108,6 +108,5 @@ AC_DEFUN([gl_FUNC_UNLINK],
           esac
         }; then
     REPLACE_UNLINK=1
-    AC_LIBOBJ([unlink])
   fi
 ])

diff --git a/modules/unlink b/modules/unlink
index 26af43ddcc8bc01af132a6fef9ec4cee2914f1bf..63720aaf10e642cf1a0100291bb85fdd34dc45c1 100644 (file)
--- a/modules/unlink
+++ b/modules/unlink
@@ -12,6 +12,9 @@ lstat           [test $REPLACE_UNLINK = 1]
 
 configure.ac:
 gl_FUNC_UNLINK
+if test $REPLACE_UNLINK = 1; then
+  AC_LIBOBJ([unlink])
+fi
 gl_UNISTD_MODULE_INDICATOR([unlink])
 
 Makefile.am: