Author: reinhold.birkenfeld Date: Tue Dec 27 19:24:30 2005 New Revision: 41837 Modified: python/branches/release24-maint/setup.py Log: Bug #999767: make setup.py obey Setup.local wrt shared modules Modified: python/branches/release24-maint/setup.py ============================================================================== --- python/branches/release24-maint/setup.py (original) +++ python/branches/release24-maint/setup.py Tue Dec 27 19:24:30 2005 @@ -148,17 +148,18 @@ self.extensions.remove(ext) if platform != 'mac': - # Parse Modules/Setup to figure out which modules are turned - # on in the file. - input = text_file.TextFile('Modules/Setup', join_lines=1) + # Parse Modules/Setup and Modules/Setup.local to figure out which + # modules are turned on in the file. remove_modules = [] - while 1: - line = input.readline() - if not line: break - line = line.split() - remove_modules.append( line[0] ) - input.close() - + for filename in ('Modules/Setup', 'Modules/Setup.local'): + input = text_file.TextFile(filename, join_lines=1) + while 1: + line = input.readline() + if not line: break + line = line.split() + remove_modules.append(line[0]) + input.close() + for ext in self.extensions[:]: if ext.name in remove_modules: self.extensions.remove(ext)