Remove X11 detection during configure

X11 is not used anywhere.

3 files changed, 12 insertions, 43 deletions

diff --git a/Lib/perl5/Makefile.in b/Lib/perl5/Makefile.in
index dde01894d..f11ad2bdf 100644
--- a/Lib/perl5/Makefile.in
+++ b/Lib/perl5/Makefile.in
@@ -47,7 +47,7 @@ SWIGOPT       = -perl5
 SWIGCC        = $(CC) 
 
 # SWIG Library files.  Uncomment this to staticly rebuild Perl
-#SWIGLIB       = -static -lperlmain.i
+#SWIGLIBS      = -static -lperlmain.i
 
 # Rules for creating .o files from source.
 
@@ -69,33 +69,21 @@ BUILD         = @LDSHARED@
 #DLL_LIBS      = -L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \
              -L/usr/local/lib -lg++ -lstdc++ -lgcc
 
-# X11 installation (possibly needed if using Perl-Tk)
-
-XLIB          = @XLIBSW@
-XINCLUDE      = @XINCLUDES@
-
 # Perl installation
 
 PERL_INCLUDE  = -I@PERL5EXT@
 PERL_LIB      = -L@PERL5EXT@ -lperl 
 PERL_FLAGS    = -Dbool=char -Dexplicit=
 
-# Tcl installation.  If using Tk you might need this
-
-TCL_INCLUDE   = @TCLINCLUDE@
-TCL_LIB       = @TCLLIB@
-
 # Build libraries (needed for static builds)
 
 LIBM          = @LIBM@
 LIBC          = @LIBC@
 SYSLIBS       = $(LIBM) $(LIBC) @LIBS@
 
-# Build options (uncomment only one these)
+# Build options
 
-#TK_LIB        = $(TCL_LIB) -ltcl -ltk $(XLIB)
 BUILD_LIBS    = $(LIBS) # Dynamic loading
-#BUILD_LIBS    = $(PERL_LIB) $(TK_LIB) $(LIBS) $(SYSLIBS)  # Static linking
 
 # Compilation rules for non-SWIG components
 
@@ -123,7 +111,7 @@ $(WRAPOBJ) : $(WRAPFILE)
 	$(SWIGCC) -c $(CCSHARED) $(CFLAGS) $(INCLUDES) $(PERL_INCLUDE) $(PERL_FLAGS) $(WRAPFILE)
 
 $(WRAPFILE) : $(INTERFACE)
-	$(SWIG) $(SWIGOPT) -o $(WRAPFILE) $(SWIGLIB) $(INTERFACE)
+	$(SWIG) $(SWIGOPT) -o $(WRAPFILE) $(SWIGLIBS) $(INTERFACE)
 
 $(TARGET): $(WRAPOBJ) $(ALLOBJS)
 	$(BUILD) $(WRAPOBJ) $(ALLOBJS) $(BUILD_LIBS) -o $(TARGET)
diff --git a/Lib/python/Makefile.in b/Lib/python/Makefile.in
index 3243b3df4..71effea70 100644
--- a/Lib/python/Makefile.in
+++ b/Lib/python/Makefile.in
@@ -47,7 +47,7 @@ SWIGOPT       = -python
 SWIGCC        = $(CC) 
 
 # SWIG Library files.  Uncomment if rebuilding the Python interpreter
-#SWIGLIB       = -lembed.i
+#SWIGLIBS      = -lembed.i
 
 # Rules for creating .o files from source.
 
@@ -69,32 +69,20 @@ BUILD         = @LDSHARED@
 #DLL_LIBS      = -L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \
              -L/usr/local/lib -lg++ -lstdc++ -lgcc
 
-# X11 installation (needed if rebuilding Python + tkinter)
-
-XLIB          = @XLIBSW@
-XINCLUDE      = @XINCLUDES@
-
 # Python installation
 
 PY_INCLUDE    = -DHAVE_CONFIG_H @PYINCLUDE@ 
 PY_LIB        = @PYLIB@
 
-# Tcl installation.  Needed if rebuilding Python with tkinter.
-
-TCL_INCLUDE   = @TCLINCLUDE@
-TCL_LIB       = @TCLLIB@
-
 # Build libraries (needed for static builds)
 
 LIBM          = @LIBM@
 LIBC          = @LIBC@
 SYSLIBS       = $(LIBM) $(LIBC) @LIBS@
 
-# Build options (uncomment only one these)
+# Build options
 
-#TKINTER      = $(TCL_LIB) -ltk -ltcl $(XLIB)
 BUILD_LIBS    = $(LIBS) # Dynamic loading
-#BUILD_LIBS    = $(PY_LIB) @PYLINK@ $(TKINTER) $(LIBS) $(SYSLIBS)
 
 # Compilation rules for non-SWIG components
 
@@ -122,7 +110,7 @@ $(WRAPOBJ) : $(WRAPFILE)
 	$(SWIGCC) -c $(CCSHARED) $(CFLAGS) $(WRAPFILE) $(INCLUDES) $(PY_INCLUDE) 
 
 $(WRAPFILE) : $(INTERFACE)
-	$(SWIG) $(SWIGOPT) -o $(WRAPFILE) $(SWIGLIB) $(INTERFACE)
+	$(SWIG) $(SWIGOPT) -o $(WRAPFILE) $(SWIGLIBS) $(INTERFACE)
 
 $(TARGET): $(WRAPOBJ) $(ALLOBJS)
 	$(BUILD) $(WRAPOBJ) $(ALLOBJS) $(BUILD_LIBS) -o $(TARGET)
diff --git a/Lib/tcl/Makefile.in b/Lib/tcl/Makefile.in
index 523349bb5..2ab0f7b01 100644
--- a/Lib/tcl/Makefile.in
+++ b/Lib/tcl/Makefile.in
@@ -1,5 +1,5 @@
 # ---------------------------------------------------------------
-# SWIG Tcl/Tk Makefile
+# SWIG Tcl Makefile
 # 
 # This file can be used to build various Tcl extensions with SWIG.
 # By default this file is set up for dynamic loading, but it can
@@ -48,9 +48,8 @@ SWIG          = $(exec_prefix)/bin/swig
 SWIGOPT       = -tcl # use -tcl8 for Tcl 8.0
 SWIGCC        = $(CC) 
 
-# SWIG Library files.  Uncomment one of these for rebuilding tclsh or wish
-#SWIGLIB       = -ltclsh.i
-#SWIGLIB       = -lwish.i
+# SWIG Library files.  Uncomment if rebuilding tclsh
+#SWIGLIBS      = -ltclsh.i
 
 # Rules for creating .o files from source.
 
@@ -72,12 +71,7 @@ BUILD         = @LDSHARED@
 #DLL_LIBS      = -L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \
              -L/usr/local/lib -lg++ -lstdc++ -lgcc
 
-# X11 installation (needed to rebuild Tk extensions)
-
-XLIB          = @XLIBSW@
-XINCLUDE      = @XINCLUDES@
-
-# Tcl installation (where is Tcl/Tk located)
+# Tcl installation (where is Tcl located)
 
 TCL_INCLUDE   = @TCLINCLUDE@
 TCL_LIB       = @TCLLIB@
@@ -88,11 +82,10 @@ LIBM          = @LIBM@
 LIBC          = @LIBC@
 SYSLIBS       = $(LIBM) $(LIBC) @LIBS@
 
-# Build options (uncomment only one these)
+# Build options (uncomment only one of these)
 
 BUILD_LIBS    = $(LIBS) # Dynamic loading
 #BUILD_LIBS    = $(TCL_LIB) -ltcl $(LIBS) $(SYSLIBS) # tclsh  
-#BUILD_LIBS    = $(TCL_LIB) -ltk -ltcl $(XLIB) $(LIBS) $(SYSLIBS) # wish
 
 # Compilation rules for non-SWIG components
 
@@ -120,7 +113,7 @@ $(WRAPOBJ) : $(WRAPFILE)
 	$(SWIGCC) -c $(CCSHARED) $(CFLAGS) $(WRAPFILE) $(INCLUDES) $(TCL_INCLUDE) 
 
 $(WRAPFILE) : $(INTERFACE)
-	$(SWIG) $(SWIGOPT) -o $(WRAPFILE) $(SWIGLIB) $(INTERFACE)
+	$(SWIG) $(SWIGOPT) -o $(WRAPFILE) $(SWIGLIBS) $(INTERFACE)
 
 $(TARGET): $(WRAPOBJ) $(ALLOBJS)
 	$(BUILD) $(WRAPOBJ) $(ALLOBJS) $(BUILD_LIBS) -o $(TARGET)