diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-06-16 11:57:07 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-06-16 11:57:07 (GMT) |
| commit | 12efa830f66d02509c99edcf8843347c8ec2487d (patch) | |
| tree | 3f749d5a28074e849594afa30d12e46baef02d9d | |
| parent | 0917075f648253085f5ee2fb1cefa25a6c66f632 (diff) | |
| parent | fbcd87e044a689ee654c0848842691e3c871730d (diff) | |
| download | tk-12efa830f66d02509c99edcf8843347c8ec2487d.zip tk-12efa830f66d02509c99edcf8843347c8ec2487d.tar.gz tk-12efa830f66d02509c99edcf8843347c8ec2487d.tar.bz2 | |
Sync with win/tcl.m4 from Tcl
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | win/configure | 58 | ||||
| -rw-r--r-- | win/tcl.m4 | 15 |
3 files changed, 78 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2011-06-16 Jan Nijtmans <nijtmans@users.sf.net> + + * win/tcl.m4: Sync with win/tcl.m4 from Tcl + * win/configure: (regenerated) + 2011-06-10 Don Porter <dgp@users.sourceforge.net> * generic/tkEntry.c: [Bug 3315731] Fix [$entry -invcmd]. diff --git a/win/configure b/win/configure index 8bc626f..6a49788 100755 --- a/win/configure +++ b/win/configure @@ -3578,6 +3578,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 @@ -589,6 +589,21 @@ file for information about building with Mingw.]) 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 |