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
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
Description: Patch fixes loading the libBLT library from
[package require BLT]. Specifically, it provides correct version
BLT_PATCH_LEVEL and prevents loading the library twice (once
by its real name and onr more time by a symlink if the blt-dev
package is installed). Also, it skips initializing widget bindings
if Tk isn't present.
Author: Sergei Golovan
Last-Modified: Fri, 04 Jul 2014 09:27:54 +0400
--- a/configure
+++ b/configure
@@ -3757,6 +3757,22 @@
BLT_VERSION=${BLT_MAJOR_VERSION}.${BLT_MINOR_VERSION}
+echo $ac_n "checking BLT_PATCH_LEVEL""... $ac_c" 1>&6
+echo "configure:3742: checking BLT_PATCH_LEVEL" >&5
+if eval "test \"`echo '$''{'blt_cv_patch_level'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.awk <<EOF
+/^# *define *BLT_PATCH_LEVEL[ \t]/ { print \$3 }
+EOF
+blt_cv_patch_level=`${AWK} -f conftest.awk ${srcdir}/generic/blt.h`
+rm -rf conftest*
+
+fi
+
+echo "$ac_t""$blt_cv_patch_level" 1>&6
+BLT_PATCH_LEVEL=${blt_cv_patch_level}
+
# Add BLT to the run path
libdir=${exec_prefix}/lib
@@ -4448,6 +4464,7 @@
s%@BLT_MAJOR_VERSION@%$BLT_MAJOR_VERSION%g
s%@BLT_MINOR_VERSION@%$BLT_MINOR_VERSION%g
s%@BLT_VERSION@%$BLT_VERSION%g
+s%@BLT_PATCH_LEVEL@%$BLT_PATCH_LEVEL%g
s%@AUX_LIBS@%$AUX_LIBS%g
s%@TCL_LIB_DIR@%$TCL_LIB_DIR%g
s%@TCL_VERSION@%$TCL_VERSION%g
--- a/library/Makefile.in
+++ b/library/Makefile.in
@@ -5,6 +5,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
version = @BLT_VERSION@
+patchlevel = @BLT_PATCH_LEVEL@
lib_prefix = @BLT_LIB_PREFIX@
srcdir = @srcdir@
libdir = @libdir@
@@ -49,6 +50,7 @@
pkgIndex:
rm -f pkgIndex.tcl
sed -e 's/%VERSION%/$(version)/' $(srcdir)/pkgIndex.tcl.in | \
+ sed -e 's/%PATCHLEVEL%/$(patchlevel)/' | \
sed -e 's/%LIB_PREFIX%/$(lib_prefix)/' | \
sed -e 's;%LIB_DIR%;$(libdir);' > pkgIndex.tcl
--- a/library/pkgIndex.tcl.in
+++ b/library/pkgIndex.tcl.in
@@ -49,11 +49,13 @@
}
if { ![file exists $library] } continue
load $library BLT
+ break
}
}
set version "%VERSION%"
+set patchlevel %PATCHLEVEL%
-package ifneeded BLT $version [list LoadBLT25 $version $dir]
+package ifneeded BLT $patchlevel [list LoadBLT25 $version $dir]
# End of package index file
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -8,7 +8,9 @@
}
}
- initializeLibrary
+ if {[info commands tk] == "tk"} {
+ initializeLibrary
+ }
}
|
