diff -Naur kinput2-v3.1.orig/Kinput2.conf kinput2-v3.1/Kinput2.conf
--- kinput2-v3.1.orig/Kinput2.conf	2002-10-03 18:35:26.000000000 +0900
+++ kinput2-v3.1/Kinput2.conf	2003-08-13 15:51:21.000000000 +0900
@@ -17,8 +17,8 @@
 
 /* #define UseWnn */	/* define if you are going to use Wnn (v4, v6 or v7) */
 /* #define UseWnn6 */	/* define if you are going to use Wnn6 or above */
-#define UseCanna	/* define if you are going to use Canna */
-#define UseSj3		/* define if you are going to use Sj3 */
+/* #define UseCanna */	/* define if you are going to use Canna */
+/* #define UseSj3 */	/* define if you are going to use Sj3 */
 /* #define UseAtok */	/* define if you are going to use Atok */
 
 
@@ -34,7 +34,7 @@
  * You have to define WnnLibDir if Wnn4 configuration files
  * are not installed in /usr/local/lib/wnn (which is the default).
  */
-/* #define WnnLibDir /some/peculiar/directory/wnn */
+#define WnnLibDir /usr/lib/wnn 
 
 /* for convenience.. */
 #if defined(UseWnn6) && !defined(UseWnn)
@@ -52,17 +52,17 @@
  * WnnLibDir above.
  */
 XCOMM use installed header files
-XCOMM WNNINCDIR = /usr/X11R6/include/wnn
+WNNINCDIR = /usr/include/wnn
 XCOMM use installed library
-XCOMM WNNLIB = -lwnn
+WNNLIB = -lwnn
 
 /*
  * Or, use library in the source tree..
  */
 XCOMM use library in the source tree
-WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
-WNNINCDIR = $(WNNSRC)/include
-WNNLIB = $(WNNSRC)/jlib/libwnn.a
+XCOMM WNNSRC = $(CONTRIBSRC)/programs/Xsi/Wnn
+XCOMM WNNINCDIR = $(WNNSRC)/include
+XCOMM WNNLIB = $(WNNSRC)/jlib/libwnn.a
 
 
 XCOMM Canna configuration
@@ -78,17 +78,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
+CANNASRC = $(CANNAINSTDIR)/include
+CANNALIB = -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
@@ -100,7 +100,7 @@
  *		   definition files are to be installed
  */
 
-SJ3DEF_DIR = $(LIBDIR)/sj3def
+XCOMM SJ3DEF_DIR = $(LIBDIR)/sj3def
 
 /*
  * If you have installed SJ3 library and header file,
@@ -117,8 +117,8 @@
  * Use compiled library in the source tree..
  */
 XCOMM use library in the source tree
-SJ3SRC = $(CONTRIBSRC)/programs/sj3
-SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
+XCOMM SJ3SRC = $(CONTRIBSRC)/programs/sj3
+XCOMM SJ3LIB = $(SJ3SRC)/sj3lib/libsj3lib.a
 
 
 XCOMM Atok configuration
@@ -133,8 +133,8 @@
  */
 XCOMM use installed headers/libraries
 XCOMM ATOKINCDIR = /usr/include/atok
-XCOMM ATOKLIBDIR = /usr/jp/lib
-ATOKLIB = -latok12n -latok12util
+XCOMM ATOKLIBDIR = /var/lib/atok
+XCOMM ATOKLIB = -latok12n -latok12util
 
 
 /**
diff -Naur kinput2-v3.1.orig/cmd/kinput2.c kinput2-v3.1/cmd/kinput2.c
--- kinput2-v3.1.orig/cmd/kinput2.c	2002-10-03 18:35:26.000000000 +0900
+++ kinput2-v3.1/cmd/kinput2.c	2003-08-13 15:51:21.000000000 +0900
@@ -644,3 +644,8 @@
     return n;
 }
 #endif
+
+#if defined(linux) && defined(PPC)
+/* avoid nusty gcc bug */
+void _XtInherit() {}
+#endif
diff -Naur kinput2-v3.1.orig/lib/imlib/imconv.c kinput2-v3.1/lib/imlib/imconv.c
--- kinput2-v3.1.orig/lib/imlib/imconv.c	2002-10-03 18:35:30.000000000 +0900
+++ kinput2-v3.1/lib/imlib/imconv.c	2003-08-13 15:55:54.000000000 +0900
@@ -591,6 +591,9 @@
 	}
     }
     IMFinishRequest(conn, offset);
+    #ifdef STATUS_SYNC
+	IMFlush(conn);
+    #endif /* STATUS_SYNC */
 }
 
 /*- preeditCaret: do actual preedit caret -*/