--- install_lib.py.old Sun May 14 22:44:08 2000 +++ install_lib.py Sun May 14 23:00:13 2000 @@ -5,6 +5,7 @@ import sys, os, string from distutils.core import Command from distutils.util import copy_tree +from distutils.errors import DistutilsOptionError class install_lib (Command): @@ -29,8 +30,8 @@ # let the 'install' command dictate our installation directory self.install_dir = None self.build_dir = None - self.compile = 1 - self.optimize = 1 + self.compile = None + self.optimize = None self.skip_build = None def finalize_options (self): @@ -44,9 +45,17 @@ ('skip_build', 'skip_build'), ) - # 'optimize implies 'compile' - if self.optimize: - self.compile = 1 + # make sure --optimize agrees with --compile, set defaults + if self.optimize == 1 and self.compile == 0: + raise DistutilsOptionError, \ + "Incompatible options: '--no-compile' and '--optimize'" + if self.compile == 0: + self.optimize = 0 + else: + if self.compile == None: + self.compile = 1 + if self.optimize == None: + self.optimize = 1 def run (self):