remove --enable-gcc configure option

7 files changed, 52 insertions, 102 deletions

diff --git a/ChangeLog b/ChangeLog
index 6eb33d3..d07e6b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-08-24  Mo DeJong  <mdejong@redhat.com>
+
+	* unix/README: Update to account for removal of --enable-gcc.
+	* unix/configure.in:
+	* unix/tcl.m4 (SC_ENABLE_GCC): Remove --enable-gcc option.
+	* win/README: Add note about building with Cygwin.
+	* win/configure.in: 
+	* win/tcl.m4 (SC_ENABLE_GCC): Remove --enable-gcc option.
+	Remove quick hack that provided cross compile support for
+	windows builds.
+
 2000-08-24  Eric Melski  <ericm@ajubasolutions.com>
 
 	Overall change:  Added support for command rename/delete traces
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
diff --git a/win/README b/win/README
index a287f6b..ef896ba 100644
--- a/win/README
+++ b/win/README
@@ -4,7 +4,7 @@ by Scott Stanton
 Scriptics Corporation
 scott.stanton@scriptics.com
 
-RCS: @(#) $Id: README,v 1.17 2000/05/03 00:15:10 hobbs Exp $
+RCS: @(#) $Id: README,v 1.18 2000/08/25 05:45:08 mo Exp $
 
 1. Introduction
 ---------------
@@ -25,6 +25,10 @@ In order to compile Tcl for Windows, you need the following items:
 
 	Visual C++ 2.x/4.x/5.x
 
+        or
+
+        Cygwin 1.1 (See http://sources.redhat.com/cygwin)
+
 In practice, this release is built with Visual C++ 5.0
 
 In the "win" subdirectory of the source release, you will find
@@ -33,6 +37,11 @@ update the paths at the top of the file to reflect your system
 configuration.  Now you can use "make" (or "nmake" for VC++) to build
 the tcl libraries and the tclsh executable.
 
+If you are building with Cygwin, you can use the configure script
+that lives in the win subdirectory. The Cygwin based configure/build
+process works just like the UNIX one, so you will want to refer to
+../unix/README for available configure options.
+
 In order to use the binaries generated by these makefiles, you will
 need to place the Tcl script library files someplace where Tcl can
 find them.  Tcl looks in one of following places for the library files:
diff --git a/win/configure.in b/win/configure.in
index ec2725f..908163e 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -2,7 +2,7 @@
 # generate the file "configure", which is run during Tcl installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.26 2000/07/27 22:47:37 mo Exp $
+# RCS: @(#) $Id: configure.in,v 1.27 2000/08/25 05:45:09 mo Exp $
 
 AC_INIT(../generic/tcl.h)
 
@@ -19,13 +19,27 @@ if test "${exec_prefix}" = "NONE"; then
     exec_prefix=$prefix
 fi
 
-#--------------------------------------------------------------------
-# Check whether --enable-gcc or --disable-gcc was given.  Do this 
-# before AC_PROG_CC and AC_CYGWIN are called so the compiler can 
-# be fully tested by built-in autoconf tools.
-#--------------------------------------------------------------------
- 
-SC_ENABLE_GCC
+#------------------------------------------------------------------------
+# Standard compiler checks
+#------------------------------------------------------------------------
+
+AC_PROG_CC
+
+# To properly support cross-compilation, one would
+# need to use these tool checks instead of
+# the ones below and reconfigure with
+# autoconf 2.50. You can also just set
+# the CC, AR, RANLIB, and RC environment
+# variables if you want to cross compile.
+#AC_CHECK_TOOL(AR, ar, :)
+#AC_CHECK_TOOL(RANLIB, ranlib, :)
+#AC_CHECK_TOOL(RC, windres, :)
+
+if test "${GCC}" = "yes" ; then
+    AC_CHECK_PROG(AR, ar, ar)
+    AC_CHECK_PROG(RANLIB, ranlib, ranlib)
+    AC_CHECK_PROG(RC, windres, windres)
+fi
 
 #--------------------------------------------------------------------
 # Checks to see if the make progeam sets the $MAKE variable.
diff --git a/win/tcl.m4 b/win/tcl.m4
index 7b5d7fe..906e4ff 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -151,60 +151,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
-#		AR	Comman for the archive tool
-#		RANLIB	Command for the archive indexing tool
-#		RC	Command for the resource 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
-	# Quick hack to simulate a real cross check
-	# The right way to do this is to use AC_CHECK_TOOL
-	# correctly, but this is the minimal change
-	# we need until the real fix is ready.
-	if test "$host" != "$build" ; then
-	    if test -z "$CC"; then
-		CC=${host}-gcc
-	    fi
-	    AC_PROG_CC
-	    AC_CHECK_PROG(AR, ${host}-ar, ${host}-ar)
-	    AC_CHECK_PROG(RANLIB, ${host}-ranlib, ${host}-ranlib)
-	    AC_CHECK_PROG(RC, ${host}-windres, ${host}-windres)
-	else
-	    if test -z "$CC"; then
-		CC=gcc
-	    fi
-	    AC_PROG_CC
-	    AC_CHECK_PROG(AR, ar, ar)
-	    AC_CHECK_PROG(RANLIB, ranlib, ranlib)
-	    AC_CHECK_PROG(RC, windres, windres)
-    	fi
-    else
-	# Allow user to override
-	if test -z "$CC"; then
-	    CC=cl
-	fi
-    fi
-])
-
-#------------------------------------------------------------------------
 # SC_ENABLE_SHARED --
 #
 #	Allows the building of shared libraries