--- a/bindings/python/wscript	Fri Sep 05 21:36:20 2008 -0700
+++ b/bindings/python/wscript	Sat Sep 06 14:46:01 2008 +0100
@@ -28,7 +28,7 @@
 
 def set_options(opt):
     opt.tool_options('python')
-    opt.add_option('--python-disable',
+    opt.add_option('--disable-python',
                    help=("Don't build Python bindings."),
                    action="store_true", default=False,
                    dest='python_disable')

--- a/src/internet-stack/wscript	Fri Sep 05 21:36:20 2008 -0700
+++ b/src/internet-stack/wscript	Sat Sep 06 14:46:01 2008 +0100
@@ -12,10 +12,10 @@
 
 
 def set_options(opt):
-    opt.add_option('--nsc',
+    opt.add_option('--enable-nsc',
                    help=('Enable Network Simulation Cradle to allow the use real-world network stacks'),
                    action="store_true", default=False,
-                   dest='nsc')
+                   dest='enable_nsc')
 
 
 def nsc_fetch():
@@ -50,9 +50,9 @@
         e.name = 'fl'
         e.run()
 
-    if not Params.g_options.nsc:
+    if not Params.g_options.enable_nsc:
         conf.report_optional_feature("nsc", "Network Simulation Cradle", False,
-                                     "--nsc configure option not given")
+                                     "--enable-nsc configure option not given")
 	return
 
     check_nsc_buildutils()