[PATCH] uh-oh, AS_ESCAPE was used wrong

[Paolo Bonzini]

My fault.  An argument of AS_ESCAPE was mistakenly placed into the inner
macro, AC_INCLUDES_DEFAULT.  I'll push this as obvious.

Unfortunately, this was not covered by the testsuite, which does not
test sane results of the check for common header files at the end of
AC_PROG_CC.

Paolo

2008-10-28  Paolo Bonzini  <address@hidden>

        Fix AS_ESCAPE usage together with AC_INCLUDES_DEFAULT.
        * lib/autoconf/general.m4 (AC_CHECK_DECL): Fix AS_ESCAPE usage.
        * lib/autoconf/headers.m4 (_AC_CHECK_HEADER_MONGREL,
        _AC_CHECK_HEADER_NEW): Likewise.
        * lib/autoconf/types.m4 (_AC_CHECK_TYPE_NEW, AC_CHECK_MEMBER): Likewise.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 922dda3..ccaf340 100644
--- a/lib/autoconf/general.m4
+++ b/lib/autoconf/general.m4
@@ -2742,7 +2742,7 @@ AC_DEFUN([AC_CHECK_DECL],
   [_$0_BODY])]dnl
 [AS_VAR_PUSHDEF([ac_Symbol], [ac_cv_have_decl_$1])]dnl
 [ac_func_[]_AC_LANG_ABBREV[]_check_decl ]dnl
-["$LINENO" "$1" "ac_Symbol" "AS_ESCAPE([AC_INCLUDES_DEFAULT([$4], [""])])"
+["$LINENO" "$1" "ac_Symbol" "AS_ESCAPE([AC_INCLUDES_DEFAULT([$4])], [""])"
 AS_VAR_IF([ac_Symbol], [yes], [$2], [$3])
 AS_VAR_POPDEF([ac_Symbol])dnl
 ])# AC_CHECK_DECL
diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4
index ebe09b6..fb6eb0c 100644
--- a/lib/autoconf/headers.m4
+++ b/lib/autoconf/headers.m4
@@ -160,7 +160,7 @@ m4_define([_AC_CHECK_HEADER_MONGREL],
   [$0_BODY])]dnl
 [AS_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])]dnl
 [ac_func_[]_AC_LANG_ABBREV[]_check_header_mongrel ]dnl
-["$LINENO" "$1" "ac_Header" "AS_ESCAPE([AC_INCLUDES_DEFAULT([$4], [""])])"
+["$LINENO" "$1" "ac_Header" "AS_ESCAPE([AC_INCLUDES_DEFAULT([$4])], [""])"
 AS_VAR_IF([ac_Header], [yes], [$2], [$3])
 AS_VAR_POPDEF([ac_Header])])# _AC_CHECK_HEADER_MONGREL
 
@@ -192,7 +192,7 @@ AC_DEFUN([_AC_CHECK_HEADER_NEW],
   [$0_BODY])]dnl
 [AS_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])]dnl
 [ac_func_[]_AC_LANG_ABBREV[]_check_header_new ]dnl
-["$LINENO" "$1" "ac_Header" "AS_ESCAPE([AC_INCLUDES_DEFAULT([$4], [""])])"
+["$LINENO" "$1" "ac_Header" "AS_ESCAPE([AC_INCLUDES_DEFAULT([$4])], [""])"
 AS_VAR_IF([ac_Header], [yes], [$2], [$3])
 AS_VAR_POPDEF([ac_Header])])# _AC_CHECK_HEADER_NEW
 
diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4
index ffd5c24..7f10ebf 100644
--- a/lib/autoconf/types.m4
+++ b/lib/autoconf/types.m4
@@ -175,7 +175,7 @@ AC_DEFUN([_AC_CHECK_TYPE_NEW],
     [$0_BODY])]dnl
 [AS_VAR_PUSHDEF([ac_Type], [ac_cv_type_$1])]dnl
 [ac_func_[]_AC_LANG_ABBREV[]_check_type "$LINENO" "$1" "ac_Type" ]dnl
-["AS_ESCAPE([AC_INCLUDES_DEFAULT([$4], [""])])"
+["AS_ESCAPE([AC_INCLUDES_DEFAULT([$4])], [""])"
 AS_VAR_IF([ac_Type], [yes], [$2], [$3])
 AS_VAR_POPDEF([ac_Type])dnl
 ])# _AC_CHECK_TYPE_NEW
@@ -896,7 +896,7 @@ AC_DEFUN([AC_CHECK_MEMBER],
 [AS_VAR_PUSHDEF([ac_Member], [ac_cv_member_$1])]dnl
 [ac_func_[]_AC_LANG_ABBREV[]_check_member "$LINENO" ]dnl
 [m4_bpatsubst([$1], [^\([^.]*\)\.\(.*\)], ["\1" "\2"]) "ac_Member" ]dnl
-["AS_ESCAPE([AC_INCLUDES_DEFAULT([$4], [""])])"
+["AS_ESCAPE([AC_INCLUDES_DEFAULT([$4])], [""])"
 AS_VAR_IF([ac_Member], [yes], [$2], [$3])
 AS_VAR_POPDEF([ac_Member])dnl
 ])# AC_CHECK_MEMBER