Change the syntax from load_on: to load_on (since that way configure.pl can

use the generic variable reading routines).

Instead of hardcoding the module sets (historically, 'unix', 'beos', and
'win32') into the script, have each module specify which group(s) (if any) it
should be considered a member of in its modinfo.txt file.

Add a new module set compression which contains (currently) the zlib and bzip2
modules.

27 files changed, 40 insertions, 28 deletions

diff --git a/modules/alg_amd64/modinfo.txt b/modules/alg_amd64/modinfo.txt
index f9023b273..313d9ea03 100644
--- a/modules/alg_amd64/modinfo.txt
+++ b/modules/alg_amd64/modinfo.txt
@@ -2,7 +2,7 @@ realname "Algorithm x86-64 Assembler"
 
 mp_bits 64
 
-load_on: asm_ok
+load_on asm_ok
 
 <replace>
 sha160.cpp
diff --git a/modules/alg_ia32/modinfo.txt b/modules/alg_ia32/modinfo.txt
index fdd955d11..33d30e8bf 100644
--- a/modules/alg_ia32/modinfo.txt
+++ b/modules/alg_ia32/modinfo.txt
@@ -2,7 +2,7 @@ realname "Algorithm x86 Assembler"
 
 mp_bits 32
 
-load_on: asm_ok
+load_on asm_ok
 
 <replace>
 md4.cpp
diff --git a/modules/alloc_mmap/modinfo.txt b/modules/alloc_mmap/modinfo.txt
index 6426bdf24..8cc2b206e 100644
--- a/modules/alloc_mmap/modinfo.txt
+++ b/modules/alloc_mmap/modinfo.txt
@@ -1,8 +1,9 @@
 realname "Disk Based Allocation System"
 
 define ALLOC_MMAP
+modset unix
 
-load_on: auto
+load_on auto
 
 <add>
 mmap_mem.cpp
diff --git a/modules/comp_bzip2/modinfo.txt b/modules/comp_bzip2/modinfo.txt
index 92ffb2085..efedc097f 100644
--- a/modules/comp_bzip2/modinfo.txt
+++ b/modules/comp_bzip2/modinfo.txt
@@ -3,8 +3,9 @@
 realname "Bzip2 Compressor"
 
 define COMPRESSOR_BZIP2
+modset compression
 
-load_on: request
+load_on request
 
 <add>
 bzip2.h
diff --git a/modules/comp_zlib/modinfo.txt b/modules/comp_zlib/modinfo.txt
index 1687ad312..c1f1f998c 100644
--- a/modules/comp_zlib/modinfo.txt
+++ b/modules/comp_zlib/modinfo.txt
@@ -4,7 +4,8 @@ realname "Zlib Compressor"
 define COMPRESSOR_ZLIB
 #define COMPRESSOR_ZLIB,COMPRESSOR_GZIP
 
-load_on: request
+load_on request
+modset compression
 
 <add>
 zlib.h
diff --git a/modules/eng_aep/modinfo.txt b/modules/eng_aep/modinfo.txt
index 1ffdb81d5..497a0c89f 100644
--- a/modules/eng_aep/modinfo.txt
+++ b/modules/eng_aep/modinfo.txt
@@ -2,7 +2,7 @@ realname "AEP Engine"
 
 define ENGINE_AEP,ENTROPY_SRC_AEP
 
-load_on: request
+load_on request
 
 <add>
 eng_aep.cpp
diff --git a/modules/eng_gmp/modinfo.txt b/modules/eng_gmp/modinfo.txt
index bc44986de..e65e411fd 100644
--- a/modules/eng_gmp/modinfo.txt
+++ b/modules/eng_gmp/modinfo.txt
@@ -2,7 +2,7 @@ realname "GMP Engine"
 
 define ENGINE_GNU_MP
 
-load_on: request
+load_on request
 
 <add>
 eng_gmp.cpp
diff --git a/modules/eng_ossl/modinfo.txt b/modules/eng_ossl/modinfo.txt
index 3378a9158..7892e8e90 100644
--- a/modules/eng_ossl/modinfo.txt
+++ b/modules/eng_ossl/modinfo.txt
@@ -2,7 +2,7 @@ realname "OpenSSL Engine"
 
 define ENGINE_OPENSSL
 
-load_on: request
+load_on request
 
 <add>
 eng_ossl.cpp
diff --git a/modules/es_beos/modinfo.txt b/modules/es_beos/modinfo.txt
index 292f7832d..a7e62cfb3 100644
--- a/modules/es_beos/modinfo.txt
+++ b/modules/es_beos/modinfo.txt
@@ -1,8 +1,9 @@
 realname "BeOS Entropy Source"
 
 define ENTROPY_SRC_BEOS
+modset beos
 
-load_on: auto
+load_on auto
 
 <add>
 es_beos.h
diff --git a/modules/es_capi/modinfo.txt b/modules/es_capi/modinfo.txt
index 8a0f3041c..40104664b 100644
--- a/modules/es_capi/modinfo.txt
+++ b/modules/es_capi/modinfo.txt
@@ -1,8 +1,8 @@
 realname "Win32 CryptoAPI Entropy Source"
 
 define ENTROPY_SRC_CAPI
-
-load_on: auto
+load_on auto
+modset win32
 
 <add>
 es_capi.h
diff --git a/modules/es_egd/modinfo.txt b/modules/es_egd/modinfo.txt
index 06261862c..6b34f395c 100644
--- a/modules/es_egd/modinfo.txt
+++ b/modules/es_egd/modinfo.txt
@@ -2,7 +2,8 @@ realname "EGD Entropy Source"
 
 define ENTROPY_SRC_EGD
 
-load_on: auto
+load_on auto
+modset unix
 
 <add>
 es_egd.h
diff --git a/modules/es_ftw/modinfo.txt b/modules/es_ftw/modinfo.txt
index d3e93db69..d932523fd 100644
--- a/modules/es_ftw/modinfo.txt
+++ b/modules/es_ftw/modinfo.txt
@@ -2,7 +2,8 @@ realname "File Tree Walking Entropy Source"
 
 define ENTROPY_SRC_FTW
 
-load_on: auto
+load_on auto
+modset unix
 
 <add>
 es_ftw.h
diff --git a/modules/es_unix/modinfo.txt b/modules/es_unix/modinfo.txt
index ccb499b82..f16e21289 100644
--- a/modules/es_unix/modinfo.txt
+++ b/modules/es_unix/modinfo.txt
@@ -1,8 +1,9 @@
 realname "Generic Unix Entropy Source"
 
 define ENTROPY_SRC_UNIX
+modset unix,beos
 
-load_on: auto
+load_on auto
 
 <add>
 es_unix.cpp
diff --git a/modules/es_win32/modinfo.txt b/modules/es_win32/modinfo.txt
index cc8a525bc..931760979 100644
--- a/modules/es_win32/modinfo.txt
+++ b/modules/es_win32/modinfo.txt
@@ -4,8 +4,9 @@ realname "Win32 Entropy Source"
 #note "This module will not run under NT4"
 
 define ENTROPY_SRC_WIN32
+modset win32
 
-load_on: auto
+load_on auto
 
 <add>
 es_win32.h
diff --git a/modules/fd_unix/modinfo.txt b/modules/fd_unix/modinfo.txt
index c659f5377..e1f30ea28 100644
--- a/modules/fd_unix/modinfo.txt
+++ b/modules/fd_unix/modinfo.txt
@@ -1,8 +1,9 @@
 realname "Unix I/O support for Pipe"
 
 define PIPE_UNIXFD_IO
+modset unix,beos
 
-load_on: auto
+load_on auto
 
 <add>
 fd_unix.h
diff --git a/modules/ml_unix/modinfo.txt b/modules/ml_unix/modinfo.txt
index b25468586..201a30ead 100644
--- a/modules/ml_unix/modinfo.txt
+++ b/modules/ml_unix/modinfo.txt
@@ -1,6 +1,6 @@
 realname "Memory Locking for Unix"
 
-load_on: auto
+load_on auto
 
 <replace>
 mlock.cpp
diff --git a/modules/ml_win32/modinfo.txt b/modules/ml_win32/modinfo.txt
index e886c758f..92936e1de 100644
--- a/modules/ml_win32/modinfo.txt
+++ b/modules/ml_win32/modinfo.txt
@@ -1,6 +1,6 @@
 realname "Memory Locking for Win32"
 
-load_on: auto
+load_on auto
 
 <replace>
 mlock.cpp
diff --git a/modules/mp_amd64/modinfo.txt b/modules/mp_amd64/modinfo.txt
index 0e24da0d9..527d9a2c6 100644
--- a/modules/mp_amd64/modinfo.txt
+++ b/modules/mp_amd64/modinfo.txt
@@ -2,7 +2,7 @@ realname "MPI Assembler Backend for x86-64/AMD64 Systems"
 
 mp_bits 64
 
-load_on: asm_ok
+load_on asm_ok
 
 <replace>
 mp_asm.h
diff --git a/modules/mp_asm64/modinfo.txt b/modules/mp_asm64/modinfo.txt
index 256a439d3..6c51ed5b8 100644
--- a/modules/mp_asm64/modinfo.txt
+++ b/modules/mp_asm64/modinfo.txt
@@ -2,7 +2,7 @@ realname "MPI Assembler Backend for 64 bit Systems"
 
 mp_bits 64
 
-load_on: asm_ok
+load_on asm_ok
 
 <replace>
 mp_asm.h
diff --git a/modules/mp_ia32/modinfo.txt b/modules/mp_ia32/modinfo.txt
index 805fb656f..2fa8db56e 100644
--- a/modules/mp_ia32/modinfo.txt
+++ b/modules/mp_ia32/modinfo.txt
@@ -2,7 +2,7 @@ realname "MPI Assembler Backend for x86 Systems"
 
 mp_bits 32
 
-load_on: asm_ok
+load_on asm_ok
 
 <replace>
 mp_asm.h
diff --git a/modules/mux_pthr/modinfo.txt b/modules/mux_pthr/modinfo.txt
index f14137dd5..88de70de0 100644
--- a/modules/mux_pthr/modinfo.txt
+++ b/modules/mux_pthr/modinfo.txt
@@ -2,7 +2,7 @@ realname "Pthread Mutex"
 
 define MUTEX_PTHREAD
 
-load_on: auto
+load_on auto
 
 <add>
 mux_pthr.cpp
diff --git a/modules/mux_qt/modinfo.txt b/modules/mux_qt/modinfo.txt
index 32094eaf4..a21108c79 100644
--- a/modules/mux_qt/modinfo.txt
+++ b/modules/mux_qt/modinfo.txt
@@ -4,7 +4,7 @@ define MUTEX_QT
 
 note "You'll probably have to add -I/-L flags to the Makefile to find Qt"
 
-load_on: request
+load_on request
 
 <add>
 mux_qt.cpp
diff --git a/modules/mux_win32/modinfo.txt b/modules/mux_win32/modinfo.txt
index 320d21b5b..d235ff73c 100644
--- a/modules/mux_win32/modinfo.txt
+++ b/modules/mux_win32/modinfo.txt
@@ -1,8 +1,9 @@
 realname "Win32 Mutex"
 
 define MUTEX_WIN32
+modset win32
 
-load_on: auto
+load_on auto
 
 <add>
 mux_win32.cpp
diff --git a/modules/tm_hard/modinfo.txt b/modules/tm_hard/modinfo.txt
index 35f13dd91..5c928cf83 100644
--- a/modules/tm_hard/modinfo.txt
+++ b/modules/tm_hard/modinfo.txt
@@ -2,7 +2,7 @@ realname "Hardware Timer"
 
 define TIMER_HARDWARE
 
-load_on: asm_ok
+load_on asm_ok
 
 <add>
 tm_hard.cpp
diff --git a/modules/tm_posix/modinfo.txt b/modules/tm_posix/modinfo.txt
index b6c1d6916..e9298a81c 100644
--- a/modules/tm_posix/modinfo.txt
+++ b/modules/tm_posix/modinfo.txt
@@ -2,7 +2,7 @@ realname "POSIX Timer"
 
 define TIMER_POSIX
 
-load_on: auto
+load_on auto
 
 <add>
 tm_posix.cpp
diff --git a/modules/tm_unix/modinfo.txt b/modules/tm_unix/modinfo.txt
index 405e341c4..495914589 100644
--- a/modules/tm_unix/modinfo.txt
+++ b/modules/tm_unix/modinfo.txt
@@ -2,7 +2,8 @@ realname "Unix Timer"
 
 define TIMER_UNIX
 
-load_on: auto
+load_on auto
+modset unix,beos
 
 <add>
 tm_unix.cpp
diff --git a/modules/tm_win32/modinfo.txt b/modules/tm_win32/modinfo.txt
index cc5f06197..74c4a59ea 100644
--- a/modules/tm_win32/modinfo.txt
+++ b/modules/tm_win32/modinfo.txt
@@ -1,8 +1,9 @@
 realname "Win32 Timer"
 
 define TIMER_WIN32
+modset win32
 
-load_on: auto
+load_on auto
 
 <add>
 tm_win32.cpp