[PATCH master 2/7] Fix make commit-check when shelltest is missing

['Thomas Vander Stichele' via ganeti-devel]

Signed-off-by: Thomas Vander Stichele <thoma...@google.com>
---
 Makefile.am  | 4 +++-
 configure.ac | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 928a97a..199920f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3033,7 +3033,9 @@ live-test: all
 commit-check: autotools-check distcheck lint apidoc
 
 autotools-check:
-       TESTDATA_DIR=./test/data shelltest $(SHELLTESTARGS) \
+       @test -n "$(SHELLTEST)" || \
+           { echo 'shelltest' not found during configure; exit 1; }
+       TESTDATA_DIR=./test/data $(SHELLTEST) $(SHELLTESTARGS) \
   $(abs_top_srcdir)/test/autotools/*-*.test \
   -- --hide-successes
 
diff --git a/configure.ac b/configure.ac
index 4f003c1..c743ebc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -761,6 +761,8 @@ AC_GHC_PKG_CHECK([test-framework-0.6*], [], [
 AC_GHC_PKG_CHECK([test-framework-hunit], [], [HS_NODEV=1])
 AC_GHC_PKG_CHECK([test-framework-quickcheck2], [], [HS_NODEV=1])
 AC_GHC_PKG_CHECK([temporary], [], [HS_NODEV=1])
+AC_PATH_PROG(SHELLTEST, [shelltest], [])
+if test -z "$SHELLTEST"; then HS_NODEV=1; fi
 if test -n "$HS_NODEV"; then
    AC_MSG_WARN(m4_normalize([Required development modules were not found,
                              you won't be able to run Haskell unittests]))
-- 
2.7.0.rc3.207.g0ac5344