Attachment "1068088-core-8-4-branch.diff" to
ticket [1068088fff]
added by
das
2004-11-19 13:35:24.
Index: macosx/Makefile
===================================================================
RCS file: /cvsroot/tcl/tcl/macosx/Makefile,v
retrieving revision 1.5.2.9
diff -u -p -r1.5.2.9 Makefile
--- macosx/Makefile 11 Nov 2004 01:17:07 -0000 1.5.2.9
+++ macosx/Makefile 19 Nov 2004 06:19:37 -0000
@@ -101,7 +101,6 @@ TCL_EXE ?= ${SYMROOT}/${TCLSH}
DYLIB_INSTALL_PATH ?= ${INSTALL_PATH}
-TCL_LIBRARY := @TCL_IN_FRAMEWORK@
LIBDIR := ${INSTALL_PATH}/${PRODUCT_NAME}.framework/Versions/${PRODUCT_VERSION}
DYLIB_INSTALL_DIR := ${DYLIB_INSTALL_PATH}/${PRODUCT_NAME}.framework/Versions/${PRODUCT_VERSION}
INCLUDEDIR := ${LIBDIR}/Headers
@@ -115,7 +114,7 @@ OBJ_DIR = ${OBJROOT}/${BUILD_STYLE}
${PROJECT}: override INSTALL_ROOT = ${OBJ_DIR}/
-MAKE_VARS := INSTALL_ROOT TCL_PACKAGE_PATH TCL_LIBRARY DYLIB_INSTALL_DIR
+MAKE_VARS := INSTALL_ROOT TCL_PACKAGE_PATH DYLIB_INSTALL_DIR
MAKE_ARGS_V = $(foreach v,${MAKE_VARS},$v=${$v})
export CPPROG := cp -p
Index: unix/configure
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/configure,v
retrieving revision 1.92.2.16
diff -u -p -r1.92.2.16 configure
--- unix/configure 18 Nov 2004 02:07:10 -0000 1.92.2.16
+++ unix/configure 19 Nov 2004 06:19:37 -0000
@@ -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}"
Index: unix/configure.in
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/configure.in,v
retrieving revision 1.106.2.10
diff -u -p -r1.106.2.10 configure.in
--- unix/configure.in 18 Nov 2004 02:07:09 -0000 1.106.2.10
+++ unix/configure.in 19 Nov 2004 06:19:37 -0000
@@ -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}"
Index: unix/tclUnixInit.c
===================================================================
RCS file: /cvsroot/tcl/tcl/unix/tclUnixInit.c,v
retrieving revision 1.34.2.4
diff -u -p -r1.34.2.4 tclUnixInit.c
--- unix/tclUnixInit.c 29 Mar 2004 18:49:36 -0000 1.34.2.4
+++ unix/tclUnixInit.c 19 Nov 2004 06:19:37 -0000
@@ -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 */
