Mercurial > hg > octave-lyh > gnulib-hg

changeset 15082:e2b57a7be469

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Sat, 21 May 2011 20:49:45 +0200
parents e73533e769a3
children 0c86c6d851e0
files ChangeLog m4/rename.m4 modules/rename
diffstat 3 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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...
--- 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 @@
     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 @@
     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 @@
     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 @@
     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,
--- a/modules/rename
+++ b/modules/rename
@@ -17,6 +17,9 @@
 
 configure.ac:
 gl_FUNC_RENAME
+if test $REPLACE_RENAME = 1; then
+  AC_LIBOBJ([rename])
+fi
 gl_STDIO_MODULE_INDICATOR([rename])
 
 Makefile.am: