summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2001-01-10 18:53:48 (GMT)
committerGuido van Rossum <guido@python.org>2001-01-10 18:53:48 (GMT)
commit3d15bd88063019352d11382f5d1b36b6845f65dc (patch)
treeb7f0e74ce9183915fc99d7fd05cd1e5438a6e97a /Modules
parent3559d1f9b3f33b45de924f5d17dcea6ab949bb41 (diff)
downloadcpython-3d15bd88063019352d11382f5d1b36b6845f65dc.zip
cpython-3d15bd88063019352d11382f5d1b36b6845f65dc.tar.gz
cpython-3d15bd88063019352d11382f5d1b36b6845f65dc.tar.bz2
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.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Setup.config.in21
-rw-r--r--Modules/Setup.dist4
2 files changed, 17 insertions, 8 deletions
diff --git a/Modules/Setup.config.in b/Modules/Setup.config.in
index f9c5851..424099f 100644
--- a/Modules/Setup.config.in
+++ b/Modules/Setup.config.in
@@ -1,19 +1,24 @@
# This file is transmogrified into Setup.config by config.status.
# The purpose of this file is to conditionally enable certain modules
-# based on configure-time options. Currently thread support, garbage
-# collection support, and the BSD DB modules are the only modules so
-# enabled.
-
-@USE_THREAD_MODULE@thread threadmodule.c
+# based on configure-time options.
# Garbage collection enabled with --with-cycle-gc
@USE_GC_MODULE@gc gcmodule.c
-# You may want this to be built as a dynamically loaded module; uncomment
-# the following line in that case:
+# Threading
+@USE_THREAD_MODULE@thread threadmodule.c
+
+# You may want the following to be built as statically loaded modules;
+# comment out the *shared* line in that case:
+
+*shared*
+
+# Readline
+@USE_READLINE_MODULE@readline readline.c -lreadline -ltermcap
-#*shared*
+# The ncurses library, under Linux
+@USE_NCURSES_MODULE@_curses _cursesmodule.c -lncurses -ltermcap
# bsddb module enabled by --with-libdb or presence of db.h
@USE_BSDDB_MODULE@bsddb bsddbmodule.c @HAVE_LIBDB@
diff --git a/Modules/Setup.dist b/Modules/Setup.dist
index 53ab1fb..522ca52 100644
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -120,6 +120,8 @@ GLHACK=-Dclear=__GLclear
# and you may have to change -ltermcap to -ltermlib or perhaps remove
# it, depending on your system -- see the GNU readline instructions.
# It's okay for this to be a shared library, too.
+#
+# First, look at Setup.config; configure may have set this for you.
#readline readline.c -lreadline -ltermcap
@@ -322,6 +324,8 @@ rotor rotormodule.c # enigma-inspired encryption
# provided by the ncurses library. e.g. on Linux, link with -lncurses
# instead of -lcurses; on SunOS 4.1.3, insert -I/usr/5include
# -L/usr/5lib before -lcurses).
+#
+# First, look at Setup.config; configure may have set this for you.
#_curses _cursesmodule.c -lcurses -ltermcap
# Wrapper for the panel library that's part of ncurses and SYSV curses.