From 82117336431423ec510476abc4c9d414e174bed5 Mon Sep 17 00:00:00 2001 From: mdejong Date: Tue, 26 Jul 2005 20:26:27 +0000 Subject: * 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] --- ChangeLog | 9 +++++++++ unix/configure | 7 +++++++ unix/configure.in | 9 ++++++++- 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 24ab4e8..0229a0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-07-26 Mo DeJong + + * 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 * generic/tclBasic.c (Tcl_CallWhenDeleted): Converted to use diff --git a/unix/configure b/unix/configure index a59ced9..6da3455 100755 --- a/unix/configure +++ b/unix/configure @@ -7661,6 +7661,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 ad3cc18..e408a9e 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.106.2.18 2005/06/18 19:24:25 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.106.2.19 2005/07/26 20:26:34 mdejong Exp $ AC_INIT(../generic/tcl.h) AC_PREREQ(2.13) @@ -558,6 +558,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. -- cgit v0.12