* m4/chdir-long.m4 (gl_FUNC_CHDIR_LONG): Revamp wording and local

variables to suggest the intended function of the PATH_MAX check.

Trivial changes to support SCO systems.
* m4/chdir-long.m4 (gl_FUNC_CHDIR_LONG): Check for MAXPATHLEN as well
as PATH_MAX.
* m4/fpending.m4 (gl_FUNC_FPENDING): Correct check for SCO systems,
where __ptr is null when no I/O is pending.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index e7e7c0cbc18e93409a622e95afe3390d91753727..471f2fd874f60c5af71227c206a79f8f1ced4339 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,16 @@
+2005-10-30  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * chdir-long.m4 (gl_FUNC_CHDIR_LONG): Revamp wording and local
+       variables to suggest the intended function of the PATH_MAX check.
+
+2005-10-30  Kean Johnston  <jkj@sco.com>
+
+       Trivial changes to support SCO systems.
+       * chdir-long.m4 (gl_FUNC_CHDIR_LONG): Check for MAXPATHLEN as well
+       as PATH_MAX.
+       * fpending.m4 (gl_FUNC_FPENDING): Correct check for SCO systems,
+       where __ptr is null when no I/O is pending.
+
 2005-10-28  Simon Josefsson  <jas@extundo.com>
 
        * inet_ntop.m4: More tests.

diff --git a/m4/chdir-long.m4 b/m4/chdir-long.m4
index 0f22e382ca913be1c43f6de7f3e71c7620d41f4d..170434924ab50c0d8d79580024a82edc92199895 100644 (file)
--- a/m4/chdir-long.m4
+++ b/m4/chdir-long.m4
@@ -1,4 +1,4 @@
-#serial 6
+#serial 7
 
 # Use Gnulib's robust chdir function.
 # It can handle arbitrarily long directory names, which means
@@ -16,18 +16,18 @@ 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_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)])
+    gl_have_arbitrary_file_name_length_limit=yes,
+    gl_have_arbitrary_file_name_length_limit=no)])
 
-  if test $gl_have_path_max_definition = yes; then
+  if test $gl_have_arbitrary_file_name_length_limit = yes; then
     AC_LIBOBJ([chdir-long])
     gl_PREREQ_CHDIR_LONG
   fi

diff --git a/m4/fpending.m4 b/m4/fpending.m4
index 87398b142b4ba5e9ccccfd631ecac62be355c8de..f43aaa41958b3523715588f577373ac704cf54f2 100644 (file)
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -1,4 +1,4 @@
-#serial 6
+#serial 7
 
 # Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -42,7 +42,7 @@ AC_DEFUN([gl_FUNC_FPENDING],
            'fp->_p - fp->_bf._base'                            \
                                                                \
            '# SCO, Unixware'                                   \
-           'fp->__ptr - fp->__base'                            \
+           '(fp->__ptr ? fp->__ptr - fp->__base : 0)'          \
                                                                \
            '# old glibc?'                                      \
            'fp->__bufp - fp->__buffer'                         \