[SCM] Samba Shared Repository - branch master updated

[Ira Cooper]

The branch, master has been updated
       via  e8601c0 s3-configure: Fix configure version information.
      from  b211768 s3:rpc_server/dfs: pass allow_broken_path=true to create_junction()

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e8601c02ba59fb12b46919a50702365ceee6aee1
Author: Ira Cooper <ira at samba.org>
Date:   Wed May 23 09:40:11 2012 -0400

    s3-configure: Fix configure version information.
    
    version.h moved from include -> include/autoconf.
    
    Autobuild-User: Ira Cooper <ira at samba.org>
    Autobuild-Date: Thu May 24 01:34:24 CEST 2012 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/m4/samba_version.m4 |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/m4/samba_version.m4 b/source3/m4/samba_version.m4
index 8ee0232..f0e3b8a 100644
--- a/source3/m4/samba_version.m4
+++ b/source3/m4/samba_version.m4
@@ -8,18 +8,18 @@ dnl http://www.gnu.org/licenses/
 dnl
 dnl
 
-SMB_VERSION_STRING=`cat $srcdir/include/version.h | grep '#define SAMBA_VERSION_OFFICIAL_STRING' | cut -d '"' -f2`
+SMB_VERSION_STRING=`cat $srcdir/include/autoconf/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`
+SAMBA_VERSION_GIT_COMMIT_FULLREV=`cat $srcdir/include/autoconf/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_COMMIT_DATE=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_COMMIT_DATE' | cut -d ' ' -f3-`
+SAMBA_VERSION_COMMIT_DATE=`cat $srcdir/include/autoconf/version.h | grep 'SAMBA_VERSION_COMMIT_DATE' | cut -d ' ' -f3-`
 if test -n "${SAMBA_VERSION_COMMIT_DATE}";then
 	echo "BUILD COMMIT DATE: ${SAMBA_VERSION_COMMIT_DATE}"
 fi
-SAMBA_VERSION_COMMIT_TIME=`cat $srcdir/include/version.h | grep 'SAMBA_VERSION_COMMIT_TIME' | cut -d ' ' -f3-`
+SAMBA_VERSION_COMMIT_TIME=`cat $srcdir/include/autoconf/version.h | grep 'SAMBA_VERSION_COMMIT_TIME' | cut -d ' ' -f3-`
 if test -n "${SAMBA_VERSION_COMMIT_TIME}";then
 	echo "BUILD COMMIT TIME: ${SAMBA_VERSION_COMMIT_TIME}"
 


-- 
Samba Shared Repository