Commit cefad29d authored by Derek Buitenhuis's avatar Derek Buitenhuis

configure: Revert recent changes to disable-everything

These will be re-merged once it's been fixed properly.

This reverts:
 * Commit '8e7bea6d'
   configure: Improve requesting specific features
 * Commit 'e93aa2c9'
   configure: Force-enable select_any dependencies only on --enable
Signed-off-by: 's avatarDerek Buitenhuis <derek.buitenhuis@gmail.com>
parent 5889bc16
......@@ -581,15 +581,8 @@ enable(){
set_all yes $*
}
check_requested() {
for var; do
eval test "x\$${var#!}_requested" = "xyes" && die "${var#*_} ${var/_*} cannot be enabled"
done
}
disable(){
set_all no $*
check_requested $*
}
enable_weak(){
......@@ -640,28 +633,6 @@ enable_deep_weak(){
done
}
do_enable_deep_force(){
for var; do
enabled $var && continue
eval sel="\$${var}_select\ \$${var}_suggest\ \$${var}_select_any"
pushvar var
enable_deep_force $sel
popvar var
done
}
enable_deep_force(){
do_enable_deep_force $*
enable $*
}
request(){
for var; do
enable ${var}_requested
done
enable_deep_force $*
}
enabled(){
test "${1#!}" = "$1" && op='=' || op=!=
eval test "x\$${1#!}" $op "xyes"
......@@ -721,7 +692,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"
......@@ -2861,7 +2832,7 @@ tls_schannel_protocol_deps="schannel"
tls_schannel_protocol_select="tcp_protocol"
tls_securetransport_protocol_deps="securetransport"
tls_securetransport_protocol_select="tcp_protocol"
tls_protocol_select_any="tls_schannel_protocol tls_securetransport_protocol tls_gnutls_protocol tls_openssl_protocol"
tls_protocol_deps_any="tls_schannel_protocol tls_securetransport_protocol tls_gnutls_protocol tls_openssl_protocol"
udp_protocol_select="network"
udplite_protocol_select="network"
unix_protocol_deps="sys_un_h"
......@@ -3171,6 +3142,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(){
......@@ -3237,10 +3214,10 @@ for opt do
disable $PROGRAM_LIST
;;
--disable-everything)
map 'eval disable \${$(toupper ${v%s})_LIST}' $COMPONENT_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 avutil
;;
......@@ -3257,7 +3234,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"
list=$(filter "$name" $list)
[ "$list" = "" ] && warn "Option $opt did not match anything"
$action $list
......@@ -3265,6 +3241,7 @@ for opt do
--enable-?*|--disable-?*)
eval $(echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g')
if is_in $option $COMPONENT_LIST; then
test $action = disable && action=unset
eval $action \$$(toupper ${option%s})_LIST
elif is_in $option $CMDLINE_SELECT; then
$action $option
......@@ -3307,7 +3284,7 @@ disabled logging && logfile=/dev/null
# 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
)
......@@ -3315,25 +3292,6 @@ disable_components(){
map 'disable_components $v' $LIBRARY_LIST
echo "# $0 $FFMPEG_CONFIGURATION" > $logfile
# 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 $FFMPEG_CONFIGURATION" > $logfile
set >> $logfile
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment