Update library soname handling

build/top.mk

@@ -67,8 +67,9 @@ MKVERSION = $(top_srcdir)/build/mkversion -v "$(VERSION)"
 SHTOOL = $(top_srcdir)/build/shtool
 
 LIBTOOL = @LIBTOOL@
+LIBRELEASE = @OPENLDAP_LIBRELEASE@
 LIBVERSION = @OPENLDAP_LIBVERSION@
-LTVERSION = -release $(LIBVERSION)
+LTVERSION = -release $(LIBRELEASE) -version-info $(LIBVERSION)
 
 # libtool --only flag for libraries: platform specific
 NT_LTONLY_LIB = # --only-$(BUILD_LIBS_DYNAMIC)

build/version.sh

@@ -18,14 +18,16 @@ DIR=`dirname $0`
 
 if test $ol_patch != X ; then
 	ol_version=${ol_major}.${ol_minor}.${ol_patch}
+	ol_api_lib_release=${ol_major}.${ol_minor}
 	ol_type=Release
 elif test $ol_minor != X ; then
 	ol_version=${ol_major}.${ol_minor}.${ol_patch}
+	ol_api_lib_release=${ol_major}.${ol_minor}-releng
 	ol_type=Engineering
 else
 	ol_version=${ol_major}.${ol_minor}
+	ol_api_lib_release=${ol_major}-devel
 	ol_type=Devel
-	ol_api_lib=0
 fi
 
 ol_string="${ol_package} ${ol_version}-${ol_type}"
@@ -35,7 +37,8 @@ echo OL_MAJOR=$ol_major
 echo OL_MINOR=$ol_minor
 echo OL_PATCH=$ol_patch
 echo OL_API_INC=$ol_api_inc
-echo OL_API_LIB=$ol_api_lib
+echo OL_API_LIB_RELEASE=$ol_api_lib_release
+echo OL_API_LIB_VERSION=$ol_api_lib_version
 echo OL_VERSION=$ol_version
 echo OL_TYPE=$ol_type
 echo OL_STRING=\"${ol_string}\"

build/version.var

@@ -17,5 +17,5 @@ ol_major=2
 ol_minor=X
 ol_patch=X
 ol_api_inc=000000
-ol_api_lib=0.0.0
+ol_api_lib_version=0:0:0
 ol_release_date="00/00/0000"

configure.in

@@ -95,7 +95,10 @@ AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_MAJOR,$OL_MAJOR,Major)
 AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_MINOR,$OL_MINOR,Minor)
 AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_PATCH,$OL_PATCH,Patch)
 
-OPENLDAP_LIBVERSION=$OL_API_LIB
+OPENLDAP_LIBRELEASE=$OL_API_LIB_RELEASE
+AC_SUBST(OPENLDAP_LIBRELEASE)dnl
+
+OPENLDAP_LIBVERSION=$OL_API_LIB_VERSION
 AC_SUBST(OPENLDAP_LIBVERSION)dnl
 
 OPENLDAP_RELEASE_DATE="$OL_RELEASE_DATE"