From 9ad9f44669ff28df49f73d6572a9be7ab29b2de4 Mon Sep 17 00:00:00 2001
From: Gustavo Sverzut Barbieri <barbieri@gmail.com>
Date: Tue, 19 Jun 2012 01:07:33 +0000
Subject: [PATCH] fix ecore-imf linkage

SVN revision: 72429
---
 configure.ac        |  2 --
 src/bin/Makefile.am | 10 ++--------
 src/bin/termio.c    |  5 +++++
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index b9b7ff63..2c1ba7f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,13 +39,11 @@ AC_ARG_ENABLE([ecore-imf],
    [AC_HELP_STRING([--disable-ecore-imf], [disable ecore-imf (Input Method Framework) usage. @<:@default=enabled@:>@])],
    [want_ecore_imf=$enableval], [])
 
-AM_CONDITIONAL(HAVE_ECORE_IMF, false)
 if test "x$want_ecore_imf" != "xno"; then
    PKG_CHECK_MODULES([ECORE_IMF],
        [ecore-imf >= 1.2.0 ecore-imf-evas >= 1.2.0],
        [
           AC_DEFINE([HAVE_ECORE_IMF], [1], [Input Method Support])
-          AM_CONDITIONAL(HAVE_ECORE_IMF, true)
           have_ecore_imf="yes"
           requirements="ecore-imf-evas >= 1.2.0 ecore-imf >= 1.2.0 ${requirements}"
        ],
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index a31b2607..5f502093 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -4,15 +4,9 @@ bin_PROGRAMS = terminology
 
 terminology_CPPFLAGS = -I. \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @TERMINOLOGY_CFLAGS@
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @TERMINOLOGY_CFLAGS@ @ECORE_IMF_CFLAGS@
 
-terminology_LDADD = @TERMINOLOGY_LIBS@
-
-if HAVE_ECORE_IMF
-
-terminology_LDADD += @ECORE_IMF_LIBS@
-
-endif
+terminology_LDADD = @TERMINOLOGY_LIBS@ @ECORE_IMF_LIBS@
 
 terminology_SOURCES = \
 private.h \
diff --git a/src/bin/termio.c b/src/bin/termio.c
index 08e7a3ce..6041dd8a 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -1,5 +1,10 @@
 #include "private.h"
 
+#ifdef HAVE_ECORE_IMF
+# include <Ecore_IMF.h>
+# include <Ecore_IMF_Evas.h>
+#endif
+
 #include <Elementary.h>
 #include "termio.h"
 #include "termpty.h"