From adb3fc2f1d85f7621043d087ed2afb0fd053a009 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Fri, 6 May 2011 12:44:04 +0200
Subject: s3:build: add an optional full version argument to the SMB_LIBRARY()
 macro.

---
 source3/m4/aclocal.m4 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'source3/m4')

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)
-- 
cgit 


From 710444d1108252e9a9cc80e963d47b542cc6c2f5 Mon Sep 17 00:00:00 2001
From: Herb Lewis <hlewis@panasas.com>
Date: Thu, 2 Jun 2011 10:15:18 -0700
Subject: In samba_version.m4 the test to get the version now returns several
 lines instead of the one we really wanted which causes some spurious output
 when configure tries to print the samba version when it starts running. This
 is only a cosmetic problem but still looks ugly.

Signed-off-by: Jeremy Allison <jra@samba.org>
---
 source3/m4/samba_version.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/m4')

diff --git a/source3/m4/samba_version.m4 b/source3/m4/samba_version.m4
index dbea1f3b3a..8ee0232df8 100644
--- a/source3/m4/samba_version.m4
+++ b/source3/m4/samba_version.m4
@@ -8,7 +8,7 @@ dnl http://www.gnu.org/licenses/
 dnl
 dnl
 
-SMB_VERSION_STRING=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
+SMB_VERSION_STRING=`cat $srcdir/include/version.h | grep '#define SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
 echo "SAMBA VERSION: ${SMB_VERSION_STRING}"
 
 SAMBA_VERSION_GIT_COMMIT_FULLREV=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_FULLREV' | cut -d ' ' -f3- | cut -d '"' -f2`
-- 
cgit