---
configure | 33 +++++++++++++--------------------
1 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/configure b/configure
index 2894d6f..57a3891 100755
--- a/configure
+++ b/configure
@@ -980,6 +980,15 @@ COMPONENT_LIST="
protocols
"
+LIBRARY_LIST="
+ avcodec
+ avdevice
+ avfilter
+ avformat
+ avresample
+ swscale
+"
+
PROGRAM_LIST="
avconv
avplay
@@ -989,12 +998,8 @@ PROGRAM_LIST="
CONFIG_LIST="
$COMPONENT_LIST
+ $LIBRARY_LIST
$PROGRAM_LIST
- avcodec
- avdevice
- avfilter
- avformat
- avresample
avisynth
bzlib
dct
@@ -1047,7 +1052,6 @@ CONFIG_LIST="
small
sram
static
- swscale
swscale_alpha
thumb
vaapi
@@ -1782,13 +1786,8 @@ host_os=$target_os_default
# configurable options
enable $PROGRAM_LIST
-enable avcodec
-enable avdevice
-enable avfilter
-enable avformat
-enable avresample
+enable $LIBRARY_LIST
enable avutil
-enable swscale
enable asm
enable debug
@@ -3795,7 +3794,7 @@ SAMPLES:=${samples:-\$(LIBAV_SAMPLES)}
EOF
get_version(){
- lcname=$1
+ lcname=lib${1}
name=$(toupper $lcname)
file=$source_path/$lcname/version.h
eval $(awk "/#define ${name}_VERSION_M/ { print \$2 \"=\" \$3 }" "$file")
@@ -3804,13 +3803,7 @@ get_version(){
eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak
}
-get_version libavcodec
-get_version libavdevice
-get_version libavfilter
-get_version libavformat
-get_version libavresample
-get_version libavutil
-get_version libswscale
+map 'get_version $v' $LIBRARY_LIST avutil
cat > $TMPH <<EOF
/* Automatically generated by configure - do not modify! */
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
