$NetBSD: patch-ad,v 1.11 2007/05/31 13:02:06 adam Exp $

--- unix/configure.in.orig	2007-05-25 18:09:53.000000000 +0200
+++ unix/configure.in
@@ -301,6 +301,10 @@ if test "x${x_libraries}" != "x"; then
 fi
 if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
     LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
+elif test "${TCL_LD_SEARCH_FLAGS}" = '-R${LIB_RUNTIME_DIR}'; then
+    LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -R/g'`
+elif test "${TCL_LD_SEARCH_FLAGS}" = '-Wl,-R${LIB_RUNTIME_DIR}'; then
+    LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -Wl,-R/g'`
 fi
 
 # The statement below is very tricky!  It actually *evaluates* the
@@ -476,11 +480,18 @@ else
     if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then
         if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
             eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
+	    eval TK_BUILD_LIB_SPEC="libtk${VERSION}\${TK_DBGX}.la"
         else
             eval TK_LIB_FLAG="-ltk`echo ${VERSION} | tr -d .`\${TK_DBGX}"
+	    eval TK_BUILD_LIB_SPEC="libtk`echo ${VERSION} | tr -d .`\${TK_DBGX}.la"
         fi
-        TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}"
         TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
+	if test "${RPATH_FLAG}" != ""; then
+	    TK_LIB_SPEC_RPATH="${RPATH_FLAG}${exec_prefix}/lib"
+	else
+	    TK_LIB_SPEC_RPATH=""
+	fi
+	TK_LIB_SPEC="-L${exec_prefix}/lib ${TK_LIB_SPEC_RPATH} ${TK_LIB_FLAG}"
     else
         TK_BUILD_EXP_FILE="lib.exp"
         eval "TK_EXP_FILE=libtk${TCL_EXPORT_FILE_SUFFIX}"