summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2009-06-16 10:44:59 -0700
committerBrian Behlendorf <[email protected]>2009-06-16 10:44:59 -0700
commit39a3d2a421bf067329bae352866a5d1fccbcee70 (patch)
tree326b0cb2c65c3d9150bfe4717095e046940cadce /configure
parente554dffa6031a2cf37537fc8451f757d5ae9e46f (diff)
Packaging improvements for RHEL and SLES
- Properly honor --prefix in build system and rpm spec file. - Add '--define require_kdir' to spec file to support building rpms against kernel sources installed in non-default locations. - Add '--define require_kobj' to spec file to support building rpms against kernel object installed in non-default locations. - Stop suppressing errors in autogen.sh script. - Improved logic to detect missing kernel objects when they are not located with the source. This is the common case for SLES as well as in-tree chaos kernel builds and is done to simply support for multiple arches. - Moved spl-devel build products to /usr/src/spl-<version>, a spl symlink is created to reference the last installed version.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure15
1 files changed, 9 insertions, 6 deletions
diff --git a/configure b/configure
index e42d7bfb9..d2e177ced 100755
--- a/configure
+++ b/configure
@@ -18930,7 +18930,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
# Check whether --with-linux or --without-linux was given.
if test "${with_linux+set}" = set; then
withval="$with_linux"
- kernelsrc="$withval"; kernelbuild="$withval"
+ kernelsrc="$withval"
fi;
@@ -18948,7 +18948,6 @@ echo $ECHO_N "checking kernel source directory... $ECHO_C" >&6
if test -e ${sourcelink}; then
kernelsrc=`readlink -f ${sourcelink}`
- kernelbuild=
else
echo "$as_me:$LINENO: result: Not found" >&5
echo "${ECHO_T}Not found" >&6
@@ -18970,10 +18969,14 @@ echo "$as_me: error:
echo "${ECHO_T}$kernelsrc" >&6
echo "$as_me:$LINENO: checking kernel build directory" >&5
echo $ECHO_N "checking kernel build directory... $ECHO_C" >&6
- if test -z "$kernelbuild" && test -d ${kernelsrc}-obj; then
- kernelbuild=${kernelsrc}-obj/`arch`/`arch`
- else
- kernelbuild=${kernelsrc}
+ if test -z "$kernelbuild"; then
+ if test -d ${kernelsrc}-obj; then
+ kernelbuild=${kernelsrc}-obj/`arch`/`arch`
+ elif test -d `dirname ${kernelsrc}`/build-`arch`; then
+ kernelbuild=`dirname ${kernelsrc}`/build-`arch`
+ else
+ kernelbuild=${kernelsrc}
+ fi
fi
echo "$as_me:$LINENO: result: $kernelbuild" >&5
echo "${ECHO_T}$kernelbuild" >&6