[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  567f05e mkversion: Add quotes around various version strings
      from  474c02a s3-waf: add dependency on talloc or it won't build if talloc.h is not in the default include path

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


- Log -----------------------------------------------------------------
commit 567f05e571278c4674dbf3c9aba8c69a11921873
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Fri Feb 10 10:58:30 2012 +1100

    mkversion: Add quotes around various version strings
    
    This fixes compilation errors when VENDOR strings are specified.
    
    Autobuild-User: Amitay Isaacs <amitay at samba.org>
    Autobuild-Date: Sat Feb 11 09:07:54 CET 2012 on sn-devel-104

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

Summary of changes:
 source3/script/mkversion.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh
index 0e4a860..d8ba8af 100755
--- a/source3/script/mkversion.sh
+++ b/source3/script/mkversion.sh
@@ -108,10 +108,10 @@ if test -n "${SAMBA_VERSION_VENDOR_FUNCTION}"; then
 fi
 
 if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then
-    echo "#define SAMBA_VERSION_VENDOR_SUFFIX ${SAMBA_VERSION_VENDOR_SUFFIX}" >> $OUTPUT_FILE
+    echo "#define SAMBA_VERSION_VENDOR_SUFFIX \"${SAMBA_VERSION_VENDOR_SUFFIX}\"" >> $OUTPUT_FILE
     SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_SUFFIX}"
     if test -n "${SAMBA_VERSION_VENDOR_PATCH}";then
-        echo "#define SAMBA_VERSION_VENDOR_PATCH ${SAMBA_VERSION_VENDOR_PATCH}" >> $OUTPUT_FILE
+        echo "#define SAMBA_VERSION_VENDOR_PATCH \"${SAMBA_VERSION_VENDOR_PATCH}\"" >> $OUTPUT_FILE
         echo "#define SAMBA_VERSION_VENDOR_PATCH_STRING \"${SAMBA_VERSION_VENDOR_PATCH}\"" >> $OUTPUT_FILE
         SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_PATCH}"
     fi
@@ -121,7 +121,7 @@ fi
 ## Add a release nickname
 ##
 if test -n "${SAMBA_VERSION_RELEASE_NICKNAME}";then
-    echo "#define SAMBA_VERSION_RELEASE_NICKNAME ${SAMBA_VERSION_RELEASE_NICKNAME}" >> $OUTPUT_FILE
+    echo "#define SAMBA_VERSION_RELEASE_NICKNAME \"${SAMBA_VERSION_RELEASE_NICKNAME}\"" >> $OUTPUT_FILE
     SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING} (${SAMBA_VERSION_RELEASE_NICKNAME})"
 fi
 


-- 
Samba Shared Repository