diff options
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 18 | ||||
| -rw-r--r-- | win/tcl.m4 | 14 |
2 files changed, 16 insertions, 16 deletions
diff --git a/win/configure b/win/configure index e41ce6e..6f6ef8e 100755 --- a/win/configure +++ b/win/configure @@ -1221,17 +1221,17 @@ fi # which requires x86|amd64|ia64. MACHINE="X86" - echo $ac_n "checking for Cygwin version of gcc""... $ac_c" 1>&6 -echo "configure:1226: checking for Cygwin version of gcc" >&5 -if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then + echo $ac_n "checking for cross-compile version of gcc""... $ac_c" 1>&6 +echo "configure:1226: checking for cross-compile version of gcc" >&5 +if eval "test \"`echo '$''{'ac_cv_cross'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF #line 1231 "configure" #include "confdefs.h" - #ifdef __CYGWIN__ - #error cygwin + #ifdef __WIN32__ + #error cross-compiler #endif int main() { @@ -1240,20 +1240,20 @@ int main() { EOF if { (eval echo configure:1242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_cv_cygwin=no + ac_cv_cross=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_cygwin=yes + ac_cv_cross=no fi rm -f conftest* fi -echo "$ac_t""$ac_cv_cygwin" 1>&6 +echo "$ac_t""$ac_cv_cross" 1>&6 - if test "$ac_cv_cygwin" = "yes"; then + if test "$ac_cv_cross" = "yes"; then case "$do64bit" in amd64|x64|yes) CC="x86_64-w64-mingw32-gcc" @@ -408,18 +408,18 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ # which requires x86|amd64|ia64. MACHINE="X86" - AC_CACHE_CHECK(for Cygwin version of gcc, - ac_cv_cygwin, + AC_CACHE_CHECK(for cross-compile version of gcc, + ac_cv_cross, AC_TRY_COMPILE([ - #ifdef __CYGWIN__ - #error cygwin + #ifdef __WIN32__ + #error cross-compiler #endif ], [], - ac_cv_cygwin=no, - ac_cv_cygwin=yes) + ac_cv_cross=yes, + ac_cv_cross=no) ) - if test "$ac_cv_cygwin" = "yes"; then + if test "$ac_cv_cross" = "yes"; then case "$do64bit" in amd64|x64|yes) CC="x86_64-w64-mingw32-gcc" |