diff -x configure -ur emacs20-20.7.ORIG/configure.in emacs20-20.7/configure.in
--- emacs20-20.7.ORIG/configure.in	Thu Jan 11 20:00:14 2001
+++ emacs20-20.7/configure.in	Thu Jan 11 19:58:19 2001
@@ -45,6 +45,32 @@
 AC_ARG_WITH(mail-spool-directory,
 [  --with-mail-spool-directory=DIR   system mail spool is DIR],
 [AC_DEFINE_UNQUOTED(USE_MAIL_SPOOL_DIRECTORY,"${withval}")])
+dnl
+AC_ARG_WITH(wnn,
+[  --with-wnn              obsolete, same as --with-wnn4])
+AC_ARG_WITH(wnn4,
+[  --with-wnn4             use Wnn4 library to input Japanese or Chinese],
+[with_wnn=${withval}])
+AC_ARG_WITH(wnn6,
+[  --with-wnn6             use Wnn6 library to input Japanese or Chinese],
+[with_wnn=${withval}])
+AC_ARG_WITH(wnn-includes,
+[  --with-wnn-includes=DIR search for WNN header files in DIR])
+AC_ARG_WITH(wnn-libraries,
+[  --with-wnn-libraries=DIR search for WNN libraries in DIR])
+AC_ARG_WITH(sj3,
+[  --with-sj3              support SJ3],
+[	  case "${withval}" in
+	    y | yes )	AC_DEFINE(SJ3) ;;
+	  esac
+])
+AC_ARG_WITH(canna,
+[  --with-canna            support CANNA])
+AC_ARG_WITH(canna-includes,
+[  --with-canna-includes=DIR search for CANNA header files in DIR])
+AC_ARG_WITH(canna-libraries,
+[  --with-canna-libraries=DIR search for CANNA libraries in DIR])
+dnl
 dnl This should be the last --with option, because --with-x is
 dnl added later on when we find the path of X, and it's best to
 dnl keep them together visually.
diff -x configure -ur emacs20-20.7.ORIG/debian/rules emacs20-20.7/debian/rules
--- emacs20-20.7.ORIG/debian/rules	Thu Jan 11 19:54:07 2001
+++ emacs20-20.7/debian/rules	Thu Jan 11 20:05:02 2001
@@ -76,8 +76,13 @@
   export DEBIAN_SRCDIR
 endif
 
-CFLAGS    := -DDEBIAN -O2 -g
-LDFLAGS   := -g
+CFLAGS   := -DDEBIAN -DX_I18N_INHIBITED
+ifeq "${arch}" "alpha"
+  CFLAGS += -g -O2
+else
+  CFLAGS += -O3 -pipe
+endif
+LDFLAGS  := -g
 
 local_lpath := /etc/emacs${major_ver}:/etc/emacs
 local_lpath := ${local_lpath}:/usr/local/share/emacs/${runtime_ver}/site-lisp
@@ -136,6 +141,10 @@
 	  --localstatedir=/var/lib \
 	  --infodir=/usr/share/info \
 	  --with-pop=yes \
+	  --with-wnn6 \
+	  --with-wnn-includes=/usr/include/wnn \
+	  --with-wnn-libraries=/usr/lib \
+	  --with-line-space \
 	  --with-x=yes --with-x-toolkit=yes
 
   # Because paths-force is called in configure, but configure