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

[Norbert Thiebaud]

 configure.in                         |    1 +
 scp2/source/ooo/file_library_ooo.scp |    4 ++++
 2 files changed, 5 insertions(+)

New commits:
commit 9e0d9cada503d6e22631a169d111aecbda99096c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat May 28 05:29:10 2011 -0500

    make librsvg a conditional

diff --git a/configure.in b/configure.in
index 14c4e74..8dbdbee 100755
--- a/configure.in
+++ b/configure.in
@@ -6571,6 +6571,7 @@ if test  "$test_librsvg" = "yes"; then
         PKG_CHECK_MODULES( LIBRSVG, librsvg-2.0 >= 2.14,,AC_MSG_ERROR([requirements to build with librsvg support not met. Use --disable-librsvg or install the missing packages]))
         ENABLE_LIBRSVG="TRUE"
         AC_MSG_RESULT([yes])
+        BUILD_TYPE="$BUILD_TYPE LIBRSVG"
     else
         AC_MSG_RESULT([no])
     fi
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index bbca5d1..3e44053 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1785,6 +1785,8 @@ File gid_File_Lib_Gmodule
 End
 #endif
 
+#if ENABLE_LIBRSVG
+
 #if ! defined SYSTEM_GDKPIXBUF
 File gid_File_Lib_Gdkpixbuf
     TXT_FILE_BODY;
@@ -1866,6 +1868,8 @@ File gid_File_Lib_Librsvg
 End
 #endif
 
+#endif
+
 #ifdef WNT
 File gid_File_Lib_sellangmsi
     TXT_FILE_BODY;