mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make configure actually find LODE nasm

Browse Source 
Change-Id: I7650a56375d98814e89fc21894c92a200832bb29
This commit is contained in:
Thorsten Behrens
2015-04-02 00:54:05 +02:00
parent f77a138e38
commit 7b45c5cc05
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@@ -7440,9 +7440,14 @@ else
AC_MSG_RESULT([internal, jpeg-turbo]) AC_MSG_RESULT([internal, jpeg-turbo])
BUILD_TYPE="$BUILD_TYPE JPEG_TURBO" BUILD_TYPE="$BUILD_TYPE JPEG_TURBO"
AC_CHECK_PROGS(NASM, [nasm nasmw yasm]) AC_CHECK_PROGS(NASM, [nasm nasmw yasm])
if test -z "$NASM" -a "$build_os" = "cygwin" -a -x "/opt/lo/bin/nasm"; then
if test -z "$NASM" -a "$build_os" = "cygwin"; then
if test -n "$LODE_HOME" -a -x "$LODE_HOME/opt/bin/nasm"; then
NASM="$LODE_HOME/opt/bin/nasm"
elif -x "/opt/lo/bin/nasm"; then
NASM="/opt/lo/bin/nasm" NASM="/opt/lo/bin/nasm"
fi fi
fi
if test -z "$NASM"; then if test -z "$NASM"; then
cat << _EOS cat << _EOS
**************************************************************************** ****************************************************************************