From: Bruno Haible <bruno@clisp.org>
Date: Sat, 21 May 2011 18:49:45 +0000 (+0200)
Subject: rename: Respect rules for use of AC_LIBOBJ.
X-Git-Tag: v0.1~2444
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=9ac735c21d9dfce5243f821eb0f1fc3ab853ca40;p=gnulib.git

rename: Respect rules for use of AC_LIBOBJ.

* m4/rename.m4 (gl_FUNC_RENAME): Move AC_LIBOBJ invocations from
here...
* modules/rename (configure.ac): ... to here.
---

diff --git a/ChangeLog b/ChangeLog
index c1d64b893..ca585d5a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+	rename: Respect rules for use of AC_LIBOBJ.
+	* m4/rename.m4 (gl_FUNC_RENAME): Move AC_LIBOBJ invocations from
+	here...
+	* modules/rename (configure.ac): ... to here.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
 	remove: Move AC_LIBOBJ invocations to module description.
 	* m4/remove.m4 (gl_FUNC_REMOVE): Move AC_LIBOBJ invocations from
 	here...
diff --git a/m4/rename.m4 b/m4/rename.m4
index 6648542c7..c938b0d00 100644
--- a/m4/rename.m4
+++ b/m4/rename.m4
@@ -1,4 +1,4 @@
-# serial 23
+# serial 24
 
 # Copyright (C) 2001, 2003, 2005-2006, 2009-2011 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -58,7 +58,6 @@ AC_DEFUN([gl_FUNC_RENAME],
     rm -rf conftest.f conftest.f1 conftest.f2 conftest.d1 conftest.d2 conftest.lnk
   ])
   if test "x$gl_cv_func_rename_slash_dst_works" != xyes; then
-    AC_LIBOBJ([rename])
     REPLACE_RENAME=1
     AC_DEFINE([RENAME_TRAILING_SLASH_DEST_BUG], [1],
       [Define if rename does not correctly handle slashes on the destination
@@ -102,7 +101,6 @@ AC_DEFUN([gl_FUNC_RENAME],
     rm -rf conftest.f conftest.f1 conftest.d1 conftest.d2 conftest.d3 conftest.lnk
   ])
   if test "x$gl_cv_func_rename_slash_src_works" != xyes; then
-    AC_LIBOBJ([rename])
     REPLACE_RENAME=1
     AC_DEFINE([RENAME_TRAILING_SLASH_SOURCE_BUG], [1],
       [Define if rename does not correctly handle slashes on the source
@@ -144,7 +142,6 @@ AC_DEFUN([gl_FUNC_RENAME],
     rm -rf conftest.f conftest.f1
   ])
   if test "x$gl_cv_func_rename_link_works" != xyes; then
-    AC_LIBOBJ([rename])
     REPLACE_RENAME=1
     AC_DEFINE([RENAME_HARD_LINK_BUG], [1],
       [Define if rename fails to leave hard links alone, as on NetBSD 1.6
@@ -179,7 +176,6 @@ AC_DEFUN([gl_FUNC_RENAME],
     rm -rf conftest.f conftest.d1 conftest.d2
   ])
   if test "x$gl_cv_func_rename_dest_works" != xyes; then
-    AC_LIBOBJ([rename])
     REPLACE_RENAME=1
     AC_DEFINE([RENAME_DEST_EXISTS_BUG], [1],
       [Define if rename does not work when the destination file exists,
diff --git a/modules/rename b/modules/rename
index 449d9beea..52ca382d3 100644
--- a/modules/rename
+++ b/modules/rename
@@ -17,6 +17,9 @@ strdup            [test $REPLACE_RENAME = 1]
 
 configure.ac:
 gl_FUNC_RENAME
+if test $REPLACE_RENAME = 1; then
+  AC_LIBOBJ([rename])
+fi
 gl_STDIO_MODULE_INDICATOR([rename])
 
 Makefile.am: