Mercurial > hg > octave-lojdl > gnulib-hg

changeset 15122:15f55e6c30d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
symlink: Move AC_LIBOBJ invocations to module description. * m4/symlink.m4 (gl_FUNC_SYMLINK): Move AC_LIBOBJ invocations from here... * modules/symlink (configure.ac): ... to here.
author Bruno Haible <bruno@clisp.org>
date Sun, 22 May 2011 14:52:14 +0200
parents 4ae1058b7455
children aa9e38804c40
files ChangeLog m4/symlink.m4 modules/symlink
diffstat 3 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
+	symlink: Move AC_LIBOBJ invocations to module description.
+	* m4/symlink.m4 (gl_FUNC_SYMLINK): Move AC_LIBOBJ invocations from
+	here...
+	* modules/symlink (configure.ac): ... to here.
+
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
 	strverscmp: Move AC_LIBOBJ invocations to module description.
--- a/m4/symlink.m4
+++ b/m4/symlink.m4
@@ -1,4 +1,4 @@
-# serial 4
+# serial 5
 # See if we need to provide symlink replacement.
 
 dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
@@ -17,7 +17,6 @@
   dnl and Solaris 9, we want to fix a bug with trailing slash handling.
   if test $ac_cv_func_symlink = no; then
     HAVE_SYMLINK=0
-    AC_LIBOBJ([symlink])
   else
     AC_CACHE_CHECK([whether symlink handles trailing slash correctly],
       [gl_cv_func_symlink_works],
@@ -39,7 +38,6 @@
       rm -f conftest.f conftest.link conftest.lnk2])
     if test "$gl_cv_func_symlink_works" != yes; then
       REPLACE_SYMLINK=1
-      AC_LIBOBJ([symlink])
     fi
   fi
 ])
--- a/modules/symlink
+++ b/modules/symlink
@@ -11,6 +11,9 @@
 
 configure.ac:
 gl_FUNC_SYMLINK
+if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then
+  AC_LIBOBJ([symlink])
+fi
 gl_UNISTD_MODULE_INDICATOR([symlink])
 
 Makefile.am: