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=21966 can not mount mdt after umount
[fs/lustre-release.git]
/
build
/
autogen.sh
diff --git
a/build/autogen.sh
b/build/autogen.sh
index
71c05e4
..
419d8e7
100644
(file)
--- a/
build/autogen.sh
+++ b/
build/autogen.sh
@@
-85,7
+85,7
@@
if [ -d kernel_patches ] ; then
else
REQUIRED_DIRS="build libcfs lnet lustre"
OPTIONAL_DIRS="snmp portals"
else
REQUIRED_DIRS="build libcfs lnet lustre"
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 1.11; do
+ [ "$(which automake-$AMVER 2> /dev/null)" ] && break
+done
+
+[ "${AMVER#1.}" -ge "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