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
91
92
93
94
|
--- configure.orig Sun Apr 21 07:47:32 1996
+++ configure Sat Aug 3 18:59:02 1996
@@ -1460,7 +1460,7 @@
if test "$prefix" = "NONE"; then
if test -z "$PREFIX" ; then
- prefix=/usr/local/blt
+ prefix=/usr/local
else
prefix=$PREFIX
fi
@@ -2100,7 +2100,7 @@
guesses="$TCLINCDIR \
$TCL_LIBRARY/../../include \
/usr/local/itcl/include \
- /usr/local/tcl/tcl7.5/include /usr/local/tcl/tcl7.4/include \
+ /usr/local/include/tcl7.5 /usr/local/tcl/tcl7.4/include \
/usr/local/tcl/tcl7.3/include /usr/local/tcl/tcl7.2/include \
/usr/local/tcl/tcl7.1/include /usr/local/tcl/tcl7.0/include \
$PWD/../itcl2.0/tcl7.4 \
@@ -2165,8 +2165,8 @@
blt_path_tcl_lib="$dir/itcl"
break
fi
- libnames=`echo $dir/libtcl*`
- if test "$libnames" != "$dir/libtcl*" ; then
+ libnames=`echo $dir/libtcl75*`
+ if test "$libnames" != "$dir/libtcl75*" ; then
blt_path_tcl_lib=$dir
break
fi
@@ -2180,8 +2180,8 @@
*-sunos4*)
;;
*)
- if test -r $TCLLIBDIR/tclConfig.sh; then
- . $TCLLIBDIR/tclConfig.sh
+ if test -r $TCLLIBDIR/tcl7.5/tclConfig.sh; then
+ . $TCLLIBDIR/tcl7.5/tclConfig.sh
fi
;;
esac
@@ -2192,9 +2192,7 @@
TCLLIBDIR="__Edit_${saveFile}__"
echo "$ac_t""no" 1>&6
fi
-if test "$TCLLIBDIR" != "/usr/lib" ; then
- TCLLIBSW="-L$TCLLIBDIR -ltcl${TCL_VERSION}"
-fi
+TCLLIBSW=${TCL_LIB_SPEC}
@@ -2208,7 +2206,7 @@
$TKINCDIR \
/usr/local/itcl/include \
/usr/local/tcl/include \
- /usr/local/tcl/tk4.1/include \
+ /usr/local/include/tk4.1 \
/usr/local/tcl/tk4.0/include \
/usr/local/tcl/tk3.6/include \
/usr/local/tcl/tk3.5/include \
@@ -2299,8 +2297,8 @@
*-sunos4*)
;;
*)
- if test -r $TKLIBDIR/tkConfig.sh; then
- . $TKLIBDIR/tkConfig.sh
+ if test -r $TKLIBDIR/tk4.1/tkConfig.sh; then
+ . $TKLIBDIR/tk4.1/tkConfig.sh
fi
;;
esac
@@ -2312,10 +2310,7 @@
echo "$ac_t""no" 1>&6
fi
-if test "$TKLIBDIR" != "/usr/lib" ; then
- TKLIBSW="-L$TKLIBDIR -ltk${TK_VERSION}"
-fi
-
+TKLIBSW=${TK_LIB_SPEC}
@@ -2634,6 +2629,8 @@
*-freebsd*|*-386bsd*|*-netbsd*)
SHLIB_CCFLAGS="-fpic"
SHLIB_LDFLAGS="-Bshareable"
+ SHLIB_LOADER="ld"
+ SHLIB_SUFFIX=".so.${blt_cv_major_version}.${blt_cv_minor_version}"
;;
*-linux*)
if eval "test \"`echo '$''{'blt_cv_sys_elf'+set}'`\" = set"; then
|
