From 891134eba97f4869ebb76df2d3b0232a46d2cf08 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 23 Aug 2015 23:04:19 +0900 Subject: [PATCH] Define it and itprep recursive target if AM_EXTRA_RECURSIVE_TARGETS is defined --- configure.ac | 5 ++--- integration-tests/Makefile.am | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 713346d3..6e69c1d5 100644 --- a/configure.ac +++ b/configure.ac @@ -39,10 +39,9 @@ AC_CANONICAL_HOST AC_CANONICAL_TARGET AM_INIT_AUTOMAKE([subdir-objects]) -# comment out for now since this requires automake 1.13 or higher and -# travis has older one. -# AM_EXTRA_RECURSIVE_TARGETS([it]) +# AM_EXTRA_RECURSIVE_TARGETS requires automake 1.13 or higher +m4_ifdef([AM_EXTRA_RECURSIVE_TARGETS], [AM_EXTRA_RECURSIVE_TARGETS([it itprep])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) dnl See versioning rule: diff --git a/integration-tests/Makefile.am b/integration-tests/Makefile.am index 2ab15608..3ad95ece 100644 --- a/integration-tests/Makefile.am +++ b/integration-tests/Makefile.am @@ -32,13 +32,11 @@ EXTRA_DIST = \ alt-server.crt \ setenv -.PHONY: itprep it - -itprep: +itprep-local: go get -d -v github.com/bradfitz/http2 go get -d -v github.com/tatsuhiro-t/go-nghttp2 go get -d -v github.com/tatsuhiro-t/spdy go get -d -v golang.org/x/net/websocket -it: +it-local: sh setenv go test -v