summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2004-06-11 20:25:20 (GMT)
committerdgp <dgp@users.sourceforge.net>2004-06-11 20:25:20 (GMT)
commit4ddc6442ba71c437f4b4bfb3c8ecff5b908b0957 (patch)
tree450a3d204cc0fc05f023f7a3c5a856fca846f21a /unix
parent3523cf7b7735207f9575d847269dfa4b3278a8d3 (diff)
downloadtcl-4ddc6442ba71c437f4b4bfb3c8ecff5b908b0957.zip
tcl-4ddc6442ba71c437f4b4bfb3c8ecff5b908b0957.tar.gz
tcl-4ddc6442ba71c437f4b4bfb3c8ecff5b908b0957.tar.bz2
* 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.
Diffstat (limited to 'unix')
-rwxr-xr-xunix/configure2
-rw-r--r--unix/configure.in4
2 files changed, 3 insertions, 3 deletions
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"