[Libreoffice-commits] .: Branch 'integration/dev300_m98' - ure/source

[Jan Holesovsky]

 ure/source/makefile.mk |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 1e0af8ce5733a25e9984ba74cacd31a51ded0087
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Mar 4 18:29:29 2011 +0100

    Fix build --without-java.

diff --git a/ure/source/makefile.mk b/ure/source/makefile.mk
index 602851e..63265cd 100644
--- a/ure/source/makefile.mk
+++ b/ure/source/makefile.mk
@@ -41,8 +41,6 @@ my_components = \
     introspection \
     invocadapt \
     invocation \
-    javaloader \
-    javavm \
     juh \
     namingservice \
     proxyfac \
@@ -54,6 +52,12 @@ my_components = \
     textoutstream \
     uuresolver
 
+.IF "$(SOLAR_JAVA)" != ""
+my_components += \
+    javaloader \
+    javavm
+.ENDIF
+
 .INCLUDE: settings.mk
 .INCLUDE: target.mk