[ovs-dev] [PATCH 2/2] tests: Allow environment specified autom4te.

Ben Pfaff blp at nicira.com
Thu Oct 4 16:57:52 UTC 2012


On Wed, Oct 03, 2012 at 05:32:40PM -0700, Ethan Jackson wrote:
> 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 at nicira.com>

We can't (shouldn't, anyhow) use ?= because it's a GNU Make
extension.

Here's the canonical way to solve this:

diff --git a/configure.ac b/configure.ac
index 9bdffea..6be660e 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], [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 $@.tmp $@.at



More information about the dev mailing list