If --gen-amalgamation is used, imply --disable-asm and

--disable-modules=sha1_sse,serpent_simd (and inform the user this is
happening), so amalgamation builds work out of the box.

1 files changed, 10 insertions, 0 deletions

diff --git a/configure.py b/configure.py
index e1b1df7c2..1f0c9aa00 100755
--- a/configure.py
+++ b/configure.py
@@ -1498,6 +1498,16 @@ def main(argv = None):
         else:
             options.with_tr1 = 'none'
 
+    if options.gen_amalgamation:
+        if options.asm_ok:
+            logging.info('Disabling assembly code, cannot use in amalgamation')
+            options.asm_ok = False
+
+        for mod in ['sha1_sse2', 'serpent_simd']:
+            if mod not in options.disabled_modules:
+                logging.info('Disabling %s, cannot use in amalgamation' % (mod))
+                options.disabled_modules.append(mod)
+
     modules_to_use = choose_modules_to_use(modules,
                                            archinfo[options.arch],
                                            options)