Set LD_LIBRARY_PATH to Tcl build area for native TCLSH_NATIVE

Author: apnadkarni

configure

@@ -9815,19 +9815,52 @@ printf '%s\n' "$found" >&6; }
             { printf '%s\n' "$as_me:${as_lineno-$LINENO}: checking $TCLSH_PROG for Tcl 9" >&5
 printf %s "checking $TCLSH_PROG for Tcl 9... " >&6; }
 
+            tcl_build_dir=`$as_dirname -- "$TCLSH_PROG" ||
+$as_expr X"$TCLSH_PROG" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$TCLSH_PROG" : 'X\(//\)[^/]' \| \
+	 X"$TCLSH_PROG" : 'X\(//\)$' \| \
+	 X"$TCLSH_PROG" : 'X\(/\)' \| . 2>/dev/null ||
+printf '%s\n' X"$TCLSH_PROG" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+            eval "tcl_save_libpath=\$$LD_LIBRARY_PATH_VAR"
+            eval "$LD_LIBRARY_PATH_VAR=\$tcl_build_dir"
+            eval "export $LD_LIBRARY_PATH_VAR"
+
+
     found=`echo "puts [package vsatisfies \\$tcl_version 9]" | $TCLSH_PROG`
 	if test "x$found" = "x1"; then
 	    found=yes
 	else
 	    found=no
 	fi
 
+
+            eval "$LD_LIBRARY_PATH_VAR=\$tcl_save_libpath"
+            eval "export $LD_LIBRARY_PATH_VAR"
+
             { printf '%s\n' "$as_me:${as_lineno-$LINENO}: result: $found" >&5
 printf '%s\n' "$found" >&6; }
             if test x"$found" != x"yes"; then
                 as_fn_error $? "cannot find a usable native Tcl 9 tclsh. Either set TCLSH_NATIVE or use configure with --disable-zipfs" "$LINENO" 5
             fi
-            TCLSH_NATIVE="$TCLSH_PROG"
+            eval "TCLSH_NATIVE=\"$LD_LIBRARY_PATH_VAR=\$tcl_build_dir \$TCLSH_PROG\""
         fi
     else
         # User specified. Check version acceptable.

configure.ac

@@ -245,12 +245,23 @@ if test "${ZIPFS_BUILD}" != 0; then
         # compiling.
         if test -z "$TCLSH_NATIVE" -a -n "$TCLSH_PROG" -a x"$ac_cv_cross" != x"yes"; then
             AC_MSG_CHECKING([$TCLSH_PROG for Tcl 9])
+
+            tcl_build_dir=`AS_DIRNAME(["$TCLSH_PROG"])`
+
+            eval "tcl_save_libpath=\$$LD_LIBRARY_PATH_VAR"
+            eval "$LD_LIBRARY_PATH_VAR=\$tcl_build_dir"
+            eval "export $LD_LIBRARY_PATH_VAR"
+
             CHECK_TCLSH_VERSION([found], [$TCLSH_PROG], [9])
+
+            eval "$LD_LIBRARY_PATH_VAR=\$tcl_save_libpath"
+            eval "export $LD_LIBRARY_PATH_VAR"
+
             AC_MSG_RESULT([$found])
             if test x"$found" != x"yes"; then
                 AC_MSG_ERROR([cannot find a usable native Tcl 9 tclsh. Either set TCLSH_NATIVE or use configure with --disable-zipfs])
             fi
-            TCLSH_NATIVE="$TCLSH_PROG"
+            eval "TCLSH_NATIVE=\"$LD_LIBRARY_PATH_VAR=\$tcl_build_dir \$TCLSH_PROG\""
         fi
     else
         # User specified. Check version acceptable.