diff options
| author | das <das> | 2007-03-07 23:46:33 (GMT) |
|---|---|---|
| committer | das <das> | 2007-03-07 23:46:33 (GMT) |
| commit | 3288ca4931072f874190455b686106df2d756cbd (patch) | |
| tree | b327533aebd6e8b2b22cd04e1e847fddbe5de52d /unix | |
| parent | 377fc83bb085523c857545603b7cd054ef49f160 (diff) | |
| download | tk-3288ca4931072f874190455b686106df2d756cbd.zip tk-3288ca4931072f874190455b686106df2d756cbd.tar.gz tk-3288ca4931072f874190455b686106df2d756cbd.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().
* generic/ttk/ttkGenStubs.tcl (new): add ttk-specific genstubs.tcl from
* unix/Makefile.in (genstubs): tile and run it from 'genstubs'
target, restores ability to generate all of Tk's stub sources.
* generic/ttk/ttkTreeview.c: #ifdef out unused declaration.
* macosx/tkMacOSXDebug.c (TkMacOSXGetNamedDebugSymbol): add fix for
libraries loaded with a DYLD_IMAGE_SUFFIX.
* macosx/Wish.xcodeproj/project.pbxproj: ensure gcc version used by
* macosx/Wish.xcodeproj/default.pbxuser: Xcode and configure/make are
* macosx/Wish-Common.xcconfig: consistent and independent of
gcc_select default and CC env var; fixes for Xcode 3.0.
* unix/tcl.m4 (Darwin): s/CFLAGS/CPPFLAGS/ in macosx-version-min check.
* unix/configure: autoconf-2.59
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 5 | ||||
| -rwxr-xr-x | unix/configure | 2 | ||||
| -rw-r--r-- | unix/tcl.m4 | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 177af09..a522a7a 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.120 2006/12/13 23:04:33 hobbs Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.121 2007/03/07 23:46:33 das Exp $ # Current Tk version; used in various names. @@ -1430,8 +1430,7 @@ $(TTK_DIR)/ttkStubInit.c: $(TTK_DIR)/ttk.decls genstubs: $(TCL_EXE) $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \ $(GENERIC_DIR)/tk.decls $(GENERIC_DIR)/tkInt.decls -# Need the Ttk specific genstubs as well -# $(TCL_EXE) $(TOOL_DIR)/genStubs.tcl $(TTK_DIR) $(TTK_DIR)/ttk.decls + $(TCL_EXE) $(TTK_DIR)/ttkGenStubs.tcl $(TTK_DIR) $(TTK_DIR)/ttk.decls # # Target to check that all exported functions have an entry in the stubs diff --git a/unix/configure b/unix/configure index 9487ac3..9a9b911 100755 --- a/unix/configure +++ b/unix/configure @@ -5938,7 +5938,7 @@ echo "${ECHO_T}$tcl_cv_ld_single_module" >&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 "$as_me:$LINENO: checking if ld accepts -search_paths_first flag" >&5 diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 1ca5af3..d2e82c6 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1656,7 +1656,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, [ |