zfs/spl config checks should only proceed to variable substitution in
case system supports it. Otherwise, it would end up adding 'Not found'
in list of include dirs/libs.
Test-Parameters: trivial testgroup=review-zfs
Signed-off-by: Sebastien Buisson <sbuisson@ddn.com>
Change-Id: Ia76a67e42cc6a2f116013c142b6c0b2143838548
Reviewed-on: https://review.whamcloud.com/38592
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Shuichi Ihara <sihara@ddn.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
AC_MSG_RESULT([$splsym])
])
AC_MSG_RESULT([$splsym])
])
- SPL=${splsrc}
- SPL_OBJ=${splobj}
- SPL_VERSION=${splver}
-
- AC_SUBST(SPL)
- AC_SUBST(SPL_OBJ)
- AC_SUBST(SPL_VERSION)
- AC_SUBST(EXTRA_SYMBOLS)
+ AS_IF([test x$enable_zfs = xyes], [
+ SPL=${splsrc}
+ SPL_OBJ=${splobj}
+ SPL_VERSION=${splver}
+
+ AC_SUBST(SPL)
+ AC_SUBST(SPL_OBJ)
+ AC_SUBST(SPL_VERSION)
+ AC_SUBST(EXTRA_SYMBOLS)
+ ])
+
AC_MSG_RESULT([$zfssym])
])
AC_MSG_RESULT([$zfssym])
])
- ZFS=${zfssrc}
- ZFS_OBJ=${zfsobj}
- ZFS_VERSION=${zfsver}
+ AS_IF([test x$enable_zfs = xyes], [
+ ZFS=${zfssrc}
+ ZFS_OBJ=${zfsobj}
+ ZFS_VERSION=${zfsver}
+
+ AC_SUBST(ZFS)
+ AC_SUBST(ZFS_OBJ)
+ AC_SUBST(ZFS_VERSION)
+ AC_SUBST(EXTRA_SYMBOLS)
+ ])
- AC_SUBST(ZFS)
- AC_SUBST(ZFS_OBJ)
- AC_SUBST(ZFS_VERSION)
- AC_SUBST(EXTRA_SYMBOLS)
])
AC_DEFUN([LB_ZFS_DEVEL], [
])
AC_DEFUN([LB_ZFS_DEVEL], [
dnl #
dnl # SPL is only needed if ZFS is prior to 0.8.0
dnl #
dnl #
dnl # SPL is only needed if ZFS is prior to 0.8.0
dnl #
- AS_IF([test x$enable_modules = xyes && test $ZFS_MAJOR -eq 0 && test $ZFS_MINOR -lt 8], [
+ AS_IF([test x$enable_modules = xyes && test -n "$ZFS_MAJOR" &&
+ test $ZFS_MAJOR -eq 0 && test $ZFS_MINOR -lt 8], [