summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2013-07-01 18:47:09 +0200
committerStefano Sabatini <stefasab@gmail.com>2013-07-03 13:16:33 +0200
commit5efbeae38cdcf8ed099be06f59fb422b5004e163 (patch)
tree353af057f3746207ef8f3eb437039b60a5219d36 /configure
parent7c71ef4f1727e6a59b7266ef04be1076b6363b61 (diff)
configure: rename have_incompatible_fork_abi -> have_incompatible_libav_abi
"Fork" is an ambiguous term, since there may be more than one fork, also "fork" could be confused with the corresponding function. Also it seems important to point the name of the referenced fork in the symbol. Note: the old --enable-incompatible-fork-abi command is retained for compatibility, although it should be considered deprecated.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 8 insertions, 0 deletions
diff --git a/configure b/configure
index dd6e9510b0..130e2b4e88 100755
--- a/configure
+++ b/configure
@@ -102,6 +102,8 @@ Configuration options:
--enable-gray enable full grayscale support (slower color)
--disable-swscale-alpha disable alpha channel support in swscale
--disable-all disable building components, libraries and programs
+ --enable-incompatible-libav-abi enable incompatible Libav fork ABI [no]
+ --enable-incompatible-fork-abi enable incompatible Libav fork ABI (deprecated) [no]
Program options:
--disable-programs do not build command line programs
@@ -1259,6 +1261,7 @@ CONFIG_LIST="
gpl
gray
hardcoded_tables
+ incompatible_libav_abi
incompatible_fork_abi
lsp
lzo
@@ -1365,6 +1368,7 @@ HAVE_LIST_CMDLINE='
HAVE_LIST_PUB='
bigendian
fast_unaligned
+ incompatible_libav_abi
incompatible_fork_abi
'
@@ -3700,6 +3704,10 @@ EOF
exit 1;
fi
+# backward compatibility layer for incompatible_libav/fork_abi
+enabled incompatible_fork_abi && enable incompatible_libav_abi
+enabled incompatible_libav_abi && enable incompatible_fork_abi
+
die_license_disabled() {
enabled $1 || { enabled $2 && die "$2 is $1 and --enable-$1 is not specified."; }
}