Fix WANT_DEVNAME2DEVID configure error

Accidentally introduced by commit e4023e4. The AM_CONDITIONAL cannot be located where it can be invoked conditionally, as in the `--with-config=user` case. Relocate it to the top level ZFS_AC_CONFIG macro along with the other AM_CONDITIONALs. Signed-off-by: Brian Behlendorf <[email protected]> Issue #4416
openzfs · Apr 1, 2016 · 63e0828 · 63e0828
1 parent f7b939b
commit 63e0828
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/config/user-libudev.m4 b/config/user-libudev.m4
@@ -5,14 +5,13 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_LIBUDEV], [
 	LIBUDEV=
 
 	AC_CHECK_HEADER([libudev.h], [
-	    libudev=yes
+	    user_libudev=yes
 	    AC_SUBST([LIBUDEV], ["-ludev"])
 	    AC_DEFINE([HAVE_LIBUDEV], 1, [Define if you have libudev])
 	], [
-	    libudev=no
+	    user_libudev=no
 	])
 
-	AM_CONDITIONAL([WANT_DEVNAME2DEVID], [ test x$libudev = xyes ])
 	AC_SEARCH_LIBS([udev_device_get_is_initialized], [udev], [
 	    AC_DEFINE([HAVE_LIBUDEV_UDEV_DEVICE_GET_IS_INITIALIZED], 1, [
 	    Define if udev_device_get_is_initialized is available])], [])

diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
@@ -100,10 +100,12 @@ AC_DEFUN([ZFS_AC_CONFIG], [
 	esac
 
 	AM_CONDITIONAL([CONFIG_USER],
-		       [test "$ZFS_CONFIG" = user -o "$ZFS_CONFIG" = all])
+	    [test "$ZFS_CONFIG" = user -o "$ZFS_CONFIG" = all])
 	AM_CONDITIONAL([CONFIG_KERNEL],
-		       [test "$ZFS_CONFIG" = kernel -o "$ZFS_CONFIG" = all] &&
-		       [test "x$enable_linux_builtin" != xyes ])
+	    [test "$ZFS_CONFIG" = kernel -o "$ZFS_CONFIG" = all] &&
+	    [test "x$enable_linux_builtin" != xyes ])
+	AM_CONDITIONAL([WANT_DEVNAME2DEVID],
+	    [test "x$user_libudev" = xyes ])
 ])
 
 dnl #