version bump

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 492fa022429bf096c2b4415b805c51c8c86969d7..4bac653b5d1c9d14f7a6c155fddd4bbceb5dc235 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([udev], [152], [linux-hotplug@vger.kernel.org])
+AC_INIT([udev], [159], [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])])
@@ -46,6 +46,24 @@ if test "x$enable_logging" = "xyes"; then
        AC_DEFINE(ENABLE_LOGGING, [1], [System logging.])
 fi
 
+AC_ARG_WITH(firmware-path,
+       AS_HELP_STRING([--with-firmware-path=DIR[[[:DIR[...]]]]],
+          [Firmware search path (default=/lib/firmware/updates:/lib/firmware)]),
+       [], [with_firmware_path="/lib/firmware/updates:/lib/firmware"]
+       )
+OLD_IFS=$IFS
+IFS=:
+for i in $with_firmware_path
+do
+       if test "x${FIRMWARE_PATH}" = "x"; then
+               FIRMWARE_PATH="\\\"${i}/\\\""
+       else
+               FIRMWARE_PATH="${FIRMWARE_PATH}, \\\"${i}/\\\""
+       fi
+done
+IFS=$OLD_IFS
+AC_SUBST([FIRMWARE_PATH], [$FIRMWARE_PATH])
+
 AC_ARG_ENABLE([extras],
        AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
        [], [enable_extras=yes])
@@ -69,17 +87,21 @@ if test "x$enable_extras" = xyes; then
        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])
+       if test "x$cross_compiling" = "xno" ; then
+               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])
+       fi
        AC_ARG_WITH(pci-ids-path,
-               AS_HELP_STRING([--with-pci-ids-path=DIR], [Path to pci.ids file]),
+               [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
                        AC_MSG_ERROR([pci.ids not found, try --with-pci-ids-path=])
                fi])
+       AC_MSG_CHECKING([for PCI database location])
+       AC_MSG_RESULT([$PCI_DATABASE])
        AC_SUBST(PCI_DATABASE)
 
        AC_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
@@ -144,6 +166,7 @@ AC_MSG_RESULT([
 
        usb.ids:                ${USB_DATABASE}
        pci.ids:                ${PCI_DATABASE}
+       firmware path:          ${FIRMWARE_PATH}
 
        xsltproc:               ${XSLTPROC}
        gperf:                  ${GPERF}