diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-08-11 17:52:17 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-08-11 17:52:17 -0700 |
| commit | eaca0446e72c1a62e259c0ee0eabdd6a0443e5c8 (patch) | |
| tree | 5d0d07c792c47fc34bd9086a689f460fd45b741d /m4 | |
| parent | 808190e694c48dd9bf851baf114c095f39794c37 (diff) | |
| download | emacs-eaca0446e72c1a62e259c0ee0eabdd6a0443e5c8.tar.gz | |
Merge from gnulib.
This incorporates:
2013-08-11 fpending: port to recent Cygwin change to stdio_ext.h
2013-08-10 sys_time: port to OpenBSD
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/fpending.m4 | 23 | ||||
| -rw-r--r-- | m4/gnulib-comp.m4 | 2 |
2 files changed, 15 insertions, 10 deletions
diff --git a/m4/fpending.m4 b/m4/fpending.m4 index 8f585624317..c8d9e8b7ba8 100644 --- a/m4/fpending.m4 +++ b/m4/fpending.m4 @@ -1,4 +1,4 @@ -# serial 19 +# serial 20 # Copyright (C) 2000-2001, 2004-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -16,14 +16,19 @@ dnl we have to grub around in the FILE struct. AC_DEFUN([gl_FUNC_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 -' - AC_CHECK_DECLS([__fpending], , , $fp_headers) + 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 + ]], + [[return ! __fpending (stdin);]])], + [gl_cv_func___fpending=yes], + [gl_cv_func___fpending=no]) + ]) ]) AC_DEFUN([gl_PREREQ_FPENDING], diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index af9a9ca3ae0..7c5f22861b5 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -216,7 +216,7 @@ AC_DEFUN([gl_INIT], gl_MODULE_INDICATOR([fdopendir]) gl_FILEMODE gl_FUNC_FPENDING - if test $ac_cv_func___fpending = no; then + if test $gl_cv_func___fpending = no; then AC_LIBOBJ([fpending]) gl_PREREQ_FPENDING fi |