diff options
| author | Colin Watson <cjwatson@debian.org> | 2010-01-31 03:41:16 +0000 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2010-01-31 03:41:16 +0000 |
| commit | 3dc8f6d688ea217738895cc3b121d6b77da03351 (patch) | |
| tree | 50927f15ba5f1d74a4a4b97e879ce039dd6946fa /gnulib/m4/sys_select_h.m4 | |
| parent | deff3e659e9a1a2eaa59d6389e58e7f1f930b054 (diff) | |
Upgrade to Automake 1.11.1 and Gnulib 20100109.
Diffstat (limited to 'gnulib/m4/sys_select_h.m4')
| -rw-r--r-- | gnulib/m4/sys_select_h.m4 | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/gnulib/m4/sys_select_h.m4 b/gnulib/m4/sys_select_h.m4 index 0bb097e1..6ce09dbd 100644 --- a/gnulib/m4/sys_select_h.m4 +++ b/gnulib/m4/sys_select_h.m4 @@ -1,5 +1,5 @@ -# sys_select_h.m4 serial 8 -dnl Copyright (C) 2006-2009 Free Software Foundation, Inc. +# sys_select_h.m4 serial 10 +dnl Copyright (C) 2006-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,7 +17,7 @@ AC_DEFUN([gl_HEADER_SYS_SELECT], dnl 2. On OSF/1 4.0, <sys/select.h> provides only a forward declaration dnl of 'struct timeval', and no definition of this type. AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/select.h>]], - [[struct timeval b;]])], + [[struct timeval b;]])], [gl_cv_header_sys_select_h_selfcontained=yes], [gl_cv_header_sys_select_h_selfcontained=no]) dnl Test against another bug: @@ -45,20 +45,17 @@ AC_DEFUN([gl_HEADER_SYS_SELECT], ]) fi ]) - if test $gl_cv_header_sys_select_h_selfcontained = yes; then - SYS_SELECT_H='' + AC_CHECK_HEADERS_ONCE([sys/select.h]) + gl_CHECK_NEXT_HEADERS([sys/select.h]) + if test $ac_cv_header_sys_select_h = yes; then + HAVE_SYS_SELECT_H=1 else - SYS_SELECT_H='sys/select.h' - gl_CHECK_NEXT_HEADERS([sys/select.h]) - if test $ac_cv_header_sys_select_h = yes; then - HAVE_SYS_SELECT_H=1 - else - HAVE_SYS_SELECT_H=0 - fi - AC_SUBST([HAVE_SYS_SELECT_H]) + HAVE_SYS_SELECT_H=0 + fi + AC_SUBST([HAVE_SYS_SELECT_H]) + if test $gl_cv_header_sys_select_h_selfcontained != yes; then gl_PREREQ_SYS_H_WINSOCK2 fi - AC_SUBST([SYS_SELECT_H]) ]) AC_DEFUN([gl_SYS_SELECT_MODULE_INDICATOR], |