[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  815fcfb... build: treat a blank --build or --host as not a cross-compile
      from  1c7a60e... Fix cancel by close lock test.

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


- Log -----------------------------------------------------------------
commit 815fcfba48ecf2596d989c646cd59c305b0d38ef
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri May 7 09:00:53 2010 +0200

    build: treat a blank --build or --host as not a cross-compile
    
    This matches autoconf behaviour

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

Summary of changes:
 buildtools/wafsamba/wscript |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index c8872eb..56f2e60 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -178,7 +178,9 @@ def configure(conf):
     conf.env.AUTOCONF_HOST  = Options.options.AUTOCONF_HOST
     conf.env.AUTOCONF_PROGRAM_PREFIX = Options.options.AUTOCONF_PROGRAM_PREFIX
 
-    if conf.env.AUTOCONF_BUILD != conf.env.AUTOCONF_HOST:
+    if (conf.env.AUTOCONF_HOST and
+        conf.env.AUTOCONF_BUILD and
+        conf.env.AUTOCONF_BUILD != conf.env.AUTOCONF_HOST):
         Logs.error('ERROR: Mismatch between --build and --host. Please use --cross-compile instead')
         sys.exit(1)
     if conf.env.AUTOCONF_PROGRAM_PREFIX:


-- 
Samba Shared Repository