You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ig...@apache.org on 2012/07/18 02:21:41 UTC
[13/13] git commit: TS-1296 Do not link all binaries and plugins with
libreadline
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/95fdb2c0
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/95fdb2c0
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/95fdb2c0
Branch: refs/heads/3.2.x
Commit: 95fdb2c087c5d3012ef045a0351e4886343d2cd5
Parents: 4385b3b
Author: Leif Hedstrom <zw...@apache.org>
Authored: Sun Jun 10 14:15:06 2012 -0600
Committer: Igor Galić <i....@brainsware.org>
Committed: Tue Jul 17 15:51:46 2012 -0700
----------------------------------------------------------------------
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/95fdb2c0/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/95fdb2c0/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 = \