Browse code

configure: simplify $COMPONENT_LIST handling

This lets check_deps set the generic CONFIG_ENCODERS and friends using
an _if_any construct.

Originally committed as revision 22911 to svn://svn.ffmpeg.org/ffmpeg/trunk

Måns Rullgård authored on 2010/04/19 21:49:56
Showing 1 changed files
... ...
@@ -1550,18 +1550,13 @@ INDEV_LIST=$(find_things    indev    _IN      libavdevice/alldevices.c)
1550 1550
 PROTOCOL_LIST=$(find_things protocol PROTOCOL libavformat/allformats.c)
1551 1551
 FILTER_LIST=$(find_things   filter   FILTER   libavfilter/allfilters.c)
1552 1552
 
1553
-enable $ARCH_EXT_LIST \
1554
-       $DECODER_LIST \
1555
-       $ENCODER_LIST \
1556
-       $HWACCEL_LIST \
1557
-       $PARSER_LIST \
1558
-       $BSF_LIST \
1559
-       $DEMUXER_LIST \
1560
-       $MUXER_LIST \
1561
-       $FILTER_LIST \
1562
-       $PROTOCOL_LIST \
1563
-       $INDEV_LIST \
1564
-       $OUTDEV_LIST \
1553
+for n in $COMPONENT_LIST; do
1554
+    v=$(toupper ${n%s})_LIST
1555
+    eval enable \$$v
1556
+    eval ${n}_if_any="\$$v"
1557
+done
1558
+
1559
+enable $ARCH_EXT_LIST
1565 1560
 
1566 1561
 die_unknown(){
1567 1562
     echo "Unknown option \"$1\"."
... ...
@@ -2788,17 +2783,6 @@ fi
2788 2788
 # Find out if the .align argument is a power of two or not.
2789 2789
 check_asm asmalign_pot '".align 3"'
2790 2790
 
2791
-enabled_any $DECODER_LIST      && enable decoders
2792
-enabled_any $ENCODER_LIST      && enable encoders
2793
-enabled_any $HWACCEL_LIST      && enable hwaccels
2794
-enabled_any $BSF_LIST          && enable bsfs
2795
-enabled_any $DEMUXER_LIST      && enable demuxers
2796
-enabled_any $MUXER_LIST        && enable muxers
2797
-enabled_any $FILTER_LIST       && enable filters
2798
-enabled_any $INDEV_LIST        && enable indevs
2799
-enabled_any $OUTDEV_LIST       && enable outdevs
2800
-enabled_any $PROTOCOL_LIST     && enable protocols
2801
-
2802 2791
 enabled_any $THREADS_LIST      && enable threads
2803 2792
 
2804 2793
 check_deps $CONFIG_LIST       \