Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'mer1903' into 'master'
[configure] Add an explicit check for mce-dev. Fixes MER#1903

See merge request mer-core/dsme!26
  • Loading branch information
spiiroin committed Jun 7, 2018
2 parents 5903787 + ec81138 commit c4552ca
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions configure.ac
Expand Up @@ -206,6 +206,9 @@ AM_PROG_CC_C_O()
PKG_CHECK_MODULES(GLIB, glib-2.0)
PKG_CHECK_MODULES(DBUS, dbus-1)
PKG_CHECK_MODULES(DBUSGLIB, dbus-glib-1)
PKG_CHECK_MODULES(MCE_DEV, mce,
[],
AC_MSG_ERROR(Development files for mce are missing. Install mce-headers / mce-dev.))
if test "x$enable_vibra_feedback" != xno; then
PKG_CHECK_MODULES(LIBNGF, libngf0 >= 0.24)
fi
Expand Down
4 changes: 2 additions & 2 deletions modules/Makefile.am
Expand Up @@ -129,7 +129,7 @@ usbtracker_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS)
usbtracker_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS)

iphb_la_SOURCES = iphb.c
iphb_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS)
iphb_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(MCE_DEV_CFLAGS)
iphb_la_CPPFLAGS = $(AM_CPPFLAGS)
iphb_la_LIBADD = $(GLIB_LIBS) $(DBUS_LIBS)

Expand Down Expand Up @@ -170,7 +170,7 @@ endif

if WANT_BATTERY_TRACKER
batterytracker_la_SOURCES = batterytracker.c
batterytracker_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS)
batterytracker_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(DBUS_CFLAGS) $(MCE_DEV_CFLAGS)
batterytracker_la_LIBADD = $(GLIB_LIBS)
endif

Expand Down

0 comments on commit c4552ca

Please sign in to comment.