-fix breakage from additional headers required by tk8.5

-make test.tcl more specific about where to fint libgv_tcl.so

diff --git a/configure.ac b/configure.ac
index d689d89e1e466baade77a7ac36728a5012b9ec15..48dc450d43e7849fb299964fb3653def6d155387 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1271,7 +1271,7 @@ if test "$HAVE_TK" = "1"; then
     WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'`
 
     if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then
-       TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic"
+       TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/unix"
     else
         if test "x${WISH_EXEC_PREFIX}" != "x/usr" -a -f ${WISH_EXEC_PREFIX}/include/tk.h; then
            TK_INCLUDES=-I${WISH_EXEC_PREFIX}/include
@@ -2045,7 +2045,7 @@ AC_SUBST(TCLINT_INCLUDES)
 # -----------------------------------
 # tkInt.h
 if test -f "$TK_SRC_DIR/generic/tkInt.h"; then
-TKINT_INCLUDES="-I$TK_SRC_DIR/generic"
+TKINT_INCLUDES="-I$TK_SRC_DIR/generic -I$TK_SRC_DIR/unix"
 else
 if test -f "/usr/include/tkInt.h"; then
 TKINT_INCLUDES=""