diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-02-09 22:39:42 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-02-10 02:08:05 +0100 |
commit | ca8ac449e3524f895de1e94a3c5d511591031b40 (patch) | |
tree | df690637e7c82375ec1dc429b496b5677869d520 /scp2 | |
parent | Fix Resource leak: ddf (diff) | |
download | core-ca8ac449e3524f895de1e94a3c5d511591031b40.tar.gz core-ca8ac449e3524f895de1e94a3c5d511591031b40.zip |
fdo#60491: scp2: always package emboleobj library on non-WNT platforms
(regression from 09cd5c460704ddd99669a61ae335bfb2ce357140, which defined
DISABLE_ATL on all platforms in configure)
Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index f6699e650ac6..8feb75d46328 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -394,7 +394,8 @@ STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer) SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj) -#ifndef DISABLE_ATL +/* fdo#60491 always need emboleobj library on non-WNT platforms */ +#if !defined(WNT) || !defined(DISABLE_ATL) SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) #endif |