From: Scott James Remnant Date: Fri, 20 May 2011 21:06:29 +0000 (-0700) Subject: configure: allow usb.ids location to be specified X-Git-Tag: 174~122 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=bda2674f22b58bd32802b2057a05efada6155bae configure: allow usb.ids location to be specified We already allow the pci.ids location to be specified, so add a patch doing the same for usb.ids. Please don't make me explain why this is necessary, it will only make you cry. Signed-off-by: Scott James Remnant Signed-off-by: Kay Sievers Acked-by: Greg Kroah-Hartman --- diff --git a/configure.ac b/configure.ac index 3646f9327..cfdb3bf81 100644 --- a/configure.ac +++ b/configure.ac @@ -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])],