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

[Peter Foley]

 configure.ac |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit e9c6338f1b50c0deaf714c87750319ea3482916c
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Wed Mar 6 13:07:05 2013 -0500

    Do not add empty path to SOLARINC on windows
    
    Change-Id: I6c53e999b9921dff4338815a48b8c97b4fe25059

diff --git a/configure.ac b/configure.ac
index 26ec6cf..d43892c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8876,9 +8876,11 @@ if test -n "$ENABLE_DIRECTX" -a "$_os" = "WINNT"; then
     else
         AC_MSG_RESULT([no, hoping the necessary headers and libraries will be found anyway])
     fi
-    PathFormat "$DIRECTXSDK_HOME"
-    DIRECTXSDK_HOME="$formatted_path"
-    SOLARINC="$SOLARINC -I$DIRECTXSDK_HOME/include"
+    if test -n "$DIRECTXSDK_HOME"; then
+        PathFormat "$DIRECTXSDK_HOME"
+        DIRECTXSDK_HOME="$formatted_path"
+        SOLARINC="$SOLARINC -I$DIRECTXSDK_HOME/include"
+    fi
 fi
 AC_SUBST(DIRECTXSDK_HOME)
 AC_SUBST(DIRECTXSDK_LIB)