From 5e4c8b8cd375131094e0fe40bd4c048539206ac2 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Wed, 21 Sep 2005 07:12:23 +0000 Subject: r10378: Build config.h file from dictionary of defines and always use it. (This used to be commit 252b64eb20db9152d357188d45fb39bb3d0b61bc) --- source4/SConstruct | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'source4/SConstruct') diff --git a/source4/SConstruct b/source4/SConstruct index 58f2640d09..f399fd2c7a 100644 --- a/source4/SConstruct +++ b/source4/SConstruct @@ -15,7 +15,6 @@ opts = Options(None, ARGUMENTS) opts.AddOptions( BoolOption('developer','enable developer flags', 0), PathOption('prefix','installation prefix','/usr/local/samba'), - BoolOption('configh','use config.h file', 0), BoolOption('configure','run configure checks', False), ) @@ -156,10 +155,16 @@ hostenv.CProtoHeader(target='include/proto.h',source=proto_files) if hostenv['configure']: saveconfig(defines) -if hostenv['configh']: - def create_config_h(env,target,source): - pass #FIXME - hostenv.Command('include/config.h',[],create_config_h) - hostenv.Append(CPPDEFINES = {'HAVE_CONFIG_H': 1}) -else: - [hostenv.Append(CPPDEFINES = {p: defines[p]}) for p in defines] +# How to create config.h file + +def create_config_h(env, target, source): + fd = open(str(target[0]), 'w') + [fd.write('#define %s\n' % x) for x in defines] + fd.close() + +def create_config_h_print(*args, **kwargs): + print 'Building config.h' + +hostenv.Command('include/config.h', [], + Action(create_config_h, create_config_h_print)) +hostenv.Append(CPPDEFINES = {'HAVE_CONFIG_H': 1}) -- cgit