* unix/configure.in: Updated TCL_PACKAGE_PATH value to

        * win/configure.in:     handle --libdir configuration.

        * unix/configure.in:    autoconf-2.57
        * win/configure.in:

        * generic/tclBasic.c (Tcl_CreateInterp): Moved call to
        TclInitEmbeddedConfigurationInformation() earlier in
        Tcl_CreateInterp() so that other parts of interp creation
        and initialization may access and use the config values.

6 files changed, 29 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index afd22d0..2296965 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-06-11  Don Porter  <dgp@users.sourceforge.net>
+
+	* unix/configure.in:	Updated TCL_PACKAGE_PATH value to
+	* win/configure.in:	handle --libdir configuration.
+
+	* unix/configure.in:	autoconf-2.57
+	* win/configure.in:
+
+	* generic/tclBasic.c (Tcl_CreateInterp): Moved call to
+	TclInitEmbeddedConfigurationInformation() earlier in
+	Tcl_CreateInterp() so that other parts of interp creation
+	and initialization may access and use the config values.
+
 2004-06-11  Kevin Kenny  <kennykb@acm.org>
 
 	* win/tclAppInit.c: Restored the 'setargv' procedure when
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index cf68241..20a46d0 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclBasic.c,v 1.104 2004/05/30 12:18:25 dkf Exp $
+ * RCS: @(#) $Id: tclBasic.c,v 1.105 2004/06/11 20:25:21 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -528,6 +528,15 @@ Tcl_CreateInterp()
 #endif
 
     /*
+     * TIP #59: Make embedded configuration information
+     * available. This makes use of a public API call
+     * (Tcl_RegisterConfig) and thus requires that the global stub
+     * table is initialized.
+     */
+
+    TclInitEmbeddedConfigurationInformation (interp);
+
+    /*
      * Compute the byte order of this machine.
      */
 
@@ -574,14 +583,6 @@ Tcl_CreateInterp()
 #endif
     Tcl_InitStubs(interp, TCL_VERSION, 1);
 
-    /*
-     * TIP #59: Make embedded configuration information
-     * available. This makes use of a public API call
-     * (Tcl_RegisterConfig) and thus requires that the global stub
-     * table is initialized.
-     */
-
-    TclInitEmbeddedConfigurationInformation (interp);
     return interp;
 }
 
diff --git a/unix/configure b/unix/configure
index 7c34ef0..ae3262f 100755
--- a/unix/configure
+++ b/unix/configure
@@ -13240,7 +13240,7 @@ VERSION=${TCL_VERSION}
 
 if test "$FRAMEWORK_BUILD" = "1" ; then
     TCL_PACKAGE_PATH="${libdir}/Resources/Scripts"
-elif test "$prefix" != "$exec_prefix"; then
+elif test "$prefix/lib" != "$libdir"; then
     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
 else
     TCL_PACKAGE_PATH="${prefix}/lib"
diff --git a/unix/configure.in b/unix/configure.in
index 9e3f44c..7d9fc08 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.113 2004/05/26 22:51:58 hobbs Exp $
+# RCS: @(#) $Id: configure.in,v 1.114 2004/06/11 20:25:24 dgp Exp $
 
 AC_INIT(../generic/tcl.h)
 AC_PREREQ(2.57)
@@ -532,7 +532,7 @@ VERSION=${TCL_VERSION}
 
 if test "$FRAMEWORK_BUILD" = "1" ; then
     TCL_PACKAGE_PATH="${libdir}/Resources/Scripts"
-elif test "$prefix" != "$exec_prefix"; then
+elif test "$prefix/lib" != "$libdir"; then
     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
 else
     TCL_PACKAGE_PATH="${prefix}/lib"
diff --git a/win/configure b/win/configure
index c141665..b675b38 100755
--- a/win/configure
+++ b/win/configure
@@ -4133,7 +4133,7 @@ fi
 #	another for platform-independent scripts.
 #--------------------------------------------------------------------
 
-if test "$prefix" != "$exec_prefix"; then
+if test "$prefix/lib" != "$libdir"; then
     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
 else
     TCL_PACKAGE_PATH="${prefix}/lib"
diff --git a/win/configure.in b/win/configure.in
index bad0cfd..a3189eb 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
 # generate the file "configure", which is run during Tcl installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.80 2004/04/07 21:10:17 hobbs Exp $
+# RCS: @(#) $Id: configure.in,v 1.81 2004/06/11 20:25:25 dgp Exp $
 
 AC_INIT(../generic/tcl.h)
 AC_PREREQ(2.57)
@@ -429,7 +429,7 @@ fi
 #	another for platform-independent scripts.
 #--------------------------------------------------------------------
 
-if test "$prefix" != "$exec_prefix"; then
+if test "$prefix/lib" != "$libdir"; then
     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
 else
     TCL_PACKAGE_PATH="${prefix}/lib"