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 <scott@netsplit.com>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/configure.ac b/configure.ac
index 3646f9327d071f5f019d6be0a28aa11dd41d3869..cfdb3bf8165a8a8654aa9f99be91c42e6dd530a1 100644 (file)
--- 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
 
                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])],
 
        AC_ARG_WITH(pci-ids-path,
                [AS_HELP_STRING([--with-pci-ids-path=DIR], [Path to pci.ids file])],