--- xemacs-21.1.11/src/mule-wnnfns.c.orig	Mon Jul 24 10:54:12 2000
+++ xemacs-21.1.11/src/mule-wnnfns.c	Mon Jul 24 10:54:33 2000
@@ -270,10 +270,10 @@
 #include "window.h"
 #include "sysdep.h"
 
-#include "wnn/commonhd.h"
+#include "wnn6/commonhd.h"
 #include "mule-charset.h"
-#include "wnn/jllib.h"
-#include "wnn/cplib.h"
+#include "wnn6/jllib.h"
+#include "wnn6/cplib.h"
 
 /* UCHAR が二重定義されるので */
 #define _UCHAR_T
--- xemacs-21.1.11/configure.in.orig	Mon Jul 24 14:37:30 2000
+++ xemacs-21.1.11/configure.in	Mon Jul 24 14:38:12 2000
@@ -3053,10 +3053,8 @@
   fi
   dnl Back to our regularly scheduled wnn hunting
   if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
-    AC_CHECK_LIB(wnn,jl_dic_list_e,libwnn=wnn,
-      AC_CHECK_LIB(wnn4,jl_dic_list_e,libwnn=wnn4,
 	AC_CHECK_LIB(wnn6,jl_dic_list_e,libwnn=wnn6,
-	  AC_CHECK_LIB(wnn6_fromsrc,dic_list_e,libwnn=wnn6_fromsrc,with_wnn=no))))
+	  AC_CHECK_LIB(wnn6_fromsrc,dic_list_e,libwnn=wnn6_fromsrc,with_wnn=no))
   fi
   test -z "$with_wnn" && with_wnn=yes
   if test "$with_wnn" = "yes"; then