summaryrefslogtreecommitdiff
path: root/solenv/inc/libs.mk
diff options
context:
space:
mode:
authorRobert Nagy <robert@openbsd.org>2010-11-04 15:38:10 +0100
committerRobert Nagy <robert@openbsd.org>2010-11-05 11:06:44 +0100
commita90417f0191fbd426da744704cbcfd3732fec631 (patch)
treee5466152f05bbcf508ca719cd866a85e3deb54d9 /solenv/inc/libs.mk
parent3632c1f81ea1a5dbc157701511bb46d55aba1c5d (diff)
use system jpeg on OpenBSD
Diffstat (limited to 'solenv/inc/libs.mk')
-rw-r--r--solenv/inc/libs.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 06c720c985b6..fc5dee4ecbfe 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -205,7 +205,8 @@ ZLIB3RDLIB=-lz
ZLIB3RDLIB=-lzlib
.ENDIF
.IF "$(SYSTEM_JPEG)"=="YES"
-.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX"
+.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX" && \
+ "$(OS)" != "OPENBSD"
#i34482# Blackdown/Sun jdk is in the libsearch patch and has a libjpeg :-(
.IF "$(OS)" == "FREEBSD"
JPEG3RDLIB=/usr/local/lib/libjpeg.so