diff options
| author | das <das> | 2005-05-24 04:20:05 (GMT) |
|---|---|---|
| committer | das <das> | 2005-05-24 04:20:05 (GMT) |
| commit | 1f8ced7c37e71e5e0c6563a50e8aa53ea2242fa5 (patch) | |
| tree | bf72ea7d291744b7df10a64e210f2c0d4ec41b6e /unix/tclUnixInit.c | |
| parent | fca40523b43d3d77abecf7ffcd91efb66fdc7893 (diff) | |
| download | tcl-1f8ced7c37e71e5e0c6563a50e8aa53ea2242fa5.zip tcl-1f8ced7c37e71e5e0c6563a50e8aa53ea2242fa5.tar.gz tcl-1f8ced7c37e71e5e0c6563a50e8aa53ea2242fa5.tar.bz2 | |
* macosx/Makefile:
* macosx/README:
* macosx/Tcl-Info.plist.in (new file):
* unix/Makefile.in:
* unix/configure.in:
* unix/tcl.m4:
* unix/tclUnixInit.c: moved all Darwin framework build support from
macosx/Makefile into the standard unix configure/make buildsystem, the
macosx/Makefile is no longer required to build Tcl.framework (but its
functionality is still available for backwards compatibility).
* unix/configure: autoconf-2.13
Diffstat (limited to 'unix/tclUnixInit.c')
| -rw-r--r-- | unix/tclUnixInit.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index 8403f6b..a47e763 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.7 2005/05/14 20:52:33 das Exp $ + * RCS: @(#) $Id: tclUnixInit.c,v 1.34.2.8 2005/05/24 04:20:12 das Exp $ */ #if defined(HAVE_COREFOUNDATION) @@ -146,7 +146,9 @@ static CONST LocaleTable localeTable[] = { }; #ifdef HAVE_COREFOUNDATION -static int Tcl_MacOSXGetLibraryPath(Tcl_Interp *interp, int maxPathLen, char *tclLibPath); +static int MacOSXGetLibraryPath _ANSI_ARGS_(( + Tcl_Interp *interp, int maxPathLen, + char *tclLibPath)); #endif /* HAVE_COREFOUNDATION */ @@ -439,12 +441,12 @@ CONST char *path; /* Path to the executable in native * This is needed when users install Tcl with an exec-prefix that * is different from the prtefix. */ - + { #ifdef HAVE_COREFOUNDATION char tclLibPath[MAXPATHLEN + 1]; - - if (Tcl_MacOSXGetLibraryPath(NULL, MAXPATHLEN, tclLibPath) == TCL_OK) { + + if (MacOSXGetLibraryPath(NULL, MAXPATHLEN, tclLibPath) == TCL_OK) { str = tclLibPath; } else #endif /* HAVE_COREFOUNDATION */ @@ -741,8 +743,8 @@ TclpSetVariables(interp) #ifdef HAVE_COREFOUNDATION char tclLibPath[MAXPATHLEN + 1]; - - if (Tcl_MacOSXGetLibraryPath(interp, MAXPATHLEN, tclLibPath) == TCL_OK) { + + if (MacOSXGetLibraryPath(interp, MAXPATHLEN, tclLibPath) == TCL_OK) { CONST char *str; Tcl_DString ds; CFBundleRef bundleRef; @@ -1053,11 +1055,10 @@ TclpCheckStackSpace() return 1; } -#ifdef HAVE_COREFOUNDATION /* *---------------------------------------------------------------------- * - * Tcl_MacOSXGetLibraryPath -- + * MacOSXGetLibraryPath -- * * If we have a bundle structure for the Tcl installation, * then check there first to see if we can find the libraries @@ -1071,14 +1072,16 @@ TclpCheckStackSpace() * *---------------------------------------------------------------------- */ -static int Tcl_MacOSXGetLibraryPath(Tcl_Interp *interp, int maxPathLen, char *tclLibPath) + +#ifdef HAVE_COREFOUNDATION +static int +MacOSXGetLibraryPath(Tcl_Interp *interp, int maxPathLen, char *tclLibPath) { int foundInFramework = TCL_ERROR; #ifdef TCL_FRAMEWORK foundInFramework = Tcl_MacOSXOpenVersionedBundleResources(interp, - "com.tcltk.tcllibrary", TCL_VERSION, 0, maxPathLen, tclLibPath); + "com.tcltk.tcllibrary", TCL_FRAMEWORK_VERSION, 0, maxPathLen, tclLibPath); #endif return foundInFramework; } #endif /* HAVE_COREFOUNDATION */ - |