diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | macosx/tkMacOSXInit.c | 13 | ||||
| -rwxr-xr-x | unix/configure | 6 | ||||
| -rw-r--r-- | unix/tcl.m4 | 6 |
4 files changed, 24 insertions, 12 deletions
@@ -1,3 +1,14 @@ +2005-01-25 Daniel Steffen <das@users.sourceforge.net> + + * macosx/tkMacOSXInit.c (TkpInit): set tcl_interactive to 1 to show + console at startup instead of directly calling [console show]. + + * unix/tcl.m4 (Darwin): fixed bug with static build linking to + dynamic library in /usr/lib etc instead of linking to static library + earlier in search path. [Tcl Bug 956908] + Removed obsolete references to Rhapsody. + * unix/configure: autoconf-2.13 + 2005-01-18 Donal K. Fellows <donal.k.fellows@man.ac.uk> * library/demos/menu.tcl: Reworked to make dialogs children of the diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index f99124b..605120a 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXInit.c,v 1.3.2.3 2004/11/11 01:26:43 das Exp $ + * RCS: @(#) $Id: tkMacOSXInit.c,v 1.3.2.4 2005/01/25 06:54:58 das Exp $ */ #include "tkInt.h" @@ -173,11 +173,12 @@ TkpInit(interp) Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDIN)); Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDOUT)); Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDERR)); - if (Tk_CreateConsoleWindow(interp) == TCL_OK) { - /* Only show the console if we don't have a startup script */ - if (TclGetStartupScriptPath() == NULL) { - Tcl_Eval(interp, "console show"); - } + /* Only show the console if we don't have a startup script */ + if (TclGetStartupScriptFileName() == NULL) { + Tcl_SetVar(interp, "tcl_interactive", "1", TCL_GLOBAL_ONLY); + } + if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) { + return TCL_ERROR; } } } diff --git a/unix/configure b/unix/configure index 787fc0c..b9f3d28 100755 --- a/unix/configure +++ b/unix/configure @@ -2638,7 +2638,7 @@ rm -f conftest* ;; esac ;; - Rhapsody-*|Darwin-*) + Darwin-*) SHLIB_CFLAGS="-fno-common" SHLIB_LD="cc -dynamiclib \${LDFLAGS}" TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_VERSION} -current_version \${VERSION} -install_name \${DYLIB_INSTALL_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr 0xa000000" @@ -2648,7 +2648,7 @@ rm -f conftest* DL_OBJS="tclLoadDyld.o" PLAT_OBJS=\$\(MAC\_OSX_OBJS\) DL_LIBS="" - LDFLAGS="$LDFLAGS -prebind" + LDFLAGS="$LDFLAGS -prebind -Wl,-search_paths_first" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" CFLAGS_OPTIMIZE="-Os" @@ -3147,7 +3147,7 @@ fi ;; NetBSD-*|FreeBSD-*|OpenBSD-*) ;; - Rhapsody-*|Darwin-*) + Darwin-*) ;; RISCos-*) ;; diff --git a/unix/tcl.m4 b/unix/tcl.m4 index a1bdc5b..4e47554 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1329,7 +1329,7 @@ dnl AC_CHECK_TOOL(AR, ar) ;; esac ;; - Rhapsody-*|Darwin-*) + Darwin-*) SHLIB_CFLAGS="-fno-common" SHLIB_LD="cc -dynamiclib \${LDFLAGS}" TCL_SHLIB_LD_EXTRAS="-compatibility_version ${TCL_VERSION} -current_version \${VERSION} -install_name \${DYLIB_INSTALL_DIR}/\${TCL_LIB_FILE} -prebind -seg1addr 0xa000000" @@ -1339,7 +1339,7 @@ dnl AC_CHECK_TOOL(AR, ar) DL_OBJS="tclLoadDyld.o" PLAT_OBJS=\$\(MAC\_OSX_OBJS\) DL_LIBS="" - LDFLAGS="$LDFLAGS -prebind" + LDFLAGS="$LDFLAGS -prebind -Wl,-search_paths_first" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" CFLAGS_OPTIMIZE="-Os" @@ -1725,7 +1725,7 @@ dnl AC_CHECK_TOOL(AR, ar) ;; NetBSD-*|FreeBSD-*|OpenBSD-*) ;; - Rhapsody-*|Darwin-*) + Darwin-*) ;; RISCos-*) ;; |