From 7fd3e43db0715475e12a7cfb5d4b57a6005cac81 Mon Sep 17 00:00:00 2001
From: Ethan Jackson <ethan@nicira.com>
Date: Wed, 3 Oct 2012 15:58:54 -0700
Subject: [PATCH] tests: Allow environment specified autom4te.

In the ESX build system, autom4te is in a funny location specified
by an environment variable.  Before this patch, this environment
variable was overridden by the tests automake file.

Signed-off-by: Ethan Jackson <ethan@nicira.com>
---
 configure.ac      | 5 +++++
 tests/automake.mk | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 9bdffeadf..10b214e64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,6 +34,11 @@ if test "$PERL" = no; then
    AC_MSG_ERROR([Perl interpreter not found in $PATH or $PERL.])
 fi
 
+AC_PATH_PROG([AUTOM4TE], autom4te, no)
+if test "$AUTOM4TE" = no; then
+   AC_MSG_ERROR([autom4te not found in $PATH or $AUTOM4TE.])
+fi
+
 AC_USE_SYSTEM_EXTENSIONS
 AC_C_BIGENDIAN
 AC_SYS_LARGEFILE
diff --git a/tests/automake.mk b/tests/automake.mk
index 20f9e827f..2977f76bf 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -146,7 +146,6 @@ check-valgrind: all tests/atconfig tests/atlocal $(TESTSUITE) \
 clean-local:
 	test ! -f '$(TESTSUITE)' || $(SHELL) '$(TESTSUITE)' -C tests --clean
 
-AUTOM4TE = autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
 $(TESTSUITE): package.m4 $(TESTSUITE_AT)
 	$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at
-- 
2.20.1