diff options
| author | nijtmans@users.sourceforge.net <jan.nijtmans> | 2011-05-12 06:07:26 (GMT) |
|---|---|---|
| committer | nijtmans@users.sourceforge.net <jan.nijtmans> | 2011-05-12 06:07:26 (GMT) |
| commit | c183fe9c143cb45873c6d29f9d510d66c633fa34 (patch) | |
| tree | fc368871e316ff453358a626d738b3a6b37edab1 | |
| parent | dc8aa321fe70b3a17b1449c2316779e56b1ca702 (diff) | |
| parent | f8fb773da9692fd91e9b2bc3d24bc118e0628599 (diff) | |
| download | tcl-c183fe9c143cb45873c6d29f9d510d66c633fa34.zip tcl-c183fe9c143cb45873c6d29f9d510d66c633fa34.tar.gz tcl-c183fe9c143cb45873c6d29f9d510d66c633fa34.tar.bz2 | |
If your compiler already defines _WIN64, assume --enable-64bit
| -rwxr-xr-x | win/configure | 58 | ||||
| -rw-r--r-- | win/tcl.m4 | 15 |
2 files changed, 73 insertions, 0 deletions
diff --git a/win/configure b/win/configure index c397e45..288e57d 100755 --- a/win/configure +++ b/win/configure @@ -4201,6 +4201,64 @@ echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6 echo "$as_me:$LINENO: result: Using 64-bit $MACHINE mode" >&5 echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6 ;; + *) + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + #ifdef _WIN64 + #error 64-bit + #endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + tcl_win_64bit=no +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +tcl_win_64bit=yes + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + if test "$tcl_win_64bit" = "yes" ; then + do64bit=amd64 + MACHINE="AMD64" + echo "$as_me:$LINENO: result: Using 64-bit $MACHINE mode" >&5 +echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6 + fi + ;; esac else if test "${SHARED_BUILD}" = "0" ; then @@ -557,6 +557,21 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ MACHINE="IA64" AC_MSG_RESULT([ Using 64-bit $MACHINE mode]) ;; + *) + AC_TRY_COMPILE([ + #ifdef _WIN64 + #error 64-bit + #endif + ], [], + tcl_win_64bit=no, + tcl_win_64bit=yes + ) + if test "$tcl_win_64bit" = "yes" ; then + do64bit=amd64 + MACHINE="AMD64" + AC_MSG_RESULT([ Using 64-bit $MACHINE mode]) + fi + ;; esac else if test "${SHARED_BUILD}" = "0" ; then |