svn commit: samba r10418 - in branches/SAMBA_4_0/source: .

[tpot at samba.org]

Author: tpot
Date: 2005-09-22 08:47:32 +0000 (Thu, 22 Sep 2005)
New Revision: 10418

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10418

Log:
Fix comparison_fn_t test I busted.  Add $HOME to the environment as some
tools get confused if it isn't there.

Modified:
   branches/SAMBA_4_0/source/SConstruct


Changeset:
Modified: branches/SAMBA_4_0/source/SConstruct
===================================================================
--- branches/SAMBA_4_0/source/SConstruct	2005-09-22 08:23:45 UTC (rev 10417)
+++ branches/SAMBA_4_0/source/SConstruct	2005-09-22 08:47:32 UTC (rev 10418)
@@ -7,7 +7,7 @@
 # Copyright (C) 2005 Jelmer Vernooij <jelmer at samba.org>
 # Published under the GNU GPL
 
-import cPickle, string
+import cPickle, string, os
 
 # We don't care about NFS builds...
 
@@ -45,6 +45,9 @@
 # Pull in GNU extensions
 hostenv.Append(CPPDEFINES = {'_GNU_SOURCE': 1})
 
+# Some tools get confused if $HOME isn't defined
+hostenv.Append(ENV={'HOME': os.environ['HOME']})
+
 # Store configuration data in a dictionary.
 
 def saveconfig(data):
@@ -159,7 +162,7 @@
 		if conf.CheckType(t, type_headers):
 			defines['HAVE_%s' % string.upper(t)] = 1
 
-	if conf.CheckType('comparison_fn_t', type_headers):
+	if conf.CheckType('comparison_fn_t', '#include <stdlib.h>'):
 		defines['HAVE_COMPARISON_FN_T'] = 1
 
 	if conf.CheckType('sig_atomic_t', '#include <signal.h>'):