chiark / gitweb /
Makefile: add tar-sync
[elogind.git] / configure.ac
index 3646f9327d071f5f019d6be0a28aa11dd41d3869..d8388883d5384890d8af8d482a23829457ebdcfc 100644 (file)
@@ -1,4 +1,4 @@
-AC_INIT([udev], [170], [linux-hotplug@vger.kernel.org])
+AC_INIT([udev], [171], [linux-hotplug@vger.kernel.org])
 AC_PREREQ(2.60)
 AM_INIT_AUTOMAKE([check-news foreign 1.10 dist-bzip2 subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -93,8 +93,18 @@ if test "x$enable_hwdb" = xyes; then
                AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids])
        fi
 
-       PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82)
-       AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
+       AC_ARG_WITH(usb-ids-path,
+               [AS_HELP_STRING([--with-usb-ids-path=DIR], [Path to usb.ids file])],
+               [USB_DATABASE=${withval}],
+               [if test -n "$usbids" ; then
+                       USB_DATABASE="$usbids"
+               else
+                       PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82)
+                       AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
+               fi])
+       AC_MSG_CHECKING([for USB database location])
+       AC_MSG_RESULT([$USB_DATABASE])
+       AC_SUBST(USB_DATABASE)
 
        AC_ARG_WITH(pci-ids-path,
                [AS_HELP_STRING([--with-pci-ids-path=DIR], [Path to pci.ids file])],