shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-26 14:04:03 +03:00
Code

configure.ac: move firmware-path setting out of extras section

Browse Source
This commit is contained in:
Robby Workman 2010-04-24 21:38:37 +02:00 committed by Kay Sievers
parent 2793f4e34b
commit 0c6a3f4835
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
configure.ac
View File

@ -46,6 +46,24 @@ if test "x$enable_logging" = "xyes"; then
AC_DEFINE(ENABLE_LOGGING, [1], [System logging.]) AC_DEFINE(ENABLE_LOGGING, [1], [System logging.])
fi 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], AC_ARG_ENABLE([extras],
AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]), AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
[], [enable_extras=yes]) [], [enable_extras=yes])
@ -82,26 +100,6 @@ if test "x$enable_extras" = xyes; then
fi]) fi])
AC_SUBST(PCI_DATABASE) 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_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}')]) 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 fi