X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frename.m4;h=1c9e0e98e97580b2ced5beee21fa80e04a2a1b1d;hb=8575b0774d7270385308b89a8d021c054db65c58;hp=50a715ee906ee8454b5ed411e7324ceb787e3f7b;hpb=d2b42b931376d8d7a7f7e0735f1cc666529f6925;p=gnulib.git

diff --git a/m4/rename.m4 b/m4/rename.m4
index 50a715ee9..1c9e0e98e 100644
--- a/m4/rename.m4
+++ b/m4/rename.m4
@@ -1,27 +1,32 @@
-#serial 1
+#serial 8
+
+# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 dnl From Volker Borchert.
-dnl Determine whether rename works for source paths with a trailing slash.
+dnl Determine whether rename works for source file names with a trailing slash.
 dnl The rename from SunOS 4.1.1_U1 doesn't.
 dnl
 dnl If it doesn't, then define RENAME_TRAILING_SLASH_BUG and arrange
 dnl to compile the wrapper function.
 dnl
 
-AC_DEFUN(vb_FUNC_RENAME,
+AC_DEFUN([vb_FUNC_RENAME],
 [
  AC_CACHE_CHECK([whether rename is broken],
   vb_cv_func_rename_trailing_slash_bug,
   [
-    rm -rf conftestdir conftestdir2
-    mkdir conftestdir ||
+    rm -rf conftest.d1 conftest.d2
+    mkdir conftest.d1 ||
       AC_MSG_ERROR([cannot create temporary directory])
     AC_TRY_RUN([
 #       include <stdio.h>
         int
         main ()
         {
-          exit (rename ("conftestdir/", "conftestdir2") ? 1 : 0);
+          exit (rename ("conftest.d1/", "conftest.d2") ? 1 : 0);
         }
       ],
       vb_cv_func_rename_trailing_slash_bug=no,
@@ -29,12 +34,18 @@ AC_DEFUN(vb_FUNC_RENAME,
       dnl When crosscompiling, assume rename is broken.
       vb_cv_func_rename_trailing_slash_bug=yes)
 
-      rm -rf conftestdir conftestdir2
+      rm -rf conftest.d1 conftest.d2
   ])
   if test $vb_cv_func_rename_trailing_slash_bug = yes; then
     AC_LIBOBJ(rename)
-    AC_DEFINE_UNQUOTED(RENAME_TRAILING_SLASH_BUG, 1,
-[Define if rename does not work for source paths with a trailing slash,
-   like the one from SunOS 4.1.1_U1.])
+    AC_DEFINE(rename, rpl_rename,
+      [Define to rpl_rename if the replacement function should be used.])
+    AC_DEFINE(RENAME_TRAILING_SLASH_BUG, 1,
+      [Define if rename does not work for source file names with a trailing
+       slash, like the one from SunOS 4.1.1_U1.])
+    gl_PREREQ_RENAME
   fi
 ])
+
+# Prerequisites of lib/rename.c.
+AC_DEFUN([gl_PREREQ_RENAME], [:])