X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autogen.sh;h=f8b7741f29255a7c68ca5ba50c80ca5f22935984;hp=3a40a5e208148968a175405525ddb0ba85a6e86a;hb=d6604b4a7d147602b4cab14e2353f860ba0f422e;hpb=5fc8551aaba3bc467647d8ea549fafee039b48f9

diff --git a/autogen.sh b/autogen.sh
index 3a40a5e..f8b7741 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,59 +2,14 @@
 
 # NOTE: Please avoid bashisms (bash specific syntax) in this script
 
-# install Lustre Git commit hooks by default - LU-2083
-for HOOK in commit-msg prepare-commit-msg; do
-	[ -e .git/hooks/$HOOK ] || ln -sf ../../build/$HOOK .git/hooks/
+set -e
+pw="$PWD"
+for dir in libcfs lnet lustre snmp ; do
+	ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $pw/$dir/autoconf"
 done
 
-echo "Checking for a complete tree..."
-REQUIRED_DIRS="build libcfs lnet lustre"
-OPTIONAL_DIRS="snmp portals"
-CONFIGURE_DIRS="libsysio lustre-iokit ldiskfs"
-
-for dir in $REQUIRED_DIRS ; do
-	if [ ! -d "$dir" ] ; then
-		cat >&2 <<EOF
-Your tree seems to be missing $dir.
-Please read README.lustrecvs for details.
-EOF
-		exit 1
-	fi
-	ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$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
-
-run_cmd()
-{
-	cmd="$@"
-	echo -n "Running $cmd"
-	eval $cmd
-	res=$?
-	if [ $res -ne 0 ]; then
-		echo " failed: $res"
-		echo "Aborting"
-		exit 1
-	fi
-	echo
-}
-
-run_cmd "aclocal $ACLOCAL_FLAGS"
-run_cmd "autoheader"
-run_cmd "automake -a -c"
-run_cmd autoconf
-
-# Run autogen.sh in these directories
-PWD_SAVE=$PWD
-for dir in $CONFIGURE_DIRS; do
-	if [ -d $dir ] ; then
-		cd $dir
-		echo "Running autogen for $dir..."
-		run_cmd "sh autogen.sh"
-	fi
-	cd $PWD_SAVE
-done
+libtoolize -q
+aclocal -I $pw/config $ACLOCAL_FLAGS
+autoheader
+automake -a -c
+autoconf