X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Frmdir-errno.m4;h=4aca05451248d0664c65d1a6f8fa12d5a762b6b2;hb=68dfc9591e97db34b5ba693da028ff1f356a12b7;hp=c6b582947f0d51e50dff50e628015d0bdb2dd6aa;hpb=f2b62ff7e6360f418df082926030ff4dc77c5ca3;p=gnulib.git

diff --git a/m4/rmdir-errno.m4 b/m4/rmdir-errno.m4
index c6b582947..4aca05451 100644
--- a/m4/rmdir-errno.m4
+++ b/m4/rmdir-errno.m4
@@ -1,6 +1,6 @@
-#serial 6
+# serial 9
 
-# Copyright (C) 2000, 2001, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2005, 2006, 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.
@@ -12,6 +12,7 @@
 # test runs a test to determine the actual numeric value.
 AC_DEFUN([gl_FUNC_RMDIR_NOTEMPTY],
 [dnl
+  AC_CHECK_HEADERS_ONCE([unistd.h])
   AC_CACHE_CHECK([for rmdir-not-empty errno value],
     gl_cv_func_rmdir_errno_not_empty,
     [
@@ -21,8 +22,8 @@ AC_DEFUN([gl_FUNC_RMDIR_NOTEMPTY],
       AC_TRY_RUN([
 #include <stdio.h>
 #include <errno.h>
-#ifndef errno
-extern int errno;
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
 #endif
 	int main ()
 	{