diff options
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 5 | ||||
| -rw-r--r-- | unix/configure.in | 3 | ||||
| -rw-r--r-- | unix/tclConfig.h.in | 3 | ||||
| -rw-r--r-- | unix/tclUnixInit.c | 10 |
4 files changed, 15 insertions, 6 deletions
diff --git a/unix/configure b/unix/configure index 6a096fc..3a1b334 100755 --- a/unix/configure +++ b/unix/configure @@ -13453,6 +13453,11 @@ 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 <<\_ACEOF +#define TCL_FRAMEWORK 1 +_ACEOF +) 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 7d803b2..b2e8f70 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.120 2004/11/18 00:45:03 rmax Exp $ +# RCS: @(#) $Id: configure.in,v 1.121 2004/11/19 06:28:31 das Exp $ AC_INIT([tcl],[8.5]) AC_PREREQ(2.57) @@ -497,6 +497,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, 1, [Is Tcl built as a 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/tclConfig.h.in b/unix/tclConfig.h.in index f931b23..bc20165 100644 --- a/unix/tclConfig.h.in +++ b/unix/tclConfig.h.in @@ -270,6 +270,9 @@ /* Are we to override what our default encoding is? */ #undef TCL_DEFAULT_ENCODING +/* Is Tcl built as a framework? */ +#undef TCL_FRAMEWORK + /* Is memory debugging enabled? */ #undef TCL_MEM_DEBUG 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 */ |