aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-11-11 23:11:44 -0300
committerJames Almer <jamrial@gmail.com>2017-11-11 23:11:44 -0300
commitd168ff70ea41234b01c21e2d19151e9db3a21f90 (patch)
treef82b2aa7c467858f8a5c8beac41094bd8cdbb156
parent3e9fd83592cf102a40512386fdca5a4a3f5a06fb (diff)
parent62be1caf161c1241a9e148f347850cfe092588dc (diff)
downloadffmpeg-d168ff70ea41234b01c21e2d19151e9db3a21f90.tar.gz
Merge commit '62be1caf161c1241a9e148f347850cfe092588dc'
* commit '62be1caf161c1241a9e148f347850cfe092588dc': configure: Bail out early if neither static nor shared libs are built Merged-by: James Almer <jamrial@gmail.com>
-rwxr-xr-xconfigure22
1 files 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() {