From bf8b25f5646b0f94a34a5553386cbc1cfd27f796 Mon Sep 17 00:00:00 2001
From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Tue, 4 Aug 2015 11:23:25 +0900
Subject: [PATCH] Remove elementary dependency in libscim.so

Change-Id: Ib08df478a334c67378be2c3c5f98174598c7c249
---
 configure.ac                            | 5 ++++-
 ism/demos/Makefile.am                   | 2 ++
 ism/extras/efl_panel/Makefile.am        | 2 ++
 ism/extras/kbd_mode_changer/Makefile.am | 2 ++
 ism/src/scim_setup_module_efl.h         | 2 +-
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1af545f..a041efd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,8 +220,11 @@ PKG_CHECK_MODULES(ECORE, [ecore])
 # Check ECORE_IPC library
 PKG_CHECK_MODULES(ECORE_IPC, [ecore-ipc])
 
+# Check ELEMENTARY library
+PKG_CHECK_MODULES(ELEMENTARY, [elementary edje])
+
 # Check EFL library
-PKG_CHECK_MODULES(EFL, [elementary evas ecore ecore-evas ecore-file edje ecore-input ecore-imf],
+PKG_CHECK_MODULES(EFL, [eina evas ecore ecore-evas ecore-file ecore-input ecore-imf],
                   [ISF_HAS_EFL=yes],
                   [ISF_HAS_EFL=no])
 
diff --git a/ism/demos/Makefile.am b/ism/demos/Makefile.am
index e0e9f7f..cebaa98 100644
--- a/ism/demos/Makefile.am
+++ b/ism/demos/Makefile.am
@@ -44,6 +44,7 @@ isf_demo_efl_SOURCES  = isf_demo_efl.cpp \
 
 isf_demo_efl_CXXFLAGS = @EFL_CFLAGS@ \
                         @ECOREX_CFLAGS@ \
+                        @ELEMENTARY_CFLAGS@ \
                         @APPCORE_EFL_CFLAGS@ \
                         @VCONF_CFLAGS@ \
                         @PRIVILEGE_CONTROL_CFLAGS@ \
@@ -54,6 +55,7 @@ isf_demo_efl_CXXFLAGS = @EFL_CFLAGS@ \
 
 isf_demo_efl_LDFLAGS  = @EFL_LIBS@ @LTLIBINTL@ -rpath $(libdir) \
                         @ECOREX_LIBS@ \
+                        @ELEMENTARY_LIBS@ \
                         @VCONF_LIBS@ \
                         @APPCORE_EFL_LIBS@ \
                         @PRIVILEGE_CONTROL_LIBS@ \
diff --git a/ism/extras/efl_panel/Makefile.am b/ism/extras/efl_panel/Makefile.am
index 2318754..74943b1 100644
--- a/ism/extras/efl_panel/Makefile.am
+++ b/ism/extras/efl_panel/Makefile.am
@@ -30,6 +30,7 @@ isf_panel_efl_SOURCES  = isf_panel_efl.cpp \
 
 isf_panel_efl_CXXFLAGS = @EFL_CFLAGS@ \
                          @ECOREX_CFLAGS@ \
+                         @ELEMENTARY_CFLAGS@ \
                          @EFL_EXTENSION_CFLAGS@ \
                          @VCONF_CFLAGS@ \
                          @X11_CFLAGS@ \
@@ -48,6 +49,7 @@ isf_panel_efl_CXXFLAGS = @EFL_CFLAGS@ \
 
 isf_panel_efl_LDFLAGS  = @EFL_LIBS@ @LTLIBINTL@ -rpath $(libdir) \
                          @ECOREX_LIBS@ \
+                         @ELEMENTARY_LIBS@ \
                          @EFL_EXTENSION_LIBS@ \
                          @VCONF_LIBS@ \
                          @X11_LIBS@ \
diff --git a/ism/extras/kbd_mode_changer/Makefile.am b/ism/extras/kbd_mode_changer/Makefile.am
index 5f7a9ce..1b2ae28 100644
--- a/ism/extras/kbd_mode_changer/Makefile.am
+++ b/ism/extras/kbd_mode_changer/Makefile.am
@@ -31,11 +31,13 @@ appexec_PROGRAMS      = $(ISF_KBD_MODE_CHANGER)
 isf_kbd_mode_changer_SOURCES  = main.cpp
 
 isf_kbd_mode_changer_CXXFLAGS = @EFL_CFLAGS@ \
+                                @ELEMENTARY_CFLAGS@ \
                                 @DLOG_CFLAGS@ \
                                 @APPFW_CFLAGS@ \
                                 -fPIE
 
 isf_kbd_mode_changer_LDFLAGS  = @EFL_LIBS@ -rpath $(libdir)\
+                                @ELEMENTARY_LIBS@ \
                                 @DLOG_LIBS@ \
                                 @APPFW_LIBS@ \
                                 -pie
diff --git a/ism/src/scim_setup_module_efl.h b/ism/src/scim_setup_module_efl.h
index 888a892..08f0209 100644
--- a/ism/src/scim_setup_module_efl.h
+++ b/ism/src/scim_setup_module_efl.h
@@ -28,7 +28,7 @@
 #define __SCIM_SETUP_MODULE_EFL_H
 
 
-#include <Elementary.h>
+#include <Evas.h>
 #include <string.h>
 
 using namespace scim;
-- 
2.7.4