--- configure.orig	Sun Oct  3 08:47:46 1999
+++ configure	Sun Jan 30 16:05:14 2000
@@ -53,9 +53,9 @@
 
 echo "Configuring rqm v$VERSION for $OSTYPE"
 
-GCCWFLAGS="-W -Wall -Wbad-function-cast -Wmissing-prototypes -Wno-implicit-int -Werror"
-TCL_LIBS="../tk-8.0/unix/libtk8.0.a ../tcl-8.0/unix/libtcl8.0.a"
-TCL_INCL="-I../tk-8.0/generic -I../tcl-8.0/generic"
+GCCWFLAGS="-W -Wall -Wbad-function-cast -Wmissing-prototypes -Wno-implicit-int"
+TCL_LIBS="-L${PREFIX}/lib -ltk84 -ltcl84"
+TCL_INCL="-I${PREFIX}/include/tk8.4/generic -I${PREFIX}/include/tcl8.4/generic"
 DEFS=""
 
 AR="ar"
@@ -103,7 +103,7 @@
             ;;
   FreeBSD ) CC="gcc"
             WFLAGS=$GCCWFLAGS
-	    INCLUDE="-I/usr/local/include"
+	    INCLUDE="-I${LOCALBASE}/include"
 	    LDLIBS="-lm"
 	    DEBUG="-g"
 	    CHAR="-fsigned-char"
@@ -172,8 +172,8 @@
 s@__AR__@$AR@
 s@__RANLIB__@$RANLIB@
 s@__WFLAGS__@$WFLAGS@
-s@__INCLUDE__@$TCL_INCL $INCLUDE -I../common@g
-s@__LDLIBS__@$TCL_LIBS -L../common -lcommon $LDLIBS@g
+s@__INCLUDE__@$TCL_INCL $INCLUDE -I${PREFIX}/include/uclmmbase@g
+s@__LDLIBS__@$TCL_LIBS -L${PREFIX}/lib -luclmmbase $LDLIBS@g
 s@__CHAR__@$CHAR@
 s@__DEBUG__@$DEBUG2@
 s@__OPTIMIZE__@$OPTIMIZE2@