From d81440c8ab0661710756f8f62769f2609a586c03 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 14 Jul 2010 12:37:31 -0700 Subject: [PATCH] Check sourcelink is set before passing to readlink When no source was found in any of the expected paths treat this as fatal and provide the user with a hint as to what they should do. --- config/kernel.m4 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/config/kernel.m4 b/config/kernel.m4 index 4cea344ccd..9bf63d4272 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -84,13 +84,14 @@ AC_DEFUN([ZFS_AC_KERNEL], [ 2>/dev/null | grep -v obj | tail -1) fi - if test -e $sourcelink; then + if test -n "$sourcelink" && test -e ${sourcelink}; then kernelsrc=`readlink -f ${sourcelink}` else AC_MSG_RESULT([Not found]) AC_MSG_ERROR([ - *** Please specify the location of the kernel source - *** with the '--with-linux=PATH' option]) + *** Please make sure the kernel devel package for your distribution + *** is installed then try again. If that fails you can specify the + *** location of the kernel source with the '--with-linux=PATH' option.]) fi else if test "$kernelsrc" = "NONE"; then @@ -206,8 +207,9 @@ AC_DEFUN([ZFS_AC_SPL], [ else AC_MSG_RESULT([Not found]) AC_MSG_ERROR([ - *** Please specify the location of the spl source - *** with the '--with-spl=PATH' option]) + *** Please make sure the spl devel package for your distribution + *** is installed then try again. If that fails you can specify the + *** location of the spl source with the '--with-spl=PATH' option.]) fi else if test "$splsrc" = "NONE"; then