2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index b9f113a964..d61e45ce9d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,6 @@ MODULE_DIRS :=
 # Load the make rules generated by configure
 include config.mak
 
-# Uncomment this for stricter compile time code verification
-# CXXFLAGS+= -Werror
-
 CXXFLAGS:= -Wall $(CXXFLAGS)
 CXXFLAGS+= -O -Wuninitialized
 CXXFLAGS+= -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
diff --git a/configure b/configure
index fa50895deb..55aedb9421 100755
--- a/configure
+++ b/configure
@@ -291,6 +291,7 @@ Special configuration feature:
 
 Optional Features:
   --disable-debug          disable building with debugging symbols
+  --enable-Werror          treat warnings as errors
   --disable-scumm          don't build the SCUMM engine
   --disable-scumm-7-8      exclude v7 and v8 game in SCUMM engine (ft, dig, comi and demos)
   --disable-he             exclude HE70+ games in SCUMM engine
@@ -444,6 +445,9 @@ for ac_option in $@; do
       --disable-debug)
         DEBFLAGS=""
         ;;
+      --enable-Werror)
+        CXXFLAGS="$CXXFLAGS -Werror"
+        ;;
       --enable-release)
         DEBFLAGS="-O2"
         ;;