 Makefile.am  | 4 +++-
 configure.in | 4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1278f28..1eda657 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,9 +15,11 @@ SUBDIRS = src lib man tests
 
 CLEANFILES = kanwadict
 
+MKKANWA = src/mkkanwa$(EXEEXT)
+
 kanwadict:
 	if test -f kakasidict; then \
-	    ITAIJIDICT="itaijidict" src/mkkanwa$(EXEEXT) $@ kakasidict; \
+	    ITAIJIDICT="itaijidict" $(MKKANWA) $@ kakasidict; \
 	fi
 
 dist-hook:
diff --git a/configure.in b/configure.in
index e865b04..e2930b1 100644
--- a/configure.in
+++ b/configure.in
@@ -84,10 +84,6 @@ AS_VAR_IF(utf8, "yes",[
     AM_ICONV
     LIBS="$LIBICONV $LIBS"
     AC_DEFINE(KAKASI_SUPPORT_UTF8, 1, [KAKASI_SUPPORT_UTF8])
-    AC_RUN_IFELSE([AC_LANG_PROGRAM([#include <iconv.h>],
-		    [if (iconv_open("EUC-JP", "UTF-8") == -1) exit(1);])],
-	[],
-	[AC_MSG_ERROR([can not use EUC-JP or UTF-8 encoding on iconv])])
 ])
 
 dnl check gcc flags
