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

[Kohei Yoshida]

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

New commits:
commit 5f228840059ec0da8aa90fcee82e9ea9617cabae
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Mar 15 22:58:42 2011 -0400

    Define SOLAR_JAVA only when --with-java.

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 085909a..ad30ff7 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -155,7 +155,6 @@ gb_GLOBALDEFS := \
 	-DENABLE_LAYOUT_EXPERIMENTAL=0 \
 	-DENABLE_LAYOUT=0 \
 	-DOSL_DEBUG_LEVEL=$(gb_DEBUGLEVEL) \
-	-DSOLAR_JAVA \
 	-DSTLPORT_VERSION=$(STLPORT_VER) \
 	-DSUPD=$(UPD) \
 	-DVCL \
@@ -176,6 +175,10 @@ gb_GLOBALDEFS += \
 
 endif
 
+ifneq ($(strip $(SOLAR_JAVA)),)
+gb_GLOBALDEFS += -DSOLAR_JAVA
+endif
+
 ifeq ($(gb_DEBUGLEVEL),2)
 gb_GLOBALDEFS += \
 	-DDEBUG \