Index: source/libvpx/configure |
=================================================================== |
--- source/libvpx/configure (revision 219822) |
+++ source/libvpx/configure (working copy) |
@@ -1,4 +1,4 @@ |
-#!/bin/bash |
+#!/bin/sh |
## |
## configure |
## |
@@ -153,7 +153,7 @@ |
# all targets available are enabled, by default. |
for t in ${all_targets}; do |
- [ -f ${source_path}/${t}.mk ] && enable ${t} |
+ [ -f ${source_path}/${t}.mk ] && enable_feature ${t} |
done |
# check installed doxygen version |
@@ -164,30 +164,30 @@ |
doxy_minor=${doxy_version%%.*} |
doxy_patch=${doxy_version##*.} |
- [ $doxy_major -gt 1 ] && enable doxygen |
- [ $doxy_minor -gt 5 ] && enable doxygen |
- [ $doxy_minor -eq 5 ] && [ $doxy_patch -ge 3 ] && enable doxygen |
+ [ $doxy_major -gt 1 ] && enable_feature doxygen |
+ [ $doxy_minor -gt 5 ] && enable_feature doxygen |
+ [ $doxy_minor -eq 5 ] && [ $doxy_patch -ge 3 ] && enable_feature doxygen |
fi |
# install everything except the sources, by default. sources will have |
# to be enabled when doing dist builds, since that's no longer a common |
# case. |
-enabled doxygen && php -v >/dev/null 2>&1 && enable install_docs |
-enable install_bins |
-enable install_libs |
+enabled doxygen && php -v >/dev/null 2>&1 && enable_feature install_docs |
+enable_feature install_bins |
+enable_feature install_libs |
-enable static |
-enable optimizations |
-enable fast_unaligned #allow unaligned accesses, if supported by hw |
-enable md5 |
-enable spatial_resampling |
-enable multithread |
-enable os_support |
-enable temporal_denoising |
+enable_feature static |
+enable_feature optimizations |
+enable_feature fast_unaligned #allow unaligned accesses, if supported by hw |
+enable_feature md5 |
+enable_feature spatial_resampling |
+enable_feature multithread |
+enable_feature os_support |
+enable_feature temporal_denoising |
-[ -d ${source_path}/../include ] && enable alt_tree_layout |
+[ -d ${source_path}/../include ] && enable_feature alt_tree_layout |
for d in vp8 vp9; do |
- [ -d ${source_path}/${d} ] && disable alt_tree_layout; |
+ [ -d ${source_path}/${d} ] && disable_feature alt_tree_layout; |
done |
if ! enabled alt_tree_layout; then |
@@ -200,10 +200,10 @@ |
[ -f ${source_path}/../include/vpx/vp8dx.h ] && CODECS="${CODECS} vp8_decoder" |
[ -f ${source_path}/../include/vpx/vp9cx.h ] && CODECS="${CODECS} vp9_encoder" |
[ -f ${source_path}/../include/vpx/vp9dx.h ] && CODECS="${CODECS} vp9_decoder" |
-[ -f ${source_path}/../include/vpx/vp8cx.h ] || disable vp8_encoder |
-[ -f ${source_path}/../include/vpx/vp8dx.h ] || disable vp8_decoder |
-[ -f ${source_path}/../include/vpx/vp9cx.h ] || disable vp9_encoder |
-[ -f ${source_path}/../include/vpx/vp9dx.h ] || disable vp9_decoder |
+[ -f ${source_path}/../include/vpx/vp8cx.h ] || disable_feature vp8_encoder |
+[ -f ${source_path}/../include/vpx/vp8dx.h ] || disable_feature vp8_decoder |
+[ -f ${source_path}/../include/vpx/vp9cx.h ] || disable_feature vp9_encoder |
+[ -f ${source_path}/../include/vpx/vp9dx.h ] || disable_feature vp9_decoder |
[ -f ${source_path}/../lib/*/*mt.lib ] && soft_enable static_msvcrt |
fi |
@@ -257,6 +257,7 @@ |
install_bins |
install_libs |
install_srcs |
+ use_x86inc |
debug |
gprof |
gcov |
@@ -313,6 +314,7 @@ |
gprof |
gcov |
pic |
+ use_x86inc |
optimizations |
ccache |
runtime_cpu_detect |
@@ -356,12 +358,12 @@ |
for opt do |
optval="${opt#*=}" |
case "$opt" in |
- --disable-codecs) for c in ${CODECS}; do disable $c; done ;; |
+ --disable-codecs) for c in ${CODECS}; do disable_feature $c; done ;; |
--enable-?*|--disable-?*) |
eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'` |
if echo "${EXPERIMENT_LIST}" | grep "^ *$option\$" >/dev/null; then |
if enabled experimental; then |
- $action $option |
+ ${action}_feature $option |
else |
log_echo "Ignoring $opt -- not in experimental mode." |
fi |
@@ -382,8 +384,8 @@ |
# If the codec family is enabled, enable all components of that family. |
log_echo "Configuring selected codecs" |
for c in ${CODECS}; do |
- disabled ${c%%_*} && disable ${c} |
- enabled ${c%%_*} && enable ${c} |
+ disabled ${c%%_*} && disable_feature ${c} |
+ enabled ${c%%_*} && enable_feature ${c} |
done |
# Enable all detected codecs, if they haven't been disabled |
@@ -391,12 +393,12 @@ |
# Enable the codec family if any component of that family is enabled |
for c in ${CODECS}; do |
- enabled $c && enable ${c%_*} |
+ enabled $c && enable_feature ${c%_*} |
done |
# Set the {en,de}coders variable if any algorithm in that class is enabled |
for c in ${CODECS}; do |
- enabled ${c} && enable ${c##*_}s |
+ enabled ${c} && enable_feature ${c##*_}s |
done |
} |
@@ -506,13 +508,13 @@ |
fi |
if [ -z "$CC" ] || enabled external_build; then |
echo "Bypassing toolchain for environment detection." |
- enable external_build |
+ enable_feature external_build |
check_header() { |
log fake_check_header "$@" |
header=$1 |
shift |
var=`echo $header | sed 's/[^A-Za-z0-9_]/_/g'` |
- disable $var |
+ disable_feature $var |
# Headers common to all environments |
case $header in |
stdio.h) |
@@ -524,7 +526,7 @@ |
[ -f "${d##-I}/$header" ] && result=true && break |
done |
${result:-true} |
- esac && enable $var |
+ esac && enable_feature $var |
# Specialize windows and POSIX environments. |
case $toolchain in |
@@ -532,7 +534,7 @@ |
case $header-$toolchain in |
stdint*-gcc) true;; |
*) false;; |
- esac && enable $var |
+ esac && enable_feature $var |
;; |
*) |
case $header in |
@@ -541,7 +543,7 @@ |
sys/mman.h) true;; |
unistd.h) true;; |
*) false;; |
- esac && enable $var |
+ esac && enable_feature $var |
esac |
enabled $var |
} |
@@ -559,7 +561,7 @@ |
check_header sys/mman.h |
check_header unistd.h # for sysconf(3) and friends. |
- check_header vpx/vpx_integer.h -I${source_path} && enable vpx_ports |
+ check_header vpx/vpx_integer.h -I${source_path} && enable_feature vpx_ports |
} |
process_toolchain() { |
@@ -641,14 +643,14 @@ |
# ccache only really works on gcc toolchains |
enabled gcc || soft_disable ccache |
if enabled mips; then |
- enable dequant_tokens |
- enable dc_recon |
+ enable_feature dequant_tokens |
+ enable_feature dc_recon |
fi |
# Enable the postbuild target if building for visual studio. |
case "$tgt_cc" in |
- vs*) enable msvs |
- enable solution |
+ vs*) enable_feature msvs |
+ enable_feature solution |
vs_version=${tgt_cc##vs} |
case $vs_version in |
[789]) |