scons: Try to cope with scons 0.98+.

diff --git a/common.py b/common.py
index 1c939e0e2455ef73431901027d18acea6e8710de..6de181739bab0baf1c47566d43eef516cbdc98e0 100644 (file)
--- a/common.py
+++ b/common.py
@@ -44,8 +44,14 @@ else:
 # Common options
 
 def AddOptions(opts):
-       from SCons.Options.BoolOption import BoolOption
-       from SCons.Options.EnumOption import EnumOption
+       try:
+               from SCons.Options.BoolOption import BoolOption
+       except ImportError:
+               from SCons.Variables.BoolVariable import BoolVariable as BoolOption
+       try:
+               from SCons.Options.EnumOption import EnumOption
+       except ImportError:
+               from SCons.Variables.EnumVariable import EnumVariable as EnumOption
        opts.Add(BoolOption('debug', 'build debug version', 'no'))
        #opts.Add(BoolOption('quiet', 'quiet command lines', 'no'))
        opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,