forked from enlightenment/enlightenment
Allow illume and illume2 to both be built, but DO NOT allow them both
to be loaded @ the same time (causes bad things to happen). This is for Lutin ;) so that users can have some time to transition their setups to Illume2. SVN revision: 51908
This commit is contained in:
parent
265586f299
commit
a016c69719
|
@ -594,7 +594,7 @@ AC_E_OPTIONAL_MODULE([mixer], true, [CHECK_MODULE_MIXER])
|
||||||
AC_E_OPTIONAL_MODULE([connman], true, [CHECK_MODULE_CONNMAN])
|
AC_E_OPTIONAL_MODULE([connman], true, [CHECK_MODULE_CONNMAN])
|
||||||
AC_E_OPTIONAL_MODULE([bluez], true, [CHECK_MODULE_BLUEZ])
|
AC_E_OPTIONAL_MODULE([bluez], true, [CHECK_MODULE_BLUEZ])
|
||||||
AC_E_OPTIONAL_MODULE([ofono], true, [CHECK_MODULE_OFONO])
|
AC_E_OPTIONAL_MODULE([ofono], true, [CHECK_MODULE_OFONO])
|
||||||
AC_E_OPTIONAL_MODULE([illume], false)
|
AC_E_OPTIONAL_MODULE([illume], true)
|
||||||
AC_E_OPTIONAL_MODULE([illume2], true)
|
AC_E_OPTIONAL_MODULE([illume2], true)
|
||||||
AC_E_OPTIONAL_MODULE([syscon], true)
|
AC_E_OPTIONAL_MODULE([syscon], true)
|
||||||
AC_E_OPTIONAL_MODULE([everything], true)
|
AC_E_OPTIONAL_MODULE([everything], true)
|
||||||
|
@ -609,10 +609,6 @@ AC_E_OPTIONAL_MODULE([comp], true)
|
||||||
|
|
||||||
AC_E_CHECK_PKG(ENOTIFY, [edbus >= 1.0.0 enotify >= 1.0.0], [], [])
|
AC_E_CHECK_PKG(ENOTIFY, [edbus >= 1.0.0 enotify >= 1.0.0], [], [])
|
||||||
|
|
||||||
if test "x$USE_MODULE_ILLUME" = "xtrue" -a "x$USE_MODULE_ILLUME2" = "xtrue" ;then
|
|
||||||
AC_MSG_ERROR([illume and illume2 cannot be built together])
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_OUTPUT([
|
AC_OUTPUT([
|
||||||
Makefile
|
Makefile
|
||||||
enlightenment.spec
|
enlightenment.spec
|
||||||
|
|
|
@ -34,6 +34,10 @@ EAPI E_Module_Api e_modapi =
|
||||||
EAPI void *
|
EAPI void *
|
||||||
e_modapi_init(E_Module *m)
|
e_modapi_init(E_Module *m)
|
||||||
{
|
{
|
||||||
|
/* check if illume2 is loaded and bail out if it is.
|
||||||
|
* Illume1 and illume2 both cannot be loaded @ the same time */
|
||||||
|
if (e_module_find("illume2")) return NULL;
|
||||||
|
|
||||||
/* set up the virtual keyboard */
|
/* set up the virtual keyboard */
|
||||||
e_cfg_init(m);
|
e_cfg_init(m);
|
||||||
e_kbd_init(m);
|
e_kbd_init(m);
|
||||||
|
|
|
@ -26,6 +26,10 @@ e_modapi_init(E_Module *m)
|
||||||
Ecore_X_Window *zones;
|
Ecore_X_Window *zones;
|
||||||
int zcount = 0;
|
int zcount = 0;
|
||||||
|
|
||||||
|
/* check if illume is loaded and bail out if it is.
|
||||||
|
* Illume1 and illume2 both cannot be loaded @ the same time */
|
||||||
|
if (e_module_find("illume")) return NULL;
|
||||||
|
|
||||||
/* set module priority so we load first */
|
/* set module priority so we load first */
|
||||||
e_module_priority_set(m, 100);
|
e_module_priority_set(m, 100);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue