X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Ffpending.m4;h=87398b142b4ba5e9ccccfd631ecac62be355c8de;hb=07ca91adc3957e0066d8813468a71047b5bc1db0;hp=6e287975e62a93b05c36ad4def457fc43e8b627c;hpb=c7a6a25ebf703e131c23dafdcb16cdf37d13033f;p=gnulib.git

diff --git a/m4/fpending.m4 b/m4/fpending.m4
index 6e287975e..87398b142 100644
--- a/m4/fpending.m4
+++ b/m4/fpending.m4
@@ -1,19 +1,35 @@
-#serial 1
+#serial 6
+
+# Copyright (C) 2000, 2001, 2004, 2005 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
 dnl and Ulrich Drepper.
 
-AC_DEFUN(jm_FUNC_FPENDING,
+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([gl_FUNC_FPENDING],
 [
+  AC_LIBSOURCES([__fpending.c, __fpending.h])
+
   AC_CHECK_HEADERS(stdio_ext.h)
   AC_REPLACE_FUNCS([__fpending])
+  fp_headers='
+#     if HAVE_STDIO_EXT_H
+#      include <stdio_ext.h>
+#     endif
+'
+  AC_CHECK_DECLS([__fpending], , , $fp_headers)
   if test $ac_cv_func___fpending = no; then
     AC_CACHE_CHECK(
 	      [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'						\
@@ -44,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