v4l_id: 70-v4l.rules -> 60-persistent-v4l.rules

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 960a552e8701a66c7f4bda823931a419346c2e6b..2fae2ccd3040c9472450d47fe7882f2dc3a173bf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -68,13 +68,17 @@ if test "x$enable_extras" = xyes; then
 
        AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
        AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
+
+       PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
+       AC_SUBST(LIBUSB_CFLAGS)
+       AC_SUBST(LIBUSB_LIBS)
 fi
 AM_CONDITIONAL([ENABLE_EXTRAS], [test "x$enable_extras" = xyes])
 
 AC_ARG_ENABLE([introspection],
        AS_HELP_STRING([--enable-introspection], [enable GObject introspection]),
        [], [enable_introspection=no])
-if test "$enable_introspection" = xyes; then
+if test "x$enable_introspection" = xyes; then
        PKG_CHECK_MODULES([INTROSPECTION], [gobject-introspection-1.0 >= 0.6.2])
        AC_DEFINE([ENABLE_INTROSPECTION], [1], [enable GObject introspection support])
        AC_SUBST([G_IR_SCANNER], [$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)])
@@ -107,6 +111,7 @@ AC_CONFIG_FILES([
        extras/scsi_id/Makefile
        extras/usb_id/Makefile
        extras/v4l_id/Makefile
+       extras/hid2hci/Makefile
        extras/udev-acl/Makefile
        extras/gudev/Makefile
        extras/gudev/gudev-1.0.pc