diff options
| author | Zack Weinberg <zackw@panix.com> | 2013-09-14 12:42:15 -0400 |
|---|---|---|
| committer | Zack Weinberg <zackw@panix.com> | 2013-09-21 19:38:17 -0400 |
| commit | bb7b27a9c7ef873453da277522bf0cd24cb9b96b (patch) | |
| tree | 3ee5e1d89a5fb0549f2963d8374b071327a2d976 | |
| parent | 86c213d0e355296f026a36e3203c0813041aae89 (diff) | |
| download | autoconf-bb7b27a9c7ef873453da277522bf0cd24cb9b96b.tar.gz | |
Use AC_CHECK_HEADERS_ONCE for the tests done by AC_INCLUDES_DEFAULT.
* lib/autoconf/headers.m4 (AC_CHECK_HEADERS_ONCE): Divide into a public
macro that AC_REQUIREs _AC_INCLUDES_DEFAULT_REQUIREMENTS, and ...
(_AC_CHECK_HEADERS_ONCE): ... a private macro, that doesn't.
(_AC_HEADERS_EXPANSION): Use $ac_includes_default, not
AC_INCLUDES_DEFAULT.
(_AC_INCLUDES_DEFAULT_REQUIREMENTS): Use AC_CHECK_HEADERS_ONCE.
| -rw-r--r-- | lib/autoconf/headers.m4 | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4 index 634cf45b..c36e406a 100644 --- a/lib/autoconf/headers.m4 +++ b/lib/autoconf/headers.m4 @@ -204,15 +204,19 @@ _AC_HEADERS_EXPANSION])AC_REQUIRE([_AC_Header_]m4_translit([[$1]], # ------------------------------------- # Add each whitespace-separated name in HEADER-FILE to the list of # headers to check once. +# Note: has intimate knowledge of how AC_INCLUDES_DEFAULT works, +# and vice versa. AC_DEFUN([AC_CHECK_HEADERS_ONCE], -[m4_map_args_w([$1], [_AC_CHECK_HEADER_ONCE(], [)])]) + [AC_REQUIRE([_AC_INCLUDES_DEFAULT_REQUIREMENTS])]dnl + [_AC_CHECK_HEADERS_ONCE([$1])]) + +AC_DEFUN([_AC_CHECK_HEADERS_ONCE], + [m4_map_args_w([$1], [_AC_CHECK_HEADER_ONCE(], [)])]) m4_define([_AC_HEADERS_EXPANSION], -[ - m4_divert_text([DEFAULTS], [ac_header_list=]) - AC_CHECK_HEADERS([$ac_header_list], [], [], [AC_INCLUDES_DEFAULT]) - m4_define([_AC_HEADERS_EXPANSION], []) -]) + [m4_divert_text([DEFAULTS], [ac_header_list=])]dnl + [AC_CHECK_HEADERS([$ac_header_list], [], [], [$ac_includes_default])]dnl + [m4_define([_AC_HEADERS_EXPANSION], [])]) @@ -256,7 +260,7 @@ ac_includes_default="\ # include <unistd.h> #endif" ])]dnl -[AC_CHECK_HEADERS( +[_AC_CHECK_HEADERS_ONCE( [sys/types.h sys/stat.h strings.h inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])]dnl dnl For backward compatibility, provide unconditional AC_DEFINEs of |