Add auto-detection for configure --with-migemo

2 files changed, 48 insertions, 7 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 0d08e9b..ded6950 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -289,16 +289,36 @@ AC_DEFUN([AC_W3M_KEYMAP],
 AC_DEFUN([AC_W3M_MIGEMO],
 [AC_SUBST(USE_MIGEMO)
  AC_SUBST(DEF_MIGEMO_COMMAND)
- migemo_command="migemo -t egrep /usr/local/share/migemo/migemo-dict"
  AC_MSG_CHECKING(if migemo is supported with)
  AC_ARG_WITH(migemo,
-  [  --with-migemo[[=COMMAND]] migemo command and options
-                          [[migemo -t egrep /usr/local/share/migemo/migemo-dict]]],
-  [test x"$with_migemo" = xyes || migemo_command="$with_migemo"])
+  [  --with-migemo[[=COMMAND]] migemo/cmigemo command and options [[guessed]]],
+  [test x"$with_migemo" = xyes || migemo_command="$with_migemo"],
+  migemo_command=no)
+ if test x"$with_migemo" = xyes; then
+  if command -v migemo >/dev/null 2>&1; then
+   migemo_command="migemo -t egrep"
+   for f in \
+    /usr/share/migemo/migemo-dict \
+    /usr/local/share/migemo/migemo-dict; do
+    if test -f "$f" -a -r "$f"; then break; fi
+   done
+  else
+   migemo_command="cmigemo -q -d"
+   for f in \
+    /usr/local/share/migemo/utf-8/migemo-dict \
+    /usr/local/share/cmigemo/utf-8/migemo-dict \
+    /usr/share/migemo/utf-8/migemo-dict \
+    /usr/share/cmigemo/utf-8/migemo-dict; do
+    if test -f "$f" -a -r "$f"; then break; fi
+   done
+  fi
+  migemo_command="$migemo_command $f"
+ fi
  if test "${with_migemo+set}" = set -a "$with_migemo" != "no"; then
    AC_DEFINE(USE_MIGEMO)
  fi
  AC_MSG_RESULT($migemo_command)
+ if test x"$migemo_command" = xno; then migemo_command=""; fi
  AC_DEFINE_UNQUOTED(DEF_MIGEMO_COMMAND, "$migemo_command")])
 #
 # ----------------------------------------------------------------
diff --git a/configure b/configure
index d1da5ed..daabc59 100755
--- a/configure
+++ b/configure
@@ -1529,8 +1529,7 @@ Optional Packages:
   --with-imagelib[=LIBS]  image library [guessed]
                            LIBS may be space separated:
                             gtk2 gdk-pixbuf imlib imlib2
-  --with-migemo[=COMMAND] migemo command and options
-                          [migemo -t egrep /usr/local/share/migemo/migemo-dict]
+  --with-migemo[=COMMAND] migemo/cmigemo command and options [guessed]
   --with-editor=EDITOR    default editor [/usr/bin/vi]
   --with-mailer=MAILER    default mailer [/usr/bin/mail]
   --with-browser=BROWSER  default browser [/usr/bin/firefox]
@@ -8025,21 +8024,43 @@ fi
 $as_echo "$enable_w3mmailer" >&6; }
 
 
- migemo_command="migemo -t egrep /usr/local/share/migemo/migemo-dict"
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if migemo is supported with" >&5
 $as_echo_n "checking if migemo is supported with... " >&6; }
 
 # Check whether --with-migemo was given.
 if test "${with_migemo+set}" = set; then :
   withval=$with_migemo; test x"$with_migemo" = xyes || migemo_command="$with_migemo"
+else
+  migemo_command=no
 fi
 
+ if test x"$with_migemo" = xyes; then
+  if command -v migemo >/dev/null 2>&1; then
+   migemo_command="migemo -t egrep"
+   for f in \
+    /usr/share/migemo/migemo-dict \
+    /usr/local/share/migemo/migemo-dict; do
+    if test -f "$f" -a -r "$f"; then break; fi
+   done
+  else
+   migemo_command="cmigemo -q -d"
+   for f in \
+    /usr/local/share/migemo/utf-8/migemo-dict \
+    /usr/local/share/cmigemo/utf-8/migemo-dict \
+    /usr/share/migemo/utf-8/migemo-dict \
+    /usr/share/cmigemo/utf-8/migemo-dict; do
+    if test -f "$f" -a -r "$f"; then break; fi
+   done
+  fi
+  migemo_command="$migemo_command $f"
+ fi
  if test "${with_migemo+set}" = set -a "$with_migemo" != "no"; then
    $as_echo "#define USE_MIGEMO 1" >>confdefs.h
 
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $migemo_command" >&5
 $as_echo "$migemo_command" >&6; }
+ if test x"$migemo_command" = xno; then migemo_command=""; fi
  cat >>confdefs.h <<_ACEOF
 #define DEF_MIGEMO_COMMAND "$migemo_command"
 _ACEOF