Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
b=17604
[fs/lustre-release.git]
/
build
/
autogen.sh
diff --git
a/build/autogen.sh
b/build/autogen.sh
index
b406459
..
70cada2
100644
(file)
--- a/
build/autogen.sh
+++ b/
build/autogen.sh
@@
-31,7
+31,7
@@
error_msg() {
EOF
else
cat >&2 <<-EOF
EOF
else
cat >&2 <<-EOF
-
CFS
provides RPMs which can be installed alongside your
+
Sun
provides RPMs which can be installed alongside your
existing autoconf/make RPMs, if you are nervous about
upgrading. See
existing autoconf/make RPMs, if you are nervous about
upgrading. See
@@
-83,9
+83,9
@@
if [ -d kernel_patches ] ; then
REQUIRED_DIRS="build"
CONFIGURE_DIRS=""
else
REQUIRED_DIRS="build"
CONFIGURE_DIRS=""
else
- REQUIRED_DIRS="build lnet lustre"
+ REQUIRED_DIRS="build l
ibcfs l
net lustre"
OPTIONAL_DIRS="snmp portals"
OPTIONAL_DIRS="snmp portals"
- CONFIGURE_DIRS="libsysio lustre-iokit ldiskfs"
+ CONFIGURE_DIRS="libsysio lustre-iokit ldiskfs
spl zfs
"
fi
for dir in $REQUIRED_DIRS ; do
fi
for dir in $REQUIRED_DIRS ; do
@@
-105,15
+105,21
@@
for dir in $OPTIONAL_DIRS; do
fi
done
fi
done
-check_version automake automake-1.7 "1.7.8"
+for AMVER in 1.7 1.8 1.9 1.10; do
+ [ "$(which automake-$AMVER 2> /dev/null)" ] && break
+done
+
+[ "$AMVER" = "1.10" ] && AMOPT="-W no-portability"
+
+check_version automake automake-$AMVER "1.7.8"
check_version autoconf autoconf "2.57"
check_version autoconf autoconf "2.57"
-echo "Running aclocal-
1.7
$ACLOCAL_FLAGS..."
-aclocal-
1.7
$ACLOCAL_FLAGS || exit 1
+echo "Running aclocal-
$AMVER
$ACLOCAL_FLAGS..."
+aclocal-
$AMVER
$ACLOCAL_FLAGS || exit 1
echo "Running autoheader..."
autoheader || exit 1
echo "Running autoheader..."
autoheader || exit 1
-echo "Running automake-
1.7
..."
-automake-
1.7 -a -c
|| exit 1
+echo "Running automake-
$AMVER
..."
+automake-
$AMVER -a -c $AMOPT
|| exit 1
echo "Running autoconf..."
autoconf || exit 1
echo "Running autoconf..."
autoconf || exit 1