diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-08-30 22:49:33 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-08-31 09:04:12 +0200 |
| commit | 6f5a7802e92fccb1b80f8798c2a56056ad4a3ff3 (patch) | |
| tree | 4cbd2b1561a4d252fac4acb3edb751006834db32 /scp2 | |
| parent | f684dd13292c8e1b8c4d318061c5fb302287d390 (diff) | |
ENABLE_LIBLANGTAG requires glib libs
Change-Id: I37270fd57639af3a566cf05931a6ac489301344b
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 50bfdaf55c49..dbb27f69c528 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1708,22 +1708,9 @@ STD_LIB_FILE(gid_File_Lib_Unordf, unordf) STD_LIB_FILE( gid_File_Lib_For, for) STD_LIB_FILE( gid_File_Lib_Forui, forui) -// RSVG and dependencies -#if ENABLE_LIBRSVG -#if ! defined (SYSTEM_GETTEXT) -File gid_File_Lib_Intl - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; - #ifdef MACOSX - Name = "libintl.8.dylib"; - #elif defined WNT - Name = "intl.dll"; - #endif -End -#endif - -#if ! defined SYSTEM_GLIB +#if !defined SYSTEM_GLIB \ + && ((defined ENABLE_LIBLANGTAG && !defined SYSTEM_LIBLANGTAG) \ + || (ENABLE_LIBRSVG && !defined SYSTEM_LIBRSVG)) File gid_File_Lib_Glib LIB_FILE_BODY; Styles = (PACKED); @@ -1776,6 +1763,21 @@ File gid_File_Lib_Gmodule End #endif +// RSVG and dependencies +#if ENABLE_LIBRSVG +#if ! defined (SYSTEM_GETTEXT) +File gid_File_Lib_Intl + LIB_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef MACOSX + Name = "libintl.8.dylib"; + #elif defined WNT + Name = "intl.dll"; + #endif +End +#endif + #if ! defined SYSTEM_GDKPIXBUF File gid_File_Lib_Gdkpixbuf LIB_FILE_BODY; |