Commit c4552ca8 authored by spiiroin's avatar spiiroin

Merge branch 'mer1903' into 'master'

[configure] Add an explicit check for mce-dev. Fixes MER#1903

See merge request !26
parents 59037872 ec811382
......@@ -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
......
......@@ -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)
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment