summaryrefslogtreecommitdiffstats
path: root/unix/configure
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-23 08:46:14 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2017-05-23 08:46:14 (GMT)
commitebee9277b09a44d9a76abc3b2f05b0fd2636f8c9 (patch)
tree17f738a4ae1140de0b5eb079e56646a7a1f01b6f /unix/configure
parent28926d8f5d67e300ff9fae3d1c3e5da997544123 (diff)
parent2ed3d6368c6e9bdb654e8a1b69a1b18f657479c8 (diff)
downloadtk-ebee9277b09a44d9a76abc3b2f05b0fd2636f8c9.zip
tk-ebee9277b09a44d9a76abc3b2f05b0fd2636f8c9.tar.gz
tk-ebee9277b09a44d9a76abc3b2f05b0fd2636f8c9.tar.bz2
merge core-8-6-branch
Diffstat (limited to 'unix/configure')
-rwxr-xr-xunix/configure11
1 files changed, 7 insertions, 4 deletions
diff --git a/unix/configure b/unix/configure
index cf04ea2..98a1cc7 100755
--- a/unix/configure
+++ b/unix/configure
@@ -2370,8 +2370,9 @@ $as_echo "$as_me: WARNING: --with-tcl argument should refer to directory contain
for i in `ls -d ${libdir} 2>/dev/null` \
`ls -d ${exec_prefix}/lib 2>/dev/null` \
`ls -d ${prefix}/lib 2>/dev/null` \
- `ls -d /usr/local/lib 2>/dev/null` \
`ls -d /usr/contrib/lib 2>/dev/null` \
+ `ls -d /usr/local/lib 2>/dev/null` \
+ `ls -d /usr/pkg/lib 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
@@ -4700,8 +4701,10 @@ fi
PLAT_OBJS=""
PLAT_SRCS=""
LDAIX_SRC=""
- if test x"${SHLIB_VERSION}" = x; then :
- SHLIB_VERSION="1.0"
+ if test "x${SHLIB_VERSION}" = x; then :
+ SHLIB_VERSION=".1.0"
+else
+ SHLIB_VERSION=".${SHLIB_VERSION}"
fi
case $system in
AIX-*)
@@ -5911,7 +5914,7 @@ fi
# requires an extra version number at the end of .so file names.
# So, the library has to have a name like libtcl75.so.1.0
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
TCL_LIB_VERSIONS_OK=nodots
;;