Updated Branches:
  refs/heads/4.1.x 5cdf04538 -> a9a7ba639

TS-2469: remove libreadline which is gpl licensed

Signed-off-by: Zhao Yongming <[email protected]>

Conflicts:
        CHANGES


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

Branch: refs/heads/4.1.x
Commit: a40d11961e1533a98db8e6f2284d24ecc5cb6e3b
Parents: 5cdf045
Author: Ben Aitchison <[email protected]>
Authored: Mon Jan 6 16:39:48 2014 +0800
Committer: Igor Galić <[email protected]>
Committed: Tue Feb 4 14:25:40 2014 +0100

----------------------------------------------------------------------
 CHANGES                  | 3 +++
 build/ax_lib_readline.m4 | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a40d1196/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 4a5d0c8..b15e219 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,9 @@ Changes with Apache Traffic Server 4.1.3
 
   *) [TS-2305] Fall back to ftruncate if posix_fallocate fails.
 
+  *) [TS-2469] remove libreadline which is gpl licensed.
+   Author: Ben Aitchison <[email protected]>
+
   *) [TS-2712] Explicitly use subdir-objects in automake init.
 
   *) [TS-2497] Failed post results in tunnel buffers being returned to

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a40d1196/build/ax_lib_readline.m4
----------------------------------------------------------------------
diff --git a/build/ax_lib_readline.m4 b/build/ax_lib_readline.m4
index 37a02a4..1af80b2 100644
--- a/build/ax_lib_readline.m4
+++ b/build/ax_lib_readline.m4
@@ -65,7 +65,7 @@ AC_DEFUN([AX_LIB_READLINE], [
   AC_CACHE_CHECK([for a readline compatible library],
                  ax_cv_lib_readline, [
     ORIG_LIBS="$LIBS"
-    for readline_lib in readline edit editline; do
+    for readline_lib in edit editline; do
       for termcap_lib in "" termcap curses ncurses; do
         if test -z "$termcap_lib"; then
           TRY_LIB="-l$readline_lib"

Reply via email to