--- src/normal.c.orig	2006-05-13 20:55:12.000000000 +0900
+++ src/normal.c	2006-05-13 20:55:16.000000000 +0900
@@ -6034,7 +6034,9 @@
     }
 
     normal_search(cap, cap->cmdchar, cap->searchbuf,
-	    (cap->nchar == 'g' ? SEARCH_MIGEMO : 0) |
+#ifdef USE_MIGEMO
+            (cap->nchar == 'g' ? SEARCH_MIGEMO : 0) |
+#endif
 						(cap->arg ? 0 : SEARCH_MARK));
 }
 
--- src/auto/configure.orig	2006-05-13 20:47:38.000000000 +0900
+++ src/auto/configure	2006-05-13 20:55:51.000000000 +0900
@@ -873,6 +873,7 @@
   --disable-acl           Don't check for ACL support.
   --disable-gpm           Don't use gpm (Linux mouse daemon).
   --disable-nls           Don't support NLS (gettext()).
+  --disable-migemo        Don't support C/Migemo."
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -10411,7 +10412,7 @@
 
 for ac_header in stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \
 	termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h termio.h \
-	iconv.h langinfo.h unistd.h stropts.h errno.h \
+	migemo.h iconv.h langinfo.h unistd.h stropts.h errno.h \
 	sys/resource.h sys/systeminfo.h locale.h \
 	sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \
 	poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \
@@ -14312,6 +14313,66 @@
 
 fi
 
+echo $ac_n "checking --disable-migemo argument""... $ac_c" 1>&6
+echo "configure:8286: checking --disable-migemo argument" >&5
+# Check whether --enable-migemo or --disable-migemo was given.
+if test "${enable_migemo+set}" = set; then
+  enableval="$enable_migemo"
+  :
+else
+  enable_migemo="yes"
+fi
+
+if test "$enable_migemo" = "yes"; then
+  echo "$ac_t""no" 1>&6
+  echo $ac_n "checking for migemo_open in -lmigemo""... $ac_c" 1>&6
+echo "configure:8298: checking for migemo_open in -lmigemo" >&5
+ac_lib_var=`echo migemo'_'migemo_open | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lmigemo  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 8306 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char migemo_open();
+
+int main() {
+migemo_open()
+; return 0; }
+EOF
+if { (eval echo configure:8317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LIBS="$LIBS -lmigemo"
+				     cat >> confdefs.h <<\EOF
+#define HAVE_MIGEMO 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+else
+  echo "$ac_t""yes" 1>&6
+fi
+
 echo "$as_me:$LINENO: checking --disable-nls argument" >&5
 echo $ECHO_N "checking --disable-nls argument... $ECHO_C" >&6
 # Check whether --enable-nls or --disable-nls was given.