From b22c8ec5c74e75cf579aad50e3948e8c01f9d343 Mon Sep 17 00:00:00 2001
From: Guillaume Bonnet <guillaumebonnet10@gmail.com>
Date: Thu, 21 Jan 2016 18:18:43 +0100
Subject: [PATCH] configure: Support --disable-option-checking

---
 configure | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index fdef550a645..3a9051051da 100755
--- a/configure
+++ b/configure
@@ -585,6 +585,7 @@ fi
 BOOL_OPTIONS=""
 VAL_OPTIONS=""
 
+opt option-checking 1 "complain about unrecognized options"
 opt debug 0 "debug mode; disables optimization unless \`--enable-optimize\` given"
 opt valgrind 0 "run tests with valgrind (memcheck by default)"
 opt helgrind 0 "run tests with helgrind instead of memcheck"
@@ -674,8 +675,11 @@ then
 fi
 
 # Validate Options
-step_msg "validating $CFG_SELF args"
-validate_opt
+if [ -z "$CFG_DISABLE_OPTION_CHECKING" ]
+then
+    step_msg "validating $CFG_SELF args"
+    validate_opt
+fi
 
 # Validate the release channel, and configure options
 case "$CFG_RELEASE_CHANNEL" in