# HG changeset patch
# User Jim Meyering <jim@meyering.net>
# Date 979504076 0
# Node ID 20833ed0761f9331548eb10ad1db4ee960e79d2a
# Parent  ef2fa0a38c9e2db1a0ec1d6d964db7830a33df2d
Remove conftestdir{,2} before trying to create the directory.
Make the entire configure script fail if the mkdir fails.

diff --git a/m4/rename.m4 b/m4/rename.m4
--- a/m4/rename.m4
+++ b/m4/rename.m4
@@ -13,23 +13,23 @@
  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
+    mkdir conftestdir ||
+      AC_MSG_ERROR([cannot create temporary directory])
+    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
   ])
   if test $vb_cv_func_rename_trailing_slash_bug = yes; then
     AC_LIBOBJ(rename)