summaryrefslogtreecommitdiff
path: root/lang/tcl/patches/patch-af
diff options
context:
space:
mode:
Diffstat (limited to 'lang/tcl/patches/patch-af')
-rw-r--r--lang/tcl/patches/patch-af423
1 files changed, 16 insertions, 407 deletions
diff --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af
index 30bc1088630..135f4f3ed9d 100644
--- a/lang/tcl/patches/patch-af
+++ b/lang/tcl/patches/patch-af
@@ -1,154 +1,28 @@
-$NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
+$NetBSD: patch-af,v 1.12 2004/10/01 13:35:37 adam Exp $
---- tcl.m4.orig Mon Mar 1 18:58:59 2004
+--- tcl.m4.orig 2004-07-26 21:40:46.000000000 +0000
+++ tcl.m4
-@@ -651,7 +651,7 @@ AC_DEFUN(SC_CONFIG_MANPAGES, [
- # loading for Tcl on this system.
- # DL_LIBS - Library file(s) to include in tclsh and other base
- # applications in order for the "load" command to work.
--# LDFLAGS - Flags to pass to the compiler when linking object
-+# LD_FLAGS - Flags to pass to the compiler when linking object
- # files into an executable application binary such
- # as tclsh.
- # LD_SEARCH_FLAGS-Flags to pass to ld, such as "-R /usr/local/tcl/lib",
-@@ -796,6 +796,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
+@@ -802,6 +802,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
# Step 3: set configuration options based on system name and version.
do64bit_ok=no
+ TCL_LIB_SPEC_RPATH=""
- EXTRA_CFLAGS=""
+ LDFLAGS_ORIG="$LDFLAGS"
TCL_EXPORT_FILE_SUFFIX=""
UNSHARED_LIB_SUFFIX=""
-@@ -839,7 +840,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".so"
-
- DL_OBJS="tclLoadDl.o"
-- LDFLAGS=""
-+ LD_FLAGS=""
-
- LD_LIBRARY_PATH_VAR="LIBPATH"
-
-@@ -850,7 +851,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- else
- do64bit_ok=yes
- EXTRA_CFLAGS="-q64"
-- LDFLAGS="-q64"
-+ LD_FLAGS="-q64"
- RANLIB="${RANLIB} -X64"
- AR="${AR} -X64"
- SHLIB_LD_FLAGS="-b64"
-@@ -891,7 +892,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
-- LDFLAGS=""
-+ LD_FLAGS=""
- CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- LD_LIBRARY_PATH_VAR="LIBPATH"
-@@ -911,7 +912,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- else
- do64bit_ok=yes
- EXTRA_CFLAGS="-q64"
-- LDFLAGS="-q64"
-+ LD_FLAGS="-q64"
- RANLIB="${RANLIB} -X64"
- AR="${AR} -X64"
- SHLIB_LD_FLAGS="-b64"
-@@ -944,7 +945,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
-- LDFLAGS=""
-+ LD_FLAGS=""
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""
- ;;
-@@ -955,7 +956,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
-- LDFLAGS="-export-dynamic"
-+ LD_FLAGS="-export-dynamic"
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""
- ;;
-@@ -966,7 +967,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
-- LDFLAGS=""
-+ LD_FLAGS=""
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""
- ;;
-@@ -984,7 +985,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_LD_LIBS='${LIBS}'
- DL_OBJS="tclLoadShl.o"
- DL_LIBS="-ldld"
-- LDFLAGS="-Wl,-E"
-+ LD_FLAGS="-Wl,-E"
- CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
- LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
- LD_LIBRARY_PATH_VAR="SHLIB_PATH"
-@@ -1020,10 +1021,10 @@ dnl AC_CHECK_TOOL(AR, ar)
- do64bit_ok=yes
- if test "`uname -m`" = "ia64" ; then
- EXTRA_CFLAGS="+DD64"
-- LDFLAGS="+DD64 $LDFLAGS"
-+ LD_FLAGS="+DD64 $LD_FLAGS"
- else
- EXTRA_CFLAGS="+DA2.0W"
-- LDFLAGS="+DA2.0W $LDFLAGS"
-+ LD_FLAGS="+DA2.0W $LD_FLAGS"
- fi
- fi
- fi
-@@ -1037,7 +1038,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_LD_LIBS=""
- DL_OBJS="tclLoadShl.o"
- DL_LIBS="-ldld"
-- LDFLAGS="-Wl,-E"
-+ LD_FLAGS="-Wl,-E"
- CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
- LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
- LD_LIBRARY_PATH_VAR="SHLIB_PATH"
-@@ -1050,7 +1051,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_LD_LIBS='${LIBS}'
- DL_OBJS="tclLoadAout.o"
+@@ -1076,6 +1077,9 @@ dnl AC_CHECK_TOOL(AR, ar)
DL_LIBS=""
-- LDFLAGS="-Wl,-D,08000000"
-+ LD_FLAGS="-Wl,-D,08000000"
- CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- SHARED_LIB_SUFFIX='${VERSION}\$\{DBGX\}.a'
-@@ -1065,7 +1066,10 @@ dnl AC_CHECK_TOOL(AR, ar)
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- EXTRA_CFLAGS=""
-- LDFLAGS=""
-+ LD_FLAGS=""
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ TCL_LIB_VERSIONS_OK=nodots
;;
IRIX-6.*)
SHLIB_CFLAGS=""
-@@ -1078,7 +1082,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- if test "$GCC" = "yes" ; then
- EXTRA_CFLAGS="-mabi=n32"
-- LDFLAGS="-mabi=n32"
-+ LD_FLAGS="-mabi=n32"
- else
- case $system in
- IRIX-6.3)
-@@ -1089,8 +1093,11 @@ dnl AC_CHECK_TOOL(AR, ar)
- EXTRA_CFLAGS="-n32"
- ;;
+@@ -1101,6 +1105,9 @@ dnl AC_CHECK_TOOL(AR, ar)
esac
-- LDFLAGS="-n32"
-+ LD_FLAGS="-n32"
+ LDFLAGS="$LDFLAGS -n32"
fi
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
@@ -156,21 +30,8 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
;;
IRIX64-6.*)
SHLIB_CFLAGS=""
-@@ -1099,7 +1106,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS=""
-- LDFLAGS=""
-+ LD_FLAGS=""
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
-
-@@ -1112,9 +1119,12 @@ dnl AC_CHECK_TOOL(AR, ar)
- do64bit_ok=yes
- SHLIB_LD="ld -64 -shared -rdata_shared"
- EXTRA_CFLAGS="-64"
-- LDFLAGS="-64"
-+ LD_FLAGS="-64"
+@@ -1124,6 +1131,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+ LDFLAGS="$LDFLAGS -64"
fi
fi
+ UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
@@ -179,25 +40,7 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
;;
Linux*)
SHLIB_CFLAGS="-fPIC"
-@@ -1131,7 +1141,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_LD="${CC} -shared"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
-- LDFLAGS="-rdynamic"
-+ LD_FLAGS="-rdynamic"
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- else
-@@ -1139,7 +1149,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_LD="ld -shared"
- DL_OBJS="tclLoadDld.o"
- DL_LIBS="-ldld"
-- LDFLAGS=""
-+ LD_FLAGS=""
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""])
- fi
-@@ -1161,6 +1171,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1169,6 +1179,9 @@ dnl AC_CHECK_TOOL(AR, ar)
# XIM peeking works under XFree86.
AC_DEFINE(PEEK_XCLOSEIM)
@@ -207,43 +50,10 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
;;
GNU*)
SHLIB_CFLAGS="-fPIC"
-@@ -1171,7 +1184,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_LD="${CC} -shared"
- DL_OBJS=""
- DL_LIBS="-ldl"
-- LDFLAGS="-rdynamic"
-+ LD_FLAGS="-rdynamic"
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""
- else
-@@ -1179,7 +1192,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_LD="ld -shared"
- DL_OBJS=""
- DL_LIBS="-ldld"
-- LDFLAGS=""
-+ LD_FLAGS=""
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""])
- fi
-@@ -1194,7 +1207,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
-- LDFLAGS=""
-+ LD_FLAGS=""
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""
- ;;
-@@ -1205,34 +1218,42 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
-- LDFLAGS="-Wl,-Bexport"
-+ LD_FLAGS="-Wl,-Bexport"
- CC_SEARCH_FLAGS=""
+@@ -1216,28 +1229,36 @@ dnl AC_CHECK_TOOL(AR, ar)
LD_SEARCH_FLAGS=""
;;
- NetBSD-*|FreeBSD-[[1-2]].*|OpenBSD-*)
+ NetBSD-*|FreeBSD-[[1-2]].*)
+ if test "X${COMPILER_OPTIMIZATION_BUG}" = "XYES"; then
+ CFLAGS_OPTIMIZE=-O0
+ fi
@@ -256,8 +66,6 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
DL_LIBS=""
-- LDFLAGS=""
-+ LD_FLAGS=""
CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
AC_MSG_CHECKING(for ELF)
@@ -268,11 +76,10 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
- ],
+ ], [
AC_MSG_RESULT(yes)
-- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so',
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so',
+ 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'
+ ], [
AC_MSG_RESULT(no)
+ SHLIB_LD="ld -Bshareable -x"
@@ -284,167 +91,7 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
], [
SHLIB_CFLAGS=""
SHLIB_LD="echo tclLdAout $CC \{$SHLIB_CFLAGS\} | `pwd`/tclsh -r"
-@@ -1240,7 +1261,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".a"
- DL_OBJS="tclLoadAout.o"
- DL_LIBS=""
-- LDFLAGS=""
-+ LD_FLAGS=""
- CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
-@@ -1259,14 +1280,14 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS=""
-- LDFLAGS="-export-dynamic"
-+ LD_FLAGS="-export-dynamic"
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- if test "${TCL_THREADS}" = "1" ; then
- # The -pthread needs to go in the CFLAGS, not LIBS
- LIBS=`echo $LIBS | sed s/-pthread//`
- EXTRA_CFLAGS="-pthread"
-- LDFLAGS="$LDFLAGS -pthread"
-+ LD_FLAGS="$LD_FLAGS -pthread"
- fi
- case $system in
- FreeBSD-3.*)
-@@ -1287,7 +1308,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- DL_OBJS="tclLoadDyld.o"
- PLAT_OBJS="tclMacOSXBundle.o"
- DL_LIBS=""
-- LDFLAGS="-prebind"
-+ LD_FLAGS="-prebind"
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""
- CFLAGS_OPTIMIZE="-Os"
-@@ -1304,7 +1325,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadNext.o"
- DL_LIBS=""
-- LDFLAGS=""
-+ LD_FLAGS=""
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""
- ;;
-@@ -1321,7 +1342,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadOSF.o"
- DL_LIBS=""
-- LDFLAGS=""
-+ LD_FLAGS=""
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""
- ;;
-@@ -1337,7 +1358,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS=""
-- LDFLAGS=""
-+ LD_FLAGS=""
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""
- ;;
-@@ -1353,7 +1374,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS=""
-- LDFLAGS=""
-+ LD_FLAGS=""
- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
- if test "$GCC" = "yes" ; then
-@@ -1370,7 +1391,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- LIBS="$LIBS -lpthread -lmach -lexc"
- else
- EXTRA_CFLAGS="${EXTRA_CFLAGS} -pthread"
-- LDFLAGS="-pthread"
-+ LD_FLAGS="-pthread"
- fi
- fi
-
-@@ -1385,7 +1406,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- DL_OBJS="tclLoadDl.o"
- # dlopen is in -lc on QNX
- DL_LIBS=""
-- LDFLAGS=""
-+ LD_FLAGS=""
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""
- ;;
-@@ -1396,7 +1417,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".a"
- DL_OBJS="tclLoadAout.o"
- DL_LIBS=""
-- LDFLAGS="-Wl,-D,08000000"
-+ LD_FLAGS="-Wl,-D,08000000"
- CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- ;;
-@@ -1406,10 +1427,10 @@ dnl AC_CHECK_TOOL(AR, ar)
- # below.
- if test "$GCC" = "yes" ; then
- SHLIB_CFLAGS="-fPIC -melf"
-- LDFLAGS="-melf -Wl,-Bexport"
-+ LD_FLAGS="-melf -Wl,-Bexport"
- else
- SHLIB_CFLAGS="-Kpic -belf"
-- LDFLAGS="-belf -Wl,-Bexport"
-+ LD_FLAGS="-belf -Wl,-Bexport"
- fi
- SHLIB_LD="ld -G"
- SHLIB_LD_LIBS=""
-@@ -1426,7 +1447,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
-- LDFLAGS=""
-+ LD_FLAGS=""
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""
- ;;
-@@ -1437,7 +1458,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
-- LDFLAGS=""
-+ LD_FLAGS=""
- CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-
-@@ -1467,7 +1488,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=".so"
- DL_OBJS="tclLoadDl.o"
- DL_LIBS="-ldl"
-- LDFLAGS=""
-+ LD_FLAGS=""
- if test "$GCC" = "yes" ; then
- SHLIB_LD="$CC -shared"
- CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
-@@ -1487,7 +1508,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- AC_DEFINE(_POSIX_PTHREAD_SEMANTICS)
-
- SHLIB_CFLAGS="-KPIC"
-- LDFLAGS=""
-+ LD_FLAGS=""
-
- # Check to enable 64-bit flags for compiler/linker
- if test "$do64bit" = "yes" ; then
-@@ -1499,10 +1520,10 @@ dnl AC_CHECK_TOOL(AR, ar)
- do64bit_ok=yes
- if test "$do64bitVIS" = "yes" ; then
- EXTRA_CFLAGS="-xarch=v9a"
-- LDFLAGS="-xarch=v9a"
-+ LD_FLAGS="-xarch=v9a"
- else
- EXTRA_CFLAGS="-xarch=v9"
-- LDFLAGS="-xarch=v9"
-+ LD_FLAGS="-xarch=v9"
- fi
- fi
- else
-@@ -1526,6 +1547,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1546,6 +1567,9 @@ dnl AC_CHECK_TOOL(AR, ar)
CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
fi
@@ -454,37 +101,7 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
;;
ULTRIX-4.*)
SHLIB_CFLAGS="-G 0"
-@@ -1534,7 +1558,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_LD_LIBS='${LIBS}'
- DL_OBJS="tclLoadAout.o"
- DL_LIBS=""
-- LDFLAGS="-Wl,-D,08000000"
-+ LD_FLAGS="-Wl,-D,08000000"
- CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
- LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- if test "$GCC" != "yes" ; then
-@@ -1557,9 +1581,9 @@ dnl AC_CHECK_TOOL(AR, ar)
- LDFLAGS=$hold_ldflags
- AC_MSG_RESULT($found)
- if test $found = yes; then
-- LDFLAGS="-Wl,-Bexport"
-+ LD_FLAGS="-Wl,-Bexport"
- else
-- LDFLAGS=""
-+ LD_FLAGS=""
- fi
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""
-@@ -1665,7 +1689,7 @@ dnl AC_CHECK_TOOL(AR, ar)
- SHLIB_SUFFIX=""
- DL_OBJS="tclLoadNone.o"
- DL_LIBS=""
-- LDFLAGS=""
-+ LD_FLAGS=""
- CC_SEARCH_FLAGS=""
- LD_SEARCH_FLAGS=""
- BUILD_DLTEST=""
-@@ -1710,8 +1734,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1725,8 +1749,8 @@ dnl AC_CHECK_TOOL(AR, ar)
if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -495,7 +112,7 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
else
LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
-@@ -1741,10 +1765,10 @@ dnl esac
+@@ -1756,10 +1780,10 @@ dnl esac
# Stub lib does not depend on shared/static configuration
if test "$RANLIB" = "" ; then
@@ -508,11 +125,3 @@ $NetBSD: patch-af,v 1.11 2004/03/25 22:49:15 jlam Exp $
INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) $(LIB_INSTALL_DIR)/$(STUB_LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB) $(STUB_LIB_FILE))'
fi
-@@ -1762,6 +1786,7 @@ dnl esac
- AC_SUBST(LDFLAGS)
- AC_SUBST(LDFLAGS_DEBUG)
- AC_SUBST(LDFLAGS_OPTIMIZE)
-+ AC_SUBST(LD_FLAGS)
- AC_SUBST(CC_SEARCH_FLAGS)
- AC_SUBST(LD_SEARCH_FLAGS)
-