summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorhobbs <hobbs>2010-08-27 00:15:24 (GMT)
committerhobbs <hobbs>2010-08-27 00:15:24 (GMT)
commitb55ae73a21c3f0f8c4c48dd2868a00a7b7d3a608 (patch)
tree09243b88e1ccb8d3c4947fa4cc0d711123fda35b /unix
parent961806102628485ce7f0e5d0abdb9f361576effb (diff)
downloadtcl-b55ae73a21c3f0f8c4c48dd2868a00a7b7d3a608.zip
tcl-b55ae73a21c3f0f8c4c48dd2868a00a7b7d3a608.tar.gz
tcl-b55ae73a21c3f0f8c4c48dd2868a00a7b7d3a608.tar.bz2
* unix/configure, unix/tcl.m4: SHLIB_LD_LIBS='${LIBS}' for OSF1-V*.
Add /usr/lib64 to set of auto-search dirs. [Bug 1230554] (SC_PATH_X): Correct syntax error when xincludes not found.
Diffstat (limited to 'unix')
-rwxr-xr-xunix/configure2
-rw-r--r--unix/tcl.m46
2 files changed, 5 insertions, 3 deletions
diff --git a/unix/configure b/unix/configure
index 025a4bb..2965f76 100755
--- a/unix/configure
+++ b/unix/configure
@@ -8233,7 +8233,7 @@ else
fi
- SHLIB_LD_LIBS=""
+ SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index e21e2ca..9643d58 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -94,6 +94,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
; do
if test -f "$i/tclConfig.sh" ; then
ac_cv_c_tclconfig="`(cd $i; pwd)`"
@@ -224,6 +225,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
`ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
; do
if test -f "$i/tkConfig.sh" ; then
ac_cv_c_tkconfig="`(cd $i; pwd)`"
@@ -1789,7 +1791,7 @@ dnl AC_CHECK_TOOL(AR, ar)
], [
SHLIB_LD='ld -non_shared -expect_unresolved "*"'
])
- SHLIB_LD_LIBS=""
+ SHLIB_LD_LIBS='${LIBS}'
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
@@ -2420,7 +2422,7 @@ AC_DEFUN([SC_PATH_X], [
found_xincludes="yes"
fi
fi
- if test found_xincludes = "no"; then
+ if test "$found_xincludes" = "no"; then
AC_MSG_RESULT([couldn't find any!])
fi