From: Ole Streicher <olebole@debian.org>
Date: Mon, 5 Nov 2012 12:13:04 +0100
Subject: Configure shared libs for hurd-i386 and kfreeBSD-* correctly

And propagate LDFLAGS

Closes: #692301
---
 tclconfig/tcl.m4 | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tclconfig/tcl.m4 b/tclconfig/tcl.m4
index a4e45ac..79bc5b5 100644
--- a/tclconfig/tcl.m4
+++ b/tclconfig/tcl.m4
@@ -1447,7 +1447,7 @@ dnl AC_CHECK_TOOL(AR, ar)
 	    # get rid of the warnings.
 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
 
-	    SHLIB_LD="${CC} -shared"
+	    SHLIB_LD="${CC} -shared ${LDFLAGS}"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
@@ -1469,13 +1469,13 @@ dnl AC_CHECK_TOOL(AR, ar)
 	    fi
 
 	    ;;
-	GNU*)
+	GNU-*)
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
 
-	    SHLIB_LD="${CC} -shared"
-	    DL_OBJS=""
+	    SHLIB_LD="${CC} -shared ${LDFLAGS}"
+	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 	    CC_SEARCH_FLAGS=""
@@ -1552,7 +1552,7 @@ dnl AC_CHECK_TOOL(AR, ar)
 	    *)
 		SHLIB_CFLAGS="-fpic";;
 	    esac
-	    SHLIB_LD="${CC} -shared ${SHLIB_CFLAGS}"
+	    SHLIB_LD="${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS}"
 	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
@@ -1576,10 +1576,10 @@ dnl AC_CHECK_TOOL(AR, ar)
 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
-	FreeBSD-*)
+	FreeBSD-*|GNU/kFreeBSD*)
 	    # FreeBSD 3.* and greater have ELF.
 	    SHLIB_CFLAGS="-fPIC"
-	    SHLIB_LD="ld -Bshareable -x"
+	    SHLIB_LD="${CC} -shared ${SHLIB_CFLAGS} ${LDFLAGS}"
 	    SHLIB_LD_LIBS='${LIBS}'
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"