1 files changed, 22 insertions, 1 deletions
diff --git a/configure b/configure
index ab3936daf..704c3f9d9 100755
--- a/configure
+++ b/configure
@@ -212,6 +212,11 @@ HAVE_LIST="
     pthread_h
     sys_mman_h
 "
+EXPERIMENT_LIST="
+    extend_qrange
+    segmentation
+    csm
+"
 CONFIG_LIST="
     external_build
     install_docs
@@ -252,6 +257,9 @@ CONFIG_LIST="
     small
     postproc_visualizer
     os_support
+
+    experimental
+    ${EXPERIMENT_LIST}
 "
 CMDLINE_SELECT="
     extra_warnings
@@ -291,6 +299,8 @@ CMDLINE_SELECT="
     shared
     small
     postproc_visualizer
+
+    experimental
 "
 
 process_cmdline() {
@@ -298,7 +308,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