X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Frename.m4;h=4ce7f472d16ef98a72b673484f89e91478910797;hb=cbe1db166ca76ef3571be8fe34fc10374b68c282;hp=95117d05f99b6add7b130e34c7aa986af11a5508;hpb=a6a046c02e20ab4701bb4e052d6a510878040ec5;p=gnulib.git

diff --git a/m4/rename.m4 b/m4/rename.m4
index 95117d05f..4ce7f472d 100644
--- a/m4/rename.m4
+++ b/m4/rename.m4
@@ -1,4 +1,4 @@
-#serial 1
+#serial 3
 
 dnl From Volker Borchert.
 dnl Determine whether rename works for source paths with a trailing slash.
@@ -8,32 +8,32 @@ 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,
   [
-    if mkdir conftestdir; then
-      vb_cv_func_rename_trailing_slash_bug=no
-    else
-      AC_TRY_RUN([
-#         include <stdio.h>
-          int
-          main ()
-          {
-            exit (rename ("conftestdir/", "conftestdir2") ? 1 : 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 conftestdir conftestdir2
-    fi
+    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 ("conftest.d1/", "conftest.d2") ? 1 : 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
     AC_LIBOBJ(rename)
-    AC_DEFINE_UNQUOTED(RENAME_TRAILING_SLASH_BUG, 1,
+    AC_DEFINE(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.])
   fi