strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS cmcfixes24 (1.96.78); FILE MERGED

Browse source 
2006/03/13 15:42:28 cmc 1.96.78.1: #i63119# the blackdown having a libjpeg.so doesn't affect a gcj builder
This commit is contained in:
Vladimir Glazounov 2006-04-04 07:30:56 +00:00
parent f958c2bf7e
commit 0451117069
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
solenv/inc/libs.mk
View file

@ -4,9 +4,9 @@
#
# $RCSfile: libs.mk,v $
#
# $Revision: 1.96 $
# $Revision: 1.97 $
#
# last change: $Author: obo $ $Date: 2006-01-20 14:22:05 $
# last change: $Author: vg $ $Date: 2006-04-04 08:30:56 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -32,7 +32,7 @@
# MA 02111-1307 USA
#
#*************************************************************************
LIBSMKREV!:="$$Revision: 1.96 $$"
LIBSMKREV!:="$$Revision: 1.97 $$"
.IF "$(COM)"=="WTC"
LIBPRE=libr
@ -182,12 +182,12 @@ ZLIB3RDLIB=-lz
ZLIB3RDLIB=-lzlib
.ENDIF
.IF "$(SYSTEM_JPEG)"=="YES"
.IF "$(SOLAR_JAVA)" != ""
#i34482# Blackdown jdk is in the libsearch patch and has a libjpeg
.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX"
#i34482# Blackdown/Sun jdk is in the libsearch patch and has a libjpeg :-(
.IF "$(OS)" == "FREEBSD"
JPEG3RDLIB=/usr/local/lib/libjpeg.so
.ELIF "$(OS)" == "MACOSX"
JPEG3RDLIB=-ljpeg
.ELIF "$(CPUNAME)" == "X86_64"
JPEG3RDLIB=/usr/lib64/libjpeg.so
.ELSE
JPEG3RDLIB=/usr/lib/libjpeg.so
.ENDIF