summaryrefslogtreecommitdiff
path: root/solenv/inc/libs.mk
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-10-12 09:32:02 +0200
committerDavid Tardon <dtardon@redhat.com>2012-10-12 09:33:40 +0200
commit4ed91fd1633e90b8d1f872aa7ed023431958bd23 (patch)
treef2256caffa2cb086dfe21e29c985af10b617917f /solenv/inc/libs.mk
parent5c635140c7aa4b31d23ea96c8d10be3b3a44d8f7 (diff)
do not play stupid games with jpeg vs. jpeglib
Change-Id: I72ed637ecec5aff7528ff724b2665e22650c224b
Diffstat (limited to 'solenv/inc/libs.mk')
-rw-r--r--solenv/inc/libs.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 0f25a6b6fbfb..f705d5f0b8fb 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -193,11 +193,7 @@ MINIZIP3RDLIB=$(MINIZIP_LIBS)
# internally, minizip is included in zlib
MINIZIP3RDLIB=
.ENDIF
-.IF "$(SYSTEM_JPEG)"=="YES"
JPEG3RDLIB=-ljpeg
-.ELSE
-JPEG3RDLIB=-ljpeglib
-.ENDIF
.IF "$(SYSTEM_DB)" == "YES"
BERKELEYLIB=-l$(DB_LIB)
.ELIF "$(GUI)$(COM)"=="WNTGCC"
@@ -445,7 +441,7 @@ CLUCENELIB=iclucene.lib
EXPAT3RDLIB=expat_xmltok.lib expat_xmlparse.lib
EXPATASCII3RDLIB=expat_xmltok.lib ascii_expat_xmlparse.lib
ZLIB3RDLIB=zlib.lib
-JPEG3RDLIB=jpeglib.lib
+JPEG3RDLIB=jpeg.lib
BERKELEYLIB=libdb47.lib
CURLLIB=libcurl.lib
CHAOSLIB=ichaos.lib