[Libreoffice-commits] .: Branch 'libreoffice-3-3' - configure.in

[Tor Lillqvist]

 configure.in |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 48a36b901ee93302efef0d9e6c1e5751431a57fd
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jan 25 00:43:59 2011 +0200

    No ddraw.h or ddraw.lib in the June 2010 DirectX SDK
    
    (cherry picked from commit 43e3b9af8f5d85f06485e74b1080cc6a6a86eac4)
    
    Signed-off-by: Fridrich Strba <fridrich.strba at bluewin.ch>

diff --git a/configure.in b/configure.in
index d9ae234..c0b76f8 100644
--- a/configure.in
+++ b/configure.in
@@ -5809,7 +5809,7 @@ if test \( "$_os" = "WINNT" \) ; then
     # Remove a possible trailing backslash
     DIRECTXSDK_HOME=`echo $DIRECTXSDK_HOME | $SED 's/\/$//'`
 
-    if test -f "$DIRECTXSDK_HOME/Include/ddraw.h" ; then
+    if test -f "$DIRECTXSDK_HOME/Include/ddraw.h" -o -f "$DIRECTXSDK_HOME/Include/d3d9.h" ; then
         HAVE_DIRECTXSDK_H="yes"
     else
         HAVE_DIRECTXSDK_H="no"
@@ -5820,7 +5820,7 @@ if test \( "$_os" = "WINNT" \) ; then
     else
         DIRECTXSDK_LIB="$DIRECTXSDK_HOME/lib"
     fi
-    if test -f "$DIRECTXSDK_LIB/ddraw.lib" ; then
+    if test -f "$DIRECTXSDK_LIB/ddraw.lib" -o -f "$DIRECTXSDK_LIB/d3d9.lib" ; then
         HAVE_DIRECTXSDK_LIB="yes"
     else
         HAVE_DIRECTXSDK_LIB="no"