ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix version numbers for v7/v8 shared libs

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@242 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2010-10-10 00:40:37 +00:00
parent 49967cdb30
commit c54275c6a7
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -1,5 +1,5 @@
lib_LTLIBRARIES = libjpeg.la libturbojpeg.la lib_LTLIBRARIES = libjpeg.la libturbojpeg.la
libjpeg_la_LDFLAGS = -version-number ${JPEG_LIB_VERSION}:0:0 -no-undefined libjpeg_la_LDFLAGS = -version-info ${JPEG_LIB_VERSION} -no-undefined
libturbojpeg_la_LDFLAGS = -avoid-version -no-undefined libturbojpeg_la_LDFLAGS = -avoid-version -no-undefined
include_HEADERS = jerror.h jmorecfg.h jpeglib.h turbojpeg.h include_HEADERS = jerror.h jmorecfg.h jpeglib.h turbojpeg.h
nodist_include_HEADERS = jconfig.h nodist_include_HEADERS = jconfig.h

7
configure.ac
View File

@@ -135,20 +135,23 @@ AC_ARG_WITH([jpeg7],
AC_HELP_STRING([--with-jpeg7], [Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b.)])) AC_HELP_STRING([--with-jpeg7], [Emulate libjpeg v7 API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b.)]))
AC_ARG_WITH([jpeg8], AC_ARG_WITH([jpeg8],
AC_HELP_STRING([--with-jpeg8], [Emulate libjpeg v8b API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b.)])) AC_HELP_STRING([--with-jpeg8], [Emulate libjpeg v8b API/ABI (this makes libjpeg-turbo backward incompatible with libjpeg v6b.)]))
AC_MSG_CHECKING([libjpeg version number])
if test "x${with_jpeg8}" == "xyes"; then if test "x${with_jpeg8}" == "xyes"; then
JPEG_LIB_VERSION=80 JPEG_LIB_VERSION=80
AC_DEFINE([JPEG_LIB_VERSION], [80], [Version 8.0]) AC_DEFINE([JPEG_LIB_VERSION], [80], [Version 8.0])
AC_MSG_NOTICE([libjpeg v8b API/ABI emulation enabled]) [JPEG_LIB_VERSION="`expr $JPEG_LIB_VERSION / 10`:2"]
else else
if test "x${with_jpeg7}" == "xyes"; then if test "x${with_jpeg7}" == "xyes"; then
JPEG_LIB_VERSION=70 JPEG_LIB_VERSION=70
AC_DEFINE([JPEG_LIB_VERSION], [70], [Version 7.0]) AC_DEFINE([JPEG_LIB_VERSION], [70], [Version 7.0])
AC_MSG_NOTICE([libjpeg v7 API/ABI emulation enabled]) [JPEG_LIB_VERSION="`expr $JPEG_LIB_VERSION / 10`:`expr $JPEG_LIB_VERSION % 10`"]
else else
JPEG_LIB_VERSION=62 JPEG_LIB_VERSION=62
AC_DEFINE([JPEG_LIB_VERSION], [62], [Version 6b]) AC_DEFINE([JPEG_LIB_VERSION], [62], [Version 6b])
[JPEG_LIB_VERSION="$JPEG_LIB_VERSION:0:0"]
fi fi
fi fi
AC_MSG_RESULT([$JPEG_LIB_VERSION])
AC_SUBST(JPEG_LIB_VERSION) AC_SUBST(JPEG_LIB_VERSION)
# SIMD is optional # SIMD is optional