diff options
author | nijtmans <nijtmans> | 2010-11-19 21:37:13 (GMT) |
---|---|---|
committer | nijtmans <nijtmans> | 2010-11-19 21:37:13 (GMT) |
commit | e308d555ace980d925c685d9882c9ca5c3922ca0 (patch) | |
tree | f6131560465ad646ca290b1eba3eec1d0e954de6 /win/configure.in | |
parent | 0142fdb760e82fc6fb38add2a16f9b5c8f110664 (diff) | |
download | tcl-e308d555ace980d925c685d9882c9ca5c3922ca0.zip tcl-e308d555ace980d925c685d9882c9ca5c3922ca0.tar.gz tcl-e308d555ace980d925c685d9882c9ca5c3922ca0.tar.bz2 |
Allow cross-compilation by default (backported)
Use -pipe for gcc on win32 (backported)
Diffstat (limited to 'win/configure.in')
-rw-r--r-- | win/configure.in | 40 |
1 files changed, 11 insertions, 29 deletions
diff --git a/win/configure.in b/win/configure.in index aca324e..55862e4 100644 --- a/win/configure.in +++ b/win/configure.in @@ -3,7 +3,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.104.2.11 2010/08/27 00:09:30 hobbs Exp $ +# RCS: @(#) $Id: configure.in,v 1.104.2.12 2010/11/19 21:37:13 nijtmans Exp $ AC_INIT(../generic/tcl.h) AC_PREREQ(2.59) @@ -58,31 +58,9 @@ AC_PROG_CC AC_C_INLINE AC_HEADER_STDC -# 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. -dnl AC_CHECK_TOOL(AR, ar) -dnl AC_CHECK_TOOL(RANLIB, ranlib) -dnl 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) - - if test "${AR}" = "" ; then - AC_MSG_ERROR([Required archive tool 'ar' not found on PATH.]) - fi - if test "${RANLIB}" = "" ; then - AC_MSG_ERROR([Required archive index tool 'ranlib' not found on PATH.]) - fi - if test "${RC}" = "" ; then - AC_MSG_ERROR([Required resource tool 'windres' not found on PATH.]) - fi -fi +AC_CHECK_TOOL(AR, ar) +AC_CHECK_TOOL(RANLIB, ranlib) +AC_CHECK_TOOL(RC, windres) #-------------------------------------------------------------------- # Checks to see if the make program sets the $MAKE variable. @@ -147,7 +125,7 @@ fi # # Check to see if the excpt.h include file provided contains the # definition for EXCEPTION_DISPOSITION; if not, which is the case -# with Cygwin's version as of 2002-04-10, define it to be int, +# with Cygwin's version as of 2002-04-10, define it to be int, # sufficient for getting the current code to work. # AC_CACHE_CHECK(for EXCEPTION_DISPOSITION support in include files, @@ -337,7 +315,7 @@ SC_TCL_CFG_ENCODING SC_ENABLE_SHARED #-------------------------------------------------------------------- -# The statements below define a collection of compile flags. This +# The statements below define a collection of compile flags. This # macro depends on the value of SHARED_BUILD, and should be called # after SC_ENABLE_SHARED checks the configure switches. #-------------------------------------------------------------------- @@ -345,7 +323,7 @@ SC_ENABLE_SHARED SC_CONFIG_CFLAGS #-------------------------------------------------------------------- -# Set the default compiler switches based on the --enable-symbols +# Set the default compiler switches based on the --enable-symbols # option. This macro depends on C flags, and should be called # after SC_CONFIG_CFLAGS macro is called. #-------------------------------------------------------------------- @@ -526,3 +504,7 @@ AC_SUBST(RC_DEFINES) AC_SUBST(RES) AC_OUTPUT(Makefile tclConfig.sh tcl.hpj) + +dnl Local Variables: +dnl mode: autoconf; +dnl End: |