X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=bba82ee7bd1b5ecf973323e16098f19de61d5f16;hb=514b8d62123e3d63f2b935aa1d58e5c411f3f603;hp=2fae2ccd3040c9472450d47fe7882f2dc3a173bf;hpb=c283f81cb7b3451cc3be75314d670cd5b8c7be3c;p=elogind.git

diff --git a/configure.ac b/configure.ac
index 2fae2ccd3..bba82ee7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,8 +59,8 @@ if test "x$enable_logging" = "xyes"; then
 fi
 
 AC_ARG_ENABLE([extras],
-	AS_HELP_STRING([--enable-extras], [enable extras with external dependencies]),
-	[], [enable_extras=no])
+	AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
+	[], [enable_extras=yes])
 if test "x$enable_extras" = xyes; then
 	PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.7.0 gobject-2.0 >= 2.7.0])
 	AC_SUBST([GLIB_CFLAGS])
@@ -72,6 +72,22 @@ if test "x$enable_extras" = xyes; then
 	PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
 	AC_SUBST(LIBUSB_CFLAGS)
 	AC_SUBST(LIBUSB_LIBS)
+
+	PKG_CHECK_MODULES(USBUTILS, usbutils >= 0.82)
+	AC_SUBST([USB_DATABASE], [$($PKG_CONFIG --variable=usbids usbutils)])
+
+	AC_CHECK_FILES([/usr/share/pci.ids], [pciids=/usr/share/pci.ids])
+	AC_CHECK_FILES([/usr/share/hwdata/pci.ids], [pciids=/usr/share/hwdata/pci.ids])
+	AC_CHECK_FILES([/usr/share/misc/pci.ids], [pciids=/usr/share/misc/pci.ids])
+	AC_ARG_WITH(pci-ids-path,
+		AS_HELP_STRING([--pci-ids-path=DIR], [Path to pci.ids file]),
+		[PCI_DATABASE=${withval}],
+		[if test -n "$pciids" ; then
+			PCI_DATABASE="$pciids"
+		else
+			AC_MSG_ERROR([pci.ids not found, try --with-pci-ids-path=])
+		fi])
+	AC_SUBST(PCI_DATABASE)
 fi
 AM_CONDITIONAL([ENABLE_EXTRAS], [test "x$enable_extras" = xyes])
 
@@ -113,6 +129,7 @@ AC_CONFIG_FILES([
 	extras/v4l_id/Makefile
 	extras/hid2hci/Makefile
 	extras/udev-acl/Makefile
+	extras/usb-db/Makefile
 	extras/gudev/Makefile
 	extras/gudev/gudev-1.0.pc
 	extras/gudev/docs/Makefile
@@ -144,5 +161,8 @@ AC_MSG_RESULT([
 	extras:			${enable_extras}
 	gintrospection:		${enable_introspection}
 
+	usb.ids:		${USB_DATABASE}
+	pci.ids:		${PCI_DATABASE}
+
 	xsltproc:		${XSLTPROC}
 ])