link: Respect rules for use of AC_LIBOBJ.

* m4/link.m4 (gl_FUNC_LINK): Move AC_LIBOBJ invocations from here...
* modules/link (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 263c496c510f0181a15f883c2c447e62df9a17ab..209621160b1cb2621efd36c543bbe139a81994ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
+       link: Respect rules for use of AC_LIBOBJ.
+       * m4/link.m4 (gl_FUNC_LINK): Move AC_LIBOBJ invocations from here...
+       * modules/link (configure.ac): ... to here.
+
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
        lchown: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/link.m4 b/m4/link.m4
index 479083cb84bf48e2daa07201050ca183fa9d2b44..2f1a439ede0a728e25d5907622e593ce5d7c9413 100644 (file)
--- a/m4/link.m4
+++ b/m4/link.m4
@@ -1,4 +1,4 @@
-# link.m4 serial 5
+# link.m4 serial 6
 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,
@@ -10,7 +10,6 @@ AC_DEFUN([gl_FUNC_LINK],
   AC_CHECK_FUNCS_ONCE([link])
   if test $ac_cv_func_link = no; then
     HAVE_LINK=0
-    AC_LIBOBJ([link])
   else
     AC_CACHE_CHECK([whether link handles trailing slash correctly],
       [gl_cv_func_link_works],
@@ -37,7 +36,6 @@ AC_DEFUN([gl_FUNC_LINK],
        rm -f conftest.a conftest.b conftest.lnk])
     if test "$gl_cv_func_link_works" != yes; then
       REPLACE_LINK=1
-      AC_LIBOBJ([link])
     fi
   fi
 ])

diff --git a/modules/link b/modules/link
index 38cf5ec9f0e027f90b2e69be5a6ea879c04d1cca..5ea0ac2ff98efeee82f093dc2d7d8c09a4e13d2d 100644 (file)
--- a/modules/link
+++ b/modules/link
@@ -13,6 +13,9 @@ sys_stat        [test $HAVE_LINK = 0 || test $REPLACE_LINK = 1]
 
 configure.ac:
 gl_FUNC_LINK
+if test $HAVE_LINK = 0 || test $REPLACE_LINK = 1; then
+  AC_LIBOBJ([link])
+fi
 gl_UNISTD_MODULE_INDICATOR([link])
 
 Makefile.am: