summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-09-22 08:47:32 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:38:43 -0500
commit53de9b5be089bb486c9219085a89bd172207e81e (patch)
tree9892774f903f93d4b17869f5c30c0dbc7fa00621 /source4
parent217fac860134c60302332031308ed91b3b0b7b42 (diff)
downloadsamba-53de9b5be089bb486c9219085a89bd172207e81e.tar.gz
samba-53de9b5be089bb486c9219085a89bd172207e81e.tar.bz2
samba-53de9b5be089bb486c9219085a89bd172207e81e.zip
r10418: Fix comparison_fn_t test I busted. Add $HOME to the environment as some
tools get confused if it isn't there. (This used to be commit b2f15b5c79970b7f0be752ccf5bb8a6b3c0e5d70)
Diffstat (limited to 'source4')
-rw-r--r--source4/SConstruct7
1 files changed, 5 insertions, 2 deletions
diff --git a/source4/SConstruct b/source4/SConstruct
index 635562d027..3e9fd867a0 100644
--- a/source4/SConstruct
+++ b/source4/SConstruct
@@ -7,7 +7,7 @@
# Copyright (C) 2005 Jelmer Vernooij <jelmer@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 @@ if hostenv['developer']:
# 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 hostenv['configure']:
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>'):