diff options
| author | das <das> | 2006-08-18 07:47:10 (GMT) |
|---|---|---|
| committer | das <das> | 2006-08-18 07:47:10 (GMT) |
| commit | ecf66721e647c1669971b9507bb69112bb7a6595 (patch) | |
| tree | e626c7bc622c86f7865d10e09338df5200f7f124 /unix/configure.in | |
| parent | 5fd4bcf187894f2923bb2b01b8d08f9b47e0544d (diff) | |
| download | tk-ecf66721e647c1669971b9507bb69112bb7a6595.zip tk-ecf66721e647c1669971b9507bb69112bb7a6595.tar.gz tk-ecf66721e647c1669971b9507bb69112bb7a6595.tar.bz2 | |
* unix/tcl.m4 (Darwin): add support for --enable-64bit on x86_64, for
universal builds including x86_64, for 64-bit CoreFoundation on Leopard
and for use of -mmacosx-version-min instead of MACOSX_DEPLOYMENT_TARGET.
* unix/configure.in (Darwin): remove 64-bit arch flags from CFLAGS for
combined 32-bit and 64-bit universal builds, as neither TkAqua nor TkX11
can be built for 64-bit at present.
* unix/configure: autoconf-2.59
* unix/tkConfig.h.in: autoheader-2.59
* macosx/Wish.xcodeproj/project.pbxproj: switch native release targets
to use DWARF with dSYM, Xcode 3.0 changes.
* macosx/README: updates for x86_64 and Xcode 2.3.
* macosx/tkMacOSXInit.c (TkpInit): when available, use public
TransformProcessType() API instead of CPSEnableForegroundOperation() SPI
to notify the window server that we are a GUI application.
* macosx/tkMacOSXWm.c (WmAttrGetTitlePath): use HIWindow API on >=Tiger.
* macosx/tkMacOSXMouseEvent.c (GenerateToolbarButtonEvent):
* macosx/tkMacOSXMenus.c (GenerateEditEvent):
* macosx/tkMacOSXMenu.c (MenuSelectEvent): bzero XVirtualEvent structure
before use to ensure all fields are initialized. [Bug 1542205]
Diffstat (limited to 'unix/configure.in')
| -rw-r--r-- | unix/configure.in | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/unix/configure.in b/unix/configure.in index 8182d93..590b70d 100644 --- a/unix/configure.in +++ b/unix/configure.in @@ -3,7 +3,7 @@ dnl This file is an input file used by the GNU "autoconf" program to dnl generate the file "configure", which is run during Tk installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.120 2006/07/20 06:25:20 das Exp $ +# RCS: @(#) $Id: configure.in,v 1.121 2006/08/18 07:47:11 das Exp $ AC_INIT([tk],[8.5]) AC_PREREQ(2.59) @@ -257,11 +257,10 @@ if test "`uname -s`" = "Darwin" ; then fi fi AC_MSG_RESULT([$tk_aqua]) - if test $do64bit_ok = no ; then - # remove -arch ppc64 from CFLAGS for fat builds as neither Aqua nor X11 - # can be built for 64bit at present (no 64bit GUI libraries). - CFLAGS="`echo "$CFLAGS" | sed -e 's/-arch ppc64/-arch ppc/g'`" - fi + # remove 64-bit arch flags from CFLAGS for combined 32-bit and 64-bit fat + # builds, as neither TkAqua nor TkX11 can be built for 64-bit at present. + test "$fat_32_64" = yes && \ + CFLAGS="`echo "$CFLAGS " | sed -e 's/-arch ppc64 / /g' -e 's/-arch x86_64 / /g'`" if test $tk_aqua = no; then # check if weak linking whole libraries is possible. AC_CACHE_CHECK([if ld accepts -weak-l flag], tcl_cv_ld_weak_l, [ |