diff --git a/ChangeLog b/ChangeLog
index 3f57e6d5f..1ddb64dbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-24  Roland Illig  <roland.illig@gmx.de>
+
+	* configure.ac: Only add "-Wall" to CFLAGS if GCC is set to "yes".
+
 2004-10-23  Roland Illig  <roland.illig@gmx.de>
 
 	* TODO: Check proper quoting in vfs/extfs/*.
diff --git a/configure.ac b/configure.ac
index 843f1d279..2f63ae6d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -552,7 +552,9 @@ fi
 
 if test x"$USE_MAINTAINER_MODE" = x"yes"; then
     if test x"${enable_gcc_warnings+set}" != x"set"; then
-        CFLAGS="-Wall $CFLAGS"
+        if test x"${GCC}" = x"yes"; then
+            CFLAGS="-Wall $CFLAGS"
+        fi
     fi
 fi