remove --enable-gcc configure option

2 files changed, 22 insertions, 62 deletions

diff --git a/win/configure.in b/win/configure.in
index ef80902..583a554 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -2,7 +2,7 @@
 # generate the file "configure", which is run during Tk installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.21 2000/07/27 22:52:43 mo Exp $
+# RCS: @(#) $Id: configure.in,v 1.22 2000/08/25 05:55:07 mo Exp $
 
 AC_INIT(../generic/tk.h)
 
@@ -12,13 +12,27 @@ TK_MINOR_VERSION=4
 TK_PATCH_LEVEL="a1"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
-#--------------------------------------------------------------------
-# 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