From 4103b509427dd90ffb9f0f5ba78c14cf33688877 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 14 Jul 2010 12:55:57 -0700 Subject: [PATCH] Refresh autogen products --- configure | 68 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/configure b/configure index ebc78ccc20..533dc4537f 100755 --- a/configure +++ b/configure @@ -11699,17 +11699,19 @@ $as_echo_n "checking kernel source directory... " >&6; } 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 { $as_echo "$as_me:$LINENO: result: Not found" >&5 $as_echo "Not found" >&6; } { { $as_echo "$as_me:$LINENO: error: - *** Please specify the location of the kernel source - *** with the '--with-linux=PATH' option" >&5 + *** 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." >&5 $as_echo "$as_me: error: - *** Please specify the location of the kernel source - *** with the '--with-linux=PATH' option" >&2;} + *** 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." >&2;} { (exit 1); exit 1; }; } fi else @@ -11723,12 +11725,12 @@ $as_echo "$kernelsrc" >&6; } { $as_echo "$as_me:$LINENO: checking kernel build directory" >&5 $as_echo_n "checking kernel build directory... " >&6; } if test -z "$kernelbuild"; then - if test -d ${kernelsrc}-obj/`arch`/`arch`; then - kernelbuild=${kernelsrc}-obj/`arch`/`arch` - elif test -d ${kernelsrc}-obj/`arch`/default; then - kernelbuild=${kernelsrc}-obj/`arch`/default - elif test -d `dirname ${kernelsrc}`/build-`arch`; then - kernelbuild=`dirname ${kernelsrc}`/build-`arch` + if test -d ${kernelsrc}-obj/${target_cpu}/${target_cpu}; then + kernelbuild=${kernelsrc}-obj/${target_cpu}/${target_cpu} + elif test -d ${kernelsrc}-obj/${target_cpu}/default; then + kernelbuild=${kernelsrc}-obj/${target_cpu}/default + elif test -d `dirname ${kernelsrc}`/build-${target_cpu}; then + kernelbuild=`dirname ${kernelsrc}`/build-${target_cpu} else kernelbuild=${kernelsrc} fi @@ -11831,11 +11833,13 @@ $as_echo_n "checking spl source directory... " >&6; } { $as_echo "$as_me:$LINENO: result: Not found" >&5 $as_echo "Not found" >&6; } { { $as_echo "$as_me:$LINENO: error: - *** Please specify the location of the spl source - *** with the '--with-spl=PATH' option" >&5 + *** 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." >&5 $as_echo "$as_me: error: - *** Please specify the location of the spl source - *** with the '--with-spl=PATH' option" >&2;} + *** 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." >&2;} { (exit 1); exit 1; }; } fi else @@ -14524,17 +14528,19 @@ $as_echo_n "checking kernel source directory... " >&6; } 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 { $as_echo "$as_me:$LINENO: result: Not found" >&5 $as_echo "Not found" >&6; } { { $as_echo "$as_me:$LINENO: error: - *** Please specify the location of the kernel source - *** with the '--with-linux=PATH' option" >&5 + *** 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." >&5 $as_echo "$as_me: error: - *** Please specify the location of the kernel source - *** with the '--with-linux=PATH' option" >&2;} + *** 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." >&2;} { (exit 1); exit 1; }; } fi else @@ -14548,12 +14554,12 @@ $as_echo "$kernelsrc" >&6; } { $as_echo "$as_me:$LINENO: checking kernel build directory" >&5 $as_echo_n "checking kernel build directory... " >&6; } if test -z "$kernelbuild"; then - if test -d ${kernelsrc}-obj/`arch`/`arch`; then - kernelbuild=${kernelsrc}-obj/`arch`/`arch` - elif test -d ${kernelsrc}-obj/`arch`/default; then - kernelbuild=${kernelsrc}-obj/`arch`/default - elif test -d `dirname ${kernelsrc}`/build-`arch`; then - kernelbuild=`dirname ${kernelsrc}`/build-`arch` + if test -d ${kernelsrc}-obj/${target_cpu}/${target_cpu}; then + kernelbuild=${kernelsrc}-obj/${target_cpu}/${target_cpu} + elif test -d ${kernelsrc}-obj/${target_cpu}/default; then + kernelbuild=${kernelsrc}-obj/${target_cpu}/default + elif test -d `dirname ${kernelsrc}`/build-${target_cpu}; then + kernelbuild=`dirname ${kernelsrc}`/build-${target_cpu} else kernelbuild=${kernelsrc} fi @@ -14656,11 +14662,13 @@ $as_echo_n "checking spl source directory... " >&6; } { $as_echo "$as_me:$LINENO: result: Not found" >&5 $as_echo "Not found" >&6; } { { $as_echo "$as_me:$LINENO: error: - *** Please specify the location of the spl source - *** with the '--with-spl=PATH' option" >&5 + *** 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." >&5 $as_echo "$as_me: error: - *** Please specify the location of the spl source - *** with the '--with-spl=PATH' option" >&2;} + *** 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." >&2;} { (exit 1); exit 1; }; } fi else