[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  f6cfa86 talloc: Look harder for waf.
       via  c402e75 replace: Look harder for waf.
      from  c3fa203 build: In some case the flags for the sun studio linker are wrong

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


- Log -----------------------------------------------------------------
commit f6cfa866074b64b57d574c94429c8e358974b954
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 31 18:24:02 2010 +0100

    talloc: Look harder for waf.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Sun Oct 31 18:06:16 UTC 2010 on sn-devel-104

commit c402e75be930a47f4e1c5663cb0041791fd47bcf
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Oct 31 18:19:19 2010 +0100

    replace: Look harder for waf.

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

Summary of changes:
 lib/replace/configure |    9 ++++++++-
 lib/talloc/configure  |    9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/replace/configure b/lib/replace/configure
index 2d4aec7..6a9f875 100755
--- a/lib/replace/configure
+++ b/lib/replace/configure
@@ -2,7 +2,14 @@
 
 PREVPATH=`dirname $0`
 
-WAF=../../buildtools/bin/waf
+if [ -f $PREVPATH/../../buildtools/bin/waf ]; then
+	WAF=../../buildtools/bin/waf
+elif [ -f $PREVPATH/buildtools/bin/waf ]; then
+	WAF=./buildtools/bin/waf
+else
+	echo "replace: Unable to find waf"
+	exit 1
+fi
 
 # using JOBS=1 gives maximum compatibility with
 # systems like AIX which have broken threading in python
diff --git a/lib/talloc/configure b/lib/talloc/configure
index 2d4aec7..6a9f875 100755
--- a/lib/talloc/configure
+++ b/lib/talloc/configure
@@ -2,7 +2,14 @@
 
 PREVPATH=`dirname $0`
 
-WAF=../../buildtools/bin/waf
+if [ -f $PREVPATH/../../buildtools/bin/waf ]; then
+	WAF=../../buildtools/bin/waf
+elif [ -f $PREVPATH/buildtools/bin/waf ]; then
+	WAF=./buildtools/bin/waf
+else
+	echo "replace: Unable to find waf"
+	exit 1
+fi
 
 # using JOBS=1 gives maximum compatibility with
 # systems like AIX which have broken threading in python


-- 
Samba Shared Repository