X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autogen.sh;h=3f5031ced5bbce451b8ddb11f6bc8f8ca847aa0c;hp=3d04d84afe55b1e246fbae27842e8e4b5c36e5e6;hb=9cb4e3fcfdd314cff77b89e36cb7138f4e409c41;hpb=ce7eefa04b3bfabdd23dd80d594041cbcfb08fba

diff --git a/autogen.sh b/autogen.sh
index 3d04d84..3f5031c 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,61 +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
-	if [ -d .git/hooks -a ! -e .git/hooks/$HOOK ]; then
-		ln -sf ../../build/$HOOK .git/hooks/
-	fi
-done
-
-echo "Checking for a complete tree..."
-REQUIRED_DIRS="libcfs lnet lustre"
-OPTIONAL_DIRS="snmp portals"
-CONFIGURE_DIRS="libsysio lustre-iokit ldiskfs"
+set -e
 
-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
+for dir in libcfs lnet lustre snmp ; do
 	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 -I $PWD/config $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 $PWD/config $ACLOCAL_FLAGS
+autoheader
+automake -a -c
+autoconf