Comment out crypt by default; it's not used very much and messes up
the default build on Linux (because it requires -lcrypt which isn't
availabel everywhere).
Some improvements to the _tkinter build line suggested by Case Roole.
diff --git a/Modules/Setup.in b/Modules/Setup.in
index ab43526..e4e4a0f 100644
--- a/Modules/Setup.in
+++ b/Modules/Setup.in
@@ -148,11 +148,14 @@
fcntl fcntlmodule.c # fcntl(2) and ioctl(2)
pwd pwdmodule.c # pwd(3)
grp grpmodule.c # grp(3)
-crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems
select selectmodule.c # select(2); not on ancient System V
socket socketmodule.c # socket(2); not on ancient System V
errno errnomodule.c # posix (UNIX) errno values
+# The crypt module is now disabled by default because it breaks builds
+# on many systems (where -lcrypt is needed), e.g. Linux (I believe).
+#crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems
+
# Some more UNIX dependent modules -- off by default, since these
# are not supported by all UNIX systems:
@@ -273,7 +276,7 @@
# *** Always uncomment this (leave the leading underscore in!):
# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \
-# *** Uncommend and edit to reflect where your X11 header files are:
+# *** Uncomment and edit to reflect where your X11 header files are:
# -I/usr/X11R6/include \
# *** Or uncomment this for Solaris:
# -I/usr/openwin/include \
@@ -285,8 +288,6 @@
# -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
# *** Uncomment and edit for PIL (TkImaging) extension only:
# -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \
-# *** Uncomment and edit for Mesa (what's Mesa?):
-# -lGL -lGLU -lMesatk -lMesaaux \
# *** Uncomment and edit for TOGL extension only:
# -DWITH_TOGL togl.c \
# *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
@@ -297,9 +298,10 @@
# -L/usr/X11R6/lib \
# *** Or uncomment this for Solaris:
# -L/usr/openwin/lib \
+# *** Uncomment these for TOGL extension only:
+# -lGL -lGLU -lXext -lXmu \
# *** Always uncomment this; X11 libraries to link with:
-# -lX11 -lXext -lXmu
-
+# -lX11
# Lance Ellinghaus's modules: