summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-15 16:55:14 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-15 16:55:14 +0000
commita4b89a16ac988ad8306b803d1cee793511bf9ca8 (patch)
tree587aec9d9459e687d2f61e9901354119c55f9026
parent6a02aaf37b5d2d29560b967093e2e1fbaf20940e (diff)
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
-rw-r--r--configure.ac4
-rw-r--r--src/Makefile_Ecore_Imf.am18
2 files changed, 18 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index ff82e287e8..43e288883c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2708,7 +2708,7 @@ fi
2708have_ecore_imf_ibus="no" 2708have_ecore_imf_ibus="no"
2709if test "x${want_ecore_imf_ibus}" = "xyes" && test "x${have_glib}" = "xyes" ; then 2709if test "x${want_ecore_imf_ibus}" = "xyes" && test "x${have_glib}" = "xyes" ; then
2710 PKG_CHECK_MODULES([IBUS], 2710 PKG_CHECK_MODULES([IBUS],
2711 [ibus-1.0 >= 1.4 glib-2.0 evas ecore-x ecore-evas], 2711 [ibus-1.0 >= 1.4 glib-2.0],
2712 [ 2712 [
2713 have_ecore_imf_ibus="yes" 2713 have_ecore_imf_ibus="yes"
2714 AC_DEFINE([BUILD_ECORE_IMF_IBUS], [1], [Ecore Imf IBUS Support]) 2714 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"]
2722 2722
2723if test "x${want_ecore_imf_scim}" = "xyes" ; then 2723if test "x${want_ecore_imf_scim}" = "xyes" ; then
2724 PKG_CHECK_MODULES([SCIM], 2724 PKG_CHECK_MODULES([SCIM],
2725 [scim ecore-x ecore-evas], 2725 [scim],
2726 [ 2726 [
2727 have_ecore_imf_scim="yes" 2727 have_ecore_imf_scim="yes"
2728 AC_DEFINE([BUILD_ECORE_IMF_SCIM], [1], [Ecore Imf SCIM Support]) 2728 AC_DEFINE([BUILD_ECORE_IMF_SCIM], [1], [Ecore Imf SCIM Support])
diff --git a/src/Makefile_Ecore_Imf.am b/src/Makefile_Ecore_Imf.am
index e410f00521..8bfe6cb848 100644
--- a/src/Makefile_Ecore_Imf.am
+++ b/src/Makefile_Ecore_Imf.am
@@ -49,11 +49,18 @@ modules/ecore_imf/ibus/ibus_imcontext.c \
49modules/ecore_imf/ibus/ibus_imcontext.h 49modules/ecore_imf/ibus/ibus_imcontext.h
50modules_ecore_imf_ibus_module_la_CPPFLAGS = \ 50modules_ecore_imf_ibus_module_la_CPPFLAGS = \
51@ECORE_IMF_CFLAGS@ \ 51@ECORE_IMF_CFLAGS@ \
52@ECORE_EVAS_CFLAGS@ \
53@ECORE_X_CFLAGS@ \
52@IBUS_CFLAGS@ 54@IBUS_CFLAGS@
53modules_ecore_imf_ibus_module_la_LIBADD = \ 55modules_ecore_imf_ibus_module_la_LIBADD = \
54@USE_ECORE_IMF_LIBS@ \ 56@USE_ECORE_IMF_LIBS@ \
57@USE_ECORE_EVAS_LIBS@ \
58@USE_ECORE_X_LIBS@ \
55@IBUS_LIBS@ 59@IBUS_LIBS@
56modules_ecore_imf_ibus_module_la_DEPENDENCIES = @USE_ECORE_IMF_INTERNAL_LIBS@ 60modules_ecore_imf_ibus_module_la_DEPENDENCIES = \
61@USE_ECORE_IMF_INTERNAL_LIBS@ \
62@USE_ECORE_EVAS_INTERNAL_LIBS@ \
63@USE_ECORE_X_INTERNAL_LIBS@
57modules_ecore_imf_ibus_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 64modules_ecore_imf_ibus_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
58modules_ecore_imf_ibus_module_la_LIBTOOLFLAGS = --tag=disable-static 65modules_ecore_imf_ibus_module_la_LIBTOOLFLAGS = --tag=disable-static
59endif 66endif
@@ -69,11 +76,18 @@ modules/ecore_imf/scim/scim_imcontext.cpp \
69modules/ecore_imf/scim/scim_imcontext.h 76modules/ecore_imf/scim/scim_imcontext.h
70modules_ecore_imf_scim_module_la_CPPFLAGS = \ 77modules_ecore_imf_scim_module_la_CPPFLAGS = \
71@ECORE_IMF_CFLAGS@ \ 78@ECORE_IMF_CFLAGS@ \
79@ECORE_EVAS_CFLAGS@ \
80@ECORE_X_CFLAGS@ \
72@SCIM_CFLAGS@ 81@SCIM_CFLAGS@
73modules_ecore_imf_scim_module_la_LIBADD = \ 82modules_ecore_imf_scim_module_la_LIBADD = \
74@USE_ECORE_IMF_LIBS@ \ 83@USE_ECORE_IMF_LIBS@ \
84@USE_ECORE_EVAS_LIBS@ \
85@USE_ECORE_X_LIBS@ \
75@SCIM_LIBS@ 86@SCIM_LIBS@
76modules_ecore_imf_scim_module_la_DEPENDENCIES = @USE_ECORE_IMF_INTERNAL_LIBS@ 87modules_ecore_imf_scim_module_la_DEPENDENCIES = \
88@USE_ECORE_IMF_INTERNAL_LIBS@ \
89@USE_ECORE_EVAS_INTERNAL_LIBS@ \
90@USE_ECORE_X_INTERNAL_LIBS@
77modules_ecore_imf_scim_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 91modules_ecore_imf_scim_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
78modules_ecore_imf_scim_module_la_LIBTOOLFLAGS = --tag=disable-static 92modules_ecore_imf_scim_module_la_LIBTOOLFLAGS = --tag=disable-static
79endif 93endif