Add CVS checkout update instructions.

[gnulib.git] / m4 / fpending.m4

diff --git a/m4/fpending.m4 b/m4/fpending.m4
index c72b7cc..90ce87b 100644 (file)
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -1,4 +1,10 @@
-#serial 2
+#serial 11
+
+# Copyright (C) 2000, 2001, 2004, 2005, 2006, 2007 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.
 
 dnl From Jim Meyering
 dnl Using code from emacs, based on suggestions from Paul Eggert
@@ -8,11 +14,12 @@ dnl Find out how to determine the number of pending output bytes on a stream.
 dnl glibc (2.1.93 and newer) and Solaris provide __fpending.  On other systems,
 dnl we have to grub around in the FILE struct.
 
-AC_DEFUN([jm_FUNC_FPENDING],
+AC_DEFUN([gl_FUNC_FPENDING],
 [
-  AC_CHECK_HEADERS(stdio_ext.h)
-  AC_REPLACE_FUNCS([__fpending])
+  AC_CHECK_HEADERS_ONCE(stdio_ext.h)
+  AC_CHECK_FUNCS_ONCE([__fpending])
   fp_headers='
+#     include <stdio.h>
 #     if HAVE_STDIO_EXT_H
 #      include <stdio_ext.h>
 #     endif
@@ -23,7 +30,6 @@ AC_DEFUN([jm_FUNC_FPENDING],
              [how to determine the number of pending output bytes on a stream],
                   ac_cv_sys_pending_output_n_bytes,
       [
-        fp_save_DEFS=$DEFS
        for ac_expr in                                          \
                                                                \
            '# glibc2'                                          \
@@ -36,7 +42,7 @@ AC_DEFUN([jm_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'                         \
@@ -54,14 +60,12 @@ AC_DEFUN([jm_FUNC_FPENDING],
          # Skip each embedded comment.
          case "$ac_expr" in '#'*) continue;; esac
 
-         DEFS="$DEFS -DPENDING_OUTPUT_N_BYTES=$ac_expr"
          AC_TRY_COMPILE(
            [#include <stdio.h>
            ],
            [FILE *fp = stdin; (void) ($ac_expr);],
            fp_done=yes
          )
-         DEFS=$fp_save_DEFS
          test "$fp_done" = yes && break
        done
 
@@ -71,5 +75,6 @@ AC_DEFUN([jm_FUNC_FPENDING],
     AC_DEFINE_UNQUOTED(PENDING_OUTPUT_N_BYTES,
       $ac_cv_sys_pending_output_n_bytes,
       [the number of pending output bytes on stream `fp'])
+    AC_LIBOBJ([fpending])
   fi
 ])