trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject [1/3] git commit: TS-1296 Do not link all binaries and plugins with libreadline
Date Mon, 11 Jun 2012 17:01:19 GMT
Updated Branches:
  refs/heads/master 4c61fd335 -> f9abb3e94


TS-1296 Do not link all binaries and plugins with libreadline


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

Branch: refs/heads/master
Commit: 50c624f20a3ff09e5c62dc2b426c27fee3fd244c
Parents: 4c61fd3
Author: Leif Hedstrom <zwoop@apache.org>
Authored: Sun Jun 10 14:15:06 2012 -0600
Committer: Leif Hedstrom <zwoop@apache.org>
Committed: Mon Jun 11 10:42:39 2012 -0600

----------------------------------------------------------------------
 build/ax_lib_readline.m4 |    3 +++
 mgmt/cli/Makefile.am     |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/50c624f2/build/ax_lib_readline.m4
----------------------------------------------------------------------
diff --git a/build/ax_lib_readline.m4 b/build/ax_lib_readline.m4
index 056f25c..37a02a4 100644
--- a/build/ax_lib_readline.m4
+++ b/build/ax_lib_readline.m4
@@ -89,7 +89,9 @@ AC_DEFUN([AX_LIB_READLINE], [
   ])
 
   if test "$ax_cv_lib_readline" != "no"; then
+    ORIG_LIBS="$LIBS"
     LIBS="$LIBS $ax_cv_lib_readline"
+    AC_SUBST(LIBREADLINE, [$ax_cv_lib_readline])
     AC_DEFINE(HAVE_LIBREADLINE, 1,
               [Define if you have a readline compatible library])
     AC_CHECK_HEADERS(readline.h readline/readline.h)
@@ -103,5 +105,6 @@ AC_DEFUN([AX_LIB_READLINE], [
                 [Define if your readline library has \`add_history'])
       AC_CHECK_HEADERS(history.h readline/history.h)
     fi
+    LIBS="$ORIG_LIBS"
   fi
 ])dnl

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/50c624f2/mgmt/cli/Makefile.am
----------------------------------------------------------------------
diff --git a/mgmt/cli/Makefile.am b/mgmt/cli/Makefile.am
index d0e1254..6f06cbd 100644
--- a/mgmt/cli/Makefile.am
+++ b/mgmt/cli/Makefile.am
@@ -82,7 +82,7 @@ traffic_shell_LDADD = \
   $(LIBTCL) $(LIBREADLINE) \
   @LIBDL@ -lm @LIBICONV@ @LIBEXPAT@ @LIBSSL@ \
   @LIBTHREAD@ @LIBSOCKET@ @LIBNSL@ @LIBRESOLV@ \
-  @LIBRT@ @LIBEXECINFO@ @LIBPCRE@
+  @LIBRT@ @LIBEXECINFO@ @LIBPCRE@ @LIBREADLINE@
 
 traffic_line_LDFLAGS = @EXTRA_CXX_LDFLAGS@ @LIBTOOL_LINK_FLAGS@
 traffic_line_LDADD = \


Mime
View raw message