--- configure.orig	Tue Mar 22 06:43:36 1994
+++ configure	Sat Nov 11 03:58:32 2000
@@ -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`
@@ -830,7 +830,7 @@
 # Do we have the Xmu library.
 #
 if test -f "${x_libraries}/libXmu.a"; then
-    LIBSX="$LIBSX -lXmu"
+    LIBSX="$LIBSX -lXmu -lSM -lICE"
 else
     if test "x${HP_X11}" != "x" &&
        test -f "${x_libraries}/${HP_X11}/libXmu.a" ; then
@@ -1078,7 +1078,7 @@
     DEFS="$DEFS -Wf,-XNl4096"
 fi
 
-OPT=" -O "
+OPT=" ${CFLAGS} "
 #
 # Are we a HP macine
 #