mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-25 18:59:33 +03:00
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 <behlendorf1@llnl.gov>
Issue #4416
This commit is contained in:
parent
f7b939bdbc
commit
63e0828c17
@ -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])], [])
|
||||
|
@ -104,6 +104,8 @@ AC_DEFUN([ZFS_AC_CONFIG], [
|
||||
AM_CONDITIONAL([CONFIG_KERNEL],
|
||||
[test "$ZFS_CONFIG" = kernel -o "$ZFS_CONFIG" = all] &&
|
||||
[test "x$enable_linux_builtin" != xyes ])
|
||||
AM_CONDITIONAL([WANT_DEVNAME2DEVID],
|
||||
[test "x$user_libudev" = xyes ])
|
||||
])
|
||||
|
||||
dnl #
|
||||
|
Loading…
Reference in New Issue
Block a user