Build: Make the NASM autoconf variable persistent
Previously, if a custom value of this variable was specified when
running configure, then that value would be lost if configure was
automatically re-run (as a result of changes to configure.ac, for
instance.)
As a bonus, the NASM variable is now also listed when running
'configure --help', so it is obvious how to override the default
NASM command.
diff --git a/acinclude.m4 b/acinclude.m4
index c59c4b6..2c90762 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -3,8 +3,11 @@
# Check that NASM exists and determine flags
AC_DEFUN([AC_PROG_NASM],[
-AC_CHECK_PROGS(NASM, [nasm nasmw yasm])
-test -z "$NASM" && AC_MSG_ERROR([no nasm (Netwide Assembler) found])
+AC_ARG_VAR(NASM, [NASM command (used to build the x86/x86-64 SIMD code)])
+if test "x$NASM" = "x"; then
+ AC_CHECK_PROGS(NASM, [nasm nasmw yasm])
+ test -z "$NASM" && AC_MSG_ERROR([no nasm (Netwide Assembler) found])
+fi
AC_MSG_CHECKING([for object file format of host system])
case "$host_os" in
