Restructured (yet again) to treat all modules more alike.

diff --git a/Modules/config.c.in b/Modules/config.c.in
index d565fdea7421ac6e8d4628953b4c41a5a766ed5b..4103075447ca4f33f4b8151479fce1bdbb488e1e 100644 (file)
--- a/Modules/config.c.in
+++ b/Modules/config.c.in
@@ -24,6 +24,16 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /* Configurable Python configuration file */
 
+/* These modules are normally always included, but *may* be taken out */
+#define USE_GRP                1       /* Use together with pwd */
+#define USE_MARSHAL    1       /* This is linked anyway */
+#define USE_PWD                1       /* Use together with grp */
+#define USE_POSIX      1
+#define USE_SELECT     1
+#define USE_SOCKET     1
+#define USE_TIME       1
+#define USE_MATH       1
+
 #include "PROTO.h"
 #include "mymalloc.h"
 
@@ -85,7 +95,7 @@ donecalls()
 }
 
 #ifndef PYTHONPATH
-\ 1#define PYTHONPATH ".:/usr/local/lib/python"
+#define PYTHONPATH ".:/usr/local/lib/python"
 #endif
 
 extern char *getenv();
@@ -115,27 +125,25 @@ getpythonpath()
    These are initialized when first imported. */
 
 /* Standard modules */
-extern void initgrp();
-extern void initmarshal();
-extern void initmath();
-extern void initposix();
-extern void initpwd();
-extern void initselect();
-extern void initsocket();
-extern void inittime();
 
-#ifdef USE_AUDIO
-extern void initaudio();
-#endif
 #ifdef USE_AL
 extern void inital();
 #endif
 #ifdef USE_AMOEBA
 extern void initamoeba();
 #endif
+#ifdef USE_AUDIO
+extern void initaudio();
+#endif
 #ifdef USE_CD
 extern void initcd();
 #endif
+#ifdef USE_DBM
+extern void initdbm();
+#endif
+#ifdef USE_FCNTL
+extern void initfcntl();
+#endif
 #ifdef USE_FL
 extern void initfl();
 #endif
@@ -145,50 +153,75 @@ extern void initfm();
 #ifdef USE_GL
 extern void initgl();
 #endif
+#ifdef USE_GRP
+extern void initgrp();
+#endif
+#ifdef USE_IMGFILE
+extern void initimgfile();
+#endif
 #ifdef USE_JPEG
 extern void initjpeg();
 #endif
+#ifdef USE_MARSHAL
+extern void initmarshal();
+#endif
+#ifdef USE_MATH
+extern void initmath();
+#endif
 #ifdef USE_NIS
 extern void initnis();
 #endif
 #ifdef USE_PANEL
 extern void initpanel();
 #endif
+#ifdef USE_POSIX
+extern void initposix();
+#endif
+#ifdef USE_PWD
+extern void initpwd();
+#endif
 #ifdef USE_REGEX
 extern void initregex();
 #endif
+#ifdef USE_ROTOR
+extern void initrotor();
+#endif
+#ifdef USE_SELECT
+extern void initselect();
+#endif
+#ifdef USE_SGI
+extern void initsgi();
+#endif
+#ifdef USE_SOCKET
+extern void initsocket();
+#endif
 #ifdef USE_STDWIN
 extern void initstdwin();
 #endif
+#ifdef USE_STROP
+extern void initstrop();
+#endif
+#ifdef USE_STRUCT
+extern void initstruct();
+#endif
+#ifdef USE_SUNAUDIODEV
+extern void initsunaudiodev();
+#endif
 #ifdef USE_THREAD
 extern void initthread();
 #endif
 #ifdef USE_SV
 extern void initsv();
 #endif
+#ifdef USE_TIME
+extern void inittime();
+#endif
 
 struct {
        char *name;
        void (*initfunc)();
 } inittab[] = {
 
-       /* Standard modules, in alphabetical order */
-
-       {"grp",         initgrp},
-       {"marshal",     initmarshal},
-       {"math",        initmath},
-       {"posix",       initposix},
-       {"pwd",         initpwd},
-       {"select",      initselect},
-       {"socket",      initsocket},
-       {"time",        inittime},
-
-       /* Optional modules, in alphabetical order */
-
-#ifdef USE_AUDIO
-       {"audio",       initaudio},
-#endif
-
 #ifdef USE_AL
        {"al",          inital},
 #endif
@@ -197,10 +230,22 @@ struct {
        {"amoeba",      initamoeba},
 #endif
 
+#ifdef USE_AUDIO
+       {"audio",       initaudio},
+#endif
+
 #ifdef USE_CD
        {"cd",          initcd},
 #endif
 
+#ifdef USE_DBM
+       {"dbm",         initdbm},
+#endif
+
+#ifdef USE_FCNTL
+       {"fcntl",       initfcntl},
+#endif
+
 #ifdef USE_FL
        {"fl",          initfl},
 #endif
@@ -213,10 +258,26 @@ struct {
        {"gl",          initgl},
 #endif
 
+#ifdef USE_GRP
+       {"grp",         initgrp},
+#endif
+
+#ifdef USE_IMGFILE
+       {"imgfile",     initimgfile},
+#endif
+
 #ifdef USE_JPEG
        {"jpeg",        initjpeg},
 #endif
 
+#ifdef USE_MARSHAL
+       {"marshal",     initmarshal},
+#endif
+
+#ifdef USE_MATH
+       {"math",        initmath},
+#endif
+
 #ifdef USE_NIS
        {"nis",         initnis},
 #endif
@@ -225,21 +286,61 @@ struct {
        {"pnl",         initpanel},
 #endif
 
+#ifdef USE_POSIX
+       {"posix",       initposix},
+#endif
+
+#ifdef USE_PWD
+       {"pwd",         initpwd},
+#endif
+
 #ifdef USE_REGEX
        {"regex",       initregex},
 #endif
 
+#ifdef USE_ROTOR
+       {"rotor",       initrotor},
+#endif
+
+#ifdef USE_SELECT
+       {"select",      initselect},
+#endif
+
+#ifdef USE_SGI
+       {"sgi",         initsgi},
+#endif
+
+#ifdef USE_SOCKET
+       {"socket",      initsocket},
+#endif
+
 #ifdef USE_STDWIN
        {"stdwin",      initstdwin},
 #endif
 
-#ifdef USE_THREAD
-       {"thread",      initthread},
+#ifdef USE_STRUCT
+       {"strop",       initstrop},
+#endif
+
+#ifdef USE_STRUCT
+       {"struct",      initstruct},
+#endif
+
+#ifdef USE_SUNAUDIODEV
+       {"sunaudiodev", initsunaudiodev},
 #endif
 
 #ifdef USE_SV
        {"sv",          initsv},
 #endif
 
+#ifdef USE_THREAD
+       {"thread",      initthread},
+#endif
+
+#ifdef USE_TIME
+       {"time",        inittime},
+#endif
+
        {0,             0}              /* Sentinel */
 };