x
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ea5fb9f6 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ea5fb9f6 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ea5fb9f6 Branch: refs/heads/lua_config Commit: ea5fb9f6fd4c19c70e91dfdab6c1462cc5457171 Parents: c5c92b9 Author: Leif Hedstrom <[email protected]> Authored: Tue Mar 25 21:23:03 2014 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Tue Mar 25 21:23:03 2014 -0600 ---------------------------------------------------------------------- proxy/Makefile.am | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ea5fb9f6/proxy/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/Makefile.am b/proxy/Makefile.am index 1056784..bd5aeba 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -251,14 +251,9 @@ traffic_sac_LDADD = \ $(top_builddir)/iocore/eventsystem/libinkevent.a \ $(top_builddir)/lib/records/librecprocess.a \ $(top_builddir)/lib/ts/libtsutil.la \ -<<<<<<< HEAD - @LUA_LIBS@ \ - @LIBRESOLV@ @LIBPCRE@ @LIBSSL@ @LIBTCL@ \ - @LIBEXPAT@ @LIBDEMANGLE@ @LIBZ@ @LIBLZMA@ @LIBPROFILER@ -lm -======= @LIBRESOLV@ @LIBPCRE@ @OPENSSL_LIBS@ @LIBTCL@ @hwloc_LIBS@ \ - @LIBEXPAT@ @LIBDEMANGLE@ @LIBZ@ @LIBLZMA@ @LIBPROFILER@ @SPDYLAY_LIBS@ -lm ->>>>>>> origin/master + @LIBEXPAT@ @LIBDEMANGLE@ @LIBZ@ @LIBLZMA@ @LIBPROFILER@ @SPDYLAY_LIBS@ -lm \ + @LUA_LIBS@ if BUILD_TESTS traffic_sac_SOURCES += RegressionSM.cc
