Index: kinput2/Kinput2.conf
diff -u kinput2/Kinput2.conf:1.1.1.1 kinput2/Kinput2.conf:1.3
--- kinput2/Kinput2.conf:1.1.1.1	Tue May  2 22:57:34 1995
+++ kinput2/Kinput2.conf	Wed May  3 00:03:02 1995
@@ -40,14 +40,15 @@
  */
 XCOMM use installed library
 XCOMM WNNSRC = $(R5SRC)/contrib/im/Xsi/Wnn
-XCOMM WNNLIB = -lwnn
+#define Wnn42 /* now, config.h is in /usr/X11R6/include/wnn */
+WNNLIB = -lwnn -lcrypt
 
 /*
  * Or, use library in the source tree..
  */
 XCOMM use library in the source tree
-WNNSRC = $(R5SRC)/contrib/im/Xsi/Wnn
-WNNLIB = $(WNNSRC)/jlib/libwnn.a
+XCOMM WNNSRC = $(R5SRC)/contrib/im/Xsi/Wnn
+XCOMM WNNLIB = $(WNNSRC)/jlib/libwnn.a
 
 
 XCOMM Canna configuration
@@ -63,9 +64,9 @@
  * If you have already installed Canna header files and libraries..
  */
 XCOMM use installed headers/libraries
-XCOMM CANNAINSTDIR = /usr/local/canna
-XCOMM CANNASRC = $(CANNAINSTDIR)/include
-XCOMM CANNALIB = -lcanna16
+CANNAINSTDIR = /usr/local/canna
+CANNASRC = $(CANNAINSTDIR)/include
+CANNALIB = -L/usr/local/lib -lcanna16
 
 /*
  * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
Index: kinput2/lib/Imakefile
diff -u kinput2/lib/Imakefile:1.1.1.1 kinput2/lib/Imakefile:1.2
--- kinput2/lib/Imakefile:1.1.1.1	Tue May  2 22:57:45 1995
+++ kinput2/lib/Imakefile	Tue May  2 23:38:40 1995
@@ -25,7 +25,11 @@
 #ifdef UseWnn
           WNNSRCS = CcWnn.c cconv.c jclib.c jilib.c
           WNNOBJS = CcWnn.o cconv.o jclib.o jilib.o
+#ifdef Wnn42
+          WNNINCS = -I$(INCROOT)/wnn
+#else
           WNNINCS = -I$(WNNSRC)/include
+#endif
 #endif
 #ifdef UseCanna
         CANNASRCS = Canna.c