X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fchdir-long.m4;h=9a343ac9870c64182c791f08b229af18c3d6c86a;hb=1ba926b8e0433000aa9183a2c68f4f8a4fcc5d40;hp=9e9e35f9824eacadcc4bc02e8b343f308a4c9117;hpb=d1b64b0d62a960dd9010606d71236d41c074e970;p=gnulib.git

diff --git a/m4/chdir-long.m4 b/m4/chdir-long.m4
index 9e9e35f98..9a343ac98 100644
--- a/m4/chdir-long.m4
+++ b/m4/chdir-long.m4
@@ -1,4 +1,4 @@
-#serial 5
+#serial 12
 
 # Use Gnulib's robust chdir function.
 # It can handle arbitrarily long directory names, which means
@@ -6,7 +6,7 @@
 # never fails with ENAMETOOLONG.
 # Arrange to compile chdir-long.c only on systems that define PATH_MAX.
 
-dnl Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2007, 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,28 +15,20 @@ dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_CHDIR_LONG],
 [
-  AC_LIBSOURCES([chdir-long.c, chdir-long.h])
-  AC_CACHE_CHECK([whether this system has a definition of PATH_MAX],
-    gl_have_path_max_definition,
-    [AC_EGREP_CPP([have_path_max_definition],
+  AC_CACHE_CHECK([whether this system has an arbitrary file name length limit],
+    gl_cv_have_arbitrary_file_name_length_limit,
+    [AC_EGREP_CPP([have_arbitrary_file_name_length_limit],
                   [#include <unistd.h>
 #include <limits.h>
-#ifdef PATH_MAX
-have_path_max_definition
+#if defined PATH_MAX || defined MAXPATHLEN
+have_arbitrary_file_name_length_limit
 #endif],
-    gl_have_path_max_definition=yes,
-    gl_have_path_max_definition=no)])
-
-  if test $gl_have_path_max_definition; then
-    AC_LIBOBJ([chdir-long])
-    gl_PREREQ_CHDIR_LONG
-  fi
+    gl_cv_have_arbitrary_file_name_length_limit=yes,
+    gl_cv_have_arbitrary_file_name_length_limit=no)])
 ])
 
 AC_DEFUN([gl_PREREQ_CHDIR_LONG],
 [
-  AM_STDBOOL_H
-  gl_FUNC_MEMPCPY
-  gl_FUNC_OPENAT
-  gl_FUNC_MEMRCHR
+  AC_REQUIRE([AC_C_INLINE])
+  :
 ])