[PATCH libinputmapper 02/13] Require udev on top of libudev

[Peter Hutterer]

udev and libudev are two separate packages, require both of them. udev
doesn't really have cflags or libs, but use the respective defines for
consistency.

Also, split the PKG_CHECK_MODULE into two to get a better error message what
is actually missing. Most users will have udev.pc, but not libudev.pc
installed by default.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 Makefile.am  | 5 +++--
 configure.ac | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 5bac034..a0eb39d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,8 +85,9 @@ libinputmapper_la_SOURCES = \
 
 libinputmapper_la_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
-	$(UDEV_CFLAGS)
-libinputmapper_la_LIBADD = $(UDEV_LIBS)
+	$(UDEV_CFLAGS) \
+	$(LIBUDEV_CFLAGS)
+libinputmapper_la_LIBADD = $(UDEV_LIBS) $(LIBUDEV_LIBS)
 EXTRA_libinputmapper_la_DEPENDENCIES = $(top_srcdir)/docs/libinputmapper.sym
 libinputmapper_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
diff --git a/configure.ac b/configure.ac
index 781012b..37bc96b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,8 @@ LT_INIT
 # Dependencies
 #
 
-PKG_CHECK_MODULES([UDEV], [libudev >= 172])
+PKG_CHECK_MODULES([LIBUDEV], [libudev >= 172])
+PKG_CHECK_MODULES([UDEV], [udev >= 172])
 
 # TODO: check for linux/input.h
 
-- 
1.8.2.1