You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2012/06/11 19:01:19 UTC
[2/3] git commit: TS-1297 Do not link all binaries and plugins with
libz and liblzma
TS-1297 Do not link all binaries and plugins with libz and liblzma
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/726cf61c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/726cf61c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/726cf61c
Branch: refs/heads/master
Commit: 726cf61c203d5a90d7feeab5637a04cd803343da
Parents: 50c624f
Author: Leif Hedstrom <zw...@apache.org>
Authored: Sun Jun 10 14:20:48 2012 -0600
Committer: Leif Hedstrom <zw...@apache.org>
Committed: Mon Jun 11 10:42:39 2012 -0600
----------------------------------------------------------------------
build/lzma.m4 | 2 +-
build/zlib.m4 | 2 +-
proxy/Makefile.am | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/726cf61c/build/lzma.m4
----------------------------------------------------------------------
diff --git a/build/lzma.m4 b/build/lzma.m4
index 482ec14..ecf827e 100644
--- a/build/lzma.m4
+++ b/build/lzma.m4
@@ -89,7 +89,7 @@ if test "$enable_lzma" != "no"; then
TS_FLAG_HEADERS(lzma.h, [lzma_have_headers=1])
fi
if test "$lzma_have_headers" != "0"; then
- TS_ADDTO(LIBS, [-llzma])
+ AC_SUBST(LIBLZMA, [-llzma])
else
enable_lzma=no
CPPFLAGS=$saved_cppflags
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/726cf61c/build/zlib.m4
----------------------------------------------------------------------
diff --git a/build/zlib.m4 b/build/zlib.m4
index 50fbe02..d08b88b 100644
--- a/build/zlib.m4
+++ b/build/zlib.m4
@@ -89,7 +89,7 @@ if test "$enable_zlib" != "no"; then
TS_FLAG_HEADERS(zlib.h, [zlib_have_headers=1])
fi
if test "$zlib_have_headers" != "0"; then
- TS_ADDTO(LIBS, [-lz])
+ AC_SUBST(LIBZ, [-lz])
else
enable_zlib=no
CPPFLAGS=$saved_cppflags
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/726cf61c/proxy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 835dd15..69c9c2a 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -166,6 +166,7 @@ traffic_server_LDADD = \
@LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
@LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBDL@ \
@LIBEXPAT@ @LIBDEMANGLE@ @LIBICONV@ @LIBCAP@ @LIBHWLOC@ \
+ @LIBZ@ @LIBLZMA@ \
@LIBMLD@ @LIBEXC@ -lm @LIBPROFILER@ @LIBEXECINFO@
traffic_logcat_SOURCES = logcat.cc
@@ -259,7 +260,7 @@ traffic_sac_LDADD = \
@LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
@LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBDL@ \
@LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ @LIBICONV@ -lm @LIBPROFILER@ \
- @LIBEXECINFO@
+ @LIBZ@ @LIBLZMA@ @LIBEXECINFO@
if BUILD_TESTS
traffic_sac_LDADD += RegressionSM.o