From 8ae8d2361b9c377fc89de88cf88f79d0e6d012c7 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 21 May 2011 17:59:58 +0200
Subject: [PATCH] readlink: Move AC_LIBOBJ invocations to module description.
* m4/readlink.m4 (gl_FUNC_READLINK): Move AC_LIBOBJ and
gl_PREREQ_READLINK invocations from here...
* modules/readlink (configure.ac): ... to here.
---
ChangeLog | 7 +++++++
m4/readlink.m4 | 6 +-----
modules/readlink | 4 ++++
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b2537dd6ec..6abcf2401f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-21 Bruno Haible <bruno@clisp.org>
+
+ readlink: Move AC_LIBOBJ invocations to module description.
+ * m4/readlink.m4 (gl_FUNC_READLINK): Move AC_LIBOBJ and
+ gl_PREREQ_READLINK invocations from here...
+ * modules/readlink (configure.ac): ... to here.
+
2011-05-21 Bruno Haible <bruno@clisp.org>
readline: Move AC_LIBOBJ invocations to module description.
diff --git a/m4/readlink.m4 b/m4/readlink.m4
index ec737d3f40..91d7df3c91 100644
--- a/m4/readlink.m4
+++ b/m4/readlink.m4
@@ -1,4 +1,4 @@
-# readlink.m4 serial 10
+# readlink.m4 serial 11
dnl Copyright (C) 2003, 2007, 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,8 +10,6 @@ AC_DEFUN([gl_FUNC_READLINK],
AC_CHECK_FUNCS_ONCE([readlink])
if test $ac_cv_func_readlink = no; then
HAVE_READLINK=0
- AC_LIBOBJ([readlink])
- gl_PREREQ_READLINK
else
AC_CACHE_CHECK([whether readlink signature is correct],
[gl_cv_decl_readlink_works],
@@ -40,10 +38,8 @@ AC_DEFUN([gl_FUNC_READLINK],
AC_DEFINE([READLINK_TRAILING_SLASH_BUG], [1], [Define to 1 if readlink
fails to recognize a trailing slash.])
REPLACE_READLINK=1
- AC_LIBOBJ([readlink])
elif test "$gl_cv_decl_readlink_works" != yes; then
REPLACE_READLINK=1
- AC_LIBOBJ([readlink])
fi
fi
])
diff --git a/modules/readlink b/modules/readlink
index 37c03a78af..431e201d79 100644
--- a/modules/readlink
+++ b/modules/readlink
@@ -11,6 +11,10 @@ stat [test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1]
configure.ac:
gl_FUNC_READLINK
+if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then
+ AC_LIBOBJ([readlink])
+ gl_PREREQ_READLINK
+fi
gl_UNISTD_MODULE_INDICATOR([readlink])
Makefile.am:
--
2.30.2