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

[Christian Lohmaier]

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

New commits:
commit c953a3bf78aeb392440fe090073f83c714237f7b
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sun May 29 18:20:57 2011 +0200

    pixman is built as static lib on Mac

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 3e44053..adf8de8 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -602,7 +602,7 @@ File gid_File_Lib_Pixman
     Dir = gid_Dir_Program;
   #ifdef UNX
     #ifdef MACOSX
-       Name = STRING(CONCAT3(libpixman-1,.0,UNXSUFFIX));
+       Name = "libpixman-1.a";
     #else
        Name = STRING(CONCAT3(libpixman-1,UNXSUFFIX,.0));
     #endif
commit efbb5329e528f623c5730209926afc223d4194a9
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Sun May 29 18:19:22 2011 +0200

    if librsvg is turned into something optional, configure must test on Mac

diff --git a/configure.in b/configure.in
index 8dbdbee..8487bbc 100755
--- a/configure.in
+++ b/configure.in
@@ -1508,7 +1508,7 @@ case "$host_os" in
         ;;
     darwin*) # Mac OS X or iOS
         test_gtk=yes
-        test_librsvg=no
+        test_librsvg=yes
         test_randr=no
         test_freetype=no
         test_fontconfig=no