diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | unix/configure | 20 | ||||
| -rw-r--r-- | unix/configure.in | 22 |
3 files changed, 34 insertions, 13 deletions
@@ -1,3 +1,8 @@ +2002-02-04 Jeff Hobbs <jeffh@ActiveState.com> + + * unix/configure: regen'ed + * unix/configure.in: call /bin/pwd on AIX-4.3 to avoid pwd errors. + 2002-02-04 Andreas Kupries <andreas_kupries@users.sourceforge.net> * unix/tclUnixChan.c (FileOutputProc): Fixed [bug 465765] reported diff --git a/unix/configure b/unix/configure index dd0347c..9ed5440 100755 --- a/unix/configure +++ b/unix/configure @@ -6257,13 +6257,21 @@ eval "TCL_LIB_FILE=${TCL_LIB_FILE}" # AIX remembers this path and will attempt to use it at run-time to look # up the Tcl library. +# AIX 4.3.3 has a somewhat broken pwd (reported also by other projects) +# that makes us have to hardware /bin/pwd for AIX here. +if test "$system" = "AIX-4.3" ; then + PWD=`/bin/pwd` +else + PWD=`pwd` +fi + if test "$SHARED_BUILD" = "0" -o $TCL_NEEDS_EXP_FILE = 0; then if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}" else TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" fi - TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" + TCL_BUILD_LIB_SPEC="-L${PWD} ${TCL_LIB_FLAG}" TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}" else TCL_BUILD_EXP_FILE="lib.exp" @@ -6273,10 +6281,10 @@ else eval "TCL_EXP_FILE=\"${TCL_EXP_FILE}\"" if test "$GCC" = "yes" ; then - TCL_BUILD_LIB_SPEC="-Wl,-bI:`pwd`/${TCL_BUILD_EXP_FILE} -L`pwd`" - TCL_LIB_SPEC="-Wl,-bI:${libdir}/${TCL_EXP_FILE} -L`pwd`" + TCL_BUILD_LIB_SPEC="-Wl,-bI:${PWD}/${TCL_BUILD_EXP_FILE} -L${PWD}" + TCL_LIB_SPEC="-Wl,-bI:${libdir}/${TCL_EXP_FILE} -L${PWD}" else - TCL_BUILD_LIB_SPEC="-bI:`pwd`/${TCL_BUILD_EXP_FILE}" + TCL_BUILD_LIB_SPEC="-bI:${PWD}/${TCL_BUILD_EXP_FILE}" TCL_LIB_SPEC="-bI:${libdir}/${TCL_EXP_FILE}" fi fi @@ -6317,9 +6325,9 @@ else TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" fi -TCL_BUILD_STUB_LIB_SPEC="-L`pwd` ${TCL_STUB_LIB_FLAG}" +TCL_BUILD_STUB_LIB_SPEC="-L${PWD} ${TCL_STUB_LIB_FLAG}" TCL_STUB_LIB_SPEC="-L${libdir} ${TCL_STUB_LIB_FLAG}" -TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" +TCL_BUILD_STUB_LIB_PATH="${PWD}/${TCL_STUB_LIB_FILE}" TCL_STUB_LIB_PATH="${libdir}/${TCL_STUB_LIB_FILE}" # Install time header dir can be set via --includedir diff --git a/unix/configure.in b/unix/configure.in index ca6d2bc..80134f8 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.78 2002/01/11 20:46:34 mdejong Exp $ +# RCS: @(#) $Id: configure.in,v 1.79 2002/02/05 01:02:21 hobbs Exp $ AC_INIT(../generic/tcl.h) @@ -425,13 +425,21 @@ eval "TCL_LIB_FILE=${TCL_LIB_FILE}" # AIX remembers this path and will attempt to use it at run-time to look # up the Tcl library. +# AIX 4.3.3 has a somewhat broken pwd (reported also by other projects) +# that makes us have to hardware /bin/pwd for AIX here. +if test "$system" = "AIX-4.3" ; then + PWD=`/bin/pwd` +else + PWD=`pwd` +fi + if test "$SHARED_BUILD" = "0" -o $TCL_NEEDS_EXP_FILE = 0; then if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then TCL_LIB_FLAG="-ltcl${TCL_VERSION}\${TCL_DBGX}" else TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" fi - TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}" + TCL_BUILD_LIB_SPEC="-L${PWD} ${TCL_LIB_FLAG}" TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}" else TCL_BUILD_EXP_FILE="lib.exp" @@ -441,10 +449,10 @@ else eval "TCL_EXP_FILE=\"${TCL_EXP_FILE}\"" if test "$GCC" = "yes" ; then - TCL_BUILD_LIB_SPEC="-Wl,-bI:`pwd`/${TCL_BUILD_EXP_FILE} -L`pwd`" - TCL_LIB_SPEC="-Wl,-bI:${libdir}/${TCL_EXP_FILE} -L`pwd`" + TCL_BUILD_LIB_SPEC="-Wl,-bI:${PWD}/${TCL_BUILD_EXP_FILE} -L${PWD}" + TCL_LIB_SPEC="-Wl,-bI:${libdir}/${TCL_EXP_FILE} -L${PWD}" else - TCL_BUILD_LIB_SPEC="-bI:`pwd`/${TCL_BUILD_EXP_FILE}" + TCL_BUILD_LIB_SPEC="-bI:${PWD}/${TCL_BUILD_EXP_FILE}" TCL_LIB_SPEC="-bI:${libdir}/${TCL_EXP_FILE}" fi fi @@ -485,9 +493,9 @@ else TCL_STUB_LIB_FLAG="-ltclstub`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}" fi -TCL_BUILD_STUB_LIB_SPEC="-L`pwd` ${TCL_STUB_LIB_FLAG}" +TCL_BUILD_STUB_LIB_SPEC="-L${PWD} ${TCL_STUB_LIB_FLAG}" TCL_STUB_LIB_SPEC="-L${libdir} ${TCL_STUB_LIB_FLAG}" -TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" +TCL_BUILD_STUB_LIB_PATH="${PWD}/${TCL_STUB_LIB_FILE}" TCL_STUB_LIB_PATH="${libdir}/${TCL_STUB_LIB_FILE}" # Install time header dir can be set via --includedir |