diff options
| author | Robby Workman <rworkman@slackware.com> | 2010-04-24 21:38:37 +0200 |
|---|---|---|
| committer | Kay Sievers <kay.sievers@vrfy.org> | 2010-04-24 21:38:37 +0200 |
| commit | 0c6a3f48357ed4a49c2c49c43f669f930d628382 (patch) | |
| tree | 1ac4896b040379ae7d8de0606944aa6fcb5049ca | |
| parent | 2793f4e34bdf4f1a46d0263f7dbdb8fcffe78e32 (diff) | |
configure.ac: move firmware-path setting out of extras section
| -rw-r--r-- | configure.ac | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index d4d29c47f7..4fe8c3cad4 100644 --- a/configure.ac +++ b/configure.ac @@ -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]) @@ -82,26 +100,6 @@ if test "x$enable_extras" = xyes; then 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 |