diff --git a/config/ChangeLog b/config/ChangeLog
index cf260f0ef..3e6feea1b 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-12  Ryota Kunisawa  <kunisawa@access.co.jp>
+
+	PR bootstrap/21230
+	* warnings.m4 (ACX_PROG_CC_WARNING_ALMOST_PEDANTIC): Add
+	double quotes around GCC variable.
+
 2005-04-29  Paolo Bonzini  <bonzini@gnu.org>
 
 	* acx.m4 (ACX_PROG_GNAT): Remove stray break.
diff --git a/config/warnings.m4 b/config/warnings.m4
index 2f44c9222..fdfa24b57 100644
--- a/config/warnings.m4
+++ b/config/warnings.m4
@@ -50,7 +50,7 @@ AC_DEFUN([ACX_PROG_CC_WARNING_ALMOST_PEDANTIC],
 AC_SUBST([WARN_PEDANTIC])dnl
 AS_VAR_PUSHDEF([acx_Pedantic], [acx_cv_prog_cc_pedantic_$1])dnl
 WARN_PEDANTIC=
-AS_IF([test $GCC = yes],
+AS_IF([test "$GCC" = yes],
 [AC_CACHE_CHECK([whether $CC supports -pedantic $1], acx_Pedantic,
 [save_CFLAGS="$CFLAGS"
 CFLAGS="-pedantic $1"