[Libreoffice-commits] .: configure.in

[Tor Lillqvist]

 configure.in |   34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

New commits:
commit 508cd8de7e96c2f1a385a2bba3717ea1168b64ab
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu May 19 19:20:19 2011 +0300

    Fix search for NSIS

diff --git a/configure.in b/configure.in
index 6bb0d04..edcdc05 100755
--- a/configure.in
+++ b/configure.in
@@ -1120,10 +1120,10 @@ AC_ARG_WITH(nsis-path,
     AS_HELP_STRING([--with-nsis-path],
         [For Windows builds, please supply the directory where makensis
          is located. If makensis is found in PATH or this option is
-         supplied a self-contained  executable installer for LibreOffice will
-         be created.])
+         properly supplied a self-contained executable installer for
+         LibreOffice will be created.])
     [
-                          Usage:     --with-nsis-path=<abs. path to nsis.exe>
+                          Usage:     --with-nsis-path=<path to directory containing makensis>
     ],
 ,)
 
@@ -6021,28 +6021,34 @@ if test "$_os" = "WINNT" ; then
         AC_PATH_PROG(NSIS_PATH, makensis)
         if test -n "$NSIS_PATH"; then
             NSIS_PATH=`dirname "$NSIS_PATH"`
+        elif test "$build_os" = "cygwin"; then
+            AC_MSG_CHECKING([for NSIS])
+            nsistest=`./oowintool --nsis-dir`;
+            nsistest=`cygpath -d -m "$nsistest"`
+            nsistest=`cygpath -u "$nsistest"`
+            if test -x "$nsistest/nsis.exe"; then
+                NSIS_PATH="$nsistest"
+                AC_MSG_RESULT([found ($NSIS_PATH)])
+            else
+                AC_MSG_RESULT([no, no self-contained installer will be built.])
+            fi
         fi
     else
-	AC_MSG_CHECKING([for NSIS])
+        AC_MSG_CHECKING([for NSIS])
         if test "$build_os" = "cygwin"; then
             with_nsis_path=`cygpath -u "$with_nsis_path"`
         fi
         if test -e "$with_nsis_path/makensis$EXEEXT_FOR_BUILD"; then
             NSIS_PATH="$with_nsis_path"
-        elif test "$build_os" = "cygwin"; then
-	    nsistest=`./oowintool --nsis-dir`;
-	    if test -x "$nsistest/nsis.exe"; then
-		NSIS_PATH="$nsistest"
-	    fi
         fi
         if test -z "$NSIS_PATH"; then
             AC_MSG_RESULT([no, no self-contained installer will be built.])
         else
-	    if test "$build_os" = "cygwin"; then
-		NSIS_PATH=`cygpath -d "$NSIS_PATH"`
-		NSIS_PATH=`cygpath -u "$NSIS_PATH"`
-	    fi
-	    AC_MSG_RESULT([found ($NSIS_PATH)])
+            if test "$build_os" = "cygwin"; then
+                NSIS_PATH=`cygpath -d "$NSIS_PATH"`
+                NSIS_PATH=`cygpath -u "$NSIS_PATH"`
+            fi
+            AC_MSG_RESULT([found ($NSIS_PATH)])
         fi
     fi
 fi