Merge commit 'd0adf55c05beaf80420747dded2d1884bff377ec'

* commit 'd0adf55c05beaf80420747dded2d1884bff377ec':
  configure: Split some logical blocks off from CONFIG_LIST

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 35 insertions, 23 deletions

diff --git a/configure b/configure
index f5f175e403..2f9d23a7ff 100755
--- a/configure
+++ b/configure
@@ -1350,6 +1350,19 @@ DOCUMENT_LIST="
     txtpages
 "
 
+FEATURE_LIST="
+    ftrapv
+    gray
+    hardcoded_tables
+    runtime_cpudetect
+    safe_bitstream_reader
+    shared
+    small
+    sram
+    static
+    swscale_alpha
+"
+
 HWACCEL_LIST="
     dxva2
     vaapi
@@ -1370,6 +1383,12 @@ LIBRARY_LIST="
     swscale
 "
 
+LICENSE_LIST="
+    gpl
+    nonfree
+    version3
+"
+
 PROGRAM_LIST="
     ffplay
     ffprobe
@@ -1377,46 +1396,39 @@ PROGRAM_LIST="
     ffmpeg
 "
 
+SUBSYSTEM_LIST="
+    dct
+    dwt
+    error_resilience
+    fast_unaligned
+    fft
+    lsp
+    lzo
+    mdct
+    network
+    rdft
+"
+
 CONFIG_LIST="
     $COMPONENT_LIST
     $DOCUMENT_LIST
     $EXAMPLE_LIST
     $EXTERNAL_LIBRARY_LIST
+    $FEATURE_LIST
     $HWACCEL_LIST
+    $LICENSE_LIST
     $LIBRARY_LIST
     $PROGRAM_LIST
-    dct
-    dwt
-    error_resilience
-    fast_unaligned
-    fft
-    ftrapv
-    gpl
-    gray
-    hardcoded_tables
+    $SUBSYSTEM_LIST
     incompatible_libav_abi
     incompatible_fork_abi
-    lsp
-    lzo
-    mdct
     memalign_hack
     memory_poisoning
     neon_clobber_test
-    network
-    nonfree
     pic
     pod2man
     raise_major
-    rdft
-    runtime_cpudetect
-    safe_bitstream_reader
-    shared
-    small
-    sram
-    static
-    swscale_alpha
     thumb
-    version3
     xmm_clobber_test
 "