fixed lt_version in configure.ac

diff --git a/CHANGES b/CHANGES
index a8ff86ec8b89b5e1226a0fa3581c84f63c63e1db..4acd139a5aab8fc68bd5e97eb28d2b417861a47a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+March 10, 2011
+* [antonin] fixed lt_version in configure.ac
+
 March 5, 2011
 ! [antonin] cosmetic change for status report of ./configure
 

diff --git a/configure.ac b/configure.ac
index e52fefe46dcd29ec4a9bb09f1508ad9f8193a01e..18da967ab7229cdd0db4e18ad476a4fef0236fa1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,10 @@
 
+# According to http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info :
+#
+# 1) when bugs are fixed or internal code is changed: increase MICRO
+# 2) if API is added, increase MINOR and set MICRO to 0
+# 3) if API or ABI is broken (this case should (must) never happen as it's very bad for a library), or a new designed library, increase MAJOR and set MINOR and MICRO to 0
+
 m4_define([OPJ_MAJOR], [1])
 m4_define([OPJ_MINOR], [4])
 m4_define([OPJ_MICRO], [0])
@@ -7,10 +13,14 @@ m4_define([JP3D_MAJOR], [1])
 m4_define([JP3D_MINOR], [3])
 m4_define([JP3D_MICRO], [0])
 
-m4_define([lt_rev], m4_eval(OPJ_MAJOR + OPJ_MINOR))
-m4_define([lt_cur], OPJ_MICRO)
+m4_define([lt_cur], m4_eval(OPJ_MAJOR + OPJ_MINOR))
+m4_define([lt_rev], OPJ_MICRO)
 m4_define([lt_age], OPJ_MINOR)
 
+m4_define([lt_cur_jp3d], m4_eval(JP3D_MAJOR + JP3D_MINOR))
+m4_define([lt_rev_jp3d], JP3D_MICRO)
+m4_define([lt_age_jp3d], JP3D_MINOR)
+
 AC_PREREQ([2.62])
 AC_INIT([OpenJPEG],
    [OPJ_MAJOR.OPJ_MINOR.OPJ_MICRO],
@@ -44,9 +54,12 @@ AC_SUBST(JP3D_MICRO_NR)
 LT_PREREQ([2.0])
 LT_INIT([win32-dll])
 
-lt_version=lt_rev:lt_cur:lt_age
+lt_version=lt_cur:lt_rev:lt_age
 AC_SUBST(lt_version)
 
+lt_version_jp3d=lt_cur_jp3d:lt_rev_jp3d:lt_age_jp3d
+AC_SUBST(lt_version_jp3d)
+
 
 ### Needed information
 

diff --git a/jp3d/libjp3dvm/Makefile.am b/jp3d/libjp3dvm/Makefile.am
index 2e533e6df9e050fea96b0de0c9a5cbca80907e10..ccf72efad9056a44f23b4f5be2abe6caabc97510 100644 (file)
--- a/jp3d/libjp3dvm/Makefile.am
+++ b/jp3d/libjp3dvm/Makefile.am
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libopenjp3dvm.la
 includesdir = ${includedir}/openjpeg3d-@JP3D_MAJOR_NR@.@JP3D_MINOR_NR@
 includes_HEADERS = openjpeg3d.h
 
-libopenjp3dvm_la_LDFLAGS = -no-undefined -version-info @lt_version@
+libopenjp3dvm_la_LDFLAGS = -no-undefined -version-info @lt_version_jp3d@
 
 libopenjp3dvm_la_CPPFLAGS = \
 -I. \