diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2005-09-22 12:23:44 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:38:43 -0500 |
commit | 05bd880626255c6547922204d7ba012aa9bc6d50 (patch) | |
tree | 7bd3ab2c2a7a24f959afed737178791f72e42993 /source4 | |
parent | 2ce3b5a00347cc3120efd12cd58d52a5c43305b3 (diff) | |
download | samba-05bd880626255c6547922204d7ba012aa9bc6d50.tar.gz samba-05bd880626255c6547922204d7ba012aa9bc6d50.tar.bz2 samba-05bd880626255c6547922204d7ba012aa9bc6d50.zip |
r10420: Two minor scons fixes
(This used to be commit 749b19d34f6105c696a07cc2cd39d5acecfc735b)
Diffstat (limited to 'source4')
-rw-r--r-- | source4/SConstruct | 6 | ||||
-rw-r--r-- | source4/lib/tdb/SConscript | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/SConstruct b/source4/SConstruct index 3e9fd867a0..e791f97d7c 100644 --- a/source4/SConstruct +++ b/source4/SConstruct @@ -42,9 +42,6 @@ if hostenv['developer']: hostenv.Append(CCFLAGS='-Wno-format-y2k') hostenv.Append(CCFLAGS='-Wno-declaration-after-statement') -# 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']}) @@ -138,6 +135,9 @@ if hostenv['configure']: if conf.CheckFunc(f): defines['HAVE_' + f.upper()] = 1 + # Pull in GNU extensions + defines['_GNU_SOURCE'] = 1 + needed_types = { 'uint_t': 'unsigned int', 'int8_t': 'signed char', diff --git a/source4/lib/tdb/SConscript b/source4/lib/tdb/SConscript index 09d0cf538a..22f7f34ca5 100644 --- a/source4/lib/tdb/SConscript +++ b/source4/lib/tdb/SConscript @@ -12,4 +12,4 @@ tdb = tdbenv.StaticLibrary('tdb', tdb_source) tdbtool = tdbenv.Program('bin/tdbtool', ['tools/tdbtool.c',tdb]) tdbtorture = tdbenv.Program('bin/tdbtorture', ['tools/tdbtorture.c',tdb]) tdbdump = tdbenv.Program('bin/tdbdump', ['tools/tdbdump.c',tdb]) -tdbbackup = tdbenv.Program('bin/tdbbackup', ['tools/tdbbackup.c',tdb]) +#tdbbackup = tdbenv.Program('bin/tdbbackup', ['tools/tdbbackup.c',tdb]) |