X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fgetcwd-path-max.m4;h=14784999d454a312d08a637dc3cb59489eb12919;hb=05a96e0bca75d5b01c337cd7dacd04507d6e6497;hp=3d0af87517867a5625cb80fac400005b647f5c66;hpb=79c0a43808d9ca85acd04600149fc1a9b75bd1b9;p=gnulib.git

diff --git a/m4/getcwd-path-max.m4 b/m4/getcwd-path-max.m4
index 3d0af8751..14784999d 100644
--- a/m4/getcwd-path-max.m4
+++ b/m4/getcwd-path-max.m4
@@ -1,4 +1,4 @@
-#serial 12
+# serial 14
 # Check for several getcwd bugs with long file names.
 # If so, arrange to compile the wrapper function.
 
@@ -6,7 +6,7 @@
 # I've heard that this is due to a Linux kernel bug, and that it has
 # been fixed between 2.4.21-pre3 and 2.4.21-pre4.  */
 
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003-2007, 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.
@@ -15,7 +15,7 @@
 
 AC_DEFUN([gl_FUNC_GETCWD_PATH_MAX],
 [
-  AC_CHECK_DECLS_ONCE(getcwd)
+  AC_CHECK_DECLS_ONCE([getcwd])
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
   AC_CACHE_CHECK([whether getcwd handles long file names properly],
     gl_cv_func_getcwd_path_max,
@@ -163,7 +163,8 @@ main ()
       {
 	if (chdir ("..") < 0)
 	  break;
-	rmdir (DIR_NAME);
+	if (rmdir (DIR_NAME) != 0)
+	  break;
       }
   }
 
@@ -180,7 +181,7 @@ main ()
   ])
   case $gl_cv_func_getcwd_path_max in
   no,*)
-    AC_DEFINE([HAVE_PARTLY_WORKING_GETCWD], 1,
+    AC_DEFINE([HAVE_PARTLY_WORKING_GETCWD], [1],
       [Define to 1 if getcwd works, except it sometimes fails when it shouldn't,
        setting errno to ERANGE, ENAMETOOLONG, or ENOENT.  If __GETCWD_PREFIX
        is not defined, it doesn't matter whether HAVE_PARTLY_WORKING_GETCWD