summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2011-05-06 12:44:04 +0200
committerMichael Adam <obnox@samba.org>2011-05-13 16:42:23 +0200
commitadb3fc2f1d85f7621043d087ed2afb0fd053a009 (patch)
treee2c7e6bc97f20866ae07522a9498f6398c9a9110
parentf8e32980f4fab8d6cad5c9f95fab0d1828717cd2 (diff)
downloadsamba-adb3fc2f1d85f7621043d087ed2afb0fd053a009.tar.gz
samba-adb3fc2f1d85f7621043d087ed2afb0fd053a009.tar.bz2
samba-adb3fc2f1d85f7621043d087ed2afb0fd053a009.zip
s3:build: add an optional full version argument to the SMB_LIBRARY() macro.
-rw-r--r--source3/configure.in2
-rw-r--r--source3/m4/aclocal.m410
2 files changed, 7 insertions, 5 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 24ce21a9b4..1d1094c5ce 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2179,7 +2179,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 301445f562..afd7c7491a 100644
--- 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)