diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2008-07-25 16:13:46 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2008-07-25 16:13:46 +0000 |
| commit | a01b570d736a84a2c11e30565204b96bfcde6a85 (patch) | |
| tree | 343eac58a40458c771ea391aa26a72548c085b7d /stax | |
| parent | 58fc9e2e81cbdfd6263cbd37891596fc6efad171 (diff) | |
#i91376# - not required for gcj builds >=4.1.1
Diffstat (limited to 'stax')
| -rw-r--r-- | stax/makefile.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/stax/makefile.mk b/stax/makefile.mk index 303f73096c4f..f0d233592d33 100644 --- a/stax/makefile.mk +++ b/stax/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # # This file is part of OpenOffice.org. # @@ -37,10 +37,11 @@ TARGET=stax # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE : tg_javav.mk .INCLUDE : antsettings.mk .IF "$(SOLAR_JAVA)" != "" -.IF "$(JAVANUMVER:s/.//)" >= "000100060000" +.IF "$(JAVANUMVER:s/.//)" >= "000100060000" || "$(JDK)"=="gcj" all: @echo "Your java version already contains StAX" .ENDIF # "$(JAVANUMVER:s/.//)" >= "000100060000" |