[trafficserver] branch master updated: Fix linkage of traffic_manager with WCCP due to removal of metric library.

[am...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

amc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new c0bd0f7  Fix linkage of traffic_manager with WCCP due to removal of metric library.
c0bd0f7 is described below

commit c0bd0f7cb665fec92ce83f39742cb99577a58b4b
Author: Alan M. Carroll <am...@apache.org>
AuthorDate: Fri May 18 09:46:12 2018 -0500

    Fix linkage of traffic_manager with WCCP due to removal of metric library.
---
 cmd/traffic_manager/Makefile.am | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/cmd/traffic_manager/Makefile.am b/cmd/traffic_manager/Makefile.am
index baa27c3..9152614 100644
--- a/cmd/traffic_manager/Makefile.am
+++ b/cmd/traffic_manager/Makefile.am
@@ -54,14 +54,6 @@ traffic_manager_LDADD = \
 AM_LDFLAGS += \
 	$(LUAJIT_LDFLAGS)
 
-traffic_manager_LDADD += \
-	$(top_builddir)/lib/bindings/libbindings.la
-
-if BUILD_LUAJIT
-traffic_manager_LDADD += \
-	$(top_builddir)/lib/luajit/src/libluajit.a
-endif
-
 if SYSTEM_LUAJIT
 traffic_manager_LDADD +=\
 	@LIBLUAJIT@
@@ -82,6 +74,14 @@ traffic_manager_LDADD += \
 
 endif
 
+traffic_manager_LDADD += \
+	$(top_builddir)/lib/bindings/libbindings.la
+
+if BUILD_LUAJIT
+traffic_manager_LDADD += \
+	$(top_builddir)/lib/luajit/src/libluajit.a
+endif
+
 include $(top_srcdir)/build/tidy.mk
 
 clang-tidy-local: $(DIST_SOURCES)

-- 
To stop receiving notification emails like this one, please contact
amc@apache.org.