Re: disable-libzfs configure flag (Re: Freeze on 27 February)

[Mike Gilbert]

2012/2/25 Vladimir 'φ-coder/phcoder' Serbinenko <address@hidden>:
> On 25.02.2012 19:44, Mike Gilbert wrote:
>>
>> +if test x"$libzfs_excuse" = x ; then
>> +  # Only check for system headers if libzfs support has not been
>> disabled.
>> +  AC_CHECK_HEADERS(libzfs.h libnvpair.h)
>> +fi
>
> You should set excuse here if the headers aren't found.

I left that out intentionally. If the system headers are not found,
include/grub/util/libzfs.h declares the necessary functions itself.

This is actually very common since the libzfs headers are currently
installed outside of the default include search path by the ZfsOnLinux
package. Ideally, a pkgconfig file should be provided by ZfsOnLinux
and we could use that to retrieve appropriate pre-processor flags.

However, this is outside the scope of this patch.

> Also it should fail if libzfs is explicitly enable but unavailable

Done. Updated patch attached.

+if test x"$enable_libzfs" = xyes && test x"$libzfs_excuse" != x ; then
+  AC_MSG_ERROR([libzfs support was explicitly requested but
requirements are not satisfied])
+fi
+

Thanks again.

libzfs-configure-r2.patch
Description: Text Data