From 614dd20279c2ea6a33990be8f70431f8e50b5719 Mon Sep 17 00:00:00 2001
From: Vincent Richard <vincent@vincent-richard.net>
Date: Tue, 16 Mar 2010 15:55:47 +0000
Subject: [PATCH] Migrated config script for newer versions of SCons.

---
 SConstruct | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/SConstruct b/SConstruct
index 24527450..384c90f5 100644
--- a/SConstruct
+++ b/SConstruct
@@ -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(