remove --enable-gcc configure option

3 files changed, 9 insertions, 38 deletions

diff --git a/unix/README b/unix/README
index 5c0ccce..b5d546c 100644
--- a/unix/README
+++ b/unix/README
@@ -20,7 +20,7 @@ SGI, as well as PCs running Linux, BSDI, and SCO UNIX.  To compile for
 a PC running Windows, see the README file in the directory ../win.  To
 compile for a Macintosh, see the README file in the directory ../mac.
 
-RCS: @(#) $Id: README,v 1.10 2000/05/03 00:18:36 hobbs Exp $
+RCS: @(#) $Id: README,v 1.11 2000/08/25 05:55:05 mo Exp $
 
 How To Compile And Install Tk:
 ------------------------------
@@ -44,10 +44,6 @@ How To Compile And Install Tk:
     type "./configure -help" or refer to the autoconf documentation (not
     included here).  Tk's "configure" script supports the following
     special switches in addition to the standard ones:
-	--enable-gcc		If this switch is set, Tk will configure
-				itself to use gcc if it is available on your
-				system.  Note:  it is not safe to modify the
-				Makefile to use gcc after configure is run.
 	--enable-threads	Tk on Unix currently does not support
 				threaded builds.
 	--with-tcl=DIR		Specifies the directory containing the Tcl
@@ -62,6 +58,12 @@ How To Compile And Install Tk:
 				how to build shared libraries.
 	--disable-shared	If this switch is specified, Tk will compile
 				itself as a static library.
+
+    Note: by default gcc will be used if it can be located on the PATH.
+    if you want to use cc instead of gcc, set the CC environment variable
+    to "cc" before running configure. It is not safe to change the Makefile
+    to use gcc after configure is run.
+
     Note: be sure to use only absolute path names (those starting with "/")
     in the --prefix and --exec_prefix options.
 
diff --git a/unix/configure.in b/unix/configure.in
index f80be4a..6255d69 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 AC_INIT(../generic/tk.h)
-# RCS: @(#) $Id: configure.in,v 1.53 2000/07/19 02:16:00 mo Exp $
+# RCS: @(#) $Id: configure.in,v 1.54 2000/08/25 05:55:06 mo Exp $
 
 TK_VERSION=8.4
 TK_MAJOR_VERSION=8
@@ -22,9 +22,8 @@ fi
 srcdir=`cd $srcdir ; pwd`
 TK_SRC_DIR=`cd $srcdir/..; pwd`
 
-AC_PROG_RANLIB
-SC_ENABLE_GCC
 AC_PROG_CC
+AC_PROG_RANLIB
 
 #------------------------------------------------------------------------
 # I'm not sure why these need to come before all of the other tests
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index d00d058..7981282 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -257,36 +257,6 @@ AC_DEFUN(SC_LOAD_TKCONFIG, [
 ])
 
 #------------------------------------------------------------------------
-# SC_ENABLE_GCC --
-#
-#	Allows the use of GCC if available
-#
-# Arguments:
-#	none
-#	
-# Results:
-#
-#	Adds the following arguments to configure:
-#		--enable-gcc
-#
-#	Sets the following vars:
-#		CC	Command to use for the compiler
-#------------------------------------------------------------------------
-
-AC_DEFUN(SC_ENABLE_GCC, [
-    AC_ARG_ENABLE(gcc, [  --enable-gcc            allow use of gcc if available [--disable-gcc]],
-	[ok=$enableval], [ok=no])
-    if test "$ok" = "yes"; then
-	if test -z "$CC"; then
-            CC=gcc
-	fi
-	AC_PROG_CC
-    else
-	CC=${CC-cc}
-    fi
-])
-
-#------------------------------------------------------------------------
 # SC_ENABLE_SHARED --
 #
 #	Allows the building of shared libraries