From 4a7b30d126111021c3553f54ab9c5d8eb5bf1ed2 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Wed, 8 Apr 1998 02:06:37 +0000
Subject: [PATCH] From: Bruce Stephens <bruce@cenderis.demon.co.uk>

fix for the tk problem...
---
 src/configure    | 4 ++--
 src/configure.in | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/configure b/src/configure
index c5292238342..3f11f37916a 100755
--- a/src/configure
+++ b/src/configure
@@ -3371,7 +3371,7 @@ else
 fi
 rm -f conftest*
 
-if test $ac_cv_prog_gcc = yes; then
+if test x$ac_cv_prog_gcc = xyes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
 echo "configure:3377: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
@@ -5617,7 +5617,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-l$tk_lib  $LIBS"
+LIBS="-l$tk_lib $TCL_LIB $X_PRE_LIBS $X_LIBS $X11_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 5623 "configure"
 #include "confdefs.h"
diff --git a/src/configure.in b/src/configure.in
index de16dbb367c..e562792d8f2 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -659,7 +659,7 @@ then
 	tk_libs="tk8.0 tk80 tk4.2 tk42 tk"
 	for tk_lib in $tk_libs; do
 		if test -z "$TK_LIB"; then
-			AC_CHECK_LIB($tk_lib, main, TK_LIB=$tk_lib)
+			AC_CHECK_LIB($tk_lib, main, TK_LIB=$tk_lib,, $TCL_LIB $X_PRE_LIBS $X_LIBS $X11_LIBS)
 		fi
 	done
 	if test -z "$TK_LIB"; then