X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frename.m4;h=39ad5e7861d0a39761f519531ae611ffe93856d1;hb=3d37b264049ab3ff324634078c5e726f497e0df2;hp=cba3cd2420d435884f17bcd0083d3e57f5c114df;hpb=867b2d7180d6dba514349b533fe0f359b5714541;p=gnulib.git

diff --git a/m4/rename.m4 b/m4/rename.m4
index cba3cd242..39ad5e786 100644
--- a/m4/rename.m4
+++ b/m4/rename.m4
@@ -1,40 +1,52 @@
-#serial 1
+#serial 10
+
+# Copyright (C) 2001, 2003, 2005, 2006 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([gl_FUNC_RENAME],
 [
  AC_CACHE_CHECK([whether rename is broken],
-  vb_cv_func_rename_trailing_slash_bug,
-  [AC_TRY_RUN([
-#   include <stdio.h>
+  gl_cv_func_rename_trailing_slash_bug,
+  [
+    rm -rf conftest.d1 conftest.d2
+    mkdir conftest.d1 ||
+      AC_MSG_ERROR([cannot create temporary directory])
+    AC_TRY_RUN([
+#       include <stdio.h>
+#       include <stdlib.h>
+        int
+        main ()
+        {
+          exit (rename ("conftest.d1/", "conftest.d2") ? 1 : 0);
+        }
+      ],
+      gl_cv_func_rename_trailing_slash_bug=no,
+      gl_cv_func_rename_trailing_slash_bug=yes,
+      dnl When crosscompiling, assume rename is broken.
+      gl_cv_func_rename_trailing_slash_bug=yes)
 
-    int
-    main ()
-    {
-      if (mkdir ("foo") < 0)
-        exit (1);
-      if (rename ("foo/", "bar") < 0)
-        { rmdir ("foo"); exit (1); }
-      else
-        { rmdir ("bar"); exit (0); }
-    }
-	  ],
-	 vb_cv_func_rename_trailing_slash_bug=no,
-	 vb_cv_func_rename_trailing_slash_bug=yes,
-	 dnl When crosscompiling, assume rename is broken.
-	 vb_cv_func_rename_trailing_slash_bug=yes)
+      rm -rf conftest.d1 conftest.d2
   ])
-  if test $vb_cv_func_rename_trailing_slash_bug = yes; then
+  if test $gl_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], [:])