diff --git a/ChangeLog b/ChangeLog
index 3f92a4419..466208a62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-15  Erwann Chenede  <erwann.chenede@sun.com>
+
+	* configure.in: fix build on Solaris.  Closes #564123.
+
 2008-12-02  Thomas Thurman  <tthurman@gnome.org>
 
         * configure.in: Post-release bump to 2.25.55.
diff --git a/configure.in b/configure.in
index 86519155f..9edcfff15 100644
--- a/configure.in
+++ b/configure.in
@@ -484,7 +484,9 @@ if test "x$enable_debug" = "xyes"; then
 fi
 
 # Warnings are there for a reason
-CFLAGS="$CFLAGS -Wall -Werror -ansi"
+if test "x$GCC" = "xyes"; then
+  CFLAGS="$CFLAGS -Wall -Werror -ansi"
+fi
 
 # Use gnome-doc-utils:
 GNOME_DOC_INIT([0.8.0])