summaryrefslogtreecommitdiff
path: root/misc/openoffice/patches/patch-al
blob: be3275d3f34f8134098f7e4c3ca6135066ad2296 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
$NetBSD: patch-al,v 1.2 2004/05/03 20:56:36 mrauch Exp $

--- ../odk/source/bean/native/unix/makefile.mk.orig	2004-04-17 19:28:28.000000000 +0200
+++ ../odk/source/bean/native/unix/makefile.mk
@@ -36,6 +36,20 @@ SHL1STDLIBS+=-lzip -lawt
 SHL1STDLIBS+=-lstdc++
 .ENDIF
 
+.IF "$(OS)" == "NETBSD" || "$(OS)" == "FREEBSD"
+.IF "$(SOLAR_JAVA)" != ""
+.IF "$(JAVANUMVER)" < "000100040000"
+SHL1STDLIBS+=-ljvm
+.ENDIF
+.ENDIF
+.ENDIF
+
+.IF "$(OS)" == "NETBSD"
+#We might run a jdk under emulation.
+#This is fine for building, but gives a false alarm here.
+SHL1NOCHECK=TRUE
+.ENDIF
+
 NO_SHL1DESCRIPTION=TRUE
 
 # --- Targets ------------------------------------------------------