r10420: Two minor scons fixes

(This used to be commit 749b19d34f6105c696a07cc2cd39d5acecfc735b)

diff --git a/source4/SConstruct b/source4/SConstruct
index 3e9fd867a0d46e83c3d1f48282e6ccbc617fe3be..e791f97d7c1e518521df9b7bc54001f5684e9518 100644 (file)
--- 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 09d0cf538a9046876b024286c3de2977bff1f6c8..22f7f34ca5313bcdc3cbd7c75ffb53a80b35ca87 100644 (file)
--- 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])