Rewrite part of the module loading code in configure.pl, now dependencies

seem to be handled correctly (er, at least mostly), and more importantly
the asm MPI modules are detected and used correctly (at least on x86-64
and x86).

11 files changed, 14 insertions, 12 deletions

diff --git a/src/asn1/info.txt b/src/asn1/info.txt
index 4e561afc5..e923bd1d8 100644
--- a/src/asn1/info.txt
+++ b/src/asn1/info.txt
@@ -2,7 +2,7 @@ realname "ASN.1/BER/DER module"
 
 define ASN1
 
-load_on request
+load_on auto
 
 <requires>
 bigint
diff --git a/src/bigint/info.txt b/src/bigint/info.txt
index 3e1531754..d6c5df763 100644
--- a/src/bigint/info.txt
+++ b/src/bigint/info.txt
@@ -6,8 +6,8 @@ define BIGINT
 
 <requires>
 hex
-mp_amd64
-monty_amd64|monty_generic
+mp_amd64|mp_asm64|mp_ia32|mp_ia32_msvc|mp_generic
+monty_generic
 mulop_generic
 </requires>
 
diff --git a/src/bigint/monty_generic/info.txt b/src/bigint/monty_generic/info.txt
index 9187e9d22..6f5f0e722 100644
--- a/src/bigint/monty_generic/info.txt
+++ b/src/bigint/monty_generic/info.txt
@@ -1,6 +1,6 @@
 realname "Montgomery Reduction"
 
-load_on request
+load_on dep
 
 <add>
 mp_monty.cpp
diff --git a/src/bigint/mp_amd64/info.txt b/src/bigint/mp_amd64/info.txt
index c177c2a27..84a5bcf53 100644
--- a/src/bigint/mp_amd64/info.txt
+++ b/src/bigint/mp_amd64/info.txt
@@ -2,7 +2,7 @@ realname "MPI Core (x86-64)"
 
 mp_bits 64
 
-load_on request
+load_on dep
 
 <add>
 mp_asm.h
diff --git a/src/bigint/mp_generic/info.txt b/src/bigint/mp_generic/info.txt
index 8b319c58d..8bf75fec3 100644
--- a/src/bigint/mp_generic/info.txt
+++ b/src/bigint/mp_generic/info.txt
@@ -1,6 +1,6 @@
 realname "MPI Core (C++)"
 
-load_on request
+load_on dep
 
 <add>
 mp_asm.h
diff --git a/src/bigint/mulop_amd64/info.txt b/src/bigint/mulop_amd64/info.txt
index 0960ac4d6..670780d9c 100644
--- a/src/bigint/mulop_amd64/info.txt
+++ b/src/bigint/mulop_amd64/info.txt
@@ -2,7 +2,7 @@ realname "BigInt Multiply-Add (x86-64)"
 
 mp_bits 64
 
-load_on request
+load_on dep
 
 <add>
 mp_mulop_amd64.S
diff --git a/src/bigint/mulop_generic/info.txt b/src/bigint/mulop_generic/info.txt
index 1fe3c2868..28ebe41eb 100644
--- a/src/bigint/mulop_generic/info.txt
+++ b/src/bigint/mulop_generic/info.txt
@@ -1,6 +1,6 @@
 realname "BigInt Multiply-Add"
 
-load_on request
+load_on dep
 
 <add>
 mp_mulop.cpp
diff --git a/src/bigint/mulop_ia32/info.txt b/src/bigint/mulop_ia32/info.txt
index 0814bc08a..1c89e95c1 100644
--- a/src/bigint/mulop_ia32/info.txt
+++ b/src/bigint/mulop_ia32/info.txt
@@ -2,6 +2,8 @@ realname "BigInt Multiply-Add (IA-32)"
 
 mp_bits 32
 
+# Out of date, still implements bigint_mul_add_words
+
 load_on request
 
 <add>
@@ -9,7 +11,7 @@ mp_mulop.S
 </add>
 
 <requires>
-asm_amd64
+asm_ia32
 </requires>
 
 <arch>
diff --git a/src/hash/mdx_hash/info.txt b/src/hash/mdx_hash/info.txt
index 22791f836..412c93350 100644
--- a/src/hash/mdx_hash/info.txt
+++ b/src/hash/mdx_hash/info.txt
@@ -2,7 +2,7 @@ realname "MDx Hash Base"
 
 define MDX_HASH_FUNCTION
 
-load_on request
+load_on dep
 
 <add>
 mdx_hash.cpp
diff --git a/src/kdf/mgf1/info.txt b/src/kdf/mgf1/info.txt
index a42273eb6..2f704173d 100644
--- a/src/kdf/mgf1/info.txt
+++ b/src/kdf/mgf1/info.txt
@@ -2,7 +2,7 @@ realname "MGF1"
 
 define MGF1
 
-load_on request
+load_on dep
 
 <add>
 mgf1.h
diff --git a/src/pk/pubkey/info.txt b/src/pk/pubkey/info.txt
index ebcb4eb0e..480274670 100644
--- a/src/pk/pubkey/info.txt
+++ b/src/pk/pubkey/info.txt
@@ -2,7 +2,7 @@ realname "Public Key Base"
 
 define PUBKEY_BASE
 
-load_on request
+load_on dep
 
 <requires>
 bigint