[FFmpeg-cvslog] configure: Restore the --enable-everything behaviour

Luca Barbato git at videolan.org
Wed Feb 17 16:40:14 CET 2016


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Sat Jan 23 19:35:22 2016 +0100| [a2bb771a3cded8a05137c0effb34f61a2bc78e22] | committer: Luca Barbato

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 at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a2bb771a3cded8a05137c0effb34f61a2bc78e22
---

 configure |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 102ad79..9ee700a 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.
 



More information about the ffmpeg-cvslog mailing list