--- Docs/sgmlmanual/HTML.dsl-	2009-03-25 21:07:17 +0700
+++ Docs/sgmlmanual/HTML.dsl	2009-03-25 21:07:36 +0700
@@ -1,5 +1,5 @@
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
-<!ENTITY dbstyle SYSTEM "docbook/stylesheet/dsssl/modular/html/docbook.dsl" CDATA DSSSL>
+<!ENTITY dbstyle SYSTEM "docbook/dsssl-stylesheets/html/docbook.dsl" CDATA DSSSL>
 ]>
 
 <style-sheet>
--- Docs/sgmlmanual/Makefile-	2009-03-25 21:07:55 +0700
+++ Docs/sgmlmanual/Makefile	2009-03-25 21:08:13 +0700
@@ -88,14 +88,14 @@ ALL_WVSGML=$(shell /bin/ls *.wvsgml 2>/d
 	$(MAKE) dirimages htmlimages
 	rm -f $@
 	jade -t rtf -o $*.rtf.tmp \
-		-d /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/print/docbook.dsl $<
+		-d /usr/lib/sgml/docbook/dsssl-stylesheets/print/docbook.dsl $<
 	cat $*.rtf.tmp | sed 's,"img/\(.*\)\.[^.]*","img.tmp/\1.gif",g' >$@
 	rm -f $*.rtf.tmp
 
 %.tex: %.sgml
 	rm -f $@
 	jade -t tex -o $*.tex.tmp \
-		-d /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/print/docbook.dsl $<
+		-d /usr/lib/sgml/docbook/dsssl-stylesheets/print/docbook.dsl $<
 	cat $*.tex.tmp | sed 's,{img/\(.*\)\.[^.]*},{img.tmp/\1.eps},g' >$@
 	rm -f $*.tex.tmp
 
--- configure.ac-	2009-03-25 21:00:17 +0700
+++ configure.ac	2009-03-25 21:07:02 +0700
@@ -1,6 +1,9 @@
 # Process this file with autoconf to produce a configure script.
 AC_INIT(WvStreams, 4.5.1, wvstreams-devel@googlegroups.com, wvstreams)
 SO_VERSION=4.5
+PATH="$PATH:$libexecdir/qt3/bin"
+CPPFLAGS="-I$includedir/speex -I$includedir/security -I$includedir/openssl"
+LIBS="-lpam"
 
 # append to a variable without introducing superfluous white space
 AC_DEFUN([WV_APPEND],[
@@ -449,14 +452,14 @@ fi
 # tcl
 if test "$with_tcl" != "no"; then
     CPPFLAGS_save="$CPPFLAGS"
-    WV_APPEND(CPPFLAGS, -I/usr/include/tcl8.3)
+    WV_APPEND(CPPFLAGS, -I/usr/include/tcl)
     AC_CHECK_HEADERS(tcl.h,, [with_tcl=no])
     LIBS_save="$LIBS"
-    AC_CHECK_LIB(tcl8.3, TclInterpInit,, [with_tcl=no])
+    AC_CHECK_LIB(tcl, TclInterpInit,, [with_tcl=no])
     LIBS="$LIBS_save"
     if test "$with_tcl" != "no"; then
         CPPFLAGS="$CPPFLAGS_save"
-        LIBS_TCL=-ltcl8.3
+        LIBS_TCL=-ltcl
     fi
 fi
 
--- streams/wvlockdev.cc-	2009-03-25 21:08:26 +0700
+++ streams/wvlockdev.cc	2009-03-25 21:08:33 +0700
@@ -24,7 +24,7 @@ WvLockDev::WvLockDev(WvString _devicenam
 	p = devicename;
     
     lock_count = 0;
-    filename = WvString("/var/lock/LCK..%s", p);
+    filename = WvString("/var/lock/serial/LCK..%s", p);
 }
 
 
--- streams/wvmodem.cc-	2009-03-25 21:08:44 +0700
+++ streams/wvmodem.cc	2009-03-25 21:08:53 +0700
@@ -193,7 +193,7 @@ void WvModem::setup_modem(bool rtscts)
     
     drain();
     
-#if HAVE_LINUX_SERIAL_H
+#if 0
     struct serial_struct old_sinfo, sinfo;
     sinfo.reserved_char[0] = 0;
     if (ioctl(getrfd(), TIOCGSERIAL, &old_sinfo) < 0)