1 files changed, 22 insertions, 1 deletions
diff --git a/configure b/configure
index cb568d7aa..4aef55166 100755
--- a/configure
+++ b/configure
@@ -213,6 +213,11 @@ HAVE_LIST="
     pthread_h
     sys_mman_h
 "
+EXPERIMENT_LIST="
+    extend_qrange
+    segmentation
+    csm
+"
 CONFIG_LIST="
     external_build
     install_docs
@@ -253,6 +258,9 @@ CONFIG_LIST="
     small
     arm_asm_detok
     postproc_visualizer
+
+    experimental
+    ${EXPERIMENT_LIST}
 "
 CMDLINE_SELECT="
     extra_warnings
@@ -293,6 +301,8 @@ CMDLINE_SELECT="
     small
     arm_asm_detok
     postproc_visualizer
+
+    experimental
 "
 
 process_cmdline() {
@@ -300,7 +310,18 @@ process_cmdline() {
         optval="${opt#*=}"
         case "$opt" in
         --disable-codecs) for c in ${CODECS}; do disable $c; done ;;
-        *) process_common_cmdline "$opt"
+        --enable-?*|--disable-?*)
+        eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`
+        if echo "${EXPERIMENT_LIST}" | grep "^ *$option\$" >/dev/null; then
+            if enabled experimental; then
+                $action $option
+            else
+                log_echo "Ignoring $opt -- not in experimental mode."
+            fi
+        else
+            process_common_cmdline "$opt"
+        fi
+        ;;
         ;;
         esac
     done