LU-3100 tests: Skip recovery-small test_111

[fs/lustre-release.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 3a40a5e..3d04d84 100644 (file)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,11 +4,13 @@
 
 # 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/
+       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="build libcfs lnet lustre"
+REQUIRED_DIRS="libcfs lnet lustre"
 OPTIONAL_DIRS="snmp portals"
 CONFIGURE_DIRS="libsysio lustre-iokit ldiskfs"
 
@@ -43,7 +45,7 @@ run_cmd()
        echo
 }
 
-run_cmd "aclocal $ACLOCAL_FLAGS"
+run_cmd "aclocal -I $PWD/config $ACLOCAL_FLAGS"
 run_cmd "autoheader"
 run_cmd "automake -a -c"
 run_cmd autoconf