From 605b93dee2b51189e2afb3754f5fadc092af15be Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 21 Oct 1998 15:08:40 +0000 Subject: [PATCH] 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'). --- Modules/Setup.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Modules/Setup.in b/Modules/Setup.in index d652240e010..e271653989a 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: