* 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

6 files changed, 28 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index f817768..d5ce8fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-11-19  Daniel Steffen  <das@users.sourceforge.net>
+
+	* 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
+
 2004-11-18  Don Porter  <dgp@users.sourceforge.net>
 
 	* doc/SaveResult.3:	Documentation for Tcl_*InterpState (TIP 226).
diff --git a/macosx/Makefile b/macosx/Makefile
index f3de349..bc469d8 100644
--- a/macosx/Makefile
+++ b/macosx/Makefile
@@ -3,7 +3,7 @@
 # Makefile to build Tcl on Mac OS X packaged as a Framework
 #	uses standard unix build system in tcl/unix
 #
-# RCS: @(#) $Id: Makefile,v 1.17 2004/11/11 01:16:41 das Exp $
+# RCS: @(#) $Id: Makefile,v 1.18 2004/11/19 06:28:29 das Exp $
 #
 ########################################################################################################
 
@@ -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_MODULE_PATH TCL_LIBRARY DYLIB_INSTALL_DIR
+MAKE_VARS		:= INSTALL_ROOT TCL_PACKAGE_PATH TCL_MODULE_PATH DYLIB_INSTALL_DIR
 MAKE_ARGS_V		= $(foreach v,${MAKE_VARS},$v=${$v})
 export CPPROG		:= cp -p
 
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 */