X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=81233bf29b18518d88ddad96241dc0d19e9acacc;hp=4fcdbcd276015ee15240548abc15eeaf9dce45d1;hb=d80f8ffd1a182fe7fff9816e8a4efc09e877964b;hpb=901e80dc593967c5d5e810390722461760177ff8

diff --git a/configure.ac b/configure.ac
index 4fcdbcd27..81233bf29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([udev], [153], [linux-hotplug@vger.kernel.org])
+AC_INIT([udev], [157], [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])
@@ -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