X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmkdir-slash.m4;h=4e56bda718a81ac44a5613040b5fd11f91fdb2d9;hb=6fa2870cb33c7793d30df2fc10ecdbe2a0772d3a;hp=18f835a9dfe05b45551f2f5610a23c085c8ae5c4;hpb=6fe8d7498529e40705598c70355fd2f38efc7aea;p=gnulib.git

diff --git a/m4/mkdir-slash.m4 b/m4/mkdir-slash.m4
index 18f835a9d..4e56bda71 100644
--- a/m4/mkdir-slash.m4
+++ b/m4/mkdir-slash.m4
@@ -1,12 +1,19 @@
-#serial 1
+# serial 7
+
+# Copyright (C) 2001, 2003-2004, 2006, 2008-2009 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.
 
 # On some systems, mkdir ("foo/", 0700) fails because of the trailing slash.
 # On such systems, arrange to use a wrapper function that removes any
 # trailing slashes.
-AC_DEFUN([UTILS_FUNC_MKDIR_TRAILING_SLASH],
+AC_DEFUN([gl_FUNC_MKDIR_TRAILING_SLASH],
 [dnl
+  AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
+  AC_CHECK_HEADERS_ONCE([unistd.h])
   AC_CACHE_CHECK([whether mkdir fails due to a trailing slash],
-    utils_cv_func_mkdir_trailing_slash_bug,
+    gl_cv_func_mkdir_trailing_slash_bug,
     [
       # Arrange for deletion of the temporary directory this test might create.
       ac_clean_files="$ac_clean_files confdir-slash"
@@ -14,22 +21,28 @@ AC_DEFUN([UTILS_FUNC_MKDIR_TRAILING_SLASH],
 #       include <sys/types.h>
 #       include <sys/stat.h>
 #       include <stdlib.h>
+#       ifdef HAVE_UNISTD_H
+#         include <unistd.h>
+#       endif
 	int main ()
 	{
 	  rmdir ("confdir-slash");
 	  exit (mkdir ("confdir-slash/", 0700));
 	}
 	],
-      utils_cv_func_mkdir_trailing_slash_bug=no,
-      utils_cv_func_mkdir_trailing_slash_bug=yes,
-      utils_cv_func_mkdir_trailing_slash_bug=yes
+      gl_cv_func_mkdir_trailing_slash_bug=no,
+      gl_cv_func_mkdir_trailing_slash_bug=yes,
+      gl_cv_func_mkdir_trailing_slash_bug=yes
       )
     ]
   )
 
-  if test $utils_cv_func_mkdir_trailing_slash_bug = yes; then
-    AC_LIBOBJ(mkdir)
-    AC_DEFINE(mkdir, rpl_mkdir,
-      [Define to rpl_mkdir if the replacement function should be used.])
+  if test $gl_cv_func_mkdir_trailing_slash_bug = yes; then
+    REPLACE_MKDIR=1
+    AC_LIBOBJ([mkdir])
+    gl_PREREQ_MKDIR
   fi
 ])
+
+# Prerequisites of lib/mkdir.c.
+AC_DEFUN([gl_PREREQ_MKDIR], [:])