X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autogen.sh;h=f8b7741f29255a7c68ca5ba50c80ca5f22935984;hp=bf6a6a89ca7c8e831c9acd2389ecaaf7ed76db76;hb=2c7da05ca58b4146fa47cfcbc86de51099cf452a;hpb=4dd31baae9a73502c5c7bb5c0962fd703e231fd5

diff --git a/autogen.sh b/autogen.sh
index bf6a6a8..f8b7741 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,54 +2,14 @@
 
 # NOTE: Please avoid bashisms (bash specific syntax) in this script
 
-# die a horrible death.  All output goes to stderr.
-#
-die()
-{
-	echo "bootstrap failure:  $*"
-	echo Aborting
-	exit 1
-} 1>&2
-
-run_cmd()
-{
-	echo -n "Running $*"
-	eval "$@" || die "command exited with code $?"
-	echo
-}
-
-echo "Checking for a complete tree..."
-REQUIRED_DIRS="libcfs lnet lustre"
-OPTIONAL_DIRS="snmp portals"
-CONFIGURE_DIRS="libsysio lustre-iokit"
-
-for dir in $REQUIRED_DIRS ; do
-	test -d "$dir" || \
-		die "Your tree seems to be missing $dir.
-Please read README.lustrecvs for details."
-
-	ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
+set -e
+pw="$PWD"
+for dir in libcfs lnet lustre snmp ; do
+	ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $pw/$dir/autoconf"
 done
-# optional directories for Lustre
-for dir in $OPTIONAL_DIRS; do
-	if [ -d "$dir" ] ; then
-		ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
-	fi
-done
-
-PWD_SAVE=$PWD
 
-run_cmd "aclocal -I $PWD/config $ACLOCAL_FLAGS"
-run_cmd "autoheader"
-run_cmd "automake -a -c"
-run_cmd autoconf
-
-# bootstrap in these directories
-for dir in $CONFIGURE_DIRS; do
-	if [ -d $dir ] ; then
-		cd $dir
-		echo "bootstrapping in $dir..."
-		run_cmd "sh autogen.sh"
-	fi
-	cd $PWD_SAVE
-done
+libtoolize -q
+aclocal -I $pw/config $ACLOCAL_FLAGS
+autoheader
+automake -a -c
+autoconf