[MPlayer-cvslog] r37958 - trunk/configure
reimar
subversion at mplayerhq.hu
Sat Sep 16 22:04:21 EEST 2017
Author: reimar
Date: Sat Sep 16 22:04:20 2017
New Revision: 37958
Log:
configure: fix compilation without yasm/nasm.
Modified:
trunk/configure
Modified: trunk/configure
==============================================================================
--- trunk/configure Sun Sep 10 20:27:45 2017 (r37957)
+++ trunk/configure Sat Sep 16 22:04:20 2017 (r37958)
@@ -3302,6 +3302,8 @@ test "$neon" = yes && cpuexts="NEO
test "$_iwmmxt" = yes && cpuexts="IWMMXT $cpuexts"
test "$_vis" = yes && cpuexts="VIS $cpuexts"
test "$_mvi" = yes && cpuexts="MVI $cpuexts"
+cpuexts_external=""
+test "$have_yasm" = yes && cpuexts_external="$cpuexts"
# Checking kernel version...
if x86_32 && linux ; then
@@ -8985,7 +8987,7 @@ $def_vfp_args
$(ff_config_enable "$arch_all" "$arch" "#" "ARCH")
$(ff_config_enable "$subarch_all" "$subarch" "#" "ARCH")
$(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE")
-$(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE" "_EXTERNAL")
+$(ff_config_enable "$cpuexts_all" "$cpuexts_external" "#" "HAVE" "_EXTERNAL")
$(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE" "_INLINE")
@@ -9477,7 +9479,7 @@ echo "%define CONFIG_GPL 1" >> "$TMPS"
echo "%define HAVE_ALIGNED_STACK 1" >> "$TMPS"
echo "$(ff_config_enable "$arch_all" "$arch" "%" "ARCH")" >> "$TMPS"
echo "$(ff_config_enable "$subarch_all" "$subarch" "%" "ARCH")" >> "$TMPS"
-echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE" "_EXTERNAL")" >> "$TMPS"
+echo "$(ff_config_enable "$cpuexts_all" "$cpuexts_external" "%" "HAVE" "_EXTERNAL")" >> "$TMPS"
echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE" "_INLINE")" >> "$TMPS"
echo "$(ff_config_enable "$yasm_features_all" "$yasm_features" "%" "HAVE")" >> "$TMPS"
echo "$(ff_config_enable "$libavdecoders_all" "$libavdecoders" "%" "CONFIG")" >> "$TMPS"
More information about the MPlayer-cvslog
mailing list