diff options
| author | das <das> | 2007-03-07 23:48:08 (GMT) |
|---|---|---|
| committer | das <das> | 2007-03-07 23:48:08 (GMT) |
| commit | 7614214a0526527a62f6cc88b6560f003397c1a3 (patch) | |
| tree | badb4612c17d0114c5c4597e380a51c05a0867ab /unix | |
| parent | 71343a18cb63f16e62500a7a3f17942ccd841684 (diff) | |
| download | tk-7614214a0526527a62f6cc88b6560f003397c1a3.zip tk-7614214a0526527a62f6cc88b6560f003397c1a3.tar.gz tk-7614214a0526527a62f6cc88b6560f003397c1a3.tar.bz2 | |
* generic/tkMain.c (Tk_MainEx): replicate macosx-specific code from
TkpInit() that ensures the console window appears when wish is started
from the OS X Finder (i.e. with stdin == /dev/null), jeffh's 2006-11-24
change rendered the corresponding code in TkpInit() ineffective in wish
because Tk_MainEx() sets tcl_interactive before calling TkpInit().
* macosx/tkMacOSXDebug.c (TkMacOSXGetNamedDebugSymbol): add fix for
libraries loaded with a DYLD_IMAGE_SUFFIX.
* unix/tcl.m4 (Darwin): s/CFLAGS/CPPFLAGS/ in macosx-version-min check.
* unix/configure: autoconf-2.13
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 2 | ||||
| -rw-r--r-- | unix/tcl.m4 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/unix/configure b/unix/configure index 966d7e6..773a949 100755 --- a/unix/configure +++ b/unix/configure @@ -3085,7 +3085,7 @@ echo "$ac_t""$tcl_cv_ld_single_module" 1>&6 DL_LIBS="" # Don't use -prebind when building for Mac OS X 10.4 or later only: test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F '10\\.' '{print int($2)}'`" -lt 4 -a \ - "`echo "${CFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int($2)}'`" -lt 4 && \ + "`echo "${CPPFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int($2)}'`" -lt 4 && \ LDFLAGS="$LDFLAGS -prebind" LDFLAGS="$LDFLAGS -headerpad_max_install_names" echo $ac_n "checking if ld accepts -search_paths_first flag""... $ac_c" 1>&6 diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 24a0899..cf27917 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1622,7 +1622,7 @@ dnl AC_CHECK_TOOL(AR, ar) DL_LIBS="" # Don't use -prebind when building for Mac OS X 10.4 or later only: test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F '10\\.' '{print int([$]2)}'`" -lt 4 -a \ - "`echo "${CFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int([$]2)}'`" -lt 4 && \ + "`echo "${CPPFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int([$]2)}'`" -lt 4 && \ LDFLAGS="$LDFLAGS -prebind" LDFLAGS="$LDFLAGS -headerpad_max_install_names" AC_CACHE_CHECK([if ld accepts -search_paths_first flag], tcl_cv_ld_search_paths_first, [ |