forked from enlightenment/efl
elementary: support build without Ecore_IMF and/or without Ecore_Con.
SVN revision: 65449
This commit is contained in:
parent
9612934868
commit
0c63e7b2d4
|
@ -1,4 +1,4 @@
|
|||
=-------##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
|
||||
m4_define([v_maj], [0])
|
||||
m4_define([v_min], [8])
|
||||
|
@ -219,12 +219,38 @@ PKG_CHECK_MODULES([ELEMENTARY],
|
|||
ecore >= 1.0.999
|
||||
ecore-evas >= 1.0.999
|
||||
ecore-file >= 1.0.999
|
||||
ecore-imf >= 1.0.999
|
||||
ecore-con >= 1.0.999
|
||||
edje >= 1.0.999
|
||||
]
|
||||
)
|
||||
|
||||
requirement_elm="edje >= 1.0.0 ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 ${requirement_elm}"
|
||||
|
||||
PKG_CHECK_MODULES([ELEMENTARY_ECORE_IMF],
|
||||
[ecore-imf >= 1.0.999],
|
||||
[
|
||||
ELEMENTARY_ECORE_IMF_INC="#include <Ecore_IMF.h>"
|
||||
AC_DEFINE(HAVE_ELEMENTARY_ECORE_IMF, 1, [Have Ecore_IMF support])
|
||||
have_ecore_imf="yes"
|
||||
requirement_elm="ecore-imf >= 1.0.999 ${requirement_elm}"
|
||||
],
|
||||
[have_ecore_imf="no"])
|
||||
AC_SUBST(ELEMENTARY_ECORE_IMF_INC)
|
||||
|
||||
AM_CONDITIONAL([HAVE_ECORE_IMF], [test "x${have_ecore_imf}" = "xyes"])
|
||||
|
||||
PKG_CHECK_MODULES([ELEMENTARY_ECORE_CON],
|
||||
[ecore-con >= 1.0.999],
|
||||
[
|
||||
ELEMENTARY_ECORE_CON_INC="#include <Ecore_Con.h>"
|
||||
AC_DEFINE(HAVE_ELEMENTARY_ECORE_CON, 1, [Have Ecore_Con support])
|
||||
have_ecore_con="yes"
|
||||
requirement_elm="ecore-con >= 1.0.999 ${requirement_elm}"
|
||||
],
|
||||
[have_ecore_con="no"])
|
||||
AC_SUBST(ELEMENTARY_ECORE_CON_INC)
|
||||
|
||||
AM_CONDITIONAL([HAVE_ECORE_CON], [test "x${have_ecore_con}" = "xyes"])
|
||||
|
||||
PKG_CHECK_MODULES([EIO],
|
||||
[eio],
|
||||
[
|
||||
|
@ -255,8 +281,6 @@ fi
|
|||
|
||||
AM_CONDITIONAL([HAVE_EMOTION], [test "x${have_emotion}" = "xyes"])
|
||||
|
||||
requirement_elm="edje >= 1.0.0 ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.4.0 eina >= 1.0.0 ${requirement_elm}"
|
||||
|
||||
have_elementary_x="no"
|
||||
want_elementary_x="auto"
|
||||
AC_ARG_ENABLE([ecore-x],
|
||||
|
@ -718,6 +742,8 @@ echo " Windows XP.............: ${have_elementary_win32}"
|
|||
echo " Windows CE.............: ${have_elementary_wince}"
|
||||
echo
|
||||
echo " Features:"
|
||||
echo " Ecore_IMF..............: ${have_ecore_imf}"
|
||||
echo " Ecore_Con..............: ${have_ecore_con}"
|
||||
echo " EDBus..................: ${have_elementary_edbus}"
|
||||
echo " EFreet.................: ${have_elementary_efreet}"
|
||||
echo " EWeather...............: ${have_elementary_eweather}"
|
||||
|
|
|
@ -370,8 +370,8 @@ contact with the developers and maintainers.
|
|||
#include <Ecore.h>
|
||||
#include <Ecore_Evas.h>
|
||||
#include <Ecore_File.h>
|
||||
#include <Ecore_IMF.h>
|
||||
#include <Ecore_Con.h>
|
||||
@ELEMENTARY_ECORE_IMF_INC@
|
||||
@ELEMENTARY_ECORE_CON_INC@
|
||||
#include <Edje.h>
|
||||
|
||||
#ifdef ELM_EDBUS
|
||||
|
|
|
@ -23,6 +23,8 @@ AM_CPPFLAGS = \
|
|||
@ELEMENTARY_ETHUMB_CFLAGS@ \
|
||||
@ELEMENTARY_WEB_CFLAGS@ \
|
||||
@ELEMENTARY_EMAP_CFLAGS@ \
|
||||
@ELEMENTARY_ECORE_CON_CFLAGS@ \
|
||||
@ELEMENTARY_ECORE_IMF_CFLAGS@ \
|
||||
@EVIL_CFLAGS@ \
|
||||
@EIO_CFLAGS@ \
|
||||
@EMOTION_CFLAGS@
|
||||
|
@ -146,6 +148,8 @@ libelementary_la_LIBADD = \
|
|||
@ELEMENTARY_ETHUMB_LIBS@ \
|
||||
@ELEMENTARY_WEB_LIBS@ \
|
||||
@ELEMENTARY_EMAP_LIBS@ \
|
||||
@ELEMENTARY_ECORE_IMF_LIBS@ \
|
||||
@ELEMENTARY_ECORE_CON_LIBS@ \
|
||||
@EVIL_LIBS@ \
|
||||
@EIO_LIBS@ \
|
||||
@EMOTION_LIBS@
|
||||
|
|
|
@ -425,9 +425,13 @@ elm_quicklaunch_sub_init(int argc,
|
|||
_elm_module_init();
|
||||
_elm_config_sub_init();
|
||||
ecore_evas_init(); // FIXME: check errors
|
||||
#ifdef HAVE_ELEMENTARY_ECORE_IMF
|
||||
ecore_imf_init();
|
||||
#endif
|
||||
#ifdef HAVE_ELEMENTARY_ECORE_CON
|
||||
ecore_con_init();
|
||||
ecore_con_url_init();
|
||||
#endif
|
||||
_elm_ews_wm_init();
|
||||
}
|
||||
return _elm_sub_init_count;
|
||||
|
@ -449,9 +453,13 @@ elm_quicklaunch_sub_shutdown(void)
|
|||
_elm_win_shutdown();
|
||||
_elm_module_shutdown();
|
||||
_elm_ews_wm_shutdown();
|
||||
#ifdef HAVE_ELEMENTARY_ECORE_CON
|
||||
ecore_con_url_shutdown();
|
||||
ecore_con_shutdown();
|
||||
#endif
|
||||
#ifdef HAVE_ELEMENTARY_ECORE_IMF
|
||||
ecore_imf_shutdown();
|
||||
#endif
|
||||
ecore_evas_shutdown();
|
||||
_elm_config_sub_shutdown();
|
||||
#define ENGINE_COMPARE(name) (!strcmp(_elm_config->engine, name))
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue