diff options
| author | Vincent Richard <[email protected]> | 2010-03-16 16:55:47 +0100 |
|---|---|---|
| committer | Vincent Richard <[email protected]> | 2010-03-16 16:55:47 +0100 |
| commit | 614dd20279c2ea6a33990be8f70431f8e50b5719 (patch) | |
| tree | 1cf2e68cd2cdba1791b6435b24ab0e81987faae5 /SConstruct | |
| parent | Fixed calls to 'empty' instead of 'clear' (thanks to John van der Kamp, from ... (diff) | |
| download | vmime-614dd20279c2ea6a33990be8f70431f8e50b5719.tar.gz vmime-614dd20279c2ea6a33990be8f70431f8e50b5719.zip | |
Migrated config script for newer versions of SCons.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -436,7 +436,7 @@ libvmime_dist_files += libvmime_autotools # Set options # ################# -EnsureSConsVersion(0, 94) +EnsureSConsVersion(0, 98, 1) SetOption('implicit_cache', 1) @@ -578,7 +578,10 @@ opts.AddVariables( # Configuration Environment # ############################### -env = Environment(options = opts) +try: + env = Environment(variables = opts) +except TypeError: + env = Environment(options = opts) env.Append(ENV = os.environ) env.Append(ENV = {'PATH' : os.environ['PATH']}) @@ -953,7 +956,7 @@ Default(libVmime) # Tests if env['build_tests'] == 'yes': if env['debug'] == 'yes': - env = env.Copy() + env = env.Clone() env.Append(LIBS = ['cppunit', 'dl', packageVersionedGenericName + '-debug', 'pthread']) env.Append(LIBPATH=['.']) Default( |