Skip to content

Commit

Permalink
Build: Make the NASM autoconf variable persistent
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
dcommander committed Feb 19, 2016
1 parent f76c01d commit 5f97232
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions acinclude.m4
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5f97232

Please sign in to comment.