summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2005-07-26 20:20:21 (GMT)
committermdejong <mdejong>2005-07-26 20:20:21 (GMT)
commit99a3268ecf555ad04f3ce935d0c29b2477762c74 (patch)
tree1f752ee2b031e6e9bf8d593b06e2a22cf1b99d86
parent8b352c42ebe82894d4922719ca48dc45c6345844 (diff)
downloadtcl-99a3268ecf555ad04f3ce935d0c29b2477762c74.zip
tcl-99a3268ecf555ad04f3ce935d0c29b2477762c74.tar.gz
tcl-99a3268ecf555ad04f3ce935d0c29b2477762c74.tar.bz2
* unix/configure: Regen.
* unix/configure.in: Check for a $prefix/share directory and add it the the package if found. This will check for Tcl packages in /usr/local/share when Tcl is configured with the default dist install. [patch 1231015]
-rw-r--r--ChangeLog9
-rwxr-xr-xunix/configure7
-rw-r--r--unix/configure.in9
3 files changed, 24 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 71f9a7a..8d96f02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-26 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * unix/configure: Regen.
+ * unix/configure.in: Check for a $prefix/share
+ directory and add it the the package if found.
+ This will check for Tcl packages in /usr/local/share
+ when Tcl is configured with the default dist install.
+ [patch 1231015]
+
2005-07-26 Don Porter <dgp@users.sourceforge.net>
* generic/tclBasic.c (Tcl_CallWhenDeleted): Converted to use
diff --git a/unix/configure b/unix/configure
index 7f9b3fc..e872f7d 100755
--- a/unix/configure
+++ b/unix/configure
@@ -13691,6 +13691,13 @@ else
TCL_PACKAGE_PATH="${prefix}/lib"
fi
+# If a system share directory like /usr/local/share already exists, then add
+# it to the package search path.
+
+if test -d "${prefix}/share" ; then
+ TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} ${prefix}/share"
+fi
+
#--------------------------------------------------------------------
# The statements below define various symbols relating to Tcl
# stub support.
diff --git a/unix/configure.in b/unix/configure.in
index 08896a4..a550034 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.135 2005/06/21 08:51:23 dkf Exp $
+# RCS: @(#) $Id: configure.in,v 1.136 2005/07/26 20:20:54 mdejong Exp $
AC_INIT([tcl],[8.5])
AC_PREREQ(2.57)
@@ -551,6 +551,13 @@ else
TCL_PACKAGE_PATH="${prefix}/lib"
fi
+# If a system share directory like /usr/local/share already exists, then add
+# it to the package search path.
+
+if test -d "${prefix}/share" ; then
+ TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} ${prefix}/share"
+fi
+
#--------------------------------------------------------------------
# The statements below define various symbols relating to Tcl
# stub support.