Index: /rat/trunk/configure.in
===================================================================
--- /rat/trunk/configure.in (revision 2985)
+++ /rat/trunk/configure.in (revision 2986)
@@ -157,5 +157,6 @@
 AC_SUBST(X_CFLAGS)
 AC_SUBST(X_LIBS)
-
+AC_SUBST(X_EXTRA_LIBS)
+AC_SUBST(X_PRE_LIBS)
 # TCL/TK ####################################################################
 # have to use pwd because srcdir is helpfully chosen to be . and check header
@@ -178,8 +179,8 @@
 AC_CHECK_LIB(tcl8.0, 
 	Tcl_Init,
-	TCL_LIB_NAME=tcl8.0,
+	TCL_LIB="-L$TCL_LIB -ltcl8.0",
 	[AC_CHECK_LIB(tcl80, 
 		Tcl_Init,
-		TCL_LIB_NAME=tcl80,
+		TCL_LIB="-L$TCL_LIB -ltcl80",
 		[
 			echo "Could not find Tcl library.  One of the following halted progess:"
@@ -214,8 +215,8 @@
 AC_CHECK_LIB(tk8.0, 
 	Tk_Init,
-	TK_LIB_NAME=tk8.0,
+	TK_LIB="-L$TK_LIB -ltk8.0",
 	[AC_CHECK_LIB(tk80, 
 		Tk_Init,
-		TK_LIB_NAME=tk80,
+		TK_LIB="-L$TK_LIB -ltk80",
 		[
 			echo "Could not find Tk library.  One of the following halted progess:"
@@ -225,6 +226,11 @@
 			exit
 		],
-		-L${TCL_LIB} -L${TK_LIB} -l$TCL_LIB_NAME -L$ac_x_libraries -lm -lXext -lX11)],
-	-L${TCL_LIB} -L${TK_LIB} -l$TCL_LIB_NAME -L$ac_x_libraries -lm -lXext -lX11)
+		-L${TK_LIB} ${TCL_LIB} $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS -lm)],
+	 -L${TK_LIB} ${TCL_LIB} $X_LIBS $X_PRE_LIBS  -lXext -lX11 $X_EXTRA_LIBS -lm)
+
+AC_SUBST(TCL_INC)
+AC_SUBST(TCL_LIB)
+AC_SUBST(TK_INC)
+AC_SUBST(TK_LIB)
 
 # XXX Add check for common ##################################################
