[Libreoffice-commits] .: configure.in

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Fri Feb 10 08:19:00 PST 2012


 configure.in |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 90d1c9ff829c41c8384d66dfd2f6e90660517088
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Feb 10 10:17:54 2012 -0600

    the PATH must be set properly, even with java disabled ...

diff --git a/configure.in b/configure.in
index a744fa8..927326e 100644
--- a/configure.in
+++ b/configure.in
@@ -10859,18 +10859,18 @@ else
         ;;
 
     cygwin*)
+        pathmunge "$DOTNET_FRAMEWORK_HOME/bin" "before"
+        pathmunge "$ASM_HOME" "before"
+        pathmunge "$WINDOWS_SDK_HOME/bin" "before"
+        pathmunge "$CSC_PATH" "before"
+        pathmunge "$MIDL_PATH" "before"
+        pathmunge "$MSPDB_PATH" "before"
+        if test "$CL_X64" = "TRUE" ; then
+            pathmunge "$COMPATH/bin/amd64" "before"
+        else
+            pathmunge "$COMPATH/bin" "before"
+        fi
         if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then
-            pathmunge "$DOTNET_FRAMEWORK_HOME/bin" "before"
-            pathmunge "$ASM_HOME" "before"
-            pathmunge "$WINDOWS_SDK_HOME/bin" "before"
-            pathmunge "$CSC_PATH" "before"
-            pathmunge "$MIDL_PATH" "before"
-            pathmunge "$MSPDB_PATH" "before"
-            if test "$CL_X64" = "TRUE" ; then
-                pathmunge "$COMPATH/bin/amd64" "before"
-            else
-                pathmunge "$COMPATH/bin" "before"
-            fi
             if test -d "$JAVA_HOME/jre/bin/client" ; then
                 pathmunge "$JAVA_HOME/jre/bin/client" "before"
             fi


More information about the Libreoffice-commits mailing list