[Libreoffice-commits] .: 2 commits - configure.in

[Tor Lillqvist]

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

New commits:
commit 43e3b9af8f5d85f06485e74b1080cc6a6a86eac4
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

diff --git a/configure.in b/configure.in
index 55cb03d..5fefd14 100755
--- a/configure.in
+++ b/configure.in
@@ -5886,7 +5886,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"
@@ -5897,7 +5897,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"
commit 50c4be5352b1b8518bddb81aa2cf3d0b66a94b80
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jan 24 21:59:02 2011 +0200

    Improve MSVS version message

diff --git a/configure.in b/configure.in
index 7058be8..55cb03d 100755
--- a/configure.in
+++ b/configure.in
@@ -2232,18 +2232,16 @@ dnl      The following find microsoft, matches nn.nn.nnnn then pulls numbers out
                                 printf (\"%04d\",vertoken[[i]] )
                             }
                             }"`
-            AC_MSG_RESULT([found Compiler version $CCNUMVER.])
             if test "$CCNUMVER" -ge "001600000000"; then
                 COMEX=13
                 MSVSVER=2010
-                AC_MSG_RESULT([found MSVS 2010.])
             elif test "$CCNUMVER" -ge "001500000000"; then
                 COMEX=12
                 MSVSVER=2008
-                AC_MSG_RESULT([found MSVS 2008.])
             else
                 AC_MSG_ERROR([Compiler too old. Use Microsoft Visual Studio 2008 or 2010.])
             fi
+            AC_MSG_RESULT([found compiler version $CCNUMVER (MSVS $MSVSVER).])
         else
             AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.])
         fi