[Libreoffice-commits] .: 2 commits - configure.in scp2/source

[Norbert Thiebaud]

 configure.in                 |    4 ++--
 scp2/source/ooo/file_ooo.scp |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 202557da3c4f1cd57f46a4ba1c9d74e7b4d1c2db
Author: Korrawit Pruegsanusak <detective.conan.1412 at gmail.com>
Date:   Sun Aug 28 15:11:26 2011 +0700

    Also build cairo on Windows if directx disabled

diff --git a/configure.in b/configure.in
index 37f537d..f55e00f 100755
--- a/configure.in
+++ b/configure.in
@@ -8373,8 +8373,8 @@ else
         :
     elif test $_os = WINNT; then
         dnl We only need cairo for Windows if we
-        dnl build librsvg
-        if test "$ENABLE_LIBRSVG" != NO; then
+        dnl build librsvg or directx disabled
+        if test "$ENABLE_LIBRSVG" != NO -o -z "$ENABLE_DIRECTX"; then
             BUILD_TYPE="$BUILD_TYPE CAIRO"
         fi
     else
commit 6fdde9acfd5aebd23400e7101c8ddff80fcdd8fa
Author: Korrawit Pruegsanusak <detective.conan.1412 at gmail.com>
Date:   Sun Aug 28 14:51:01 2011 +0700

    Recover a condition which lost with merge

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index d48bba1..4b0db36 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -379,7 +379,7 @@ File gid_File_Help_Schart_Zip
 End
 #endif
 
-#if defined WNT
+#if defined SOLAR_JAVA && defined INCLUDE_JAVA_ACCESSBRIDGE && defined WNT
 
 File gid_File_Jar_Accessbridge
     TXT_FILE_BODY;