Author: jelmer
Date: 2005-09-22 12:23:44 +0000 (Thu, 22 Sep 2005)
New Revision: 10420

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

Log:
Two minor scons fixes

Modified:
   branches/SAMBA_4_0/source/SConstruct
   branches/SAMBA_4_0/source/lib/tdb/SConscript


Changeset:
Modified: branches/SAMBA_4_0/source/SConstruct
===================================================================
--- branches/SAMBA_4_0/source/SConstruct        2005-09-22 09:06:37 UTC (rev 
10419)
+++ branches/SAMBA_4_0/source/SConstruct        2005-09-22 12:23:44 UTC (rev 
10420)
@@ -42,9 +42,6 @@
        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 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',

Modified: branches/SAMBA_4_0/source/lib/tdb/SConscript
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/SConscript        2005-09-22 09:06:37 UTC 
(rev 10419)
+++ branches/SAMBA_4_0/source/lib/tdb/SConscript        2005-09-22 12:23:44 UTC 
(rev 10420)
@@ -12,4 +12,4 @@
 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])

Reply via email to