propagate from branch 'net.randombit.botan' (head 75d272c759511a9a99a371ddc74bd17b2c1453b6)

            to branch 'net.randombit.botan.c++0x' (head 2ce9ba37cb9287a3d875921240d6682100625b9f)

1 files changed, 10 insertions, 2 deletions

diff --git a/configure.py b/configure.py
index 024711a1c..1e91a35e3 100755
--- a/configure.py
+++ b/configure.py
@@ -40,8 +40,8 @@ class BuildConfigurationInformation(object):
     """
     version_major = 1
     version_minor = 9
-    version_patch = 5
-    version_so_patch = 5
+    version_patch = 6
+    version_so_patch = 6
     version_suffix = '-dev'
 
     version_string = '%d.%d.%d%s' % (
@@ -506,6 +506,12 @@ class ModuleInfo(object):
     def compatible_compiler(self, cc):
         return self.cc == [] or cc in self.cc
 
+    def tr1_ok(self, with_tr1):
+        if self.uses_tr1:
+            return with_tr1 in ['boost', 'system']
+        else:
+            return True
+
     def dependencies(self):
         # utils is an implicit dep (contains types, etc)
         deps = self.requires + ['utils']
@@ -1022,6 +1028,8 @@ def choose_modules_to_use(modules, archinfo, options):
             cannot_use_because(modname, 'incompatible OS')
         elif not module.compatible_compiler(options.compiler):
             cannot_use_because(modname, 'incompatible compiler')
+        elif not module.tr1_ok(options.with_tr1):
+            cannot_use_because(modname, 'missing TR1')
 
         else:
             if module.load_on == 'never':