diff --git a/ChangeLog b/ChangeLog
index eafcd7ac7..784154b62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-07  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
+
+	* configure.ac: Do not run CF_GXX_WARNINGS unless they are enabled.
+
 2010-10-07  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
 
 	Hide the safra_tree_automaton type from the public interface.
diff --git a/configure.ac b/configure.ac
index 226b955af..a2f36f91c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,9 @@ AC_CHECK_FUNCS([srand48 drand48])
 LT_INIT([win32-dll])
 
 spot_INTEL
-CF_GXX_WARNINGS
+if test x$enable_warnings = xyes; then
+  CF_GXX_WARNINGS
+fi
 adl_ENABLE_DEBUG
 ad_GCC_OPTIM
 adl_NDEBUG