Use the new AS_FOR function.

* lib/autoconf/functions.m4 (AC_CHECK_FUNCS): Use new
abstraction for cleaner code.
* lib/autoconf/headers.m4 (AC_CHECK_HEADERS): Likewise.

Signed-off-by: Eric Blake <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index f99863f041f0a6d3482ef1f840de36fdb008ce67..81f28fbf3ccafe562b1e1eeedd3c18699eaa2530 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-11-15  Eric Blake  <ebb9@byu.net>
 
+       Use the new AS_FOR function.
+       * lib/autoconf/functions.m4 (AC_CHECK_FUNCS): Use new
+       abstraction for cleaner code.
+       * lib/autoconf/headers.m4 (AC_CHECK_HEADERS): Likewise.
+
        Add AS_FOR, undocumented for now.
        * lib/m4sugar/m4sh.m4 (AS_FOR): New macro.
        * tests/m4sh.at (AS@&t@_FOR): New test.

diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4
index ebd7403ff87680e6241fb9c0412250b47b0c9649..0e22efc1cc4010ff3ecaa14bdcb8623233ac267c 100644 (file)
--- a/lib/autoconf/functions.m4
+++ b/lib/autoconf/functions.m4
@@ -108,15 +108,11 @@ m4_define([_AH_CHECK_FUNC],
 # `break' to stop the search.
 AC_DEFUN([AC_CHECK_FUNCS],
 [m4_map_args_w([$1], [_AH_CHECK_FUNC(], [)])]dnl
-[m4_pushdef([AC_func], m4_if(m4_index(m4_translit([$1], [      ][
-$`], [    ]), [ ]), [-1], [[$1]], [[$ac_func]]))]dnl
-[for ac_func in $1
-do
-AC_CHECK_FUNC(AC_func,
-             [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_]AC_func)) $2],
-             [$3])dnl
-done
-_m4_popdef([AC_func])])
+[AS_FOR([AC_func], [ac_func], [$1],
+[AC_CHECK_FUNC(AC_func,
+              [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_]AC_func)) $2],
+              [$3])dnl])
+])# AC_CHECK_FUNCS
 
 
 # _AC_CHECK_FUNC_ONCE(FUNCTION)

diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4
index bf2cb7a13b3e4215d15f301192d414599385d4a5..56bbb39ac967f2f27e728bdc82dfacdbd5190fd6 100644 (file)
--- a/lib/autoconf/headers.m4
+++ b/lib/autoconf/headers.m4
@@ -245,16 +245,11 @@ m4_define([_AH_CHECK_HEADER],
 # header.  Either ACTION may include `break' to stop the search.
 AC_DEFUN([AC_CHECK_HEADERS],
 [m4_map_args_w([$1], [_AH_CHECK_HEADER(], [)])]dnl
-[m4_pushdef([AC_header], m4_if(m4_index(m4_translit([$1], [    ][
-$`], [    ]), [ ]), [-1], [[$1]], [[$ac_header]]))]dnl
-[for ac_header in $1
-do
-AC_CHECK_HEADER(AC_header,
-               [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_]AC_header)) $2],
-               [$3],
-               [$4])dnl
-done
-_m4_popdef([AC_header])])# AC_CHECK_HEADERS
+[AS_FOR([AC_header], [ac_header], [$1],
+[AC_CHECK_HEADER(AC_header,
+                [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_]AC_header)) $2],
+                [$3], [$4])dnl])
+])# AC_CHECK_HEADERS
 
 
 # _AC_CHECK_HEADER_ONCE(HEADER-FILE)