[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - configure.ac

[Andrzej Hunt]

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8c0ace56528cfd469d55c17a6e9b32c33e715ec0
Author: Andrzej Hunt <andrzej at ahunt.org>
Date:   Thu Jun 4 14:02:05 2015 +0100

    Fix using /opt/lo/bin/nasm on windows/cygwin
    
    Change-Id: Ib3755598bfccffc2efd67816ae5fa5dc8903553e
    Reviewed-on: https://gerrit.libreoffice.org/16083
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit a3afa22ba4069212213009fc7304adc3c339b68b)
    Reviewed-on: https://gerrit.libreoffice.org/17124
    Reviewed-by: David Ostrovsky <david at ostrovsky.org>
    Tested-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/configure.ac b/configure.ac
index 90b13c8..cf63d27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7459,7 +7459,7 @@ else
         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
+            elif test -x "/opt/lo/bin/nasm"; then
                 NASM="/opt/lo/bin/nasm"
             fi
         fi