diff options
| author | das <das> | 2004-11-19 06:29:23 (GMT) |
|---|---|---|
| committer | das <das> | 2004-11-19 06:29:23 (GMT) |
| commit | 6297311b712fb631b245f682cfcbc17a233d7b60 (patch) | |
| tree | a308ab4415be70ba2d96ac4b00d0aef89dbd9fdb /unix | |
| parent | 318ca631dc34f11954febc6e0681081c82365e46 (diff) | |
| download | tcl-6297311b712fb631b245f682cfcbc17a233d7b60.zip tcl-6297311b712fb631b245f682cfcbc17a233d7b60.tar.gz tcl-6297311b712fb631b245f682cfcbc17a233d7b60.tar.bz2 | |
* macosx/Makefile:
* unix/configure.in:
* unix/tclUnixInit.c (MacOSXGetLibraryPath): changed detection
of tcl framework build when determining tclLibPath from overloaded
TCL_LIBRARY to configuration define TCL_FRAMEWORK. [Bug 1068088]
* unix/configure: autoconf-2.13
* tests/unixInit.test (7.1): fixed failure when running tests
with -tmpdir arg not set to working dir.
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 4 | ||||
| -rw-r--r-- | unix/configure.in | 3 | ||||
| -rw-r--r-- | unix/tclUnixInit.c | 10 |
3 files changed, 11 insertions, 6 deletions
diff --git a/unix/configure b/unix/configure index c25db6d..1f45906 100755 --- a/unix/configure +++ b/unix/configure @@ -7271,6 +7271,10 @@ if test "$FRAMEWORK_BUILD" = "1" ; then TCL_BUILD_LIB_SPEC="-F`pwd` -framework Tcl" TCL_LIB_SPEC="-framework Tcl" TCL_LIB_FILE="Tcl" + cat >> confdefs.h <<\EOF +#define TCL_FRAMEWORK 1 +EOF + elif test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}" diff --git a/unix/configure.in b/unix/configure.in index 6c4df56..bc91be2 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 Tcl installation dnl to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.106.2.10 2004/11/18 02:07:09 rmax Exp $ +# RCS: @(#) $Id: configure.in,v 1.106.2.11 2004/11/19 06:29:25 das Exp $ AC_INIT(../generic/tcl.h) AC_PREREQ(2.13) @@ -471,6 +471,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then TCL_BUILD_LIB_SPEC="-F`pwd` -framework Tcl" TCL_LIB_SPEC="-framework Tcl" TCL_LIB_FILE="Tcl" + AC_DEFINE(TCL_FRAMEWORK) elif test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}" diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index a51124e..a3add18 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -7,7 +7,7 @@ * Copyright (c) 1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tclUnixInit.c,v 1.34.2.4 2004/03/29 18:49:36 hobbs Exp $ + * RCS: @(#) $Id: tclUnixInit.c,v 1.34.2.5 2004/11/19 06:29:25 das Exp $ */ #if defined(HAVE_CFBUNDLE) @@ -1069,10 +1069,10 @@ TclpCheckStackSpace() static int Tcl_MacOSXGetLibraryPath(Tcl_Interp *interp, int maxPathLen, char *tclLibPath) { int foundInFramework = TCL_ERROR; - if (strcmp(defaultLibraryDir, "@TCL_IN_FRAMEWORK@") == 0) { - foundInFramework = Tcl_MacOSXOpenVersionedBundleResources(interp, - "com.tcltk.tcllibrary", TCL_VERSION, 0, maxPathLen, tclLibPath); - } +#ifdef TCL_FRAMEWORK + foundInFramework = Tcl_MacOSXOpenVersionedBundleResources(interp, + "com.tcltk.tcllibrary", TCL_VERSION, 0, maxPathLen, tclLibPath); +#endif return foundInFramework; } #endif /* HAVE_CFBUNDLE */ |