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/ChangeLog b/ChangeLog
index 7f66556a0c7230e8943033db2f8cf09a7b433164..6256e93c0fb2918013e8ea31041c4616ca000fe1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-10-28  Paolo Bonzini  <bonzini@gnu.org>
+
+       * 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.
+
 2008-10-28  Paolo Bonzini  <bonzini@gnu.org>
 
        * lib/autoconf/types.m4 (_AC_CHECK_MEMBER_BODY): New.

diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index 922dda3a533224dec217f46f0773fdf31e8319cd..ccaf3400e8a6fffe2887cb10dc7a15ad0ee42e44 100644 (file)
--- 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 ebe09b6e8ea39e7b12e752d436d3207ba6cba53f..fb6eb0cdac60cf78b45a1bbcf2342e9e96c5cb0f 100644 (file)
--- 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 c435498567063fb6262e8715f725d85034b6ae01..ece74c69a68859d6842f219391a8e97a13ef367a 100644 (file)
--- 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
@@ -859,7 +859,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