1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
Author: Sergei Golovan
Description: Patch restores version for the name of libtkstub.a library for now,
until a better solution is found for keeping both tk8.7-dev and tk9.0-dev
installable simultaneously.
Last-Modified: Thu, 07 Dec 2023 09:17:52 +0300
--- a/unix/configure
+++ b/unix/configure
@@ -9145,10 +9145,15 @@
#--------------------------------------------------------------------
# Replace ${VERSION} with contents of ${TK_VERSION}
- TK_STUB_LIB_FILE="libtkstub.a"
- TK_STUB_LIB_FLAG="-ltkstub"
+eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
eval "TK_STUB_LIB_DIR=\"${libdir}\""
+if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+ TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}"
+else
+ TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`"
+fi
+
TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}"
TK_BUILD_STUB_LIB_PATH="`pwd`/${TK_STUB_LIB_FILE}"
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -718,10 +718,15 @@
#--------------------------------------------------------------------
# Replace ${VERSION} with contents of ${TK_VERSION}
- TK_STUB_LIB_FILE="libtkstub.a"
- TK_STUB_LIB_FLAG="-ltkstub"
+eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
eval "TK_STUB_LIB_DIR=\"${libdir}\""
+if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+ TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}"
+else
+ TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`"
+fi
+
TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}"
TK_BUILD_STUB_LIB_PATH="`pwd`/${TK_STUB_LIB_FILE}"
|
