Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
validatorlistener module loading can be omitted with --disable-valida…
…torlistener

Fixes NEMO#471
  • Loading branch information
Pekka Lundstrom committed Oct 1, 2012
1 parent 5d7e36a commit 9180d41
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 5 deletions.
15 changes: 14 additions & 1 deletion configure.ac
@@ -1,5 +1,5 @@
# Package name and version
AC_INIT(dsme, 0.62.2)
AC_INIT(dsme, 0.62.3)

AM_INIT_AUTOMAKE

Expand Down Expand Up @@ -65,6 +65,19 @@ AS_IF([test "x$enable_upstart" != xno],
[AC_DEFINE([DSME_WANT_LIBUPSTART], [1])])
AM_CONDITIONAL([WANT_UPSTART], [test x$enable_upstart != xno])

#
# validatorlistener
#
AC_ARG_ENABLE([validatorlistener],
[AS_HELP_STRING([--disable-validatorlistener],
[disable validatorlistener plugin (validatorlistener)])],
[],
[enable_validatorlistener=yes])

AS_IF([test "x$enable_validatorlistener" != xno],
[AC_DEFINE([DSME_VALIDATOR_LISTENER], [1])])
AM_CONDITIONAL([WANT_VALIDATOR_LISTENER], [test x$enable_validatorlistener != xno])

#
# memory thermal mgmt
#
Expand Down
12 changes: 9 additions & 3 deletions modules/Makefile.am
Expand Up @@ -18,7 +18,6 @@ pkglib_LTLIBRARIES = startup.la \
iphb.la \
thermalflagger.la \
malf.la \
validatorlistener.la \
diskmonitor.la \
tempreaper.la \
dbusautoconnector.la
Expand Down Expand Up @@ -56,6 +55,10 @@ if WANT_UPSTART
pkglib_LTLIBRARIES += upstart.la
endif

if WANT_VALIDATOR_LISTENER
pkglib_LTLIBRARIES += validatorlistener.la
endif

if WANT_PWRKEY_MONITOR
pkglib_LTLIBRARIES += pwrkeymonitor.la
endif
Expand Down Expand Up @@ -84,6 +87,11 @@ upstart_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
upstart_la_LIBADD = $(DBUS_LIBS)
endif

if WANT_VALIDATOR_LISTENER
runlevel_la_SOURCES = validatorlistener.c
validatorlistener_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)
endif

processwd_la_SOURCES = processwd.c
processwd_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)

Expand Down Expand Up @@ -111,8 +119,6 @@ thermalflagger_la_SOURCES = thermalflagger.c

malf_la_SOURCES = malf.c

validatorlistener_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS)

if WANT_BMEIPC
thermalobject_surface_la_SOURCES = thermalobject_surface.c \
thermalsensor_battery.c \
Expand Down
4 changes: 3 additions & 1 deletion modules/startup.c
Expand Up @@ -95,7 +95,9 @@ const char *modules[] = {
#ifdef DSME_POWERON_TIMER
"powerontimer.so",
#endif
"validatorlistener.so", // TODO: hardcode this in dsme core
#ifdef DSME_VALIDATOR_LISTENER
"validatorlistener.so",
#endif
"diskmonitor.so",
"tempreaper.so",
"dbusautoconnector.so",
Expand Down

0 comments on commit 9180d41

Please sign in to comment.