summaryrefslogtreecommitdiffstats
path: root/win/tcl.m4
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-01-22 13:02:50 (GMT)
committernijtmans <nijtmans>2010-01-22 13:02:50 (GMT)
commit054ab462a502b5dd37f904ad14e46190554dd8ba (patch)
tree55e1b5a3324a9e4ba5914c4e528a6d7c4f81933d /win/tcl.m4
parentcc52b4d3c7d8a2d088216976f32ca253b404c75d (diff)
downloadtcl-054ab462a502b5dd37f904ad14e46190554dd8ba.zip
tcl-054ab462a502b5dd37f904ad14e46190554dd8ba.tar.gz
tcl-054ab462a502b5dd37f904ad14e46190554dd8ba.tar.bz2
Revert [2009-12-21] change in tcl.h, in stead
resolve the CYGWIN inclusion problems by re-arranging the inclusions at other places. Make cygwin configuration error into a warning: CYGWIN compilation works although there still are test failures.
Diffstat (limited to 'win/tcl.m4')
-rw-r--r--win/tcl.m416
1 files changed, 16 insertions, 0 deletions
diff --git a/win/tcl.m4 b/win/tcl.m4
index dbd89d3..39e4fe1 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -432,6 +432,22 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
cyg_conftest=
fi
+ AC_CACHE_CHECK(for Cygwin version of gcc,
+ ac_cv_cygwin,
+ AC_TRY_COMPILE([
+ #ifdef __CYGWIN__
+ #error cygwin
+ #endif
+ ],
+ [],
+ ac_cv_cygwin=no,
+ ac_cv_cygwin=yes)
+ )
+ if test "$ac_cv_cygwin" = "yes" ; then
+ AC_MSG_WARN([Compiling under Cygwin is not currently supported.
+If you are not sure you want this, see the README
+file for information about building with Mingw.])
+ fi
if test "$CYGPATH" = "echo" || test "$ac_cv_cygwin" = "yes"; then
DEPARG='"$<"'
else