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 <[email protected]> --- configure.ac | 5 +++++ tests/automake.mk | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 9bdffea..a0191d5 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([auto4mte 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 20f9e82..2977f76 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 [email protected] [email protected] -- 1.7.12 _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
