From 63e0828c174e84ec583d34327b3fc1c5f53fa39c Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 1 Apr 2016 08:49:19 -0700 Subject: 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 Issue #4416 --- config/user-libudev.m4 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'config/user-libudev.m4') diff --git a/config/user-libudev.m4 b/config/user-libudev.m4 index 2a8025903..9b7454927 100644 --- 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])], []) -- cgit v1.2.3