diff options
| author | das <das> | 2004-11-19 06:28:29 (GMT) |
|---|---|---|
| committer | das <das> | 2004-11-19 06:28:29 (GMT) |
| commit | 05b9ba728e80500b05dcfdcbd11d0d38d9ed9cd4 (patch) | |
| tree | 8a7b9fc7d04eb0be39469179cd1297ff8414d356 /unix/tclUnixInit.c | |
| parent | 1da4df965b312f16caac077583bbe48e890b2756 (diff) | |
| download | tcl-05b9ba728e80500b05dcfdcbd11d0d38d9ed9cd4.zip tcl-05b9ba728e80500b05dcfdcbd11d0d38d9ed9cd4.tar.gz tcl-05b9ba728e80500b05dcfdcbd11d0d38d9ed9cd4.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.57
* unix/tclConfig.h.in: autoheader-2.57
Diffstat (limited to 'unix/tclUnixInit.c')
| -rw-r--r-- | unix/tclUnixInit.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index 21ec34b..a25d519 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.50 2004/11/12 19:08:10 das Exp $ + * RCS: @(#) $Id: tclUnixInit.c,v 1.51 2004/11/19 06:28:31 das Exp $ */ #include "tclInt.h" @@ -1218,10 +1218,10 @@ static int 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 */ |