[Libreoffice-commits] core.git: configure.ac

[Thorsten Behrens]

 configure.ac |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 7b45c5cc05ae1d38d3e201153badefab845dfcc1
Author: Thorsten Behrens <thorsten.behrens at cib.de>
Date:   Thu Apr 2 00:54:05 2015 +0200

    Make configure actually find LODE nasm
    
    Change-Id: I7650a56375d98814e89fc21894c92a200832bb29

diff --git a/configure.ac b/configure.ac
index 0dbf5ac..4189d51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7440,8 +7440,13 @@ else
         AC_MSG_RESULT([internal, jpeg-turbo])
         BUILD_TYPE="$BUILD_TYPE JPEG_TURBO"
         AC_CHECK_PROGS(NASM, [nasm nasmw yasm])
-        if test -z "$NASM" -a "$build_os" = "cygwin" -a -x "/opt/lo/bin/nasm"; then
-            NASM="/opt/lo/bin/nasm"
+
+        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"
+            fi
         fi
         if test -z "$NASM"; then
 cat << _EOS