forked from enlightenment/enlightenment
remove library checks for a number of modules along with useless defines
most of these date back from before efl was a unified tree or enlightenment itself could be optionally built with things like dbus support
This commit is contained in:
parent
e9751f4d57
commit
40ebdb60d4
115
configure.ac
115
configure.ac
|
@ -587,19 +587,13 @@ EFL_WITH_BIN([eldbus], [eldbus_codegen], [eldbus-codegen])
|
|||
|
||||
AC_DEFINE(E_INTERNAL, 1, "This define can be used to wrap internal E stuff, as config.h isn't exported")
|
||||
|
||||
AM_CONDITIONAL(HAVE_BATTERY, false)
|
||||
define([CHECK_MODULE_BATTERY],
|
||||
[
|
||||
AC_E_CHECK_PKG(BATTERY, [ ecore >= $efl_version ecore-file >= $efl_version ecore-con >= $efl_version eina >= $efl_version ], [], [BATTERY=false])
|
||||
])
|
||||
|
||||
have_openbsd="no"
|
||||
have_freebsd="no"
|
||||
BATTERY_LDFLAGS=
|
||||
case "$host_os" in
|
||||
darwin*)
|
||||
BATTERY_LDFLAGS="${cf_libs}"
|
||||
BATTERY_CFLAGS="${BATTERY_CFLAGS} ${cf_cflags}"
|
||||
BATTERY_CFLAGS="${cf_cflags}"
|
||||
;;
|
||||
openbsd*)
|
||||
have_openbsd="yes"
|
||||
|
@ -609,22 +603,11 @@ case "$host_os" in
|
|||
;;
|
||||
esac
|
||||
|
||||
AC_SUBST([BATTERY_CFLAGS])
|
||||
AC_SUBST([BATTERY_LDFLAGS])
|
||||
AM_CONDITIONAL([HAVE_OPENBSD], [test "x${have_openbsd}" = "xyes"])
|
||||
AM_CONDITIONAL([HAVE_FREEBSD], [test "x${have_freebsd}" = "xyes"])
|
||||
|
||||
AM_CONDITIONAL(HAVE_TEMPERATURE, false)
|
||||
define([CHECK_MODULE_TEMPERATURE],
|
||||
[
|
||||
AC_E_CHECK_PKG(TEMPERATURE, [ ecore >= $efl_version ecore-file >= $efl_version eina >= $efl_version ], [], [TEMPERATURE=false])
|
||||
])
|
||||
|
||||
AM_CONDITIONAL(HAVE_MUSIC_CONTROL, false)
|
||||
define([CHECK_MODULE_MUSIC_CONTROL],
|
||||
[
|
||||
AC_E_CHECK_PKG(MUSIC_CONTROL, [ ecore >= $efl_version eina >= $efl_version eldbus ], [], [MUSIC_CONTROL=false])
|
||||
])
|
||||
|
||||
##have_exchange=no
|
||||
##AC_ARG_ENABLE(exchange,
|
||||
## AS_HELP_STRING([--disable-exchange], [disable Exchange support @<:@default=detect@:>@]),
|
||||
|
@ -643,38 +626,6 @@ AM_CONDITIONAL(HAVE_EXCHANGE, false)
|
|||
##])
|
||||
|
||||
|
||||
have_enotify=no
|
||||
AM_CONDITIONAL([HAVE_ENOTIFY], [false])
|
||||
AC_ARG_ENABLE([enotify],
|
||||
AS_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, [ eldbus >= $efl_version ],
|
||||
[
|
||||
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_NOTIFICATION, false)
|
||||
define([CHECK_MODULE_NOTIFICATION],
|
||||
[
|
||||
if test "x$e_cv_want_enotify" = "xno" ; then
|
||||
NOTIFICATION=false
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
AM_CONDITIONAL(HAVE_ALSA, false)
|
||||
AM_CONDITIONAL(HAVE_PULSE, false)
|
||||
define([CHECK_MODULE_MIXER],
|
||||
|
@ -714,25 +665,6 @@ AC_SUBST(SHM_OPEN_LIBS)
|
|||
AC_SUBST([SOUND_CFLAGS])
|
||||
AC_SUBST([SOUND_LIBS])
|
||||
|
||||
AM_CONDITIONAL(HAVE_ECONNMAN, false)
|
||||
AM_CONDITIONAL(HAVE_DUMMY, false)
|
||||
define([CHECK_MODULE_CONNMAN],
|
||||
[
|
||||
AC_E_CHECK_PKG(ECONNMAN, [ eldbus >= $efl_version ], [], [CONNMAN=false])
|
||||
dnl AC_E_CHECK_PKG(DUMMY, [ connman >= 1.0 ], [], [CONNMAN=false])
|
||||
])
|
||||
AC_SUBST([ECONNMAN_CFLAGS])
|
||||
AC_SUBST([ECONNMAN_LIBS])
|
||||
|
||||
AM_CONDITIONAL(HAVE_BLUEZ4, false)
|
||||
AM_CONDITIONAL(HAVE_DUMMY, false)
|
||||
define([CHECK_MODULE_BLUEZ4],
|
||||
[
|
||||
AC_E_CHECK_PKG(BLUEZ4, [ eldbus ],)
|
||||
])
|
||||
AC_SUBST([EBLUEZ4_CFLAGS])
|
||||
AC_SUBST([EBLUEZ4_LIBS])
|
||||
|
||||
have_wayland_egl=no
|
||||
AC_ARG_ENABLE([wayland-egl],
|
||||
AS_HELP_STRING([--enable-wayland-egl],[enable wayland to render using EGL @<:@default=disabled@:>@]),
|
||||
|
@ -745,6 +677,7 @@ if test "x${e_cv_want_wayland_only}" != "xno" ;then
|
|||
PKG_CHECK_MODULES([WAYLAND], [ecore-wl2 wayland-server >= 1.10.0 wayland-client >= 1.10.0 xkbcommon uuid],
|
||||
[
|
||||
have_wayland=yes
|
||||
have_wayland_dep=true
|
||||
AC_DEFINE_UNQUOTED([HAVE_WAYLAND],[1],[enable wayland support])
|
||||
])
|
||||
else
|
||||
|
@ -782,7 +715,7 @@ WL_X11=false
|
|||
define([CHECK_MODULE_WL_X11],
|
||||
[
|
||||
if test "x${have_wayland}" = "xyes"; then
|
||||
AC_E_CHECK_PKG(WL_X11, [ ecore >= ${efl_version} ecore-x >= ${efl_version} ecore-evas >= ${efl_version} ], [WL_X11=true], [WL_X11=false])
|
||||
AC_E_CHECK_PKG(WL_X11, [ ecore-x >= ${efl_version} ], [WL_X11=true], [WL_X11=false])
|
||||
else
|
||||
WL_X11=false
|
||||
fi
|
||||
|
@ -804,7 +737,7 @@ WL_DESKTOP_SHELL=false
|
|||
define([CHECK_MODULE_WL_DESKTOP_SHELL],
|
||||
[
|
||||
if test "x${have_wayland}" = "xyes"; then
|
||||
AC_E_CHECK_PKG(WL_DESKTOP_SHELL, [ ecore >= $efl_version eina >= $efl_version ], [WL_DESKTOP_SHELL=true], [WL_DESKTOP_SHELL=false])
|
||||
WL_DESKTOP_SHELL=true
|
||||
else
|
||||
WL_DESKTOP_SHELL=false
|
||||
fi
|
||||
|
@ -815,7 +748,7 @@ WL_FB=false
|
|||
define([CHECK_MODULE_WL_FB],
|
||||
[
|
||||
if test "x${have_wayland}" = "xyes"; then
|
||||
AC_E_CHECK_PKG(WL_FB, [ ecore-fb >= $efl_version ecore >= $efl_version eina >= $efl_version ], [WL_FB=true], [WL_FB=false])
|
||||
AC_E_CHECK_PKG(WL_FB, [ ecore-fb >= $efl_version ], [WL_FB=true], [WL_FB=false])
|
||||
else
|
||||
WL_FB=false
|
||||
fi
|
||||
|
@ -826,7 +759,7 @@ WL_DRM=false
|
|||
define([CHECK_MODULE_WL_DRM],
|
||||
[
|
||||
if test "x${have_wayland}" = "xyes" ; then
|
||||
AC_E_CHECK_PKG(WL_DRM, [ ecore-drm >= $efl_version ecore >= $efl_version eina >= $efl_version ], [WL_DRM=true], [WL_DRM=false])
|
||||
AC_E_CHECK_PKG(WL_DRM, [ ecore-drm >= $efl_version ], [WL_DRM=true], [WL_DRM=false])
|
||||
else
|
||||
WL_DRM=false
|
||||
fi
|
||||
|
@ -837,7 +770,7 @@ HAVE_XWAYLAND_DEPS=false
|
|||
define([CHECK_MODULE_XWAYLAND],
|
||||
[
|
||||
if test "x${have_wayland}" = "xyes"; then
|
||||
AC_E_CHECK_PKG(XWAYLAND, [ ecore >= ${efl_version} ecore-x >= ${efl_version} ecore-audio >= ${efl_version} ], [HAVE_XWAYLAND_DEPS=true], [HAVE_XWAYLAND_DEPS=false])
|
||||
AC_E_CHECK_PKG(XWAYLAND, [ ecore-x >= ${efl_version} ecore-audio >= ${efl_version} ], [HAVE_XWAYLAND_DEPS=true], [HAVE_XWAYLAND_DEPS=false])
|
||||
AC_PATH_PROG([XWAYLAND_BIN], [Xwayland], [false])
|
||||
else
|
||||
HAVE_XWAYLAND_DEPS=false
|
||||
|
@ -848,7 +781,7 @@ AM_CONDITIONAL([HAVE_XWAYLAND], [test "x${HAVE_XWAYLAND}" != "xno"])
|
|||
define([CHECK_MODULE_WL_TEXT_INPUT],
|
||||
[
|
||||
if test "x${have_wayland}" = "xyes"; then
|
||||
AC_E_CHECK_PKG(WL_TEXT_INPUT, [ ecore >= $efl_version eina >= $efl_version ], [WL_TEXT_INPUT=true], [WL_TEXT_INPUT=false])
|
||||
WL_TEXT_INPUT=true
|
||||
else
|
||||
WL_TEXT_INPUT=false
|
||||
fi
|
||||
|
@ -859,7 +792,7 @@ WL_WEEKEYBOARD=false
|
|||
define([CHECK_MODULE_WL_WEEKEYBOARD],
|
||||
[
|
||||
if test "x${have_wayland}" = "xyes" ; then
|
||||
AC_E_CHECK_PKG(WL_WEEKEYBOARD, [ eina >= 1.8.0 evas >= 1.8.0 ecore >= 1.8.0 ecore-evas >= 1.8.0 ecore-wl2 >= 1.8.0 edje >= 1.8.0 ], [WL_WEEKEYBOARD=true], [WL_WEEKEYBOARD=false])
|
||||
WL_WEEKEYBOARD=true
|
||||
else
|
||||
WL_WEEKEYBOARD=false
|
||||
fi
|
||||
|
@ -870,9 +803,9 @@ AC_E_OPTIONAL_MODULE([ibar], true)
|
|||
AC_E_OPTIONAL_MODULE([clock], true)
|
||||
AC_E_OPTIONAL_MODULE([pager], true)
|
||||
AC_E_OPTIONAL_MODULE([pager_plain], true)
|
||||
AC_E_OPTIONAL_MODULE([battery], true, [CHECK_MODULE_BATTERY])
|
||||
AC_E_OPTIONAL_MODULE([temperature], true, [CHECK_MODULE_TEMPERATURE])
|
||||
AC_E_OPTIONAL_MODULE([notification], true, [CHECK_MODULE_NOTIFICATION])
|
||||
AC_E_OPTIONAL_MODULE([battery], true)
|
||||
AC_E_OPTIONAL_MODULE([temperature], true)
|
||||
AC_E_OPTIONAL_MODULE([notification], true)
|
||||
AC_E_OPTIONAL_MODULE([cpufreq], true)
|
||||
AC_E_OPTIONAL_MODULE([ibox], true)
|
||||
AC_E_OPTIONAL_MODULE([start], true)
|
||||
|
@ -897,8 +830,8 @@ AC_E_OPTIONAL_MODULE([conf_paths], true)
|
|||
AC_E_OPTIONAL_MODULE([conf_interaction], true)
|
||||
AC_E_OPTIONAL_MODULE([gadman], true)
|
||||
AC_E_OPTIONAL_MODULE([mixer], true, [CHECK_MODULE_MIXER])
|
||||
AC_E_OPTIONAL_MODULE([connman], true, [CHECK_MODULE_CONNMAN])
|
||||
AC_E_OPTIONAL_MODULE([bluez4], true, [CHECK_MODULE_BLUEZ4])
|
||||
AC_E_OPTIONAL_MODULE([connman], true)
|
||||
AC_E_OPTIONAL_MODULE([bluez4], true)
|
||||
AC_E_OPTIONAL_MODULE([syscon], true)
|
||||
AC_E_OPTIONAL_MODULE([everything], true)
|
||||
AC_E_OPTIONAL_MODULE([systray], true)
|
||||
|
@ -912,18 +845,18 @@ AC_E_OPTIONAL_MODULE([tasks], true)
|
|||
AC_E_OPTIONAL_MODULE([conf_randr], true)
|
||||
AC_E_OPTIONAL_MODULE([xkbswitch], true, $ecore_x)
|
||||
AC_E_OPTIONAL_MODULE([tiling], true)
|
||||
AC_E_OPTIONAL_MODULE([music_control], true, [CHECK_MODULE_MUSIC_CONTROL])
|
||||
AC_E_OPTIONAL_MODULE([music_control], true)
|
||||
AC_E_OPTIONAL_MODULE([packagekit], true)
|
||||
AC_E_OPTIONAL_MODULE([wl_desktop_shell], $have_wayland, [CHECK_MODULE_WL_DESKTOP_SHELL])
|
||||
AC_E_OPTIONAL_MODULE([wl_x11], $have_wayland, [CHECK_MODULE_WL_X11])
|
||||
AC_E_OPTIONAL_MODULE([wl_wl], $have_wayland, [CHECK_MODULE_WL_WL])
|
||||
#AC_E_OPTIONAL_MODULE([wl_fb], $have_wayland, [CHECK_MODULE_WL_FB])
|
||||
AC_E_OPTIONAL_MODULE([wl_drm], $have_wayland, [CHECK_MODULE_WL_DRM])
|
||||
AC_E_OPTIONAL_MODULE([wl_text_input], $have_wayland, [CHECK_MODULE_WL_TEXT_INPUT])
|
||||
AC_E_OPTIONAL_MODULE([wl_weekeyboard], $have_wayland, [CHECK_MODULE_WL_WEEKEYBOARD])
|
||||
AC_E_OPTIONAL_MODULE([wl_desktop_shell], $have_wayland_dep)
|
||||
AC_E_OPTIONAL_MODULE([wl_x11], $have_wayland_dep, [CHECK_MODULE_WL_X11])
|
||||
AC_E_OPTIONAL_MODULE([wl_wl], $have_wayland_dep)
|
||||
#AC_E_OPTIONAL_MODULE([wl_fb], $have_wayland_dep, [CHECK_MODULE_WL_FB])
|
||||
AC_E_OPTIONAL_MODULE([wl_drm], $have_wayland_dep, [CHECK_MODULE_WL_DRM])
|
||||
AC_E_OPTIONAL_MODULE([wl_text_input], $have_wayland_dep)
|
||||
AC_E_OPTIONAL_MODULE([wl_weekeyboard], $have_wayland_dep)
|
||||
AC_E_OPTIONAL_MODULE([policy_mobile], true)
|
||||
AC_E_OPTIONAL_MODULE([geolocation], true)
|
||||
AC_E_OPTIONAL_MODULE([xwayland], $have_wayland, [CHECK_MODULE_XWAYLAND])
|
||||
AC_E_OPTIONAL_MODULE([xwayland], $have_wayland_dep, [CHECK_MODULE_XWAYLAND])
|
||||
AC_E_OPTIONAL_MODULE([wireless], true)
|
||||
AC_E_OPTIONAL_MODULE([time], true)
|
||||
|
||||
|
|
|
@ -27,17 +27,12 @@ endif
|
|||
src_modules_battery_module_la_LIBADD = $(MOD_LIBS)
|
||||
src_modules_battery_module_la_LDFLAGS = $(MOD_LDFLAGS)
|
||||
|
||||
if HAVE_ENOTIFY
|
||||
src_modules_battery_module_la_CPPFLAGS += @ENOTIFY_CFLAGS@
|
||||
src_modules_battery_module_la_LIBADD += @ENOTIFY_LIBS@
|
||||
endif
|
||||
|
||||
src_modules_battery_batgetdir = $(batterypkgdir)
|
||||
src_modules_battery_batget_PROGRAMS = src/modules/battery/batget
|
||||
|
||||
src_modules_battery_batget_CPPFLAGS = $(MOD_CPPFLAGS) @BATTERY_CFLAGS@
|
||||
src_modules_battery_batget_LDADD = $(MOD_LIBS)
|
||||
src_modules_battery_batget_SOURCES = src/modules/battery/batget.c
|
||||
src_modules_battery_batget_LDADD = @BATTERY_LIBS@
|
||||
src_modules_battery_batget_LDFLAGS = @BATTERY_LDFLAGS@
|
||||
|
||||
PHONIES += battery install-battery
|
||||
|
|
|
@ -18,7 +18,7 @@ src_modules_bluez4_module_la_SOURCES = src/modules/bluez4/e_mod_main.h \
|
|||
src/modules/bluez4/agent.c
|
||||
|
||||
src_modules_bluez4_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -Wno-unused-parameter
|
||||
src_modules_bluez4_module_la_LIBADD = $(MOD_LIBS) @BLUEZ4_LIBS@
|
||||
src_modules_bluez4_module_la_LIBADD = $(MOD_LIBS)
|
||||
|
||||
PHONIES += bluez4 install-bluez4
|
||||
bluez4: $(bluez4pkg_LTLIBRARIES) $(bluez4_DATA)
|
||||
|
|
|
@ -18,7 +18,7 @@ src_modules_connman_module_la_SOURCES = src/modules/connman/e_mod_main.h \
|
|||
src/modules/connman/E_Connman.h
|
||||
|
||||
src_modules_connman_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -Wno-unused-parameter
|
||||
src_modules_connman_module_la_LIBADD = $(MOD_LIBS) @ECONNMAN_LIBS@
|
||||
src_modules_connman_module_la_LIBADD = $(MOD_LIBS)
|
||||
|
||||
PHONIES += connman install-connman
|
||||
connman: $(connmanpkg_LTLIBRARIES) $(connman_DATA)
|
||||
|
|
|
@ -26,7 +26,7 @@ music_controlpkg_LTLIBRARIES = src/modules/music-control/module.la
|
|||
|
||||
src_modules_music_control_module_la_DEPENDENCIES = $(MDEPENDENCIES)
|
||||
src_modules_music_control_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -Wno-unused-parameter
|
||||
src_modules_music_control_module_la_LIBADD = @MUSIC_CONTROL_LIBS@ $(MOD_LIBS)
|
||||
src_modules_music_control_module_la_LIBADD = $(MOD_LIBS)
|
||||
src_modules_music_control_module_la_LDFLAGS = $(MOD_LDFLAGS)
|
||||
src_modules_music_control_module_la_SOURCES = \
|
||||
src/modules/music-control/e_mod_main.h \
|
||||
|
|
|
@ -16,7 +16,7 @@ src_modules_notification_module_la_SOURCES = src/modules/notification/e_mod_main
|
|||
src/modules/notification/e_mod_config.c \
|
||||
src/modules/notification/e_mod_popup.c
|
||||
|
||||
src_modules_notification_module_la_LIBADD = $(MOD_LIBS) @ENOTIFY_LIBS@
|
||||
src_modules_notification_module_la_LIBADD = $(MOD_LIBS)
|
||||
|
||||
PHONIES += notification install-notification
|
||||
notification: $(notificationpkg_LTLIBRARIES) $(notification_DATA)
|
||||
|
|
|
@ -26,8 +26,8 @@ src_modules_temperature_tempgetdir = $(temperaturepkgdir)
|
|||
src_modules_temperature_tempget_PROGRAMS = src/modules/temperature/tempget
|
||||
|
||||
src_modules_temperature_tempget_CPPFLAGS = $(MOD_CPPFLAGS)
|
||||
src_modules_temperature_tempget_LDADD = $(MOD_LIBS)
|
||||
src_modules_temperature_tempget_SOURCES = src/modules/temperature/tempget.c
|
||||
src_modules_temperature_tempget_LDADD = @TEMPERATURE_LIBS@
|
||||
|
||||
PHONIES += temperature install-temperature
|
||||
temperature: $(temperaturepkg_LTLIBRARIES) $(temperature_DATA) $(src_modules_temperature_tempget_PROGRAMS)
|
||||
|
|
|
@ -113,9 +113,6 @@ src_modules_wizard_page_110_la_LIBADD = $(MOD_LIBS)
|
|||
src_modules_wizard_page_110_la_CPPFLAGS = $(MOD_CPPFLAGS)
|
||||
src_modules_wizard_page_110_la_LDFLAGS = $(MOD_LDFLAGS)
|
||||
src_modules_wizard_page_110_la_SOURCES = src/modules/wizard/page_110.c
|
||||
if USE_MODULE_CONNMAN
|
||||
src_modules_wizard_page_110_la_LIBADD += @ECONNMAN_LIBS@
|
||||
endif
|
||||
|
||||
src_modules_wizard_page_120_la_LIBADD = $(MOD_LIBS)
|
||||
src_modules_wizard_page_120_la_CPPFLAGS = $(MOD_CPPFLAGS)
|
||||
|
|
|
@ -14,8 +14,8 @@ wl_desktop_shellpkgdir = $(MDIR)/wl_desktop_shell/$(MODULE_ARCH)
|
|||
wl_desktop_shellpkg_LTLIBRARIES = src/modules/wl_desktop_shell/module.la
|
||||
|
||||
src_modules_wl_desktop_shell_module_la_DEPENDENCIES = $(MDEPENDENCIES)
|
||||
src_modules_wl_desktop_shell_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @WL_DESKTOP_SHELL_CFLAGS@ @WAYLAND_CFLAGS@
|
||||
src_modules_wl_desktop_shell_module_la_LIBADD = $(LIBS) @WL_DESKTOP_SHELL_LIBS@ @WAYLAND_LIBS@
|
||||
src_modules_wl_desktop_shell_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @WAYLAND_CFLAGS@
|
||||
src_modules_wl_desktop_shell_module_la_LIBADD = $(MOD_LIBS) @WAYLAND_LIBS@
|
||||
src_modules_wl_desktop_shell_module_la_LDFLAGS = $(MOD_LDFLAGS)
|
||||
|
||||
src_modules_wl_desktop_shell_module_la_SOURCES = \
|
||||
|
|
|
@ -6,7 +6,7 @@ wl_drmpkg_LTLIBRARIES = src/modules/wl_drm/module.la
|
|||
|
||||
src_modules_wl_drm_module_la_DEPENDENCIES = $(MDEPENDENCIES)
|
||||
src_modules_wl_drm_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @WL_DRM_CFLAGS@ @WAYLAND_CFLAGS@
|
||||
src_modules_wl_drm_module_la_LIBADD = $(LIBS) @WL_DRM_LIBS@ @WAYLAND_LIBS@
|
||||
src_modules_wl_drm_module_la_LIBADD = $(MOD_LIBS) @WL_DRM_LIBS@ @WAYLAND_LIBS@
|
||||
src_modules_wl_drm_module_la_LDFLAGS = $(MOD_LDFLAGS)
|
||||
src_modules_wl_drm_module_la_SOURCES = src/modules/wl_drm/e_mod_main.c
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ wl_fbpkg_LTLIBRARIES = src/modules/wl_fb/module.la
|
|||
|
||||
src_modules_wl_fb_module_la_DEPENDENCIES = $(MDEPENDENCIES)
|
||||
src_modules_wl_fb_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @WL_FB_CFLAGS@ @WAYLAND_CFLAGS@
|
||||
src_modules_wl_fb_module_la_LIBADD = $(LIBS) @WL_FB_LIBS@ @WAYLAND_LIBS@
|
||||
src_modules_wl_fb_module_la_LIBADD = $(MOD_LIBS) @WL_FB_LIBS@ @WAYLAND_LIBS@
|
||||
src_modules_wl_fb_module_la_LDFLAGS = $(MOD_LDFLAGS)
|
||||
src_modules_wl_fb_module_la_SOURCES = src/modules/wl_fb/e_mod_main.c
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ wl_text_inputpkg_LTLIBRARIES = src/modules/wl_text_input/module.la
|
|||
|
||||
src_modules_wl_text_input_module_la_DEPENDENCIES = $(MDEPENDENCIES)
|
||||
src_modules_wl_text_input_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @WAYLAND_CFLAGS@
|
||||
src_modules_wl_text_input_module_la_LIBADD = $(LIBS) @WAYLAND_LIBS@
|
||||
src_modules_wl_text_input_module_la_LIBADD = $(MOD_LIBS) @WAYLAND_LIBS@
|
||||
src_modules_wl_text_input_module_la_LDFLAGS = $(MOD_LDFLAGS)
|
||||
src_modules_wl_text_input_module_la_SOURCES = \
|
||||
src/modules/wl_text_input/e_mod_main.c \
|
||||
|
|
|
@ -16,10 +16,9 @@ wl_weekeyboardpkg_LTLIBRARIES = src/modules/wl_weekeyboard/module.la
|
|||
src_modules_wl_weekeyboard_module_la_DEPENDENCIES = $(MDEPENDENCIES)
|
||||
src_modules_wl_weekeyboard_module_la_CPPFLAGS = \
|
||||
$(MOD_CPPFLAGS) \
|
||||
@WL_WEEKEYBOARD_CFLAGS@ \
|
||||
@WAYLAND_CFLAGS@ \
|
||||
-DPKGDATADIR='"$pkgdatadir)"'
|
||||
src_modules_wl_weekeyboard_module_la_LIBADD = $(LIBS) @WL_WEEKEYBOARD_LIBS@ @WAYLAND_LIBS@
|
||||
src_modules_wl_weekeyboard_module_la_LIBADD = $(MOD_LIBS) @WAYLAND_LIBS@
|
||||
src_modules_wl_weekeyboard_module_la_LDFLAGS = $(MOD_LDFLAGS)
|
||||
src_modules_wl_weekeyboard_module_la_SOURCES = \
|
||||
src/modules/wl_weekeyboard/e_mod_main.c \
|
||||
|
|
|
@ -6,7 +6,7 @@ wl_wlpkg_LTLIBRARIES = src/modules/wl_wl/module.la
|
|||
|
||||
src_modules_wl_wl_module_la_DEPENDENCIES = $(MDEPENDENCIES)
|
||||
src_modules_wl_wl_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @WAYLAND_CFLAGS@
|
||||
src_modules_wl_wl_module_la_LIBADD = $(LIBS) @WAYLAND_LIBS@
|
||||
src_modules_wl_wl_module_la_LIBADD = $(MOD_LIBS) @WAYLAND_LIBS@
|
||||
src_modules_wl_wl_module_la_LDFLAGS = $(MOD_LDFLAGS)
|
||||
src_modules_wl_wl_module_la_SOURCES = \
|
||||
src/modules/wl_wl/e_mod_main.c
|
||||
|
|
|
@ -15,9 +15,7 @@ struct _E_Config_Dialog_Data
|
|||
int suspend_below;
|
||||
int suspend_method;
|
||||
int force_mode; // 0 == auto, 1 == batget, 2 == subsystem
|
||||
#ifdef HAVE_ENOTIFY
|
||||
int desktop_notifications;
|
||||
#endif
|
||||
struct
|
||||
{
|
||||
Evas_Object *show_alert_label;
|
||||
|
@ -82,9 +80,7 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
|||
#ifdef HAVE_EEZE
|
||||
cfdata->fuzzy = battery_config->fuzzy;
|
||||
#endif
|
||||
#ifdef HAVE_ENOTIFY
|
||||
cfdata->desktop_notifications = battery_config->desktop_notifications;
|
||||
#endif
|
||||
|
||||
if ((cfdata->alert_time > 0) || (cfdata->alert_percent > 0))
|
||||
cfdata->show_alert = 1;
|
||||
|
@ -134,11 +130,9 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
|
|||
ob = e_widget_check_add(evas, _("Show alert when battery is low"),
|
||||
&(cfdata->show_alert));
|
||||
e_widget_list_object_append(o, ob, 1, 0, 0.5);
|
||||
#ifdef HAVE_ENOTIFY
|
||||
ob = e_widget_check_add(evas, _("Use desktop notifications for alert"),
|
||||
&(cfdata->desktop_notifications));
|
||||
e_widget_list_object_append(o, ob, 1, 0, 0.5);
|
||||
#endif
|
||||
return o;
|
||||
}
|
||||
|
||||
|
@ -152,17 +146,13 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata
|
|||
_ensure_alert_time(cfdata);
|
||||
battery_config->alert = cfdata->alert_time;
|
||||
battery_config->alert_p = cfdata->alert_percent;
|
||||
#ifdef HAVE_ENOTIFY
|
||||
battery_config->desktop_notifications = cfdata->desktop_notifications;
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
battery_config->alert = 0;
|
||||
battery_config->alert_p = 0;
|
||||
#ifdef HAVE_ENOTIFY
|
||||
battery_config->desktop_notifications = EINA_FALSE;
|
||||
#endif
|
||||
}
|
||||
|
||||
_battery_config_updated();
|
||||
|
@ -178,9 +168,7 @@ _basic_check_changed(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfd
|
|||
(battery_config->alert_p > 0));
|
||||
|
||||
ret = (cfdata->show_alert != old_show_alert);
|
||||
#ifdef HAVE_ENOTIFY
|
||||
ret |= (cfdata->desktop_notifications != battery_config->desktop_notifications);
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -33,9 +33,7 @@ struct _Instance
|
|||
Evas_Object *o_battery;
|
||||
Evas_Object *popup_battery;
|
||||
E_Gadcon_Popup *warning;
|
||||
#ifdef HAVE_ENOTIFY
|
||||
unsigned int notification_id;
|
||||
#endif
|
||||
};
|
||||
|
||||
static void _battery_update(int full, int time_left, int time_full, Eina_Bool have_battery, Eina_Bool have_power);
|
||||
|
@ -427,7 +425,6 @@ _battery_warning_popup_destroy(Instance *inst)
|
|||
E_FREE_FUNC(inst->warning, e_object_del);
|
||||
}
|
||||
|
||||
#ifdef HAVE_ENOTIFY
|
||||
static void
|
||||
_battery_warning_popup_cb(void *data, unsigned int id)
|
||||
{
|
||||
|
@ -435,7 +432,6 @@ _battery_warning_popup_cb(void *data, unsigned int id)
|
|||
|
||||
inst->notification_id = id;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void
|
||||
_battery_warning_popup(Instance *inst, int t, double percent)
|
||||
|
@ -446,7 +442,6 @@ _battery_warning_popup(Instance *inst, int t, double percent)
|
|||
|
||||
if ((!inst) || (inst->warning)) return;
|
||||
|
||||
#ifdef HAVE_ENOTIFY
|
||||
if (battery_config->desktop_notifications)
|
||||
{
|
||||
E_Notification_Notify n;
|
||||
|
@ -460,7 +455,7 @@ _battery_warning_popup(Instance *inst, int t, double percent)
|
|||
e_notification_client_send(&n, _battery_warning_popup_cb, inst);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
inst->warning = e_gadcon_popup_new(inst->gcc, 0);
|
||||
if (!inst->warning) return;
|
||||
|
||||
|
@ -746,9 +741,7 @@ e_modapi_init(E_Module *m)
|
|||
#if defined HAVE_EEZE || defined __OpenBSD__
|
||||
E_CONFIG_VAL(D, T, fuzzy, INT);
|
||||
#endif
|
||||
#ifdef HAVE_ENOTIFY
|
||||
E_CONFIG_VAL(D, T, desktop_notifications, INT);
|
||||
#endif
|
||||
|
||||
battery_config = e_config_domain_load("module.battery", conf_edd);
|
||||
if (!battery_config)
|
||||
|
@ -763,9 +756,7 @@ e_modapi_init(E_Module *m)
|
|||
#if defined HAVE_EEZE || defined __OpenBSD__
|
||||
battery_config->fuzzy = 0;
|
||||
#endif
|
||||
#ifdef HAVE_ENOTIFY
|
||||
battery_config->desktop_notifications = 0;
|
||||
#endif
|
||||
}
|
||||
E_CONFIG_LIMIT(battery_config->poll_interval, 4, 4096);
|
||||
E_CONFIG_LIMIT(battery_config->alert, 0, 60);
|
||||
|
@ -773,9 +764,7 @@ e_modapi_init(E_Module *m)
|
|||
E_CONFIG_LIMIT(battery_config->alert_timeout, 0, 300);
|
||||
E_CONFIG_LIMIT(battery_config->suspend_below, 0, 50);
|
||||
E_CONFIG_LIMIT(battery_config->force_mode, 0, 2);
|
||||
#ifdef HAVE_ENOTIFY
|
||||
E_CONFIG_LIMIT(battery_config->desktop_notifications, 0, 1);
|
||||
#endif
|
||||
|
||||
battery_config->module = m;
|
||||
battery_config->full = -2;
|
||||
|
|
|
@ -48,9 +48,7 @@ struct _Config
|
|||
int time_full;
|
||||
int have_battery;
|
||||
int have_power;
|
||||
#ifdef HAVE_ENOTIFY
|
||||
int desktop_notifications;
|
||||
#endif
|
||||
#ifdef HAVE_EEZE
|
||||
Eeze_Udev_Watch *acwatch;
|
||||
Eeze_Udev_Watch *batwatch;
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
/* Setup if we need connman? */
|
||||
#include "e_wizard.h"
|
||||
#ifdef HAVE_ECONNMAN
|
||||
#include <Eldbus.h>
|
||||
#endif
|
||||
|
||||
static void
|
||||
_recommend_connman(E_Wizard_Page *pg)
|
||||
|
@ -12,7 +9,7 @@ _recommend_connman(E_Wizard_Page *pg)
|
|||
o = e_widget_list_add(pg->evas, 1, 0);
|
||||
e_wizard_title_set(_("Network Management"));
|
||||
|
||||
#ifdef HAVE_ECONNMAN
|
||||
#ifdef USE_MODULE_CONNMAN
|
||||
of = e_widget_framelist_add(pg->evas,
|
||||
_("Connman network service not found"), 0);
|
||||
|
||||
|
@ -124,7 +121,7 @@ wizard_page_show(E_Wizard_Page *pg)
|
|||
{
|
||||
Eina_Bool have_connman = EINA_FALSE;
|
||||
|
||||
#ifdef HAVE_ECONNMAN
|
||||
#ifdef USE_MODULE_CONNMAN
|
||||
eldbus_init();
|
||||
conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SYSTEM);
|
||||
#endif
|
||||
|
@ -181,7 +178,7 @@ wizard_page_hide(E_Wizard_Page *pg EINA_UNUSED)
|
|||
eldbus_connection_unref(conn);
|
||||
conn = NULL;
|
||||
|
||||
#ifdef HAVE_ECONNMAN
|
||||
#ifdef USE_MODULE_CONNMAN
|
||||
eldbus_shutdown();
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue