trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jpe...@apache.org
Subject trafficserver git commit: Make sure traffic_sac links OpenSSL
Date Thu, 12 Feb 2015 18:10:16 GMT
Repository: trafficserver
Updated Branches:
  refs/heads/master 8b6eae88f -> 15db4169d


Make sure traffic_sac links OpenSSL


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/15db4169
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/15db4169
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/15db4169

Branch: refs/heads/master
Commit: 15db4169ddaf9ee274c5e8a7051a09a4b2e914f3
Parents: 8b6eae8
Author: James Peach <jpeach@apache.org>
Authored: Thu Feb 12 10:10:02 2015 -0800
Committer: James Peach <jpeach@apache.org>
Committed: Thu Feb 12 10:10:08 2015 -0800

----------------------------------------------------------------------
 proxy/Makefile.am | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/15db4169/proxy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 1d8c9f9..a225e5a 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -229,7 +229,6 @@ traffic_server_LDADD = \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   @HWLOC_LIBS@ \
   @LIBPCRE@ \
-  @OPENSSL_LIBS@ \
   @LIBTCL@ \
   @LIBEXPAT@ \
   @LIBCAP@ \
@@ -238,6 +237,7 @@ traffic_server_LDADD = \
   @LIBLZMA@ \
   @LIBPROFILER@ \
   @SPDYLAY_LIBS@ \
+  @OPENSSL_LIBS@ \
   @LIBPTHREAD@ \
   -lm
 
@@ -328,8 +328,18 @@ traffic_sac_LDADD = \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/lib/records/librecords_p.a \
   $(top_builddir)/lib/ts/libtsutil.la \
-  @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @HWLOC_LIBS@ \
-  @LIBEXPAT@ @LIBZ@ @LIBLZMA@ @LIBPROFILER@ @SPDYLAY_LIBS@ @LIBPTHREAD@ -lm
+  @LIBRESOLV@ \
+  @LIBPCRE@ \
+  @LIBTCL@ \
+  @HWLOC_LIBS@ \
+  @LIBEXPAT@ \
+  @LIBZ@ \
+  @LIBLZMA@ \
+  @LIBPROFILER@ \
+  @SPDYLAY_LIBS@ \
+  @OPENSSL_LIBS@ \
+  @LIBPTHREAD@ \
+  -lm
 
 if BUILD_TESTS
   traffic_sac_SOURCES += RegressionSM.cc


Mime
View raw message