diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-22 09:54:01 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-05-22 09:54:01 (GMT) |
| commit | 2ed3d6368c6e9bdb654e8a1b69a1b18f657479c8 (patch) | |
| tree | 1d3214e85e1f098c3fc617cac4812380718d4843 /unix/configure | |
| parent | 723ad4ff562ab93c04afa553cbb81963da84ff3d (diff) | |
| download | tk-2ed3d6368c6e9bdb654e8a1b69a1b18f657479c8.zip tk-2ed3d6368c6e9bdb654e8a1b69a1b18f657479c8.tar.gz tk-2ed3d6368c6e9bdb654e8a1b69a1b18f657479c8.tar.bz2 | |
Sync tcl.m4 with the version in Tcl's core-8-6-branch
Diffstat (limited to 'unix/configure')
| -rwxr-xr-x | unix/configure | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/unix/configure b/unix/configure index 6300b1b..d29cf7f 100755 --- a/unix/configure +++ b/unix/configure @@ -1429,8 +1429,9 @@ echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" > 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 @@ -4489,8 +4490,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 @@ -5372,7 +5375,7 @@ fi fi LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS} - SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}' + SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}' LDFLAGS="-Wl,-export-dynamic" CFLAGS_OPTIMIZE="-O2" if test "${TCL_THREADS}" = "1"; then @@ -6113,7 +6116,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 ;; |