trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jpe...@apache.org
Subject git commit: TS-1768: prefer AC_SEARCH_LIBS to AC_CHECK_LIB
Date Mon, 06 May 2013 17:06:02 GMT
Updated Branches:
  refs/heads/master 114f1719a -> abb0d748d


TS-1768: prefer AC_SEARCH_LIBS to AC_CHECK_LIB

AC_SEARCH_LIB should be preferred to AC_CHECK_LIB because the former
does not link the library under test the symbol is already present.
AC_SEARCH_LIBS conveniently appends the library to LIBS which makes
the Makefile.am simpler.

Unfortunately, our check for libresolv depends on the AC_CHECK_LIB
behavior. I didn't change this because the extensive use of macros
to rename API in libresolv makes the configuration tests more complex
that I wanted to deal with in this bug.


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

Branch: refs/heads/master
Commit: abb0d748d96d966e495f8a2bff21ec420498ee14
Parents: 114f171
Author: James Peach <jpeach@apache.org>
Authored: Fri Apr 5 11:54:16 2013 -0700
Committer: James Peach <jpeach@apache.org>
Committed: Mon May 6 09:57:34 2013 -0700

----------------------------------------------------------------------
 CHANGES                              |    2 +
 build/crypto.m4                      |    5 ++-
 build/jemalloc.m4                    |   10 +++---
 build/lzma.m4                        |    2 +-
 build/pcre.m4                        |    2 +-
 build/tcmalloc.m4                    |    2 +-
 build/xml.m4                         |    2 +-
 build/zlib.m4                        |    2 +-
 ci/regression                        |    2 +-
 configure.ac                         |   40 ++++++++++++++++------------
 cop/Makefile.am                      |    3 +-
 iocore/aio/Makefile.am               |    2 +-
 iocore/eventsystem/Makefile.am       |    2 +-
 lib/ts/Makefile.am                   |   13 +++------
 lib/tsconfig/Makefile.am             |    2 +-
 mgmt/Makefile.am                     |    5 +--
 mgmt/api/remote/Makefile.am          |    3 +-
 mgmt/cli/Makefile.am                 |    9 +++---
 plugins/experimental/esi/Makefile.am |   10 +++---
 proxy/Makefile.am                    |   37 ++++++++++++--------------
 proxy/hdrs/Makefile.am               |    2 +-
 tools/Makefile.am                    |    4 +--
 22 files changed, 79 insertions(+), 82 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index dad74a7..2df36aa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
   Changes with Apache Traffic Server 3.3.3
 
 
+  *) [TS-1768] Prefer AC_SEARCH_LIBS to AC_CHECK_LIB to avoid unnecessary linking.
+
   *) [TS-1877] Fix multiple Lua remap plugin instance creation.
 
   *) [TS-1770] Unable to create remap rule for SSL sites when accessed as a

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/build/crypto.m4
----------------------------------------------------------------------
diff --git a/build/crypto.m4 b/build/crypto.m4
index 7602d5b..80f1cf7 100644
--- a/build/crypto.m4
+++ b/build/crypto.m4
@@ -23,7 +23,7 @@ dnl TS_CHECK_CRYPTO: look for crypto libraries and headers
 dnl
 AC_DEFUN([TS_CHECK_CRYPTO], [
   enable_crypto=no
-  AC_CHECK_LIB([crypt],[crypt],[AC_SUBST([LIBCRYPT],["-lcrypt"])])
+  AC_SEARCH_LIBS([crypt], [crypt], [AC_SUBST([LIBCRYPT],["-lcrypt"])])
 
   TS_CHECK_CRYPTO_OPENSSL
   dnl add checks for other varieties of ssl here
@@ -92,7 +92,8 @@ if test "$enable_openssl" != "no"; then
     TS_ADDTO(LDFLAGS, [-L${openssl_ldflags}])
     TS_ADDTO(LIBTOOL_LINK_FLAGS, [-R${openssl_ldflags}])
   fi
-  AC_CHECK_LIB(crypto, BN_init, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
+  AC_SEARCH_LIBS([BN_init],[crypto],
+      AC_SEARCH_LIBS([SSL_accept], [ssl], [openssl_have_libs=1], [], [-lcrypto]))
   if test "$openssl_have_libs" != "0"; then
       AC_CHECK_HEADERS(openssl/x509.h, [openssl_have_headers=1])
   fi

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/build/jemalloc.m4
----------------------------------------------------------------------
diff --git a/build/jemalloc.m4 b/build/jemalloc.m4
index 1b4cb7d..55479b5 100644
--- a/build/jemalloc.m4
+++ b/build/jemalloc.m4
@@ -58,11 +58,11 @@ if test "$enable_jemalloc" != "no"; then
     TS_ADDTO(LDFLAGS, [-L${jemalloc_ldflags}])
     TS_ADDTO(LIBTOOL_LINK_FLAGS, [-R${jemalloc_ldflags}])
   fi
-  if test "`uname -s`" = "Darwin"; then
-    AC_CHECK_LIB(jemalloc, je_malloc_stats_print, [jemalloc_have_libs=1])
-  else
-    AC_CHECK_LIB(jemalloc, malloc_stats_print, [jemalloc_have_libs=1])
-  fi
+  # On Darwin, jemalloc symbols are prefixed with je_. Search for that first, then fall back
+  # to unadorned symbols.
+  AC_SEARCH_LIBS([je_malloc_stats_print], [jemalloc], [jemalloc_have_libs=1],
+    [AC_SEARCH_LIBS([malloc_stats_print], [jemalloc], [jemalloc_have_libs=1])]
+  )
   if test "$jemalloc_have_libs" != "0"; then
     TS_FLAG_HEADERS(jemalloc/jemalloc.h, [jemalloc_have_headers=1])
   fi

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/build/lzma.m4
----------------------------------------------------------------------
diff --git a/build/lzma.m4 b/build/lzma.m4
index ecf827e..0be7779 100644
--- a/build/lzma.m4
+++ b/build/lzma.m4
@@ -84,7 +84,7 @@ if test "$enable_lzma" != "no"; then
     TS_ADDTO(LDFLAGS, [-L${lzma_ldflags}])
     TS_ADDTO(LIBTOOL_LINK_FLAGS, [-R${lzma_ldflags}])
   fi
-  AC_CHECK_LIB(lzma, lzma_code, [lzma_have_libs=1])
+  AC_SEARCH_LIBS([lzma_code], [lzma], [lzma_have_libs=1])
   if test "$lzma_have_libs" != "0"; then
     TS_FLAG_HEADERS(lzma.h, [lzma_have_headers=1])
   fi

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/build/pcre.m4
----------------------------------------------------------------------
diff --git a/build/pcre.m4 b/build/pcre.m4
index fd0f14b..ba7ae3a 100644
--- a/build/pcre.m4
+++ b/build/pcre.m4
@@ -95,7 +95,7 @@ if test "$enable_pcre" != "no"; then
     TS_ADDTO(LDFLAGS, [-L${pcre_ldflags}])
     TS_ADDTO(LIBTOOL_LINK_FLAGS, [-R${pcre_ldflags}])
   fi
-  AC_CHECK_LIB(pcre, pcre_exec, [pcre_have_libs=1])
+  AC_SEARCH_LIBS([pcre_exec], [pcre], [pcre_have_libs=1])
   if test "$pcre_have_libs" != "0"; then
     TS_FLAG_HEADERS(pcre.h, [pcre_have_headers=1])
     TS_FLAG_HEADERS(pcre/pcre.h, [pcre_have_headers=1])

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/build/tcmalloc.m4
----------------------------------------------------------------------
diff --git a/build/tcmalloc.m4 b/build/tcmalloc.m4
index 20fea07..e369d73 100644
--- a/build/tcmalloc.m4
+++ b/build/tcmalloc.m4
@@ -43,7 +43,7 @@ AC_ARG_WITH([tcmalloc], [AC_HELP_STRING([--with-tcmalloc=DIR], [use the
tcmalloc
       TS_ADDTO(LDFLAGS, [-L${tcmalloc_ldflags}])
       TS_ADDTO(LIBTOOL_LINK_FLAGS, [-rpath ${tcmalloc_ldflags}])
     fi
-    AC_CHECK_LIB(${with_tcmalloc_lib}, tc_cfree , [tcmalloc_have_lib=1])
+    AC_SEARCH_LIBS([tc_cfree], ${with_tcmalloc_lib}, [tcmalloc_have_lib=1])
     if test "$tcmalloc_have_lib" != "0"; then
       TS_ADDTO(LIBS, [-l${with_tcmalloc_lib}])
       has_tcmalloc=1      

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/build/xml.m4
----------------------------------------------------------------------
diff --git a/build/xml.m4 b/build/xml.m4
index faf2aa1..0f3a62c 100644
--- a/build/xml.m4
+++ b/build/xml.m4
@@ -92,7 +92,7 @@ if test "$enable_expat" != "no"; then
     TS_ADDTO(LDFLAGS, [-L${expat_ldflags}])
     TS_ADDTO(LIBTOOL_LINK_FLAGS, [-R${expat_ldflags}])
   fi
-  AC_CHECK_LIB(expat, XML_SetUserData, [expat_have_libs=1])
+  AC_SEARCH_LIBS([XML_SetUserData], [expat], [expat_have_libs=1])
   if test "$expat_have_libs" != "0"; then
       TS_FLAG_HEADERS(expat.h, [expat_have_headers=1])
   fi

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/build/zlib.m4
----------------------------------------------------------------------
diff --git a/build/zlib.m4 b/build/zlib.m4
index d08b88b..b71a74a 100644
--- a/build/zlib.m4
+++ b/build/zlib.m4
@@ -84,7 +84,7 @@ if test "$enable_zlib" != "no"; then
     TS_ADDTO(LDFLAGS, [-L${zlib_ldflags}])
     TS_ADDTO(LIBTOOL_LINK_FLAGS, [-rpath ${zlib_ldflags}])
   fi
-  AC_CHECK_LIB(z, compressBound, [zlib_have_libs=1])
+  AC_SEARCH_LIBS([compressBound], [z], [zlib_have_libs=1])
   if test "$zlib_have_libs" != "0"; then
     TS_FLAG_HEADERS(zlib.h, [zlib_have_headers=1])
   fi

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/ci/regression
----------------------------------------------------------------------
diff --git a/ci/regression b/ci/regression
index 8fd985d..05faa9e 100755
--- a/ci/regression
+++ b/ci/regression
@@ -108,6 +108,6 @@ MAKE=${MAKE:-$(prog make)}
 export CC CXX MAKE
 
 autogen
-configure
+configure "$@"
 build
 regress

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index fce8b72..8ac51fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -953,16 +953,27 @@ fi
 # -----------------------------------------------------------------------------
 # 4. CHECK FOR LIBRARIES
 
-AC_CHECK_LIB([exc],[exc_capture_context],[AC_SUBST([LIBEXC],["-lexc"])])
-AC_CHECK_LIB([mld],[MLD_demangle_string],[AC_SUBST([LIBMLD],["-lmld"])])
-AC_CHECK_LIB([dl],[dlopen],[AC_SUBST([LIBDL],["-ldl"])])
-AC_CHECK_LIB([socket],[socket],[AC_SUBST([LIBSOCKET],["-lsocket"])])
-AC_CHECK_LIB([nsl],[gethostbyname],[AC_SUBST([LIBNSL],["-lnsl"])])
+AC_SEARCH_LIBS([exc_capture_context], [exc], [], [])
+AC_SEARCH_LIBS([MLD_demangle_string], [mld], [], [])
+AC_SEARCH_LIBS([dlopen], [dl], [], [])
+AC_SEARCH_LIBS([socket], [socket], [], [])
+AC_SEARCH_LIBS([gethostbyname], [nsl], [], [])
+
+dnl Linux has pthread symbol stubss in both libc ad libpthread, so it's important to test
+dnl specifically for pthread_create() here.
+AC_SEARCH_LIBS([pthread_create], [pthread], [], [])
+AC_SEARCH_LIBS([clock_gettime], [rt], [], [])
+AC_SEARCH_LIBS([clock_gettime], [posix4], [], [])
+
+dnl XXX The following check incorrectly causes the build to succeed
+dnl on Darwin. We should be using AC_SEARCH_LIBS, but rest_init is
+dnl actually present in libsystem. We are searching for the library
+dnl that contains the full Bind 9 API (which is acutally libresolv).
+dnl However, the resolv API uses macros to rename it's APIs to per-version
+dnl symbols, so standard autoconf macros cannot reasonably be used to
+dnl check for it. We need to write custom macros to detect it properly.
 AC_CHECK_LIB([resolv],[res_init],[AC_SUBST([LIBRESOLV],["-lresolv"])])
 AC_CHECK_LIB([resolv],[__putlong],[AC_SUBST([LIBRESOLV],["-lresolv"])])
-AC_CHECK_LIB([pthread],[pthread_exit],[AC_SUBST([LIBTHREAD],["-lpthread"])])
-AC_CHECK_LIB([rt],[clock_gettime],[AC_SUBST([LIBRT],["-lrt"])])
-AC_CHECK_LIB([posix4],[clock_gettime],[AC_SUBST([LIBRT],["-lposix4"])])
 
 # Test for ncurses. We need to turn off -Werror because the C code in the
 # ncurses compile tests does not generate unused variable warnings.
@@ -1070,11 +1081,7 @@ has_backtrace=0
 TS_FLAG_HEADERS([execinfo.h], [has_backtrace=1],[])
 if test "${has_backtrace}" = "1"; then
   # FreeBSD requires '/usr/ports/devel/libexecinfo' for gdb style backtrace() support
-  AC_CHECK_LIB([execinfo], [backtrace], [have_backtrace_lib=yes
-                                         AC_SUBST([LIBEXECINFO],["-lexecinfo"])])
-  if test "x${have_backtrace_lib}" = "xyes"; then
-    AC_MSG_NOTICE([Using backtrace library '-lexecinfo'])
-  fi
+  AC_SEARCH_LIBS([backtrace], [execinfo], [have_backtrace_lib=yes])
 else
   AC_MSG_WARN([No backtrace() support found])
 fi
@@ -1105,7 +1112,7 @@ AC_SUBST(use_port)
 
 has_profiler=0
 if test "x${with_profiler}" = "xyes"; then
-  AC_CHECK_LIB([profiler], [ProfilerStart],
+  AC_SEARCH_LIBS([ProfilerStart], [profiler],
     [AC_SUBST([LIBPROFILER], ["-lprofiler"])
      has_profiler=1
     ],
@@ -1121,7 +1128,7 @@ has_demangle=0
 #  check with the C++ compiler since we might be using
 #  SunPro CC for the C++ compiler and gcc for the C compiler
 AC_LANG_PUSH([C++])
-AC_CHECK_LIB([demangle],[cplus_demangle],
+AC_SEARCH_LIBS([cplus_demangle],[demangle],
   [LIBDEMANGLE="-ldemangle"
    has_demangle=1
   ]
@@ -1184,7 +1191,7 @@ AC_SUBST(has_128bit_cas)
 # If we don't find it, disable checking for header.
 use_posix_cap=0
 AS_IF([test "x$enable_posix_cap" != "xno"],
-  AC_CHECK_LIB([cap],[cap_set_proc],
+  AC_SEARCH_LIBS([cap_set_proc],[cap],
     [AC_SUBST([LIBCAP], ["-lcap"])
      use_posix_cap=1
     ],[
@@ -1232,7 +1239,6 @@ AC_SUBST(use_linux_native_aio)
 # Check for hwloc library.
 # If we don't find it, disable checking for header.
 use_hwloc=0
-
 AS_IF([test "x$enable_hwloc" = "xyes"], [
   AC_CHECK_HEADERS([hwloc.h], [],
     [AC_MSG_WARN([hwloc.h header not found, try --disable-hwloc])], []

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/cop/Makefile.am
----------------------------------------------------------------------
diff --git a/cop/Makefile.am b/cop/Makefile.am
index 99cb508..f201583 100644
--- a/cop/Makefile.am
+++ b/cop/Makefile.am
@@ -35,5 +35,4 @@ traffic_cop_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
 traffic_cop_LDADD = \
   $(top_builddir)/mgmt/api/remote/libtsmgmt.la \
   $(top_builddir)/lib/ts/libtsutil.la \
-  @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBTCL@ @LIBRT@ @LIBDL@ \
-  @LIBEXECINFO@ @LIBSSL@ @LIBRESOLV@
+  @LIBRESOLV@ @LIBSSL@

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/iocore/aio/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/aio/Makefile.am b/iocore/aio/Makefile.am
index bd698a2..4090184 100644
--- a/iocore/aio/Makefile.am
+++ b/iocore/aio/Makefile.am
@@ -52,5 +52,5 @@ test_AIO_LDADD = \
   $(top_builddir)/mgmt/utils/libutils_p.a \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/lib/ts/libtsutil.la \
-  @LIBTCL@ @LIBTHREAD@
+  @LIBTCL@
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/iocore/eventsystem/Makefile.am
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/Makefile.am b/iocore/eventsystem/Makefile.am
index 25348f3..1eac3d1 100644
--- a/iocore/eventsystem/Makefile.am
+++ b/iocore/eventsystem/Makefile.am
@@ -90,7 +90,7 @@ test_LDADD = \
   $(top_builddir)/mgmt/utils/libutils_p.a \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/lib/ts/libtsutil.la \
-  @LIBTCL@ @LIBTHREAD@
+  @LIBTCL@
 
 test_Buffer_SOURCES = ../../proxy/UglyLogStubs.cc test_Buffer.cc
 test_Event_SOURCES = ../../proxy/UglyLogStubs.cc test_Event.cc

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/lib/ts/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/ts/Makefile.am b/lib/ts/Makefile.am
index 2b6692d..b78cdf8 100644
--- a/lib/ts/Makefile.am
+++ b/lib/ts/Makefile.am
@@ -32,9 +32,6 @@ libtsutil_la_LIBADD = \
   @LIBSSL@ \
   @LIBTCL@ \
   @LIBRESOLV@ \
-  @LIBRT@ \
-  @LIBSOCKET@ \
-  @LIBNSL@ \
   @LIBCAP@ \
   -lc
 
@@ -169,24 +166,24 @@ ParseRulesCType: CompileParseRules
 mkdfa_SOURCES = mkdfa.c
 
 test_atomic_SOURCES = test_atomic.cc
-test_atomic_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBEXECINFO@ @LIBPCRE@
+test_atomic_LDADD = libtsutil.la @LIBTCL@ @LIBPCRE@
 test_atomic_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
 
 test_freelist_SOURCES = test_freelist.cc
-test_freelist_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBEXECINFO@ @LIBPCRE@
+test_freelist_LDADD = libtsutil.la @LIBTCL@ @LIBPCRE@
 test_freelist_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
 
 test_arena_SOURCES = test_arena.cc
-test_arena_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBEXECINFO@ @LIBPCRE@
+test_arena_LDADD = libtsutil.la @LIBTCL@ @LIBPCRE@
 test_arena_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
 
 test_List_SOURCES = test_List.cc
 test_Map_SOURCES = test_Map.cc
-test_Map_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBEXECINFO@ @LIBPCRE@
+test_Map_LDADD = libtsutil.la @LIBTCL@ @LIBPCRE@
 test_Map_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
 
 test_Vec_SOURCES = test_Vec.cc
-test_Vec_LDADD = libtsutil.la @LIBTHREAD@ @LIBTCL@ @LIBEXECINFO@ @LIBPCRE@
+test_Vec_LDADD = libtsutil.la @LIBTCL@ @LIBPCRE@
 test_Vec_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
 
 CompileParseRules_SOURCES = CompileParseRules.cc

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/lib/tsconfig/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/tsconfig/Makefile.am b/lib/tsconfig/Makefile.am
index caa0392..dde552f 100644
--- a/lib/tsconfig/Makefile.am
+++ b/lib/tsconfig/Makefile.am
@@ -48,7 +48,7 @@ libtsconfig_la_SOURCES = \
 
 test_tsconfig_SOURCES = test-tsconfig.cc
 
-test_tsconfig_LDADD = libtsconfig.la ../ts/libtsutil.la @LIBEXECINFO@
+test_tsconfig_LDADD = libtsconfig.la ../ts/libtsutil.la
 
 # Strip to just the enum in the ts::config namespace so we can use
 # it more easily in C++.

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/mgmt/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/Makefile.am b/mgmt/Makefile.am
index ea47373..a646082 100644
--- a/mgmt/Makefile.am
+++ b/mgmt/Makefile.am
@@ -102,9 +102,8 @@ traffic_manager_LDADD = \
   $(top_builddir)/mgmt/tools/libinksysapi.a \
   $(top_builddir)/mgmt/tools/libinkconfigapi.a \
   $(top_builddir)/lib/ts/libtsutil.la \
-  @LIBEXPAT@ @LIBPCRE@ @LIBTCL@ \
-  -lm @LIBDL@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \
-  @LIBTHREAD@ @LIBRT@ @LIBEXECINFO@ @LIBCAP@
+  @LIBRESOLV@ @LIBEXPAT@ @LIBPCRE@ @LIBTCL@ @LIBCAP@ \
+  -lm
 
 # Must do it this way or the dependencies aren't detected.
 if BUILD_WCCP

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/mgmt/api/remote/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/api/remote/Makefile.am b/mgmt/api/remote/Makefile.am
index d48594b..c9a3213 100644
--- a/mgmt/api/remote/Makefile.am
+++ b/mgmt/api/remote/Makefile.am
@@ -56,5 +56,4 @@ endif
 traffic_api_cli_remote_LDADD = \
   libtsmgmt.la \
   $(top_builddir)/lib/ts/libtsutil.la \
-  @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \
-  @LIBTCL@ @LIBRT@ @LIBDL@ @LIBSSL@ @LIBEXECINFO@
+  @LIBTCL@ @LIBSSL@

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/mgmt/cli/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/cli/Makefile.am b/mgmt/cli/Makefile.am
index 933686b..d081967 100644
--- a/mgmt/cli/Makefile.am
+++ b/mgmt/cli/Makefile.am
@@ -80,13 +80,12 @@ traffic_shell_LDADD = \
   $(top_builddir)/mgmt/utils/libutils_lm.a \
   $(top_builddir)/lib/ts/libtsutil.la \
   $(LIBTCL) $(LIBREADLINE) \
-  @LIBDL@ -lm @LIBEXPAT@ @LIBSSL@ \
-  @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \
-  @LIBRT@ @LIBEXECINFO@ @LIBPCRE@ @LIBREADLINE@
+  @LIBRESOLV@ @LIBEXPAT@ @LIBSSL@ \
+  @LIBPCRE@ @LIBREADLINE@ \
+  -lm
 
 traffic_line_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
 traffic_line_LDADD = \
   $(top_builddir)/mgmt/api/remote/libtsmgmt.la \
   $(top_builddir)/lib/ts/libtsutil.la \
-  @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBTCL@ @LIBRT@ @LIBDL@ \
-  @LIBEXECINFO@ @LIBSSL@ @LIBRESOLV@
+  @LIBRESOLV@ @LIBTCL@ @LIBSSL@

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/plugins/experimental/esi/Makefile.am
----------------------------------------------------------------------
diff --git a/plugins/experimental/esi/Makefile.am b/plugins/experimental/esi/Makefile.am
index 9c796ed..f06c0c0 100644
--- a/plugins/experimental/esi/Makefile.am
+++ b/plugins/experimental/esi/Makefile.am
@@ -71,15 +71,15 @@ combo_handler_la_LIBADD = libesi.la
 combo_handler_la_LDFLAGS = -module -avoid-version -shared
 
 docnode_test_SOURCES = test/docnode_test.cc test/print_funcs.cc
-docnode_test_LDADD = libesi.la  @LIBDL@ -lz @LIBTHREAD@
+docnode_test_LDADD = libesi.la  -lz
 parser_test_SOURCES = test/parser_test.cc test/print_funcs.cc
-parser_test_LDADD = libesi.la  @LIBDL@ -lz @LIBTHREAD@
+parser_test_LDADD = libesi.la  -lz
 processor_test_SOURCES = test/processor_test.cc test/HandlerMap.cc test/StubIncludeHandler.cc
test/print_funcs.cc
-processor_test_LDADD = libtest.la  @LIBDL@ -lz @LIBTHREAD@
+processor_test_LDADD = libtest.la -lz
 utils_test_SOURCES = test/utils_test.cc test/print_funcs.cc
-utils_test_LDADD = libesi.la  @LIBDL@ -lz @LIBTHREAD@
+utils_test_LDADD = libesi.la -lz
 vars_test_SOURCES = test/vars_test.cc test/print_funcs.cc
-vars_test_LDADD = libesi.la @LIBDL@ -lz @LIBTHREAD@
+vars_test_LDADD = libesi.la -lz
 
 TESTS = $(check_PROGRAMS)
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/proxy/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index 3975db9..946ddfa 100644
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -67,7 +67,6 @@ else
    which_libts = $(top_builddir)/lib/ts/libtsutil.la
 endif
 
-
 EXTRA_DIST = InkAPITestTool.cc example_alarm_bin.sh example_prep.sh
 
 traffic_server_SOURCES = \
@@ -162,11 +161,17 @@ traffic_server_LDADD = \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(which_libts) \
   @hwloc_LIBS@ \
-  @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
-  @LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBDL@ \
-  @LIBEXPAT@ @LIBDEMANGLE@ @LIBCAP@ \
-  @LIBZ@ @LIBLZMA@ \
-  @LIBMLD@ @LIBEXC@ -lm @LIBPROFILER@ @LIBEXECINFO@
+  @LIBPCRE@ \
+  @LIBSSL@ \
+  @LIBTCL@ \
+  @LIBEXPAT@ \
+  @LIBDEMANGLE@ \
+  @LIBCAP@ \
+  @LIBRESOLV@ \
+  @LIBZ@ \
+  @LIBLZMA@ \
+  @LIBPROFILER@ \
+  -lm
 
 if BUILD_LUA_SUPPORT
 traffic_server_LDFLAGS += @LUA_LUAJIT_LDFLAGS@
@@ -186,10 +191,8 @@ traffic_logcat_LDADD = \
   $(top_builddir)/lib/records/librecprocess.a \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/lib/ts/libtsutil.la \
-  @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
-  @LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBDL@ \
-  @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ -lm @LIBPROFILER@ \
-  @LIBEXECINFO@
+  @LIBRESOLV@ @LIBPCRE@ @LIBSSL@ @LIBTCL@ \
+  @LIBEXPAT@ @LIBDEMANGLE@ @LIBPROFILER@ -lm
 
 traffic_logstats_SOURCES = \
   logstats.cc \
@@ -205,11 +208,8 @@ traffic_logstats_LDADD = \
   $(top_builddir)/lib/records/librecprocess.a \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/lib/ts/libtsutil.la \
-  @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
-  @LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBDL@ \
-  @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ -lm @LIBPROFILER@ \
-  @LIBEXECINFO@
-
+  @LIBRESOLV@ @LIBPCRE@ @LIBSSL@ @LIBTCL@ \
+  @LIBEXPAT@ @LIBDEMANGLE@ @LIBPROFILER@ -lm
 
 traffic_sac_SOURCES = \
   sac.cc \
@@ -262,10 +262,8 @@ traffic_sac_LDADD = \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/lib/records/librecprocess.a \
   $(top_builddir)/lib/ts/libtsutil.la \
-  @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ @LIBRT@ \
-  @LIBPCRE@ @LIBSSL@ @LIBTCL@ @LIBDL@ \
-  @LIBEXPAT@ @LIBDEMANGLE@ @LIBMLD@ @LIBEXC@ -lm @LIBPROFILER@ \
-  @LIBZ@ @LIBLZMA@ @LIBEXECINFO@
+  @LIBRESOLV@ @LIBPCRE@ @LIBSSL@ @LIBTCL@ \
+  @LIBEXPAT@ @LIBDEMANGLE@ @LIBZ@ @LIBLZMA@ @LIBPROFILER@ -lm
 
 if BUILD_TESTS
   traffic_sac_SOURCES += RegressionSM.cc
@@ -312,4 +310,3 @@ install-exec-hook:
 	if [ `id -un` == "root" ]; then \
 		chown -R $(pkgsysuser):$(pkgsysgroup) $(DESTDIR)$(pkglibexecdir); \
 	fi
-

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/proxy/hdrs/Makefile.am
----------------------------------------------------------------------
diff --git a/proxy/hdrs/Makefile.am b/proxy/hdrs/Makefile.am
index 2a96ede..21b8ba9 100644
--- a/proxy/hdrs/Makefile.am
+++ b/proxy/hdrs/Makefile.am
@@ -56,5 +56,5 @@ load_http_hdr_SOURCES = \
 
 load_http_hdr_LDADD = -L. -lhdrs \
   $(top_builddir)/lib/ts/libtsutil.la \
-  @LIBTCL@ @LIBRT@ @LIBTHREAD@
+  @LIBTCL@
 load_http_hdr_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/abb0d748/tools/Makefile.am
----------------------------------------------------------------------
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 4ae3d3d..99be5b9 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -48,8 +48,6 @@ tstop_tstop_CXXFLAGS = \
 tstop_tstop_SOURCES = tstop/tstop.cc
 tstop_tstop_LDADD = \
   $(top_builddir)/mgmt/api/remote/libtsmgmt.la \
-  @CURL_LIBS@ \
-  @CURSES_LIB@ \
-  @LIBTHREAD@
+  @CURL_LIBS@ @CURSES_LIB@
 
 endif


Mime
View raw message