diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-20 19:25:47 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-21 00:41:08 +0100 |
| commit | 07d4ae39601175caed76b4aa41d6e21d77c717b0 (patch) | |
| tree | 826ad4c5cd819d58b079eb0739c9ae7285ec78e8 /scp2 | |
| parent | 4a016d139e2dadddfb684308d141de53ba1e5c8f (diff) | |
--enable-ia2 disables building java-bridge, so disable packaging it too
Change-Id: I7e3b2d47af9a9b91b22df43fc56cdfd3522de6d8
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index e8be2289d48a..68eae2e6aa26 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -315,7 +315,7 @@ STD_JAR_FILE( gid_File_Jar_Xmerge, xmerge ) STD_JAR_FILE( gid_File_Jar_Xmergebridge, XMergeBridge ) #endif -#if defined ENABLE_JAVA && defined WNT +#if defined ENABLE_JAVA && defined WNT && !defined(ENABLE_IA2) STD_JAR_FILE( gid_File_Jar_Accessbridge, java_uno_accessbridge ) #endif |