diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
| commit | 6da26870e0ae5acd6ff49a30ec2f6886b44d095e (patch) | |
| tree | 850c71039563c16a5d563c47e7ba2ab645baf198 /source3/m4 | |
| parent | 6925a799d04c6fa59dd2ddef1f5510f9bb7d17d1 (diff) | |
| parent | 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 (diff) | |
| download | samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.tar.gz samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.tar.bz2 samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.zip | |
Merge 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 as Samba-4.0alpha16
Diffstat (limited to 'source3/m4')
| -rw-r--r-- | source3/m4/aclocal.m4 | 10 | ||||
| -rw-r--r-- | source3/m4/samba_version.m4 | 2 |
2 files changed, 7 insertions, 5 deletions
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) 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` |