diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-10 20:39:02 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-01-10 20:39:02 +0100 |
commit | 84c9b6235ed52770eb6dfae8b75c346d435cb260 (patch) | |
tree | 86e2a652168471e8ac0276b92db564c9cc352120 /source4/build/m4/env.m4 | |
parent | 70ca53749862a9cf0c511ca3f89ac132d53ab1ac (diff) | |
parent | 256659039affd7ce6a028be661fcc77147c0461e (diff) | |
download | samba-84c9b6235ed52770eb6dfae8b75c346d435cb260.tar.gz samba-84c9b6235ed52770eb6dfae8b75c346d435cb260.tar.bz2 samba-84c9b6235ed52770eb6dfae8b75c346d435cb260.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit ad9089c413bfac6dddda5e837d7143fe7a2c29fb)
Diffstat (limited to 'source4/build/m4/env.m4')
-rw-r--r-- | source4/build/m4/env.m4 | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/source4/build/m4/env.m4 b/source4/build/m4/env.m4 index 7556f16ce2..9510a8ee0d 100644 --- a/source4/build/m4/env.m4 +++ b/source4/build/m4/env.m4 @@ -19,9 +19,20 @@ AC_SUBST(datarootdir) SMB_VERSION_STRING=`cat ${srcdir}/version.h | grep 'SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2` echo "SAMBA VERSION: ${SMB_VERSION_STRING}" -SAMBA_VERSION_SVN_REVISION=`cat ${srcdir}/version.h | grep 'SAMBA_VERSION_SVN_REVISION' | cut -d ' ' -f3-` -if test -n "${SAMBA_VERSION_SVN_REVISION}";then - echo "BUILD REVISION: ${SAMBA_VERSION_SVN_REVISION}" +SAMBA_VERSION_GIT_COMMIT_FULLREV=`cat ${srcdir}/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_FULLREV' | cut -d ' ' -f3- | cut -d '"' -f2` +if test -n "${SAMBA_VERSION_GIT_COMMIT_FULLREV}";then + echo "BUILD COMMIT REVISION: ${SAMBA_VERSION_GIT_COMMIT_FULLREV}" +fi +SAMBA_VERSION_GIT_COMMIT_DATE=`cat ${srcdir}/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_DATE' | cut -d ' ' -f3-` +if test -n "${SAMBA_VERSION_GIT_COMMIT_DATE}";then + echo "BUILD COMMIT DATE: ${SAMBA_VERSION_GIT_COMMIT_DATE}" +fi +SAMBA_VERSION_GIT_COMMIT_TIME=`cat ${srcdir}/version.h | grep 'SAMBA_VERSION_GIT_COMMIT_TIME' | cut -d ' ' -f3-` +if test -n "${SAMBA_VERSION_GIT_COMMIT_TIME}";then + echo "BUILD COMMIT TIME: ${SAMBA_VERSION_GIT_COMMIT_TIME}" + + # just to keep the build-farm gui happy for now... + echo "BUILD REVISION: ${SAMBA_VERSION_GIT_COMMIT_TIME}" fi m4_include(build/m4/check_path.m4) |