diff options
| author | Jack Lloyd <[email protected]> | 2016-11-03 10:11:33 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-11-03 10:11:33 -0400 |
| commit | 1e72720661383466807ac496b941af41d756a2ce (patch) | |
| tree | cfdc0e8ab355061207345a53904f3606b6457e8b /configure.py | |
| parent | 0c1900d1d86c7a8928d29d162e33da49aa55b0f9 (diff) | |
Move ISA optimized versions under the main algo dir
Previously it made sense for them to be in distinct dirs because
they were standalone. However with #580 that is no longer the case,
so move them to subdirs. Configure knows that anything underneath
a directory has a dependency on the parent dir, so update info.txt
files accordingly to remove explicit dependencies where set.
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.py b/configure.py index dc5ceca60..57f24c8f3 100755 --- a/configure.py +++ b/configure.py @@ -3,7 +3,7 @@ """ Configuration program for botan -(C) 2009,2010,2011,2012,2013,2014,2015 Jack Lloyd +(C) 2009,2010,2011,2012,2013,2014,2015,2016 Jack Lloyd (C) 2015,2016 Simon Warta (Kullo GmbH) Botan is released under the Simplified BSD License (see license.txt) @@ -1592,9 +1592,10 @@ def choose_modules_to_use(modules, module_policy, archinfo, ccinfo, options): if modname in options.disabled_modules: cannot_use_because(modname, 'disabled by user') - elif modname in options.enabled_modules: - to_load.append(modname) # trust the user elif usable: + if modname in options.enabled_modules: + to_load.append(modname) # trust the user + if module.load_on == 'never': cannot_use_because(modname, 'disabled as buggy') elif module.load_on == 'request': @@ -1619,7 +1620,7 @@ def choose_modules_to_use(modules, module_policy, archinfo, ccinfo, options): else: to_load.append(modname) else: - logging.warning('Unknown load_on %s in %s' % ( + logging.error('Unknown load_on %s in %s' % ( module.load_on, modname)) dependency_failure = True |