[Libreoffice-commits] .: solenv/inc

[Robert Nagy]

 solenv/inc/libs.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e7337481f210337fcb8b9bd010ae1554176953c7
Author: Robert Nagy <robert at openbsd.org>
Date:   Thu Nov 4 15:38:10 2010 +0100

    use system jpeg on OpenBSD

diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 06c720c..fc5dee4 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