78ca1bc313
Besides more bug fixes and several enhancements some of the NetBSD relevant changes (taken from "changes" in the distribution): 2001-04-03 (doc fixes) numerous doc corrections and clarifications. Update of READMEs. 2001-03-29 (bug fix) prevent potential race condition and security leak in tmp filename creation on Unix. (max) 2001-03-13 (bug fix) Correctly possible memory corruption in string map {} $str (fellows) 2001-01-30 (bug fix) Fixed possible hangs in fcopy. (porter) 2000-11-23 (mem leak) fixed potential memory leak in error case of lsort (fellows) 2000-11-01 (mem leak) Corrected excessive mem use of info exists on a non-existent array element (hobbs) 2000-09-27 (bug fix) fixed a bug introduced by a partial fix in 8.3.2 that didn't set nonBlocking correctly when resetting the flags for the write side (mem leak) Correct mem leak in channels when statePtr was released (hobbs) 2001-07-18 (bug fix) corrected memory overwrite error when buffer size of a channel is changed after channel use has already begun (kupries, porter) 2001-08-07 (bug fix) corrected bytecode stack management during [break] (see test foreach-5.5) (sofer, tallneil, jstrot) 2001-08-08 (new features) updated packages msgcat 1.1.1, opt 0.4.3, tcltest 1.0.1, dependencies checked (porter) 2001-08-24 (bug fix) [auto_import] now matches patterns like [namespace import], not like [string match] (porter) **** POTENTIAL INCOMPATABILITY **** 2001-08-27 (new feature) added Tcl_SetMainLoop() to enable loading Tk as a true package (hobbs) 2001-09-06 (new feature) http 2.4: honor the Content-encoding and charset parameters; add -binary switch for forcing the issue (hobbs, saoukhi, orwell) 2001-09-10 (bug fix) protect against alias loops (hobbs) 2001-09-19 (bug fix) [format] and [scan] corrected for 64-bit machines (rmax) 2001-09-26 (bug fix) corrected potential deadlock in channels that do not provide a BlockModeProc (kupries, kogorman) 2001-10-11 (bug fix) corrected cleanup of self-referential bytecodes at interpreter deletion (sofer, rbrunner)
450 lines
16 KiB
Text
450 lines
16 KiB
Text
$NetBSD: patch-ab,v 1.14 2001/12/23 17:02:31 bjoern Exp $
|
|
|
|
--- configure.orig Sat Oct 20 02:24:15 2001
|
|
+++ configure
|
|
@@ -4776,6 +4776,7 @@
|
|
# Step 3: set configuration options based on system name and version.
|
|
|
|
do64bit_ok=no
|
|
+ TCL_LIB_SPEC_RPATH=""
|
|
EXTRA_CFLAGS=""
|
|
TCL_EXPORT_FILE_SUFFIX=""
|
|
UNSHARED_LIB_SUFFIX=""
|
|
@@ -4795,7 +4796,7 @@
|
|
# Extract the first word of "ar", so it can be a program name with args.
|
|
set dummy ar; ac_word=$2
|
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
-echo "configure:4799: checking for $ac_word" >&5
|
|
+echo "configure:4800: checking for $ac_word" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
@@ -4900,7 +4901,7 @@
|
|
# known GMT value.
|
|
|
|
echo $ac_n "checking for gettimeofday in -lbsd""... $ac_c" 1>&6
|
|
-echo "configure:4904: checking for gettimeofday in -lbsd" >&5
|
|
+echo "configure:4905: checking for gettimeofday in -lbsd" >&5
|
|
ac_lib_var=`echo bsd'_'gettimeofday | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -4908,7 +4909,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-lbsd $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4912 "configure"
|
|
+#line 4913 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
/* We use char because int might match the return type of a gcc2
|
|
@@ -4919,7 +4920,7 @@
|
|
gettimeofday()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:4923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:4924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
eval "ac_cv_lib_$ac_lib_var=yes"
|
|
else
|
|
@@ -4981,7 +4982,7 @@
|
|
HP-UX-*.11.*)
|
|
SHLIB_SUFFIX=".sl"
|
|
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
|
|
-echo "configure:4985: checking for shl_load in -ldld" >&5
|
|
+echo "configure:4986: checking for shl_load in -ldld" >&5
|
|
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -4989,7 +4990,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-ldld $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 4993 "configure"
|
|
+#line 4994 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
/* We use char because int might match the return type of a gcc2
|
|
@@ -5000,7 +5001,7 @@
|
|
shl_load()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:5005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
eval "ac_cv_lib_$ac_lib_var=yes"
|
|
else
|
|
@@ -5043,7 +5044,7 @@
|
|
HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*)
|
|
SHLIB_SUFFIX=".sl"
|
|
echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
|
|
-echo "configure:5047: checking for shl_load in -ldld" >&5
|
|
+echo "configure:5048: checking for shl_load in -ldld" >&5
|
|
ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
|
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
@@ -5051,7 +5052,7 @@
|
|
ac_save_LIBS="$LIBS"
|
|
LIBS="-ldld $LIBS"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5055 "configure"
|
|
+#line 5056 "configure"
|
|
#include "confdefs.h"
|
|
/* Override any gcc2 internal prototype to avoid an error. */
|
|
/* We use char because int might match the return type of a gcc2
|
|
@@ -5062,7 +5063,7 @@
|
|
shl_load()
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:5067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
eval "ac_cv_lib_$ac_lib_var=yes"
|
|
else
|
|
@@ -5169,17 +5170,17 @@
|
|
else
|
|
ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for dld.h""... $ac_c" 1>&6
|
|
-echo "configure:5173: checking for dld.h" >&5
|
|
+echo "configure:5174: checking for dld.h" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5178 "configure"
|
|
+#line 5179 "configure"
|
|
#include "confdefs.h"
|
|
#include <dld.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:5183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:5184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -5236,17 +5237,17 @@
|
|
else
|
|
ac_safe=`echo "dld.h" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for dld.h""... $ac_c" 1>&6
|
|
-echo "configure:5240: checking for dld.h" >&5
|
|
+echo "configure:5241: checking for dld.h" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5245 "configure"
|
|
+#line 5246 "configure"
|
|
#include "confdefs.h"
|
|
#include <dld.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:5250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:5251: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -5298,20 +5299,23 @@
|
|
LD_SEARCH_FLAGS=""
|
|
;;
|
|
NetBSD-*|FreeBSD-[1-2].*|OpenBSD-*)
|
|
+ if test "X${COMPILER_OPTIMIZATION_BUG}" = "XYES"; then
|
|
+ CFLAGS_OPTIMIZE=-O0
|
|
+ fi
|
|
# Not available on all versions: check for include file.
|
|
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
|
|
-echo "configure:5305: checking for dlfcn.h" >&5
|
|
+echo "configure:5309: checking for dlfcn.h" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5310 "configure"
|
|
+#line 5314 "configure"
|
|
#include "confdefs.h"
|
|
#include <dlfcn.h>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:5315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:5319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -5330,17 +5334,15 @@
|
|
|
|
# NetBSD/SPARC needs -fPIC, -fpic will not do.
|
|
SHLIB_CFLAGS="-fPIC"
|
|
- SHLIB_LD="ld -Bshareable -x"
|
|
SHLIB_LD_LIBS=""
|
|
SHLIB_SUFFIX=".so"
|
|
DL_OBJS="tclLoadDl.o"
|
|
DL_LIBS=""
|
|
LDFLAGS=""
|
|
- LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
|
|
echo $ac_n "checking for ELF""... $ac_c" 1>&6
|
|
-echo "configure:5342: checking for ELF" >&5
|
|
+echo "configure:5344: checking for ELF" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5344 "configure"
|
|
+#line 5346 "configure"
|
|
#include "confdefs.h"
|
|
|
|
#ifdef __ELF__
|
|
@@ -5351,11 +5353,20 @@
|
|
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
|
|
egrep "yes" >/dev/null 2>&1; then
|
|
rm -rf conftest*
|
|
- echo "$ac_t""yes" 1>&6
|
|
+
|
|
+ echo "$ac_t""yes" 1>&6
|
|
+ SHLIB_LD='${TCL_CC} -shared -Wl,-x'
|
|
+ LD_SEARCH_FLAGS='-Wl,-R${LIB_RUNTIME_DIR}'
|
|
+ TCL_LIB_SPEC_RPATH="-Wl,-R${exec_prefix}/lib"
|
|
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
|
|
+
|
|
else
|
|
rm -rf conftest*
|
|
- echo "$ac_t""no" 1>&6
|
|
+
|
|
+ echo "$ac_t""no" 1>&6
|
|
+ SHLIB_LD="ld -Bshareable -x"
|
|
+ LD_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
|
|
+ TCL_LIB_SPEC_RPATH="-R${exec_prefix}/lib"
|
|
SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
|
|
|
|
fi
|
|
@@ -5569,6 +5580,9 @@
|
|
DL_LIBS="-ldl"
|
|
LDFLAGS=""
|
|
LD_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
|
|
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
|
|
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
|
|
+ TCL_LIB_VERSIONS_OK=nodots
|
|
;;
|
|
SunOS-5*)
|
|
|
|
@@ -5616,6 +5630,9 @@
|
|
else
|
|
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
|
|
fi
|
|
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
|
|
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
|
|
+ TCL_LIB_VERSIONS_OK=nodots
|
|
;;
|
|
ULTRIX-4.*)
|
|
SHLIB_CFLAGS="-G 0"
|
|
@@ -5641,17 +5658,17 @@
|
|
# that don't grok the -Bexport option. Test that it does.
|
|
hold_ldflags=$LDFLAGS
|
|
echo $ac_n "checking for ld accepts -Bexport flag""... $ac_c" 1>&6
|
|
-echo "configure:5645: checking for ld accepts -Bexport flag" >&5
|
|
+echo "configure:5662: checking for ld accepts -Bexport flag" >&5
|
|
LDFLAGS="${LDFLAGS} -Wl,-Bexport"
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5648 "configure"
|
|
+#line 5665 "configure"
|
|
#include "confdefs.h"
|
|
|
|
int main() {
|
|
int i;
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
+if { (eval echo configure:5672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
|
rm -rf conftest*
|
|
found=yes
|
|
else
|
|
@@ -5697,9 +5714,9 @@
|
|
|
|
if test "x$DL_OBJS" = "xtclLoadAout.o" ; then
|
|
echo $ac_n "checking sys/exec.h""... $ac_c" 1>&6
|
|
-echo "configure:5701: checking sys/exec.h" >&5
|
|
+echo "configure:5718: checking sys/exec.h" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5703 "configure"
|
|
+#line 5720 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/exec.h>
|
|
int main() {
|
|
@@ -5717,7 +5734,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:5738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
tcl_ok=usable
|
|
else
|
|
@@ -5735,9 +5752,9 @@
|
|
|
|
else
|
|
echo $ac_n "checking a.out.h""... $ac_c" 1>&6
|
|
-echo "configure:5739: checking a.out.h" >&5
|
|
+echo "configure:5756: checking a.out.h" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5741 "configure"
|
|
+#line 5758 "configure"
|
|
#include "confdefs.h"
|
|
#include <a.out.h>
|
|
int main() {
|
|
@@ -5755,7 +5772,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:5776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
tcl_ok=usable
|
|
else
|
|
@@ -5773,9 +5790,9 @@
|
|
|
|
else
|
|
echo $ac_n "checking sys/exec_aout.h""... $ac_c" 1>&6
|
|
-echo "configure:5777: checking sys/exec_aout.h" >&5
|
|
+echo "configure:5794: checking sys/exec_aout.h" >&5
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5779 "configure"
|
|
+#line 5796 "configure"
|
|
#include "confdefs.h"
|
|
#include <sys/exec_aout.h>
|
|
int main() {
|
|
@@ -5793,7 +5810,7 @@
|
|
|
|
; return 0; }
|
|
EOF
|
|
-if { (eval echo configure:5797: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
+if { (eval echo configure:5814: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
|
rm -rf conftest*
|
|
tcl_ok=usable
|
|
else
|
|
@@ -5890,7 +5907,7 @@
|
|
|
|
|
|
echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
|
|
-echo "configure:5894: checking for build with symbols" >&5
|
|
+echo "configure:5911: checking for build with symbols" >&5
|
|
# Check whether --enable-symbols or --disable-symbols was given.
|
|
if test "${enable_symbols+set}" = set; then
|
|
enableval="$enable_symbols"
|
|
@@ -5927,17 +5944,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:5931: checking for $ac_hdr" >&5
|
|
+echo "configure:5948: checking for $ac_hdr" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5936 "configure"
|
|
+#line 5953 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:5941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:5958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -5967,17 +5984,17 @@
|
|
do
|
|
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
|
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
|
-echo "configure:5971: checking for $ac_hdr" >&5
|
|
+echo "configure:5988: checking for $ac_hdr" >&5
|
|
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
|
echo $ac_n "(cached) $ac_c" 1>&6
|
|
else
|
|
cat > conftest.$ac_ext <<EOF
|
|
-#line 5976 "configure"
|
|
+#line 5993 "configure"
|
|
#include "confdefs.h"
|
|
#include <$ac_hdr>
|
|
EOF
|
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
|
-{ (eval echo configure:5981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
+{ (eval echo configure:5998: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
|
if test -z "$ac_err"; then
|
|
rm -rf conftest*
|
|
@@ -6004,7 +6021,7 @@
|
|
done
|
|
|
|
echo $ac_n "checking FIONBIO vs. O_NONBLOCK for nonblocking I/O""... $ac_c" 1>&6
|
|
-echo "configure:6008: checking FIONBIO vs. O_NONBLOCK for nonblocking I/O" >&5
|
|
+echo "configure:6025: checking FIONBIO vs. O_NONBLOCK for nonblocking I/O" >&5
|
|
if test -f /usr/lib/NextStep/software_version; then
|
|
system=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
|
|
else
|
|
@@ -6066,7 +6083,7 @@
|
|
|
|
|
|
echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
|
|
-echo "configure:6070: checking how to build libraries" >&5
|
|
+echo "configure:6087: checking how to build libraries" >&5
|
|
# Check whether --enable-shared or --disable-shared was given.
|
|
if test "${enable_shared+set}" = set; then
|
|
enableval="$enable_shared"
|
|
@@ -6103,7 +6120,7 @@
|
|
if test "x$DL_OBJS" = "xtclLoadAout.o"; then
|
|
MAKE_LIB="\${STLIB_LD} \$@ \${OBJS}"
|
|
else
|
|
- MAKE_LIB="\${SHLIB_LD} ${TCL_SHLIB_LD_EXTRAS} -o \$@ \${OBJS} ${SHLIB_LD_LIBS}"
|
|
+ MAKE_LIB="\${SHLIB_LD} ${TCL_SHLIB_LD_EXTRAS} -o \${@:C/\.so.*/.la/} \${OBJS:.o=.lo} ${SHLIB_LD_LIBS} -version-info 1:0"
|
|
fi
|
|
else
|
|
case $system in
|
|
@@ -6141,7 +6158,7 @@
|
|
TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
|
|
fi
|
|
TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
|
|
- TCL_LIB_SPEC="-L${exec_prefix}/lib ${TCL_LIB_FLAG}"
|
|
+ TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${exec_prefix}/lib ${TCL_LIB_FLAG}"
|
|
else
|
|
TCL_BUILD_EXP_FILE="lib.exp"
|
|
eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
|
|
@@ -6171,9 +6188,9 @@
|
|
#--------------------------------------------------------------------
|
|
|
|
if test "$prefix" != "$exec_prefix"; then
|
|
- TCL_PACKAGE_PATH="${exec_prefix}/lib ${prefix}/lib"
|
|
+ TCL_PACKAGE_PATH="${exec_prefix}/lib/tcl ${prefix}/lib"
|
|
else
|
|
- TCL_PACKAGE_PATH="${prefix}/lib"
|
|
+ TCL_PACKAGE_PATH="${prefix}/lib/tcl"
|
|
fi
|
|
|
|
#--------------------------------------------------------------------
|
|
@@ -6186,7 +6203,7 @@
|
|
# Replace DBGX with TCL_DBGX
|
|
eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
|
|
|
|
-MAKE_STUB_LIB="\${STLIB_LD} \$@ \${STUB_LIB_OBJS}"
|
|
+MAKE_STUB_LIB="\${STLIB_LD} -o \$@ \${STUB_LIB_OBJS}"
|
|
|
|
if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
|
|
TCL_STUB_LIB_FLAG="-ltclstub${TCL_VERSION}\${TCL_DBGX}"
|
|
@@ -6262,6 +6279,8 @@
|
|
|
|
|
|
|
|
+
|
|
+
|
|
trap '' 1 2 15
|
|
cat > confcache <<\EOF
|
|
# This file is a shell script that caches the results of configure
|
|
@@ -6437,12 +6456,12 @@
|
|
s%@CFG_TCL_SHARED_LIB_SUFFIX@%$CFG_TCL_SHARED_LIB_SUFFIX%g
|
|
s%@CFG_TCL_UNSHARED_LIB_SUFFIX@%$CFG_TCL_UNSHARED_LIB_SUFFIX%g
|
|
s%@CFG_TCL_EXPORT_FILE_SUFFIX@%$CFG_TCL_EXPORT_FILE_SUFFIX%g
|
|
+s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
|
|
+s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g
|
|
s%@CFLAGS_DEFAULT@%$CFLAGS_DEFAULT%g
|
|
s%@EXTRA_CFLAGS@%$EXTRA_CFLAGS%g
|
|
s%@DL_OBJS@%$DL_OBJS%g
|
|
s%@LDFLAGS_DEFAULT@%$LDFLAGS_DEFAULT%g
|
|
-s%@LDFLAGS_DEBUG@%$LDFLAGS_DEBUG%g
|
|
-s%@LDFLAGS_OPTIMIZE@%$LDFLAGS_OPTIMIZE%g
|
|
s%@STLIB_LD@%$STLIB_LD%g
|
|
s%@SHLIB_LD@%$SHLIB_LD%g
|
|
s%@SHLIB_LD_LIBS@%$SHLIB_LD_LIBS%g
|