From 3d8f5d3b0511969946a6604d6762b8e17d9c2efb Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <zmike@samsung.com>
Date: Mon, 24 Mar 2014 12:32:06 -0400
Subject: [PATCH] add eo headers, aka Captain #define

---
 configure.ac        | 2 ++
 src/bin/Makefile.mk | 2 +-
 src/bin/e.h         | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index d15db8eab..5a6e1679e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -555,6 +555,7 @@ PKG_CHECK_MODULES(E, [
   eina >= ${efl_version}
   eldbus >= ${efl_version}
   eio >= ${efl_version}
+  eo >= ${efl_version}
   elementary >= ${efl_version}
   emotion >= ${efl_version}
   $eeze_mount
@@ -577,6 +578,7 @@ efreet-trash >= ${efl_version} \
 eina >= ${efl_version} \
 eldbus >= ${efl_version} \
 eio >= ${efl_version} \
+eo >= ${efl_version} \
 elementary >= ${efl_version} \
 emotion >= ${efl_version} \
 $udisks_mount \
diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index 683c98012..3dff0cf48 100644
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -379,7 +379,7 @@ enlightenment_src += \
 src/bin/e_comp_wl.c
 endif
 
-src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DE_LOGGING=1 @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ @ECORE_X_CFLAGS@ -DNEED_X=1
+src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DEFL_BETA_API_SUPPORT -DEFL_EO_API_SUPPORT -DE_LOGGING=1 @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@ @ECORE_X_CFLAGS@ -DNEED_X=1
 src_bin_enlightenment_SOURCES = \
 src/bin/e_main.c \
 $(enlightenment_src)
diff --git a/src/bin/e.h b/src/bin/e.h
index 8eac2dbc1..46a675ef7 100644
--- a/src/bin/e.h
+++ b/src/bin/e.h
@@ -98,7 +98,7 @@ void *alloca (size_t);
 # endif
 
 # include <setjmp.h>
-# include <Elementary.h>
+# include <Eo.h>
 # include <Eina.h>
 # include <Eet.h>
 # include <Evas.h>
@@ -117,6 +117,7 @@ void *alloca (size_t);
 # include <Eldbus.h>
 # include <Eio.h>
 # include <Emotion.h>
+# include <Elementary.h>
 
 # ifdef HAVE_HAL
 #  include <E_Hal.h>