Mercurial > hg > octave-lyh > gnulib-hg

changeset 15024:ff4e14f9c0be

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Sat, 21 May 2011 13:42:11 +0200
parents 9acfed062e5f
children 5cec5df6b606
files ChangeLog m4/link.m4 modules/link
diffstat 3 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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_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 @@
        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
 ])
--- a/modules/link
+++ b/modules/link
@@ -13,6 +13,9 @@
 
 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: