summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-09 02:38:33 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-04-09 02:38:37 +0300
commit0e8c38c19bb851a6433922a8068dd4887e79699d (patch)
treede605f3b78aef8281a94633da945acfda0dba641 /configure
parent6dd56815b44471026b4bd7623b4c56dfc98f2731 (diff)
parentca242e5f73d3bff1006b373b123b4749a33f5bd7 (diff)
downloadmpv-0e8c38c19bb851a6433922a8068dd4887e79699d.tar.bz2
mpv-0e8c38c19bb851a6433922a8068dd4887e79699d.tar.xz
Merge svn changes up to r29154
Synchronizes runtime CPU detection handling in the build system with latest FFmpeg.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure b/configure
index 3cfbe09e4b..020fb4ab95 100755
--- a/configure
+++ b/configure
@@ -22,13 +22,14 @@
# If you want to add a new check for $feature, here is a simple skeleton:
#
# echocheck "$feature"
-# if "$_feature" = auto; then
+# if test "$_feature" = auto; then
# cat > $TMPC << EOF
# #include <feature.h>
# int main(void) { return 0; }
# EOF
# _feature=no
# cc_check && _feature=yes
+# fi
# if test "$_feature" = yes ; then
# def_feature='#define CONFIG_FEATURE 1'
# else
@@ -2813,9 +2814,9 @@ echores "$_sighandler"
echocheck "runtime cpudetection"
if test "$_runtime_cpudetection" = yes ; then
_optimizing="Runtime CPU-Detection enabled"
- def_runtime_cpudetection='#define RUNTIME_CPUDETECT 1'
+ def_runtime_cpudetection='#define CONFIG_RUNTIME_CPUDETECT 1'
else
- def_runtime_cpudetection='#undef RUNTIME_CPUDETECT'
+ def_runtime_cpudetection='#define CONFIG_RUNTIME_CPUDETECT 0'
fi
echores "$_runtime_cpudetection"