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>

diff --git a/configure.ac b/configure.ac
index 9bdffeadf0bf1955f4b753060670b582601a2fcb..10b214e64b1b18de8ba2d77ea1ef843a747ac934 100644 (file)
--- 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 20f9e827f7137094f67811573147e49e47015ab7..2977f76bf6cb51804445971e9fe3a891f8dc5b0b 100644 (file)
--- 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