summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1998-10-21 15:08:40 (GMT)
committerGuido van Rossum <guido@python.org>1998-10-21 15:08:40 (GMT)
commit605b93dee2b51189e2afb3754f5fadc092af15be (patch)
treeb4bd73c874768e72d3ac49aaaeea0910bfcf017c /Modules
parent803b34088864daa85bc792f51b271fa3bcc91fbf (diff)
downloadcpython-605b93dee2b51189e2afb3754f5fadc092af15be.zip
cpython-605b93dee2b51189e2afb3754f5fadc092af15be.tar.gz
cpython-605b93dee2b51189e2afb3754f5fadc092af15be.tar.bz2
On a recommendation from Sjoerd Mullender, add -Dclear=__GLclear to
the compilation flags for the gl, fl and fm modules. This avoids a name conflict with the curses module (both gl and curses have an entry point called 'clear').
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Setup.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/Setup.in b/Modules/Setup.in
index d652240..e271653 100644
--- a/Modules/Setup.in
+++ b/Modules/Setup.in
@@ -93,7 +93,8 @@ signal signalmodule.c # signal(2)
# The SGI specific GL module:
-#gl glmodule.c cgensupport.c -I$(srcdir) -lgl -lX11
+GLHACK=-Dclear=__GLclear
+#gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11
# The thread module is now automatically enabled, see Setup.thread.
@@ -216,7 +217,7 @@ md5 md5module.c md5c.c
# These module work on any SGI machine:
# *** gl must be enabled higher up in this file ***
-#fm fmmodule.c -lfm -lgl # Font Manager
+#fm fmmodule.c $(GLHACK) -lfm -lgl # Font Manager
#sgi sgimodule.c # sgi.nap() and a few more
# This module requires the header file
@@ -240,7 +241,7 @@ md5 md5module.c md5c.c
# toplevel directory:
#FORMS=/ufs/guido/src/forms/FORMS
-#fl flmodule.c -I$(FORMS) $(FORMS)/libforms.a -lfm -lgl
+#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl
# SunOS specific modules -- off by default: