diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-11-08 08:24:40 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-11-08 08:24:40 -0800 |
| commit | 220a304ac3e1948e40ea76a82bc62bd81c2a6906 (patch) | |
| tree | 258d6b1b3b7ef513a7e040faf7b3d687b1d93d03 /m4/fpending.m4 | |
| parent | 71731c03382ba72c08d8a8d15ee074b4d3c97e66 (diff) | |
| download | emacs-220a304ac3e1948e40ea76a82bc62bd81c2a6906.tar.gz | |
Merge from gnulib.
This incorporates:
2013-11-08 extern-inline: port better to OS X 10.9
2013-11-08 fpending: fix regression on DragonFly BSD
* lib/fpending.h, m4/extern-inline.m4, m4/fpending.m4:
Update from gnulib.
Diffstat (limited to 'm4/fpending.m4')
| -rw-r--r-- | m4/fpending.m4 | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/m4/fpending.m4 b/m4/fpending.m4 index c8d9e8b7ba8..669105b9b53 100644 --- a/m4/fpending.m4 +++ b/m4/fpending.m4 @@ -1,4 +1,4 @@ -# serial 20 +# serial 21 # Copyright (C) 2000-2001, 2004-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -16,19 +16,23 @@ dnl we have to grub around in the FILE struct. AC_DEFUN([gl_FUNC_FPENDING], [ AC_CHECK_HEADERS_ONCE([stdio_ext.h]) + fp_headers=' + #include <stdio.h> + #if HAVE_STDIO_EXT_H + # include <stdio_ext.h> + #endif + ' AC_CACHE_CHECK([for __fpending], [gl_cv_func___fpending], [ AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [[#include <stdio.h> - #if HAVE_STDIO_EXT_H - # include <stdio_ext.h> - #endif - ]], + [AC_LANG_PROGRAM([$fp_headers], [[return ! __fpending (stdin);]])], [gl_cv_func___fpending=yes], [gl_cv_func___fpending=no]) ]) + if test $gl_cv_func___fpending = yes; then + AC_CHECK_DECLS([__fpending], [], [], [$fp_headers]) + fi ]) AC_DEFUN([gl_PREREQ_FPENDING], |