summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2005-01-25 06:54:17 (GMT)
committerdas <das>2005-01-25 06:54:17 (GMT)
commit87bbe51a83e60a0209fee4610ef2fa148f7178d8 (patch)
tree115a1055406214260386854f5102651d208e3553
parent2ce1d23eb6b0a4170b95fe9526132dffd6fe2b5a (diff)
downloadtk-87bbe51a83e60a0209fee4610ef2fa148f7178d8.zip
tk-87bbe51a83e60a0209fee4610ef2fa148f7178d8.tar.gz
tk-87bbe51a83e60a0209fee4610ef2fa148f7178d8.tar.bz2
* 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.57
-rw-r--r--ChangeLog11
-rw-r--r--macosx/tkMacOSXInit.c13
-rwxr-xr-xunix/configure6
-rw-r--r--unix/tcl.m46
4 files changed, 24 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 7dd39d2..d2ffd5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.57
+
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 07127eb..b7acd4f 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.6 2004/11/11 01:24:32 das Exp $
+ * RCS: @(#) $Id: tkMacOSXInit.c,v 1.7 2005/01/25 06:54:18 das Exp $
*/
#include "tkInt.h"
@@ -174,11 +174,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 (Tcl_GetStartupScript(NULL) == NULL) {
- Tcl_Eval(interp, "console show");
- }
+ /* Only show the console if we don't have a startup script */
+ if (Tcl_GetStartupScript(NULL) == 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 e604e13..9b1a2fa 100755
--- a/unix/configure
+++ b/unix/configure
@@ -5323,7 +5323,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"
@@ -5333,7 +5333,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"
@@ -5931,7 +5931,7 @@ fi;
;;
NetBSD-*|FreeBSD-*)
;;
- Rhapsody-*|Darwin-*)
+ Darwin-*)
;;
RISCos-*)
;;
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 73488a6..94bf885 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1389,7 +1389,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"
@@ -1399,7 +1399,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"
@@ -1797,7 +1797,7 @@ dnl AC_CHECK_TOOL(AR, ar)
;;
NetBSD-*|FreeBSD-*)
;;
- Rhapsody-*|Darwin-*)
+ Darwin-*)
;;
RISCos-*)
;;