build: use libtool option -version-number

By default, libtool -version-info does not produce a .so file that
contains the library release version number in the file name.
Better library file naming with backward compatibility for applications
can be achieved in a simple manner by using the libtool option
-version-number. Fix configure.ac and the library makefile to use this
option.

Fixes: e5ae91a ("build: fix library versioning")
Signed-off-by: Niklas Cassel <[email protected]>
Signed-off-by: Damien Le Moal <[email protected]>

Author: Niklas Cassel

configure.ac

@@ -13,15 +13,9 @@ PACKAGE_VERSION_MAJOR=$(echo $PACKAGE_VERSION | awk -F. '{print $1}')
 PACKAGE_VERSION_MINOR=$(echo $PACKAGE_VERSION | awk -F. '{print $2}')
 PACKAGE_VERSION_RELEASE=$(echo $PACKAGE_VERSION | awk -F. '{print $3}')
 
-# libzbc library version
-LIBZBC_VERSION="$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_RELEASE"
-LIBZBC_LT_MAJOR=$PACKAGE_VERSION_MAJOR
-LIBZBC_LT_MINOR=$PACKAGE_VERSION_MINOR
-LIBZBC_LT_RELEASE=0
-LIBZBC_VERSION_INFO=$(( LIBZBC_LT_MAJOR + LIBZBC_LT_MINOR )):$LIBZBC_LT_RELEASE:$LIBZBC_LT_MINOR
-
-AC_SUBST([LIBZBC_VERSION])
-AC_SUBST([LIBZBC_VERSION_INFO])
+# libtool friendly library version format
+LIBZBC_VERSION_LT=$PACKAGE_VERSION_MAJOR:$PACKAGE_VERSION_MINOR:$PACKAGE_VERSION_RELEASE
+AC_SUBST([LIBZBC_VERSION_LT])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])

lib/Makefile.am

@@ -38,4 +38,4 @@ libzbc_la_SOURCES = $(CFILES) $(HFILES)
 libzbc_la_CFLAGS = $(AM_CFLAGS) -fPIC
 libzbc_la_LDFLAGS = \
         -Wl,--version-script,${srcdir}/exports \
-	-version-info @LIBZBC_VERSION_INFO@
+	-version-number @LIBZBC_VERSION_LT@

lib/libzbc.pc.in

@@ -10,7 +10,7 @@ includedir=@includedir@
 
 Name:           libzbc
 Description:    A library for accessing and managing ZBC/ZAC devices
-Version:        @LIBZBC_VERSION@
+Version:        @PACKAGE_VERSION@
 Cflags:         -I${includedir}
 Libs:           -L${libdir} -lzbc