You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2014/09/11 01:34:54 UTC
[1/2] git commit: ci/regression: forward command line options to
configure
Repository: trafficserver
Updated Branches:
refs/heads/master 9a318f60c -> a28621e47
ci/regression: forward command line options to configure
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/9bd6e8c0
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/9bd6e8c0
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/9bd6e8c0
Branch: refs/heads/master
Commit: 9bd6e8c0ce87b494a1ad44c25dc3a9b52d6f287d
Parents: 9a318f6
Author: James Peach <jp...@apache.org>
Authored: Wed Sep 10 16:10:40 2014 -0700
Committer: James Peach <jp...@apache.org>
Committed: Wed Sep 10 16:10:40 2014 -0700
----------------------------------------------------------------------
ci/regression | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/9bd6e8c0/ci/regression
----------------------------------------------------------------------
diff --git a/ci/regression b/ci/regression
index fc1bc06..f47478b 100755
--- a/ci/regression
+++ b/ci/regression
@@ -75,7 +75,7 @@ extras() {
autogen() {
(
cd "$SRCROOT"
- [ configure -nt configure.ac -a Makefile -nt Makefile.am ] || autoreconf -fi
+ [ configure -nt configure.ac -a Makefile.in -nt Makefile.am ] || autoreconf -fi
)
}
@@ -91,7 +91,8 @@ configure() {
--enable-experimental-plugins \
$(extras) \
CC="$CC" \
- CXX="$CXX"
+ CXX="$CXX" \
+ "$@"
)
}
[2/2] git commit: build: link the sslheaders test against OpenSSL
Posted by jp...@apache.org.
build: link the sslheaders test against OpenSSL
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a28621e4
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a28621e4
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a28621e4
Branch: refs/heads/master
Commit: a28621e475ef812de9c61d5bc586e12b9b4d44d7
Parents: 9bd6e8c
Author: James Peach <jp...@apache.org>
Authored: Wed Sep 10 16:11:20 2014 -0700
Committer: James Peach <jp...@apache.org>
Committed: Wed Sep 10 16:11:20 2014 -0700
----------------------------------------------------------------------
plugins/experimental/sslheaders/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a28621e4/plugins/experimental/sslheaders/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/experimental/sslheaders/Makefile.am b/plugins/experimental/sslheaders/Makefile.am
index 0372f4d..0eed061 100644
--- a/plugins/experimental/sslheaders/Makefile.am
+++ b/plugins/experimental/sslheaders/Makefile.am
@@ -31,6 +31,7 @@ sslheaders_la_LIBADD = libsslhdr.la
test_sslheaders_SOURCES = test_sslheaders.cc sslheaders.h
test_sslheaders_LDADD = \
libsslhdr.la \
- $(top_builddir)/lib/ts/libtsutil.la
+ $(top_builddir)/lib/ts/libtsutil.la \
+ @OPENSSL_LIBS@
TESTS = $(check_PROGRAMS)