[Libreoffice-commits] .: Branch 'integration/dev300_m98' - solenv/gbuild

[Jan Holesovsky]

 solenv/gbuild/gbuild.mk |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 567993937ca8ba8e4b925e7908a36355adf1065e
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Fri Mar 4 19:02:30 2011 +0100

    Fix build --without-java.

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 249f640..71f77e3 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -140,7 +140,6 @@ gb_GLOBALDEFS := \
 	-DENABLE_LAYOUT_EXPERIMENTAL=0 \
 	-DENABLE_LAYOUT=0 \
 	-DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
-	-DSOLAR_JAVA \
 	-DSTLPORT_VERSION=$(STLPORT_VER) \
 	-DSUPD=$(UPD) \
 	-DVCL \
@@ -148,6 +147,11 @@ gb_GLOBALDEFS := \
 	$(gb_COMPILERDEFS) \
 	$(gb_CPUDEFS) \
 
+ifeq ($(SOLAR_JAVA),TRUE)
+gb_GLOBALDEFS += \
+	-DSOLAR_JAVA
+endif
+
 ifeq ($(gb_PRODUCT),$(true))
 gb_GLOBALDEFS += \
 	-DPRODUCT \