s3:build: add an optional full version argument to the SMB_LIBRARY() macro.

(cherry picked from commit adb3fc2f1d85f7621043d087ed2afb0fd053a009)

diff --git a/source3/configure.in b/source3/configure.in
index 849eb64f9e3a72cec61c8414e06c0950cb21e00e..623ef4d9cca7de033cb30e912293d46951c71aac 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2171,7 +2171,7 @@ fi
 SMB_LIBRARY(netapi, 0)
 SMB_LIBRARY(smbclient, 0)
 SMB_LIBRARY(smbsharemodes, 0)
-SMB_LIBRARY(addns, 0, no, [undefined API])
+SMB_LIBRARY(addns, 0, [], no, [undefined API])
 
 
 

diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
index 301445f562da93fc16c768365afd17220da7c90c..afd7c7491a12d327ece8f4d68c2eecb11200aa1a 100644 (file)
--- a/source3/m4/aclocal.m4
+++ b/source3/m4/aclocal.m4
@@ -54,7 +54,7 @@ AC_DEFUN(SMB_SUBSYSTEM,
 ])
 
 
-dnl SMB_LIBRARY(name, version, default, reason)
+dnl SMB_LIBRARY(name, soversion, fullversion, default, reason)
 dnl
 dnl configure build and use of an (internal) shared library
 dnl
@@ -74,6 +74,7 @@ LIBUC[_TARGET]=
 [UNINSTALL_]LIBUC=
 
 m4_if([$2], [], [LIBUC[_SOVER]=0], [LIBUC[_SOVER]=$2])
+m4_if([$3], [], [LIBUC[_FULLVER]=$LIBUC[_SOVER]], [LIBUC[_FULLVER]=$3])
 
 AC_SUBST(LIBUC[_SHARED_TARGET])
 AC_SUBST(LIBUC[_STATIC_TARGET])
@@ -84,15 +85,16 @@ AC_SUBST(LIBUC[_TARGET])
 AC_SUBST([INSTALL_]LIBUC)
 AC_SUBST([UNINSTALL_]LIBUC)
 AC_SUBST(LIBUC[_SOVER])
+AC_SUBST(LIBUC[_FULLVER])
 
 AC_MSG_CHECKING([whether to build the LIBNAME shared library])
-m4_if([$3], [no], [
+m4_if([$4], [no], [
 dnl set the default to not build the shared lib
 AC_ARG_WITH(LIBNAME,
 AS_HELP_STRING([--with-]LIBNAME,
-       m4_if([$4], [],
+       m4_if([$5], [],
                [Build the LIBNAME shared library (default=no)],
-               [Build the LIBNAME shared library (default=no ($4))])),
+               [Build the LIBNAME shared library (default=no ($5))])),
 [
 case "$withval" in
        yes)