Fix merge.

diff --cc cscript
index f7d9ea0bab78ed8b58799581c4291f57e406662f,4425693310efa65c2e34eacf59ae73b9f222ec55..aa2a46b41bf54f725a8f95d14e533c1cf9afe260
--- 1/cscript
--- 2/cscript
+++ b/cscript
@@@ -414,7 -414,9 +414,7 @@@ def configure_options(target, options)
      if target.debug and target.platform == 'windows':
          opt += ' --static-dcpomatic'
  
-     if build_disk(target):
 -    print("options=%s" % options)
 -    print("can_build_disk=%s" % can_build_disk(target))
+     if can_build_disk(target) and options['disk']:
         opt += ' --enable-disk'
  
      return opt