From c54275c6a7cc318cd77760536d899d05bb391794 Mon Sep 17 00:00:00 2001 From: DRC Date: Sun, 10 Oct 2010 00:40:37 +0000 Subject: [PATCH] Fix version numbers for v7/v8 shared libs git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@242 632fc199-4ca6-4c93-a231-07263d6284db --- Makefile.am | 2 +- configure.ac | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4a559da8b..7a87d77f8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ 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 include_HEADERS = jerror.h jmorecfg.h jpeglib.h turbojpeg.h nodist_include_HEADERS = jconfig.h diff --git a/configure.ac b/configure.ac index 8e8e6bd2e..c4199833b 100644 --- a/configure.ac +++ b/configure.ac @@ -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_ARG_WITH([jpeg8], 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 JPEG_LIB_VERSION=80 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 if test "x${with_jpeg7}" == "xyes"; then JPEG_LIB_VERSION=70 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 JPEG_LIB_VERSION=62 AC_DEFINE([JPEG_LIB_VERSION], [62], [Version 6b]) + [JPEG_LIB_VERSION="$JPEG_LIB_VERSION:0:0"] fi fi +AC_MSG_RESULT([$JPEG_LIB_VERSION]) AC_SUBST(JPEG_LIB_VERSION) # SIMD is optional