2007-12-22 13:46:38 +01:00
|
|
|
|
--- SConstruct 2007-12-21 22:00:22.000000000 -0500
|
|
|
|
|
+++ SConstruct 2007-12-21 22:03:19.000000000 -0500
|
|
|
|
|
@@ -409,7 +409,7 @@
|
2007-10-07 10:46:30 +02:00
|
|
|
|
not (os.path.exists('config.py') and os.path.exists('config.h')) and \
|
|
|
|
|
not GetOption('clean'):
|
|
|
|
|
opts = DefineOptions(None, ARGUMENTS)
|
|
|
|
|
- env = Environment(options = opts)
|
|
|
|
|
+ env = Environment(ENV = os.environ, options = opts)
|
|
|
|
|
Help(opts.GenerateHelpText(env))
|
|
|
|
|
|
|
|
|
|
opts.Update(env)
|
2007-12-22 13:46:38 +01:00
|
|
|
|
@@ -422,7 +422,8 @@
|
2007-10-06 08:42:55 +02:00
|
|
|
|
if os.environ.has_key('PKG_CONFIG_PATH'):
|
|
|
|
|
env['ENV']['PKG_CONFIG_PATH'] = os.environ['PKG_CONFIG_PATH']
|
|
|
|
|
|
|
|
|
|
- env['CPPPATH'] += ['.', 'src/']
|
|
|
|
|
+ env['CPPPATH'] = Split(env['CPPPATH'])
|
|
|
|
|
+ env['LIBPATH'] = Split(env['LIBPATH'])
|
|
|
|
|
|
|
|
|
|
config_h_defines = []
|
|
|
|
|
|
2007-12-22 13:46:38 +01:00
|
|
|
|
@@ -510,7 +511,6 @@
|
2007-10-07 10:46:30 +02:00
|
|
|
|
|
|
|
|
|
config_h = open('config.h', 'w')
|
2007-12-22 13:46:38 +01:00
|
|
|
|
config_h.write('#define VERSION "0.7.2"\n')
|
2007-10-07 10:46:30 +02:00
|
|
|
|
- config_h.write('#define ENABLE_BINRELOC 1\n')
|
2007-12-22 13:46:38 +01:00
|
|
|
|
config_h.write('#define ICONV_CONST %s\n' % iconv_const)
|
2007-10-07 10:46:30 +02:00
|
|
|
|
for (v,k) in config_h_defines:
|
|
|
|
|
config_h.write('#define %s %s\n' % (v, k))
|