fix ecore-imf linkage

SVN revision: 72429
This commit is contained in:
Gustavo Sverzut Barbieri 2012-06-19 01:07:33 +00:00
parent ec18871272
commit 9ad9f44669
3 changed files with 7 additions and 10 deletions

View File

@ -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}"
],

View File

@ -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 \

View File

@ -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"