Revert all recent configure changes related to dependency resolution

This reverts commits 2edc718723, a2bb771a3c, 21c750f240, 8e7bea6dc6.
This commit is contained in:
Diego Biurrun 2016-02-19 11:55:51 +01:00
parent ab9068cc9c
commit b4a0f172c7

77
configure vendored
View File

@ -488,15 +488,8 @@ enable(){
set_all yes $*
}
check_requested() {
for var; do
eval test "x\$${var#!}_requested" = "xyes" && die "${var%%_*} cannot be enabled"
done
}
disable(){
set_all no $*
check_requested $*
}
enable_weak(){
@ -547,32 +540,6 @@ enable_deep_weak(){
done
}
do_enable_deep_force(){
for var; do
enabled $var && continue
eval sel="\$${var}_deps\ \$${var}_deps_any\ \$${var}_select\ \$${var}_suggest\ \$${var}_select_any"
pushvar var
enable_deep_force $sel
popvar var
done
}
enable_deep_force(){
do_enable_deep_force $*
for var; do
is_in $var $ALL_COMPONENTS $COMPONENT_LIST $LIBRARY_LIST && enable $var
done
}
request(){
disable $* # force the refresh of the dependencies
for var; do
enable ${var}_requested
done
enable_deep_force $*
enable $*
}
enabled(){
test "${1#!}" = "$1" && op== || op=!=
eval test "x\$${1#!}" $op "xyes"
@ -632,7 +599,7 @@ do_check_deps(){
append allopts $cfg
eval dep_all="\$${cfg}_deps"
eval dep_any="\$${cfg}_deps_any\ \$${cfg}_select_any"
eval dep_any="\$${cfg}_deps_any"
eval dep_sel="\$${cfg}_select"
eval dep_sgs="\$${cfg}_suggest"
eval dep_ifa="\$${cfg}_if"
@ -2367,7 +2334,7 @@ tls_gnutls_protocol_deps="gnutls"
tls_gnutls_protocol_select="tcp_protocol"
tls_openssl_protocol_deps="openssl !tls_gnutls_protocol"
tls_openssl_protocol_select="tcp_protocol"
tls_protocol_select_any="tls_gnutls_protocol tls_openssl_protocol"
tls_protocol_deps_any="tls_gnutls_protocol tls_openssl_protocol"
udp_protocol_select="network"
unix_protocol_deps="sys_un_h"
unix_protocol_select="network"
@ -2457,6 +2424,8 @@ target_os_default=$(tolower $(uname -s))
host_os=$target_os_default
# configurable options
enable $EXAMPLE_LIST $LIBRARY_LIST $PROGRAM_LIST
enable asm
enable debug
enable doc
@ -2567,6 +2536,12 @@ ALL_COMPONENTS="
$PROTOCOL_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(){
@ -2629,11 +2604,10 @@ for opt do
disable $PROGRAM_LIST
;;
--disable-everything)
map 'eval disable \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST
enable_deep_force $EXAMPLE_LIST $LIBRARY_LIST $PROGRAM_LIST
map 'eval unset \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST
;;
--disable-all)
map 'eval disable \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST
map 'eval unset \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST
disable $LIBRARY_LIST $PROGRAM_LIST doc
;;
--enable-random|--disable-random)
@ -2649,7 +2623,6 @@ for opt do
is_in "${thing}s" $COMPONENT_LIST || die_unknown "$opt"
eval list=\$$(toupper $thing)_LIST
name=$(echo "${optval}" | sed "s/,/_${thing}|/g")_${thing}
test $action = enable && action="request"
$action $(filter "$name" $list)
;;
--enable-avserver|--disable-avserver*)
@ -2659,10 +2632,9 @@ for opt do
--enable-?*|--disable-?*)
eval $(echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g')
if is_in $option $COMPONENT_LIST; then
test $action = enable && action="enable_deep_force"
test $action = disable && action=unset
eval $action \$$(toupper ${option%s})_LIST
elif is_in $option $CMDLINE_SELECT; then
test $action = enable && action="request"
$action $option
else
die_unknown $opt
@ -2697,15 +2669,11 @@ done
disabled logging && logfile=/dev/null
# Enable the default components if not disabled explicitly
enable_weak $EXAMPLE_LIST $LIBRARY_LIST $PROGRAM_LIST
# Disable all the library-specific components if the library itself
# is disabled, see AVCODEC_LIST and following _LIST variables.
disable_components(){
disabled ${1} && disable_weak $(
disabled ${1} && disable $(
eval components="\$$(toupper ${1})_COMPONENTS"
map 'eval echo \${$(toupper ${v%s})_LIST}' $components
)
@ -2713,23 +2681,6 @@ disable_components(){
map 'disable_components $v' $LIBRARY_LIST
# Mark components that had not been enabled/disabled explicitly
# as enabled
for n in $COMPONENT_LIST; do
v=$(toupper ${n%s})_LIST
eval enable_weak \$$v
eval ${n}_if_any="\$$v"
done
# Make so that disabled libraries are enabled if a component
# of them is requested
for n in $LIBRARY_LIST; do
v=$(toupper ${n})_COMPONENTS
eval ${n}_if_any="\$$v"
done
echo "# $0 $LIBAV_CONFIGURATION" > $logfile
set >> $logfile