--- kinput2-v3/Kinput2.conf.ORIG	Thu May 27 08:55:18 1999
+++ kinput2-v3/Kinput2.conf	Mon Jan 15 22:38:09 2001
@@ -18,7 +18,7 @@
 /* #define UseWnn */	/* define if you are going to use Wnn (v4 or v6) */
 /* #define UseWnn6 */	/* define if you are going to use Wnn6 */
 #define UseCanna	/* define if you are going to use Canna */
-#define UseSj3		/* define if you are going to use Sj3 */
+/* #define UseSj3 */	/* define if you are going to use Sj3 */
 
 
 XCOMM Wnn configuration
@@ -77,17 +77,17 @@
  * 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
+CANNASRC = $(CANNAINSTDIR)/include
+CANNALIB = -L/usr/local/lib -lcanna16
 
 /*
  * If you have compiled Canna that came with X11R6 (contrib/programs/Canna),
  * but not installed yet..
  */
 XCOMM use headers/libraries in the source tree
-CANNASRC = $(CONTRIBSRC)/programs/Canna32
-CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
+XCOMM CANNASRC = $(CONTRIBSRC)/programs/Canna32
+XCOMM CANNALIB = -L$(CANNASRC)/lib/canna16 -lcanna16
 
 
 XCOMM SJ3 configuration