diff --git a/legacy/elementary/configure.in b/legacy/elementary/configure.in
index 06c6c2c7d0..60e6bb6b1a 100644
--- a/legacy/elementary/configure.in
+++ b/legacy/elementary/configure.in
@@ -164,6 +164,21 @@ ELM_ALLOCA_H_DEF="#undef"
 AC_CHECK_HEADER(alloca.h, [ELM_ALLOCA_H_DEF="#define"])
 AC_SUBST(ELM_ALLOCA_H_DEF)
 
+ELM_LIBINTL_H_DEF="#undef"
+AC_CHECK_HEADER(libintl.h, [ELM_LIBINTL_H_DEF="#define"])
+AC_SUBST(ELM_LIBINTL_H_DEF)
+
+AC_ARG_WITH(edje-cc,
+[  --with-edje-cc=PATH              specify a specific path to edje_cc],
+[
+  v=$withval;
+  edje_cc=$v
+  echo "  Enlightenment edje_cc explicitly set to "$edje_cc;
+],[
+  edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc
+])
+AC_SUBST(edje_cc)
+
 my_libs="-lm"
 AC_SUBST(my_libs)
 AC_SUBST(requirement_elm)
@@ -203,6 +218,8 @@ echo
 echo "Features:"
 echo "  EDBus.........: ${have_elementary_edbus}"
 echo
+echo "edje_cc.........: ${edje_cc}"
+echo
 echo "------------------------------------------------------------------------"
 echo
 echo "Now type 'make' ('gmake' on some systems) to compile $PACKAGE,"
diff --git a/legacy/elementary/data/objects/Makefile.am b/legacy/elementary/data/objects/Makefile.am
index 28a16aac81..e70ed88c52 100644
--- a/legacy/elementary/data/objects/Makefile.am
+++ b/legacy/elementary/data/objects/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS     = 1.4 foreign
 MAINTAINERCLEANFILES = Makefile.in
 
-EDJE_CC = edje_cc
+EDJE_CC = @edje_cc@
 EDJE_FLAGS = -v -id $(top_srcdir)/data/objects -fd $(top_srcdir)/data/objects
 
 filesdir = $(datadir)/elementary/objects
diff --git a/legacy/elementary/data/themes/Makefile.am b/legacy/elementary/data/themes/Makefile.am
index f53c664e21..f7929d010a 100644
--- a/legacy/elementary/data/themes/Makefile.am
+++ b/legacy/elementary/data/themes/Makefile.am
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS     = 1.4 foreign
 MAINTAINERCLEANFILES = Makefile.in
 
-EDJE_CC = edje_cc
+EDJE_CC = @edje_cc@
 EDJE_FLAGS = -v -id $(top_srcdir)/data/themes -fd $(top_srcdir)/data/themes
 
 filesdir = $(datadir)/elementary/themes
diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index 1e53c61d29..b6e44682ab 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -21,7 +21,8 @@
 @ELM_WINCE_DEF@ ELM_WINCE
 @ELM_EDBUS_DEF@ ELM_EDBUS
 @ELM_ALLOCA_H_DEF@ ELM_ALLOCA_H
-  
+@ELM_LIBINTL_H_DEF@ ELM_LIBINTL_H
+
 /* Standard headers for standard system calls etc. */
 #include <stdio.h>
 #include <stdlib.h>
@@ -43,7 +44,9 @@
 
 #ifdef ELM_UNIX
 # include <locale.h>
+#ifdef ELM_LIBINTL_H
 # include <libintl.h>
+#endif
 # include <signal.h>
 # include <grp.h>
 # include <glob.h>