diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-08-05 14:04:49 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-08-05 14:04:49 +0000 |
| commit | 167aa5b7276d56d6268f26937f0b04cd9fdbaed9 (patch) | |
| tree | d80873de7f2f4140ed7d49a850d9593f00ef59e8 | |
| parent | 9160b0d4fb863cc1f92bc32bf1bc15035d81364d (diff) | |
INTEGRATION: CWS configure11 (1.91.42); FILE MERGED
2005/07/26 15:37:30 rene 1.91.42.1: #i48757# libjpeg is in /usr/local/lib on FreeBSD
| -rw-r--r-- | solenv/inc/libs.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk index c6912973fe31..688aa2ffcf6f 100644 --- a/solenv/inc/libs.mk +++ b/solenv/inc/libs.mk @@ -2,9 +2,9 @@ # # $RCSfile: libs.mk,v $ # -# $Revision: 1.91 $ +# $Revision: 1.92 $ # -# last change: $Author: rt $ $Date: 2005-06-20 15:27:27 $ +# last change: $Author: hr $ $Date: 2005-08-05 15:04:49 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -59,7 +59,7 @@ # # #************************************************************************* -LIBSMKREV!:="$$Revision: 1.91 $$" +LIBSMKREV!:="$$Revision: 1.92 $$" .IF "$(COM)"=="WTC" LIBPRE=libr @@ -206,7 +206,11 @@ ZLIB3RDLIB=-lzlib .IF "$(SYSTEM_JPEG)"=="YES" .IF "$(SOLAR_JAVA)" != "" #i34482# Blackdown jdk is in the libsearch patch and has a libjpeg +.IF "$(OS)" == "FREEBSD" +JPEG3RDLIB=/usr/local/lib/libjpeg.so +.ELSE JPEG3RDLIB=/usr/lib/libjpeg.so +.ENDIF .ELSE JPEG3RDLIB=-ljpeg .ENDIF |