aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-04-19 12:49:56 +0000
committerMåns Rullgård <mans@mansr.com>2010-04-19 12:49:56 +0000
commit8469ae22a89061ed681fd436a0ca6509bf92995c (patch)
tree5c86e3cdd7e17ba427f1355a815a9bf8b2fb429f
parent0afab17ef9580aa1b9e6084751088cf59b7f1781 (diff)
downloadffmpeg-8469ae22a89061ed681fd436a0ca6509bf92995c.tar.gz
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
-rwxr-xr-xconfigure30
1 files changed, 7 insertions, 23 deletions
diff --git a/configure b/configure
index d8ca0e4b97..02ea987755 100755
--- a/configure
+++ b/configure
@@ -1550,18 +1550,13 @@ INDEV_LIST=$(find_things indev _IN libavdevice/alldevices.c)
PROTOCOL_LIST=$(find_things protocol PROTOCOL libavformat/allformats.c)
FILTER_LIST=$(find_things filter FILTER libavfilter/allfilters.c)
-enable $ARCH_EXT_LIST \
- $DECODER_LIST \
- $ENCODER_LIST \
- $HWACCEL_LIST \
- $PARSER_LIST \
- $BSF_LIST \
- $DEMUXER_LIST \
- $MUXER_LIST \
- $FILTER_LIST \
- $PROTOCOL_LIST \
- $INDEV_LIST \
- $OUTDEV_LIST \
+for n in $COMPONENT_LIST; do
+ v=$(toupper ${n%s})_LIST
+ eval enable \$$v
+ eval ${n}_if_any="\$$v"
+done
+
+enable $ARCH_EXT_LIST
die_unknown(){
echo "Unknown option \"$1\"."
@@ -2788,17 +2783,6 @@ fi
# Find out if the .align argument is a power of two or not.
check_asm asmalign_pot '".align 3"'
-enabled_any $DECODER_LIST && enable decoders
-enabled_any $ENCODER_LIST && enable encoders
-enabled_any $HWACCEL_LIST && enable hwaccels
-enabled_any $BSF_LIST && enable bsfs
-enabled_any $DEMUXER_LIST && enable demuxers
-enabled_any $MUXER_LIST && enable muxers
-enabled_any $FILTER_LIST && enable filters
-enabled_any $INDEV_LIST && enable indevs
-enabled_any $OUTDEV_LIST && enable outdevs
-enabled_any $PROTOCOL_LIST && enable protocols
-
enabled_any $THREADS_LIST && enable threads
check_deps $CONFIG_LIST \