diff --git a/legacy/ecore/Makefile.am b/legacy/ecore/Makefile.am
index 3912465adc..0da3fe6758 100644
--- a/legacy/ecore/Makefile.am
+++ b/legacy/ecore/Makefile.am
@@ -83,7 +83,11 @@ EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN \
 	     ecore.spec.in ecore.spec
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = ecore.pc ecore-data.pc
+pkgconfig_DATA = ecore.pc
+
+if BUILD_ECORE_DATA
+pkgconfig_DATA += ecore-data.pc
+endif
 
 if BUILD_ECORE_CON
 pkgconfig_DATA += ecore-con.pc
diff --git a/legacy/ecore/configure.ac b/legacy/ecore/configure.ac
index e50f71d5cc..ea2440b3a4 100644
--- a/legacy/ecore/configure.ac
+++ b/legacy/ecore/configure.ac
@@ -96,6 +96,7 @@ want_tslib="no"
 want_glib="no"
 
 # core modules
+want_ecore_data="yes"
 want_ecore_txt="no"
 want_ecore_con="no"
 want_ecore_ipc="no"
@@ -321,7 +322,6 @@ case "$host_os" in
       requirements_ecore_file="evil ${requirements_ecore_file}"
       requirements_ecore_imf="evil ${requirements_ecore_imf}"
       requirements_ecore_imf_evas="evil ${requirements_ecore_imf_evas}"
-      requirements_ecore_txt="evil ${requirements_ecore_txt}"
       EFL_ECORE_BUILD="-DEFL_ECORE_BUILD"
       EFL_ECORE_TXT_BUILD="-DEFL_ECORE_TXT_BUILD"
       EFL_ECORE_FILE_BUILD="-DEFL_ECORE_FILE_BUILD"
@@ -968,6 +968,9 @@ fi
 
 ## Core modules
 
+# ecore_data
+ECORE_CHECK_MODULE([data], [${want_ecore_data}], [Data])
+
 # ecore_txt
 ECORE_CHECK_MODULE([txt], [${want_ecore_txt}], [Txt], [$have_iconv])
 
@@ -1383,6 +1386,7 @@ echo
 echo "  Ecore........................: always"
 echo "    Thread support.............: $have_pthread"
 echo "    GLib support...............: $have_glib"
+echo "  Ecore_Data...................: $have_ecore_data"
 echo "  Ecore_Txt....................: $have_ecore_txt"
 echo "  Ecore_Con....................: $have_ecore_con"
 if test "x$have_ecore_con" = "xyes" ; then
diff --git a/legacy/ecore/src/lib/ecore_data/Makefile.am b/legacy/ecore/src/lib/ecore_data/Makefile.am
index 934d51ded4..00a2110d59 100644
--- a/legacy/ecore/src/lib/ecore_data/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_data/Makefile.am
@@ -1,7 +1,13 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib/ecore \
-@EVIL_CFLAGS@ @EINA_CFLAGS@  @WIN32_CPPFLAGS@ @EFL_ECORE_BUILD@
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/lib/ecore \
+@EVIL_CFLAGS@ \
+@EINA_CFLAGS@ \
+@WIN32_CPPFLAGS@ \
+@EFL_ECORE_BUILD@
+
+if BUILD_ECORE_DATA
 
 lib_LTLIBRARIES = libecore_data.la
 include_HEADERS = \
@@ -22,3 +28,4 @@ ecore_value.c
 libecore_data_la_LIBADD = @dlopen_libs@ @EINA_LIBS@ @EVIL_LIBS@ @WIN32_LIBS@ @LTLIBINTL@ @EFL_PTHREAD_LIBS@ -lm
 libecore_data_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @ecore_release_info@
 
+endif