configure.ac: fix broken firmware search path in configure.ac

[elogind.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 82e215cd68935d830aec73939ee7708126956a08..4fcdbcd276015ee15240548abc15eeaf9dce45d1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
-AC_INIT([udev], [150], [linux-hotplug@vger.kernel.org])
+AC_INIT([udev], [153], [linux-hotplug@vger.kernel.org])
 AC_PREREQ(2.60)
-AM_INIT_AUTOMAKE([check-news foreign 1.9 dist-bzip2 subdir-objects])
+AM_INIT_AUTOMAKE([check-news foreign 1.10 dist-bzip2 subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_DISABLE_STATIC
 AC_USE_SYSTEM_EXTENSIONS
@@ -73,7 +73,7 @@ if test "x$enable_extras" = xyes; then
        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]),
+               AS_HELP_STRING([--with-pci-ids-path=DIR], [Path to pci.ids file]),
                [PCI_DATABASE=${withval}],
                [if test -n "$pciids" ; then
                        PCI_DATABASE="$pciids"
@@ -81,6 +81,29 @@ if test "x$enable_extras" = xyes; then
                        AC_MSG_ERROR([pci.ids not found, try --with-pci-ids-path=])
                fi])
        AC_SUBST(PCI_DATABASE)
+
+       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_CHECK_HEADER([linux/input.h], [:], AC_MSG_ERROR([kernel headers not found]))
+       AC_SUBST([INCLUDE_PREFIX], [$(echo '#include <linux/input.h>' | eval $ac_cpp -E - | sed -n '/linux\/input.h/ {s:.*"\(.*\)/linux/input.h".*:\1:; p; q}')])
 fi
 AM_CONDITIONAL([ENABLE_EXTRAS], [test "x$enable_extras" = xyes])
 
@@ -126,6 +149,8 @@ AC_MSG_RESULT([
        mandir:                 ${mandir}
        includedir:             ${includedir}
 
+       include_prefix:         ${INCLUDE_PREFIX}
+
        logging:                ${enable_logging}
        debug:                  ${enable_debug}
        selinux:                ${with_selinux}
@@ -139,6 +164,7 @@ AC_MSG_RESULT([
 
        usb.ids:                ${USB_DATABASE}
        pci.ids:                ${PCI_DATABASE}
+       firmware path:          ${FIRMWARE_PATH}
 
        xsltproc:               ${XSLTPROC}
        gperf:                  ${GPERF}