Skip to content

Commit a888540

Browse files
eric-s-raymonderic-s-raymond
committed
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."
1 parent 90badd1 commit a888540

4 files changed

Lines changed: 394 additions & 204 deletions

File tree

‎Modules/Setup.config.in‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,18 @@
2020
# The ncurses library, under Linux
2121
@USE_NCURSES_MODULE@_curses _cursesmodule.c -lncurses -ltermcap
2222

23-
# bsddb module enabled by --with-libdb or presence of db.h
23+
# bsddb(3) module enabled by --with-libdb or presence of db.h
2424
@USE_BSDDB_MODULE@bsddb bsddbmodule.c @HAVE_LIBDB@
2525

2626
# dbm(3) may require -lndbm or similar
2727
@USE_DBM_MODULE@dbm dbmmodule.c @HAVE_LIBNDBM@
28+
29+
# ndbm(3) may require -lndbm or similar
30+
@USE_NDBM_MODULE@ndbm ndbmmodule.c @HAVE_LIBNDBM@
31+
32+
# gdbm(3) may require -lgdbm or similar
33+
@USE_GDBM_MODULE@gdbm gdbmmodule.c @HAVE_LIBGDBM@
34+
35+
# crypt(3) may require -lcrypt or similar
36+
@USE_CRYPT_MODULE@crypt cryptmodule.c @HAVE_LIBCRYPT@
37+

‎Modules/Setup.dist‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,9 @@ _socket socketmodule.c
172172

173173
# The crypt module is now disabled by default because it breaks builds
174174
# on many systems (where -lcrypt is needed), e.g. Linux (I believe).
175+
#
176+
# First, look at Setup.config; configure may have set this for you.
177+
175178
#crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems
176179

177180

@@ -359,10 +362,14 @@ new newmodule.c
359362
# it will be compiled as a shared library by default. Compiling it as
360363
# a built-in module causes conflicts with the pybsddb3 module since it
361364
# creates a static dependency on an out-of-date version of db.so.
365+
#
366+
# First, look at Setup.config; configure may have set this for you.
362367

363368
#dbm dbmmodule.c # dbm(3) may require -lndbm or similar
364369

365370
# Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
371+
#
372+
# First, look at Setup.config; configure may have set this for you.
366373

367374
#gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
368375

0 commit comments

Comments
 (0)