aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2016-01-23 19:35:22 +0100
committerLuca Barbato <lu_zero@gentoo.org>2016-02-14 11:44:57 +0100
commita2bb771a3cded8a05137c0effb34f61a2bc78e22 (patch)
treeba3200958d7fe1ba0e666921a3fd527ba06faaa9
parent5e1beec944dacd6b4ed7d710125dd508c41ca969 (diff)
downloadffmpeg-a2bb771a3cded8a05137c0effb34f61a2bc78e22.tar.gz
configure: Restore the --enable-everything behaviour
Make sure that the minimum set of dependencies needed by the tools and the examples are enabled. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rwxr-xr-xconfigure7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure b/configure
index 102ad79b77..9ee700a96b 100755
--- a/configure
+++ b/configure
@@ -2452,8 +2452,6 @@ 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
@@ -2627,6 +2625,7 @@ for opt do
;;
--disable-everything)
map 'eval disable \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST
+ enable_deep_force $EXAMPLE_LIST $LIBRARY_LIST $PROGRAM_LIST
;;
--disable-all)
map 'eval disable \${$(toupper ${v%s})_LIST}' $COMPONENT_LIST
@@ -2692,6 +2691,10 @@ 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.