diff --git a/configure.ac b/configure.ac
index 7bd54a2..84308dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,6 +71,12 @@ fi
 
 AC_SUBST(HAVE_LIBCLANG)
 
+# if cross compiling, disable NLS support.
+# It's not worth the trouble, at least for now.
+if test "${build}" != "${host}" -o "${build}" != "${target}" -o "${host}" != "${target}"; then
+  enable_nls=no
+fi
+
 EFL_TESTS([${build_tests}])
 
 # doxygen program for documentation building
diff --git a/elm_code/bin/Makefile.am b/elm_code/bin/Makefile.am
index b204d98..b081d5f 100644
--- a/elm_code/bin/Makefile.am
+++ b/elm_code/bin/Makefile.am
@@ -12,7 +12,7 @@ elm_code_test_SOURCES = \
 elm_code_test_main.c \
 elm_code_test_private.h
 
-elm_code_test_LDADD = @EFL_LIBS@ $(top_builddir)/elm_code/lib/libelm_code.la -lintl
+elm_code_test_LDADD = @EFL_LIBS@ $(top_builddir)/elm_code/lib/libelm_code.la
 
 elm_code_test_LDFLAGS = @EFL_LTLIBRARY_FLAGS@