From: Thomas Wouters <thomas@python.org>
Date: Thu, 11 Jan 2001 14:46:40 +0000 (+0000)
Subject: Move the _socket module closer to the SSL-_socket line (mmap and
X-Git-Tag: v2.1a1~332
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ade16076a1fcd90ee86d6fc1ba44832f908ec14f;p=python

Move the _socket module closer to the SSL-_socket line (mmap and
xreadlines inserted themselves inbetween the two) and clarify that the
normal socket module should be commented out. (Someone also suggested the
latter on c.l.py some time ago, I forget who, sorry.)
---

diff --git a/Modules/Setup.dist b/Modules/Setup.dist
index 522ca527da..9b863d504a 100644
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -153,7 +153,6 @@ pwd pwdmodule.c		# pwd(3)
 grp grpmodule.c		# grp(3)
 errno errnomodule.c	# posix (UNIX) errno values
 select selectmodule.c	# select(2); not on ancient System V
-_socket socketmodule.c	# socket(2)
 
 # Memory-mapped files (also works on Win32).
 mmap mmapmodule.c
@@ -161,7 +160,11 @@ mmap mmapmodule.c
 # Dynamic readlines
 xreadlines xreadlinesmodule.c
 
-# Socket module compiled with SSL support; you must edit the SSL variable:
+# for socket(2), without SSL support.
+_socket socketmodule.c
+
+# Socket module compiled with SSL support; you must comment out the other
+# socket line above, and possibly edit the SSL variable:
 #SSL=/usr/local/ssl
 #_socket socketmodule.c \
 #	-DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \