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

E17: Fix hard-coded dependency of enotify 

enotify is not a hard-dep of e17. The only thing currently using it
correctly is illume-indicator, and that's optionally supported at
compile time of illume-indicator.



SVN revision: 58496
This commit is contained in:
Christopher Michael 2011-04-08 21:03:36 +00:00
parent 164c813350
commit 1a9dccff8e
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
configure.ac
View File

@ -560,6 +560,31 @@ define([CHECK_MODULE_CONF_THEME],
fi
])
have_enotify=no
AM_CONDITIONAL([HAVE_ENOTIFY], [false])
AC_ARG_ENABLE([enotify],
AC_HELP_STRING([--disable-enotify], [disable Enotify support @<:@default=detect@:>@]),
[e_cv_want_enotify=$enableval],
AC_CACHE_VAL([e_cv_want_enotify], [e_cv_want_enotify=yes])
)
if test "x$e_cv_want_enotify" != "xno" ; then
AC_E_CHECK_PKG(ENOTIFY, [edbus >= 1.0.0 enotify >= 1.0.0],
[
AC_DEFINE_UNQUOTED([HAVE_ENOTIFY], [1], [enable enotify])
],
[
AC_MSG_NOTICE([enotify disabled])
e_cv_want_enotify=no
])
else
AC_MSG_NOTICE([enotify disabled])
e_cv_want_enotify=no
fi
AC_SUBST([ENOTIFY_CFLAGS])
AC_SUBST([ENOTIFY_LIBS])
AM_CONDITIONAL(HAVE_ALSA, false)
define([CHECK_MODULE_MIXER],
[
@ -612,6 +637,7 @@ define([CHECK_MODULE_OFONO],
AC_SUBST(EOFONO_CFLAGS)
AC_SUBST(EOFONO_LIBS)
AC_E_OPTIONAL_MODULE([ibar], true)
AC_E_OPTIONAL_MODULE([dropshadow], true)
AC_E_OPTIONAL_MODULE([clock], true)
@ -680,8 +706,6 @@ AC_E_OPTIONAL_MODULE([everything-windows], true)
AC_E_OPTIONAL_MODULE([systray], true)
AC_E_OPTIONAL_MODULE([comp], true)
AC_E_CHECK_PKG(ENOTIFY, [edbus >= 1.0.0 enotify >= 1.0.0], [], [])
SUSPEND=""
HIBERNATE=""
case "$host_os" in