aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-05-24 20:11:53 +0100
committerMans Rullgard <mans@mansr.com>2011-05-25 00:47:05 +0100
commit9bbd6a4cd89da4bfc9fd36fea5777a539a542b40 (patch)
tree5d0bb905fb7a52e1de6f37c0957e5902c9049e88
parenta724ee6265bbf0acf4c43cd948dede661459727d (diff)
downloadffmpeg-9bbd6a4cd89da4bfc9fd36fea5777a539a542b40.tar.gz
configure: enable memalign_hack automatically when needed
Signed-off-by: Mans Rullgard <mans@mansr.com>
-rwxr-xr-xconfigure8
1 files changed, 3 insertions, 5 deletions
diff --git a/configure b/configure
index 5e3d6fbe47..c628ff65bb 100755
--- a/configure
+++ b/configure
@@ -2823,11 +2823,6 @@ check_header X11/extensions/XvMClib.h
check_struct dxva2api.h DXVA_PictureParameters wDecodedPictureIndex
-if ! enabled_any memalign memalign_hack posix_memalign malloc_aligned &&
- enabled_any $need_memalign ; then
- die "Error, no aligned memory allocator but SSE enabled, disable it or use --enable-memalign-hack."
-fi
-
disabled zlib || check_lib zlib.h zlibVersion -lz || disable zlib
disabled bzlib || check_lib2 bzlib.h BZ2_bzlibVersion -lbz2 || disable bzlib
@@ -3091,6 +3086,9 @@ check_deps $CONFIG_LIST \
enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
+! enabled_any memalign posix_memalign malloc_aligned &&
+ enabled_any $need_memalign && enable memalign_hack
+
echo "install prefix $prefix"
echo "source path $source_path"
echo "C compiler $cc"