remove --enable-gcc configure option

3 files changed, 9 insertions, 39 deletions

diff --git a/unix/README b/unix/README
index e3aaee3..eac1c08 100644
--- a/unix/README
+++ b/unix/README
@@ -22,7 +22,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.12 2000/05/03 00:15:10 hobbs Exp $
+RCS: @(#) $Id: README,v 1.13 2000/08/25 05:45:08 mo Exp $
 
 How To Compile And Install Tcl:
 -------------------------------
@@ -51,12 +51,6 @@ How To Compile And Install Tcl:
     type "./configure -help" or refer to the autoconf documentation (not
     included here).  Tcl's "configure" supports the following special
     switches in addition to the standard ones:
-	--enable-gcc		If this switch is set, Tcl 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;
-				if you do this, then information related to
-				dynamic linking will be incorrect.
 	--enable-threads	If this switch is set, Tcl will compile
 				itself with multithreading support.
 	--disable-load		If this switch is specified then Tcl will
@@ -72,6 +66,12 @@ How To Compile And Install Tcl:
 				how to build shared libraries.
 	--disable-shared	If this switch is specified, Tcl 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 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 3e9bfa1..055687e 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 Tcl installation
 dnl	to configure the system for the local environment.
 AC_INIT(../generic/tcl.h)
-# RCS: @(#) $Id: configure.in,v 1.59 2000/07/19 01:17:41 mo Exp $
+# RCS: @(#) $Id: configure.in,v 1.60 2000/08/25 05:45:08 mo Exp $
 
 TCL_VERSION=8.4
 TCL_MAJOR_VERSION=8
@@ -27,8 +27,8 @@ TCL_SRC_DIR=`cd $srcdir/..; pwd`
 # Standard compiler checks
 #------------------------------------------------------------------------
 
+AC_PROG_CC
 AC_PROG_RANLIB
-SC_ENABLE_GCC
 AC_HAVE_HEADERS(unistd.h limits.h)
 
 #------------------------------------------------------------------------
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