Eric the half-a-wit, driven to berserk rage after repeatedly doing

builds during which he forgot to uncomment crucial library lines in
Setup, walks into Guido's East End nightclub with a tactical nuclear
weapon on his shoulder.  Said nuclear weapon is promptly deployed
exactly where it will do the most good, right in the middle of
configure.in.

With this patch, the set of libraries autoconfigured in is extended to
include ndbm, gdbm, and crypt.  This essentially eliminates any need to
tweak Setup for a normal Linux build.

"'E was a fair man.  Cruel, but fair."

2 files changed, 18 insertions, 1 deletions

diff --git a/Modules/Setup.config.in b/Modules/Setup.config.in
index 6f62b77..2932d3c 100644
--- a/Modules/Setup.config.in
+++ b/Modules/Setup.config.in
@@ -20,8 +20,18 @@
 # The ncurses library, under Linux
 @USE_NCURSES_MODULE@_curses _cursesmodule.c -lncurses -ltermcap
 
-# bsddb module enabled by --with-libdb or presence of db.h
+# bsddb(3) module enabled by --with-libdb or presence of db.h
 @USE_BSDDB_MODULE@bsddb bsddbmodule.c @HAVE_LIBDB@
 
 # dbm(3) may require -lndbm or similar
 @USE_DBM_MODULE@dbm dbmmodule.c @HAVE_LIBNDBM@
+
+# ndbm(3) may require -lndbm or similar
+@USE_NDBM_MODULE@ndbm ndbmmodule.c @HAVE_LIBNDBM@
+
+# gdbm(3) may require -lgdbm or similar
+@USE_GDBM_MODULE@gdbm gdbmmodule.c @HAVE_LIBGDBM@
+
+# crypt(3) may require -lcrypt or similar
+@USE_CRYPT_MODULE@crypt cryptmodule.c @HAVE_LIBCRYPT@
+
diff --git a/Modules/Setup.dist b/Modules/Setup.dist
index 31defe8..3ada281 100644
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -172,6 +172,9 @@ _socket socketmodule.c
 
 # The crypt module is now disabled by default because it breaks builds
 # on many systems (where -lcrypt is needed), e.g. Linux (I believe).
+#
+# First, look at Setup.config; configure may have set this for you.
+
 #crypt cryptmodule.c # -lcrypt	# crypt(3); needs -lcrypt on some systems
 
 
@@ -359,10 +362,14 @@ new newmodule.c
 # it will be compiled as a shared library by default.  Compiling it as
 # a built-in module causes conflicts with the pybsddb3 module since it
 # creates a static dependency on an out-of-date version of db.so.
+#
+# First, look at Setup.config; configure may have set this for you.
 
 #dbm dbmmodule.c 	# dbm(3) may require -lndbm or similar
 
 # Anthony Baxter's gdbm module.  GNU dbm(3) will require -lgdbm:
+#
+# First, look at Setup.config; configure may have set this for you.
 
 #gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm