X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fchdir-long.m4;h=9c498a62160472bae50b019fd548e39da7d68a07;hb=da8054d48dc22e1c051db54049e005d51a006e69;hp=0f22e382ca913be1c43f6de7f3e71c7620d41f4d;hpb=9db27e416179e3b92ae18be230250d08ae6190f5;p=gnulib.git

diff --git a/m4/chdir-long.m4 b/m4/chdir-long.m4
index 0f22e382c..9c498a621 100644
--- a/m4/chdir-long.m4
+++ b/m4/chdir-long.m4
@@ -1,4 +1,4 @@
-#serial 6
+#serial 15
 
 # 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-2013 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,16 @@ 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],
-                  [#include <unistd.h>
-#include <limits.h>
+  AC_REQUIRE([gl_PATHMAX_SNIPPET_PREREQ])
+  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],
+                  gl_PATHMAX_SNIPPET[
 #ifdef PATH_MAX
-have_path_max_definition
+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 = yes; 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_DEFUN([gl_PREREQ_CHDIR_LONG], [:])