summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2011-05-22 14:52:14 +0200
committerBruno Haible <bruno@clisp.org>2011-06-16 00:06:59 +0200
commit45a150ec439629a40d891a53bd75d1ce1f3dbf13 (patch)
tree79fa5867414d6f049d0d90e87bc09b6cae87d314
parentdc5910c0779fa08b8ea1d8864f997f4a446b15a1 (diff)
downloadgnulib-45a150ec439629a40d891a53bd75d1ce1f3dbf13.tar.gz
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.
-rw-r--r--ChangeLog7
-rw-r--r--m4/symlink.m44
-rw-r--r--modules/symlink3
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0562870e14..0eb217b4ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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.
* m4/strverscmp.m4 (gl_FUNC_STRVERSCMP): Call AC_CHECK_FUNCS instead of
AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_STRVERSCMP invocations
diff --git a/m4/symlink.m4 b/m4/symlink.m4
index 917d5f0ec2..680c14f661 100644
--- 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 @@ AC_DEFUN([gl_FUNC_SYMLINK],
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 @@ AC_DEFUN([gl_FUNC_SYMLINK],
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
])
diff --git a/modules/symlink b/modules/symlink
index 729f01cbeb..f6f1db2d79 100644
--- a/modules/symlink
+++ b/modules/symlink
@@ -11,6 +11,9 @@ lstat [test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1]
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: