Repository: trafficserver Updated Branches: refs/heads/master 044da6999 -> 8e6d037ef
jtest: openssl build fix Make sure jtest can link OpenSSL when it is in a non-default locatino given by --with-openssl. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/8e6d037e Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8e6d037e Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8e6d037e Branch: refs/heads/master Commit: 8e6d037ef15118ab4fb6ea653e4eddb81b6f9ef4 Parents: 044da69 Author: James Peach <[email protected]> Authored: Mon Sep 22 13:50:40 2014 -0700 Committer: James Peach <[email protected]> Committed: Mon Sep 22 13:50:40 2014 -0700 ---------------------------------------------------------------------- tools/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/8e6d037e/tools/Makefile.am ---------------------------------------------------------------------- diff --git a/tools/Makefile.am b/tools/Makefile.am index c13b81f..56726b8 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -19,6 +19,7 @@ bin_SCRIPTS = tsxs tspush +AM_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@ AM_CPPFLAGS = $(iocore_include_dirs) \ -I$(top_srcdir)/lib -I$(top_builddir)/lib \ -I$(top_srcdir)/lib/ts -I$(top_builddir)/lib/ts @@ -30,7 +31,7 @@ noinst_PROGRAMS = jtest/jtest endif jtest_jtest_SOURCES = jtest/jtest.cc -jtest_jtest_LDADD = $(top_builddir)/lib/ts/libtsutil.la +jtest_jtest_LDADD = $(top_builddir)/lib/ts/libtsutil.la @OPENSSL_LIBS@ if BUILD_HTTP_LOAD
