ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Sat Nov 11 23:11:44 2017 -0300| [d168ff70ea41234b01c21e2d19151e9db3a21f90] | committer: James Almer
Merge commit '62be1caf161c1241a9e148f347850cfe092588dc' * commit '62be1caf161c1241a9e148f347850cfe092588dc': configure: Bail out early if neither static nor shared libs are built Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d168ff70ea41234b01c21e2d19151e9db3a21f90 --- configure | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/configure b/configure index b5a45ef7d8..ffe5278f9c 100755 --- a/configure +++ b/configure @@ -3724,6 +3724,17 @@ enable_weak $HWACCEL_AUTODETECT_LIBRARY_LIST disabled logging && logfile=/dev/null +# we need to build at least one lib type +if ! enabled_any static shared; then + cat <<EOF +At least one library type must be built. +Specify --enable-static to build the static libraries or --enable-shared to +build the shared libraries as well. To only build the shared libraries specify +--disable-static in addition to --enable-shared. +EOF + exit 1 +fi + die_license_disabled() { enabled $1 || { enabled $v && die "$v is $1 and --enable-$1 is not specified."; } } @@ -5307,17 +5318,6 @@ set_default libdir set_default $PATHS_LIST set_default nm -# we need to build at least one lib type -if ! enabled_any static shared; then - cat <<EOF -At least one library type must be built. -Specify --enable-static to build the static libraries or --enable-shared to -build the shared libraries as well. To only build the shared libraries specify ---disable-static in addition to --enable-shared. -EOF - exit 1 -fi - disabled optimizations || enabled ossfuzz || check_cflags -fomit-frame-pointer enable_weak_pic() { ====================================================================== diff --cc configure index b5a45ef7d8,70463ae2c8..ffe5278f9c --- a/configure +++ b/configure @@@ -3705,25 -2855,20 +3705,36 @@@ for e in $env; d eval "export $e" done +if disabled autodetect; then + + # Unless iconv is explicitely disabled by the user, we still want to probe + # for the iconv from the libc. + disabled iconv || enable libc_iconv + + disable_weak $EXTERNAL_AUTODETECT_LIBRARY_LIST + disable_weak $HWACCEL_AUTODETECT_LIBRARY_LIST +fi +# Mark specifically enabled, but normally autodetected libraries as requested. +for lib in $AUTODETECT_LIBS; do + enabled $lib && request $lib +done +#TODO: switch to $AUTODETECT_LIBS when $THREADS_LIST is supported the same way +enable_weak $EXTERNAL_AUTODETECT_LIBRARY_LIST +enable_weak $HWACCEL_AUTODETECT_LIBRARY_LIST + disabled logging && logfile=/dev/null + # we need to build at least one lib type + if ! enabled_any static shared; then + cat <<EOF + At least one library type must be built. + Specify --enable-static to build the static libraries or --enable-shared to + build the shared libraries as well. To only build the shared libraries specify + --disable-static in addition to --enable-shared. + EOF + exit 1 + fi + -# Die early if licensing-related configure options are incompatible. die_license_disabled() { enabled $1 || { enabled $v && die "$v is $1 and --enable-$1 is not specified."; } } @@@ -5307,18 -4195,7 +5318,7 @@@ set_default libdi set_default $PATHS_LIST set_default nm - # we need to build at least one lib type - if ! enabled_any static shared; then - cat <<EOF - At least one library type must be built. - Specify --enable-static to build the static libraries or --enable-shared to - build the shared libraries as well. To only build the shared libraries specify - --disable-static in addition to --enable-shared. - EOF - exit 1 - fi - -disabled optimizations || check_cflags -fomit-frame-pointer +disabled optimizations || enabled ossfuzz || check_cflags -fomit-frame-pointer enable_weak_pic() { disabled pic && return _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
