har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '62be1caf161c1241a9e148f347850cfe092588dc'

Browse Source 
* commit '62be1caf161c1241a9e148f347850cfe092588dc':
  configure: Bail out early if neither static nor shared libs are built

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-11 23:11:44 -03:00
commit d168ff70ea
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure vendored
View File

@ -3724,6 +3724,17 @@ enable_weak $HWACCEL_AUTODETECT_LIBRARY_LIST
disabled logging && logfile=/dev/null 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() { die_license_disabled() {
enabled $1 || { enabled $v && die "$v is $1 and --enable-$1 is not specified."; } 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 $PATHS_LIST
set_default nm 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 disabled optimizations || enabled ossfuzz || check_cflags -fomit-frame-pointer
enable_weak_pic() { enable_weak_pic() {