X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=cfdb3bf8165a8a8654aa9f99be91c42e6dd530a1;hp=357806a0f42ae889abec2c446437976cf9bb9e89;hb=7df0ed83c113e4744786e7804d398d9d34b43281;hpb=16efbde01ada6869c41426af673550bb7ddbebf8

diff --git a/configure.ac b/configure.ac
index 357806a0f..cfdb3bf81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([udev], [168], [linux-hotplug@vger.kernel.org])
+AC_INIT([udev], [170], [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])])
@@ -75,10 +75,10 @@ AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_sy
 # ------------------------------------------------------------------------------
 # rule_generator - persistent network and optical device rule generator
 # ------------------------------------------------------------------------------
-AC_ARG_ENABLE([hwdb],
+AC_ARG_ENABLE([rule_generator],
 	AS_HELP_STRING([--disable-rule_generator], [disable persistent network, cdrom support]),
 	[], [enable_rule_generator=yes])
-AM_CONDITIONAL([ENABLE_RULE_GENERATOR], [test "x$enable_rule_genarator" = xyes])
+AM_CONDITIONAL([ENABLE_RULE_GENERATOR], [test "x$enable_rule_generator" = xyes])
 
 # ------------------------------------------------------------------------------
 # usb/pci-db - read vendor/device string database
@@ -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])],
@@ -190,7 +200,7 @@ AM_CONDITIONAL([ENABLE_EDD], [test "x$enable_edd" = xyes])
 # ------------------------------------------------------------------------------
 # mobile-action-modeswitch - switch Mobile Action cables into serial mode
 # ------------------------------------------------------------------------------
-AC_ARG_ENABLE([ACTION_MODESWITCH],
+AC_ARG_ENABLE([action_modeswitch],
 	AS_HELP_STRING([--enable-action_modeswitch], [enable action modeswitch support]),
 	[], [enable_action_modeswitch=no])
 if test "x$enable_action_modeswitch" = xyes; then
@@ -243,11 +253,11 @@ AC_MSG_RESULT([
 	cflags:			${CFLAGS}
 	ldflags:		${LDFLAGS}
 
-	gintrospection:         ${enable_introspection}
 	rule_generator:		${enable_rule_generator}
 	hwdb:			${enable_hwdb}
 	udev_acl:		${enable_udev_acl}
 	gudev:			${enable_gudev}
+	gintrospection:		${enable_introspection}
 	keymap:			${enable_keymap}
 	floppy:			${enable_floppy}
 	edd:			${enable_edd}