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
|
$NetBSD: patch-ab,v 1.5 2001/04/18 18:15:41 jwise Exp $
--- configure.orig Tue Aug 8 19:19:32 2000
+++ configure
@@ -1873,6 +1873,7 @@
SHLIB_LD="ld -Bshareable -x"
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
+ SHARED_LIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
LDFLAGS=""
@@ -3338,7 +3339,7 @@
for i in $dirs ; do
if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
echo "$ac_t""$i" 1>&6
- XLIBSW="-L$i -lX11"
+ XLIBSW="-L$i -Wl,-R$i -lX11"
x_libraries="$i"
break
fi
@@ -3347,7 +3348,7 @@
if test "$x_libraries" = ""; then
XLIBSW=-lX11
else
- XLIBSW="-L$x_libraries -lX11"
+ XLIBSW="-L$x_libraries -Wl,-R$x_libraries -lX11"
fi
fi
if test "$XLIBSW" = nope ; then
@@ -3415,8 +3416,8 @@
if test "x${x_libraries}" != "x"; then
LIB_RUNTIME_DIR="${LIB_RUNTIME_DIR}:${x_libraries}"
fi
-if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
- LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
+if test "${TCL_LD_SEARCH_FLAGS}" = '-Wl,-rpath,${LIB_RUNTIME_DIR}'; then
+ LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -Wl,-rpath,/g'`
fi
# The statement below is very tricky! It actually *evaluates* the
@@ -4088,7 +4089,7 @@
if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
TK_LIB_FILE=libtk${TK_SHARED_LIB_SUFFIX}
- MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${LIBS}"
+ MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE:C/\.so.*/.la/} \${OBJS:.o=.lo} \$(TK_LD_SEARCH_FLAGS) ${TCL_STUB_LIB_SPEC} \${LIBS} -version-info 1:0"
RANLIB=":"
# TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
@@ -4114,8 +4115,8 @@
else
eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}"
fi
- TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}"
- TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_FLAG}"
+ TK_BUILD_LIB_SPEC=libtk83.la
+ TK_LIB_SPEC="-L${exec_prefix}/lib -Wl,-R${exec_prefix}/lib ${TK_LIB_FLAG}"
TK_BUILD_EXP_FILE=""
TK_EXP_FILE=""
else
|
