[SCM] Samba Shared Repository - branch master updated - 96b1b8b94af56616a2d31de039ef0a91d4ff3088

[Andrew Bartlett]

The branch, master has been updated
       via  96b1b8b94af56616a2d31de039ef0a91d4ff3088 (commit)
       via  e1ab0903a96e447f9abd93324ac06b8a559122bf (commit)
      from  58b680446f5fe03434dc914db89fbba5b6152201 (commit)

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


- Log -----------------------------------------------------------------
commit 96b1b8b94af56616a2d31de039ef0a91d4ff3088
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Jan 14 15:05:08 2009 +1100

    Fix error message in mkrelease to refer to source4, not source

commit e1ab0903a96e447f9abd93324ac06b8a559122bf
Author: Torgeir Lerkerod <Torgeir.Lerkerod at gmail.com>
Date:   Tue Jan 13 22:15:37 2009 +0100

    Fixed problemed showed on a number of systems on the buildfarm.
    
    Problem shows up as perl error related to config.pm in reality
    this was related to the ECHO_C variable. Added test to skip that
    variable as no perl module is using it.
    
    Torgeir
    
    Signed-off-by: Torgeir Lerkerod <Torgeir.Lerkerod at gmail.com>
    Signed-off-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 source4/build/m4/public.m4  |    5 ++++-
 source4/script/mkrelease.sh |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index e51a8ac..a2b46a5 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -202,7 +202,10 @@ CEOF
 for ac_var in $ac_subst_vars
 do
     eval ac_val=\$$ac_var
-	echo "$ac_var => '$ac_val'," >> $1
+	if test "$ac_var" != "ECHO_C" 
+	then
+		echo "$ac_var => '$ac_val'," >> $1
+	fi
 done
 
 cat >>$1<<CEOF
diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh
index 6a8c5ae..110988d 100755
--- a/source4/script/mkrelease.sh
+++ b/source4/script/mkrelease.sh
@@ -2,7 +2,7 @@
 
 if [ ! -d ".git" -o `dirname $0` != "./source4/script" ]; then
 	echo "Run this script from the top-level directory in the"
-	echo "repository as: ./source/script/mkrelease.sh"
+	echo "repository as: ./source4/script/mkrelease.sh"
 	exit 1
 fi
 


-- 
Samba Shared Repository