diff --git a/config/ChangeLog b/config/ChangeLog
index cf260f0ef0ec8f0f3d48c750f956352ac0da366a..3e6feea1b0d99f5813685eb4fca52216592d7934 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 2f44c9222915760277ccce184532c37028521ae4..fdfa24b5781da114ba6dd5893ca3fabe45b2e919 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"
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index c1d3c63ea99756fc2d42d441950b1ea6617a7c65..6397e2a3b6d66530ea95986c3ff317f2c0976d44 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-12  Ryota Kunisawa  <kunisawa@access.co.jp>
+
+	PR bootstrap/21230
+	* configure: Regenerate.
+
 2005-04-27  Andris Pavenis  <pavenis@latnet.lv>
 
 	* files.c: Include io.h for DJGPP to get prototype of setmode.
diff --git a/libcpp/configure b/libcpp/configure
index 915b4cb77e02cfccffa2f1f0bf2cb10541885d5a..63647450dfc7c869a4df013a3caf8a4fbfb9d18e 100755
--- a/libcpp/configure
+++ b/libcpp/configure
@@ -2757,7 +2757,7 @@ fi
 CFLAGS="$save_CFLAGS"
 
 WARN_PEDANTIC=
-if test $GCC = yes; then
+if test "$GCC" = yes; then
   echo "$as_me:$LINENO: checking whether $CC supports -pedantic -Wno-long-long" >&5
 echo $ECHO_N "checking whether $CC supports -pedantic -Wno-long-long... $ECHO_C" >&6
 if test "${acx_cv_prog_cc_pedantic__Wno_long_long+set}" = set; then