X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=d0ce504bc5f7f05aec9f2318bcfd076bf5e2ce2d;hp=7a3ee3c34c4b2b5fb500e96f406d7be2730b54c5;hb=8db6dcfd3c3d19d35767f04884a99368f6c64b36;hpb=139ee8cc316a861bcc8a8ebdf4a8449dffe16f79

diff --git a/configure.ac b/configure.ac
index 7a3ee3c34..d0ce504bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -478,7 +478,7 @@ AM_CONDITIONAL(HAVE_QRENCODE, [test "$have_qrencode" = "yes"])
 have_microhttpd=no
 AC_ARG_ENABLE(microhttpd, AS_HELP_STRING([--disable-microhttpd], [disable microhttpd support]))
 if test "x$enable_microhttpd" != "xno"; then
-        PKG_CHECK_MODULES(MICROHTTPD, [ libmicrohttpd ],
+        PKG_CHECK_MODULES(MICROHTTPD, [libmicrohttpd >= 0.9.5],
                 [AC_DEFINE(HAVE_MICROHTTPD, 1, [Define if microhttpd is available]) have_microhttpd=yes], have_microhttpd=no)
         if test "x$have_microhttpd" = xno -a "x$enable_microhttpd" = xyes; then
                 AC_MSG_ERROR([*** microhttpd support requested but libraries not found])
@@ -567,33 +567,6 @@ if test "x$enable_coredump" != "xno"; then
 fi
 AM_CONDITIONAL(ENABLE_COREDUMP, [test "$have_coredump" = "yes"])
 
-# ------------------------------------------------------------------------------
-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])],
-        [PCI_DATABASE=${withval}],
-        [if test -n "$pciids" ; then
-                PCI_DATABASE="$pciids"
-        else
-                PKG_CHECK_MODULES(LIBPCI, libpci >= 3)
-                AC_SUBST([PCI_DATABASE], [$($PKG_CONFIG --variable=idsdir libpci)/pci.ids])
-        fi])
-AC_MSG_CHECKING([for PCI database location])
-AC_MSG_RESULT([$PCI_DATABASE])
-AC_SUBST(PCI_DATABASE)
-
 # ------------------------------------------------------------------------------
 AC_ARG_WITH(firmware-path,
        AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
@@ -878,8 +851,6 @@ AC_MSG_RESULT([
         localed:                 ${have_localed}
         coredump:                ${have_coredump}
         firmware path:           ${FIRMWARE_PATH}
-        usb.ids:                 ${USB_DATABASE}
-        pci.ids:                 ${PCI_DATABASE}
         gudev:                   ${enable_gudev}
         gintrospection:          ${enable_introspection}
         keymap:                  ${enable_keymap}