WIP: udev

Author: intelfx

config/user-dracut.m4

@@ -1,18 +1,23 @@
 AC_DEFUN([ZFS_AC_CONFIG_USER_DRACUT], [
-	AC_MSG_CHECKING(for dracut directory)
+	AC_MSG_CHECKING(for dracut directory XXX prefix=$prefix adp=$ac_default_prefix XXX)
 	AC_ARG_WITH([dracutdir],
 		AS_HELP_STRING([--with-dracutdir=DIR],
 		[install dracut helpers @<:@default=check@:>@]),
 		[dracutdir=$withval],
 		[dracutdir=check])
 
 	AS_IF([test "x$dracutdir" = xcheck], [
-		path1=$prefix/share/dracut
-		path2=$prefix/lib/dracut
-		default=$path2
+		AS_IF([test "$prefix" != "NONE"],
+			[tprefix="$prefix"],
+			[tprefix="$ac_default_prefix"]
+		)
 
-		AS_IF([test -d "$path1"], [dracutdir="$path1"], [
-			AS_IF([test -d "$path2"], [dracutdir="$path2"],
+		path1='$prefix/share/dracut'
+		path2='$prefix/lib/dracut'
+		default="$path2"
+
+		AS_IF([test -d "$tprefix/share/dracut"], [dracutdir="$path1"], [
+			AS_IF([test -d "$tprefix/lib/dracut"], [dracutdir="$path2"],
 				[dracutdir="$default"])
 		])
 	])

config/user-udev.m4

@@ -9,19 +9,18 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_UDEV], [
 		[udevdir=check])
 
 	AS_IF([test "x$udevdir" = xcheck], [
-		path1=/lib/udev
-		path2=$prefix/lib/udev
-		default=$path2
-
-		AS_IF([test "x${have_udev}" = xyes],
-			[udevdir=`$PKG_CONFIG --variable=udevdir udev`],
-			AS_IF([test "$prefix" = "/usr"], [
-				AS_IF([test -d "$path1"], [udevdir="$path1"], [
-					AS_IF([test -d "$path2"], [udevdir="$path2"],
-						[udevdir="$default"])
-				])
-			], [udevdir="$default"])
+		AS_IF([test "x$prefix" != "xNONE"],
+			[tprefix="$prefix"],
+			[tprefix="$ac_default_prefix"]
 		)
+
+		AS_IF([test "x$tprefix" = "x/usr"], [
+			AS_IF([test "x${have_udev}" = xyes],
+				[udevdir=`$PKG_CONFIG --variable=udevdir udev`],
+				AS_IF([test -d '/lib/udev' -a ! -L '/lib'],
+					[udevdir="/lib/udev"],
+					[udevdir="/usr/lib/udev"]))
+		], [udevdir='${prefix}/lib/udev'])
 	])
 
 	AC_ARG_WITH(udevruledir,