[FFmpeg-devel] [RFC][PATCH 3/4] build: Rename --yasmexe to --yasm-prog

[Alexander Strasser]

Signed-off-by: Alexander Strasser <eclipse7 at gmx.net>
---
 configure |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure b/configure
index 474d684..8fd939e 100755
--- a/configure
+++ b/configure
@@ -221,7 +221,7 @@ Advanced options (experts only):
   --nm=NM                  use nm tool
   --ar=AR                  use archive tool AR [$ar_default]
   --as=AS                  use assembler AS [$as_default]
-  --yasmexe=EXE            use yasm-compatible assembler EXE [$yasmexe_default]
+  --yasm-prog=AS           use yasm-compatible assembler AS [$yasm_prog_default]
   --cc=CC                  use C compiler CC [$cc_default]
   --cxx=CXX                use C compiler CXX [$cxx_default]
   --ld=LD                  use linker LD
@@ -668,7 +668,7 @@ check_yasm(){
     echo "$1" > $TMPS
     log_file $TMPS
     shift 1
-    check_cmd $yasmexe $YASMFLAGS "$@" -o $TMPO $TMPS
+    check_cmd $yasm_prog $YASMFLAGS "$@" -o $TMPO $TMPS
 }
 
 check_ld(){
@@ -1316,7 +1316,7 @@ CMDLINE_SET="
     target_exec
     target_os
     target_path
-    yasmexe
+    yasm_prog
 "
 
 CMDLINE_APPEND="
@@ -1798,7 +1798,7 @@ objformat="elf"
 pkg_config_default=pkg-config
 ranlib="ranlib"
 strip_default="strip"
-yasmexe_default="yasm"
+yasm_prog_default="yasm"
 
 nm_opts='-g'
 nogas=":"
@@ -2029,7 +2029,7 @@ strip_default="${cross_prefix}${strip_default}"
 
 sysinclude_default="${sysroot}/usr/include"
 
-set_default cc cxx nm pkg_config strip sysinclude yasmexe
+set_default cc cxx nm pkg_config strip sysinclude yasm_prog
 enabled cross_compile || host_cc_default=$cc
 set_default host_cc
 
@@ -2923,11 +2923,11 @@ EOF
     enabled mmx2  && check_asm mmx2  '"pmaxub %mm0, %mm1"'
 
     if ! disabled_any asm mmx yasm; then
-        if check_cmd $yasmexe --version; then
+        if check_cmd $yasm_prog --version; then
             enabled x86_64 && yasm_extra="-m amd64"
             yasm_debug="-g dwarf2"
         elif check_cmd nasm -v; then
-            yasmexe=nasm
+            yasm_prog=nasm
             yasm_debug="-g -F dwarf"
             enabled x86_64 && test "$objformat" = elf && objformat=elf64
         fi
@@ -3382,7 +3382,7 @@ fi
 echo "big-endian                ${bigendian-no}"
 echo "runtime cpu detection     ${runtime_cpudetect-no}"
 if enabled x86; then
-    yasm_res=$yasmexe
+    yasm_res=$yasm_prog
     disabled yasm && yasm_res=no
 
     echo "yasm                      ${yasm_res}"
@@ -3523,8 +3523,8 @@ CXX=$cxx
 AS=$as
 LD=$ld
 DEPCC=$dep_cc
-YASM=$yasmexe
-YASMDEP=$yasmexe
+YASM=$yasm_prog
+YASMDEP=$yasm_prog
 AR=$ar
 RANLIB=$ranlib
 CP=cp -p
-- 
1.7.5.4