summaryrefslogtreecommitdiffstats
path: root/unix/tcl.m4
diff options
context:
space:
mode:
authorhobbs <hobbs>2010-08-27 00:53:36 (GMT)
committerhobbs <hobbs>2010-08-27 00:53:36 (GMT)
commit1cbfdbdbdfdefad09ec36f1da58549f431ddc3da (patch)
treef0656d18803440b4dfc0091182f1df0cc14f74df /unix/tcl.m4
parente8ae0e2a82a55688671443664a4ccf8f4a05a2b9 (diff)
downloadtcl-1cbfdbdbdfdefad09ec36f1da58549f431ddc3da.zip
tcl-1cbfdbdbdfdefad09ec36f1da58549f431ddc3da.tar.gz
tcl-1cbfdbdbdfdefad09ec36f1da58549f431ddc3da.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/tcl.m4')
-rw-r--r--unix/tcl.m46
1 files changed, 4 insertions, 2 deletions
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index 22d4701..c86e994 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)`"
@@ -1773,7 +1775,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=""
@@ -2411,7 +2413,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