From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Wed, 30 Apr 2008 15:58:04 +0000 (+0900)
Subject: scons: Try to cope with scons 0.98+.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c9acd439b1af4b037ded324139664cf9832930f8;p=mesa.git

scons: Try to cope with scons 0.98+.
---

diff --git a/common.py b/common.py
index 1c939e0e245..6de181739ba 100644
--- 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,