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 | |
| parent | 4a016d139e2dadddfb684308d141de53ba1e5c8f (diff) | |
--enable-ia2 disables building java-bridge, so disable packaging it too
Change-Id: I7e3b2d47af9a9b91b22df43fc56cdfd3522de6d8
| -rw-r--r--[-rwxr-xr-x] | Repository.mk | 7 | ||||
| -rw-r--r--[-rwxr-xr-x] | configure.ac | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Repository.mk b/Repository.mk index 220d79b35b50..b31a8091aed8 100755..100644 --- a/Repository.mk +++ b/Repository.mk @@ -554,13 +554,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ dtrans \ fps \ ftransl \ - $(if $(ENABLE_JAVA),java_uno_accessbridge) \ $(if $(DISABLE_ATL),,\ inprocserv \ ) \ $(if $(ENABLE_IA2), \ - UAccCOM \ - winaccessibility \ + UAccCOM \ + winaccessibility \ + , \ + $(if $(ENABLE_JAVA),java_uno_accessbridge) \ ) \ ) \ )) diff --git a/configure.ac b/configure.ac index 1473aebf52c1..394b8cd4c2e8 100755..100644 --- a/configure.ac +++ b/configure.ac @@ -11613,6 +11613,7 @@ if test "$enable_ia2" = "yes"; then if test "$_os" = "WINNT"; then AC_MSG_RESULT([yes]) ENABLE_IA2="TRUE" + SCPDEFS="$SCPDEFS -DENABLE_IA2" else AC_MSG_RESULT([no]) fi 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 |