--- SConstruct	2008-08-23 19:37:34.000000000 -0500
+++ SConstruct	2019-07-04 09:06:34.000000000 -0500
@@ -27,57 +27,57 @@
 # Options
 #-----------------------------------------------------------------------------
 
-opts = Options (conf_file)
+opts = Variables (conf_file)
 
-opts.AddOptions (EnumOption ('host',
+opts.Add (EnumVariable ('host',
 			     help = 'host build platform',
 			     allowed_values = ('posix', 'win32'),
 			     default = 'posix',
-			     ignorecase = 1),
+			     ignorecase = 1))
 
-		 EnumOption ('target',
+opts.Add (EnumVariable ('target',
 			     help = 'execution target platform',
 			     allowed_values = ('posix', 'win32'),
 			     default = 'posix',
-			     ignorecase = 1),
+			     ignorecase = 1))
 
-		 PathOption ('prefix',
+opts.Add (PathVariable ('prefix',
 			     'installation path prefix',
-			     '/usr/local'),
+			     '/usr/local'))
 
 		 # Don't use PathOption for other paths, because we don't
 		 # require the directories to preexist.
-		 ('bindir',
+opts.Add ('bindir',
 		  'path for executable files (default is $prefix/bin)',
-		  ''),
+		  '')
 
-		 ('libdir',
+opts.Add ('libdir',
 		  'path for library files (default is $prefix/lib/nonpareil)',
-		  ''),
+		  '')
 
-		 ('destdir',
+opts.Add ('destdir',
 		  'installation virtual root directory (for packaging)',
-		  ''),
+		  '')
 
-		 BoolOption ('debug',
+opts.Add (BoolVariable ('debug',
 			     help = 'compile for debugging',
-			     default = 1),
+			     default = 1))
 
 		 # Feature switches:
 
-		 BoolOption ('has_debugger_gui',
+opts.Add (BoolVariable ('has_debugger_gui',
 			     help = 'enable debugger GUI interface',
-			     default = 0),
+			     default = 0))
 
-		 BoolOption ('has_debugger_cli',
+opts.Add (BoolVariable ('has_debugger_cli',
 			     help = 'enable debugger command-line interface',
-			     default = 0),
+			     default = 0))
 
-		 BoolOption ('use_tcl',
+opts.Add (BoolVariable ('use_tcl',
 			     help = 'use Tcl as debug command interpreter (only when debugger CLI is enabled)',
-			     default = 1),  # only if has_debugger_cli
+			     default = 1))  # only if has_debugger_cli
 
-		 BoolOption ('use_readline',
+opts.Add (BoolVariable ('use_readline',
 			     help = 'use Readline library for command editing and history (only when debugger CLI is enabled)',
 			     default = 1))  # only if has_debugger_cli