--- configure.orig	Wed Jul 18 16:03:57 2001
+++ configure	Wed Jul 18 16:37:11 2001
@@ -38,6 +38,10 @@
 ac_help="$ac_help
   --with-wnn6             Use Wnn6 library to input Japanese or Chinese"
 ac_help="$ac_help
+  --with-cwnn4            Use Wnn4 library to input Chinese"
+ac_help="$ac_help
+  --with-kwnn4            Use Wnn4 library to input Korean"
+ac_help="$ac_help
   --with-wnn-includes=DIR Search for WNN header files in DIR"
 ac_help="$ac_help
   --with-wnn-libraries=DIR Search for WNN libraries in DIR"
@@ -92,6 +96,7 @@
 infodir='${prefix}/info'
 mandir='${prefix}/man'
 
+wnnlib='-lwnn'
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
@@ -564,11 +569,11 @@
 emacs_prefix=emacs
 lispdir='${datadir}/${emacs_prefix}/${version}/lisp'
 locallisppath='${datadir}/${emacs_prefix}/${version}/site-lisp:'\
-'${datadir}/${emacs_prefix}/site-lisp'
+'${datadir}/${emacs_prefix}/site-lisp:${datadir}/emacs/site-lisp'
 lisppath='${locallisppath}:${lispdir}'
 etcdir='${datadir}/${emacs_prefix}/${version}/etc'
 # share lockdir with emacs and mule.
-lockdir='${sharedstatedir}/emacs/lock'
+lockdir='/var/run/emacs/lock'
 archlibdir='${libexecdir}/${emacs_prefix}/${version}/${configuration}'
 docdir='${datadir}/${emacs_prefix}/${version}/etc'
 
@@ -671,9 +676,20 @@
 
 fi
 
+if test "${with_cwnn4+set}" = set; then
+    wnnlib=-lcwnn
+elif test "${with_kwnn4+set}" = set; then
+    wnnlib=-lkwnn
+fi
+
 # Check whether --with-wnn6 or --without-wnn6 was given.
 if test "${with_wnn6+set}" = set; then
   withval="$with_wnn6"
+if test "${with_wnn6}" = yes; then
+   wnnlib=-lwnn6
+else
+   wnnlib=$with_wnn6
+fi
   with_wnn=${withval}; cat >> confdefs.h <<\EOF
 #define WNN6 1
 EOF
@@ -3104,12 +3120,12 @@
   if test -n "${with_wnn_libraries}" ; then
     if test -d ${with_wnn_libraries} ; then
       LD_SWITCH_WNN="-L${with_wnn_libraries}"
-      LIBS_MULE="${LIBS_MULE} -lwnn"
+      LIBS_MULE="${LIBS_MULE} ${wnnlib}"
     else
       LIBS_MULE="${LIBS_MULE} ${with_wnn_libraries}"
     fi
   else
-    LIBS_MULE="${LIBS_MULE} -lwnn"
+    LIBS_MULE="${LIBS_MULE} ${wnnlib}"
   fi
 fi