kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix scim and ibus imf dependencies. 

we must not use PKG_CHECK_MODULES() for internal dependencies, as
their pc were not installed at the time of configure.



SVN revision: 82825
This commit is contained in:
Gustavo Sverzut Barbieri 2013-01-15 16:55:14 +00:00
parent 6a02aaf37b
commit a4b89a16ac
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -2708,7 +2708,7 @@ fi
have_ecore_imf_ibus="no"
if test "x${want_ecore_imf_ibus}" = "xyes" && test "x${have_glib}" = "xyes" ; then
PKG_CHECK_MODULES([IBUS],
[ibus-1.0 >= 1.4 glib-2.0 evas ecore-x ecore-evas],
[ibus-1.0 >= 1.4 glib-2.0],
[
have_ecore_imf_ibus="yes"
AC_DEFINE([BUILD_ECORE_IMF_IBUS], [1], [Ecore Imf IBUS Support])
@ -2722,7 +2722,7 @@ AM_CONDITIONAL([BUILD_ECORE_IMF_IBUS], [test "x${have_ecore_imf_ibus}" = "xyes"]
if test "x${want_ecore_imf_scim}" = "xyes" ; then
PKG_CHECK_MODULES([SCIM],
[scim ecore-x ecore-evas],
[scim],
[
have_ecore_imf_scim="yes"
AC_DEFINE([BUILD_ECORE_IMF_SCIM], [1], [Ecore Imf SCIM Support])

18
src/Makefile_Ecore_Imf.am
View File

@ -49,11 +49,18 @@ modules/ecore_imf/ibus/ibus_imcontext.c \
modules/ecore_imf/ibus/ibus_imcontext.h
modules_ecore_imf_ibus_module_la_CPPFLAGS = \
@ECORE_IMF_CFLAGS@ \
@ECORE_EVAS_CFLAGS@ \
@ECORE_X_CFLAGS@ \
@IBUS_CFLAGS@
modules_ecore_imf_ibus_module_la_LIBADD = \
@USE_ECORE_IMF_LIBS@ \
@USE_ECORE_EVAS_LIBS@ \
@USE_ECORE_X_LIBS@ \
@IBUS_LIBS@
modules_ecore_imf_ibus_module_la_DEPENDENCIES = @USE_ECORE_IMF_INTERNAL_LIBS@
modules_ecore_imf_ibus_module_la_DEPENDENCIES = \
@USE_ECORE_IMF_INTERNAL_LIBS@ \
@USE_ECORE_EVAS_INTERNAL_LIBS@ \
@USE_ECORE_X_INTERNAL_LIBS@
modules_ecore_imf_ibus_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_ecore_imf_ibus_module_la_LIBTOOLFLAGS = --tag=disable-static
endif
@ -69,11 +76,18 @@ modules/ecore_imf/scim/scim_imcontext.cpp \
modules/ecore_imf/scim/scim_imcontext.h
modules_ecore_imf_scim_module_la_CPPFLAGS = \
@ECORE_IMF_CFLAGS@ \
@ECORE_EVAS_CFLAGS@ \
@ECORE_X_CFLAGS@ \
@SCIM_CFLAGS@
modules_ecore_imf_scim_module_la_LIBADD = \
@USE_ECORE_IMF_LIBS@ \
@USE_ECORE_EVAS_LIBS@ \
@USE_ECORE_X_LIBS@ \
@SCIM_LIBS@
modules_ecore_imf_scim_module_la_DEPENDENCIES = @USE_ECORE_IMF_INTERNAL_LIBS@
modules_ecore_imf_scim_module_la_DEPENDENCIES = \
@USE_ECORE_IMF_INTERNAL_LIBS@ \
@USE_ECORE_EVAS_INTERNAL_LIBS@ \
@USE_ECORE_X_INTERNAL_LIBS@
modules_ecore_imf_scim_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
modules_ecore_imf_scim_module_la_LIBTOOLFLAGS = --tag=disable-static
endif