--- configure.orig	Mon Mar 21 15:43:36 1994
+++ configure	Fri Oct 11 13:14:59 1996
@@ -165,7 +165,7 @@
     ANAME=Mftp
     TYPE="-DMOTIF"
     TLNAME=Xmp
-    TKLIB="-lXm"
+    TKLIB="\${MOTIFLIB}"
 fi
 
 if test "${TK}" = "xaw3d"; then
@@ -321,7 +321,7 @@
   cd conftestdir
   cat > Imakefile <<EOF
 acfindx:
-	@echo "x_includes=$(INCROOT); x_libraries=$(USRLIBDIR)"
+	@echo "x_includes=\$(INCROOT); x_libraries=\$(USRLIBDIR)"
 EOF
   if xmkmf >/dev/null 2>/dev/null && test -f Makefile; then
     eval `make acfindx`