[Libreoffice-commits] core.git: vcl/Library_vclplug_gen.mk vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_gtk.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/Library_vclplug_svp.mk vcl/Library_vclplug_tde.mk

[Andres Gomez]

 vcl/Library_vclplug_gen.mk  |    3 ++-
 vcl/Library_vclplug_gtk.mk  |    3 ++-
 vcl/Library_vclplug_gtk3.mk |    3 ++-
 vcl/Library_vclplug_kde.mk  |    3 ++-
 vcl/Library_vclplug_kde4.mk |    3 ++-
 vcl/Library_vclplug_svp.mk  |    3 ++-
 vcl/Library_vclplug_tde.mk  |    3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 1b96fbb97c8f0a70c493387984f3b301b4d5378c
Author: Andres Gomez <agomez at igalia.com>
Date:   Thu Apr 11 00:38:55 2013 +0300

    vcl: conditionally link to jvmaccess
    
    When SOLAR_JAVA (Java) is not there, vcl plugins
    will not link against jvmaccess.
    
    Change-Id: I13e1ae7d605965b3609c6dfdaa66faa976382e65
    Reviewed-on: https://gerrit.libreoffice.org/3320
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index f3c6d7d..bea09db 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -37,7 +37,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gen,\
     cppuhelper \
     i18nlangtag \
     i18nutil \
-    jvmaccess \
+    $(if $(filter TRUE,$(SOLAR_JAVA)), \
+        jvmaccess) \
     cppu \
     sal \
 ))
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index 6607d10..8c4d808 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -50,7 +50,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk,\
     cppuhelper \
     i18nlangtag \
     i18nutil \
-    jvmaccess \
+    $(if $(filter TRUE,$(SOLAR_JAVA)), \
+        jvmaccess) \
     cppu \
     sal \
 ))
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index cd9b63a..948e528 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -60,7 +60,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_gtk3,\
     cppuhelper \
     i18nlangtag \
     i18nutil \
-    jvmaccess \
+    $(if $(filter TRUE,$(SOLAR_JAVA)), \
+        jvmaccess) \
     cppu \
     sal \
 ))
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 5e9c666..1eedaa5 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -46,7 +46,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde,\
     cppuhelper \
     i18nlangtag \
     i18nutil \
-    jvmaccess \
+    $(if $(filter TRUE,$(SOLAR_JAVA)), \
+        jvmaccess) \
     cppu \
     sal \
 ))
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 93f6858..45e1042 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -44,7 +44,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_kde4,\
     cppuhelper \
     i18nlangtag \
     i18nutil \
-    jvmaccess \
+    $(if $(filter TRUE,$(SOLAR_JAVA)), \
+        jvmaccess) \
     cppu \
     sal \
 ))
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index 7d40e5e..32e88dd 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -46,7 +46,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_svp,\
     cppuhelper \
     i18nlangtag \
     i18nutil \
-    jvmaccess \
+    $(if $(filter TRUE,$(SOLAR_JAVA)), \
+        jvmaccess) \
     cppu \
     sal \
 ))
diff --git a/vcl/Library_vclplug_tde.mk b/vcl/Library_vclplug_tde.mk
index f2c992b..2abfce0 100644
--- a/vcl/Library_vclplug_tde.mk
+++ b/vcl/Library_vclplug_tde.mk
@@ -68,7 +68,8 @@ $(eval $(call gb_Library_use_libraries,vclplug_tde,\
     cppuhelper \
     i18nlangtag \
     i18nutil \
-    jvmaccess \
+    $(if $(filter TRUE,$(SOLAR_JAVA)), \
+        jvmaccess) \
     cppu \
     sal \
 ))