Skip to content

Commit 3d15bd8

Browse files
gvanrossumgvanrossum
committed
Adapted version of Eric Raymond's patches to automatically configure
curses and readline (for Linux, at least). These are done as shared libraries by default, and so is bsddb -- that seems to make the most sense.
1 parent 3559d1f commit 3d15bd8

4 files changed

Lines changed: 306 additions & 191 deletions

File tree

‎Modules/Setup.config.in‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
# This file is transmogrified into Setup.config by config.status.
22

33
# The purpose of this file is to conditionally enable certain modules
4-
# based on configure-time options. Currently thread support, garbage
5-
# collection support, and the BSD DB modules are the only modules so
6-
# enabled.
7-
8-
@USE_THREAD_MODULE@thread threadmodule.c
4+
# based on configure-time options.
95

106
# Garbage collection enabled with --with-cycle-gc
117
@USE_GC_MODULE@gc gcmodule.c
128

13-
# You may want this to be built as a dynamically loaded module; uncomment
14-
# the following line in that case:
9+
# Threading
10+
@USE_THREAD_MODULE@thread threadmodule.c
11+
12+
# You may want the following to be built as statically loaded modules;
13+
# comment out the *shared* line in that case:
14+
15+
*shared*
16+
17+
# Readline
18+
@USE_READLINE_MODULE@readline readline.c -lreadline -ltermcap
1519

16-
#*shared*
20+
# The ncurses library, under Linux
21+
@USE_NCURSES_MODULE@_curses _cursesmodule.c -lncurses -ltermcap
1722

1823
# bsddb module enabled by --with-libdb or presence of db.h
1924
@USE_BSDDB_MODULE@bsddb bsddbmodule.c @HAVE_LIBDB@

‎Modules/Setup.dist‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ GLHACK=-Dclear=__GLclear
120120
# and you may have to change -ltermcap to -ltermlib or perhaps remove
121121
# it, depending on your system -- see the GNU readline instructions.
122122
# It's okay for this to be a shared library, too.
123+
#
124+
# First, look at Setup.config; configure may have set this for you.
123125

124126
#readline readline.c -lreadline -ltermcap
125127

@@ -322,6 +324,8 @@ rotor rotormodule.c # enigma-inspired encryption
322324
# provided by the ncurses library. e.g. on Linux, link with -lncurses
323325
# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include
324326
# -L/usr/5lib before -lcurses).
327+
#
328+
# First, look at Setup.config; configure may have set this for you.
325329

326330
#_curses _cursesmodule.c -lcurses -ltermcap
327331
# Wrapper for the panel library that's part of ncurses and SYSV curses.

0 commit comments

Comments
 (0)