You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2015/03/30 04:20:08 UTC

trafficserver git commit: TS-3017: Disable CK build for 5.1

Repository: trafficserver
Updated Branches:
  refs/heads/5.3.x 7ecccf3e7 -> 3f9e5b1ef


TS-3017: Disable CK build for 5.1

(cherry picked from commit 9f528f52bdafe885b6a1cffdb6658c545610669f)


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

Branch: refs/heads/5.3.x
Commit: 3f9e5b1ef09684e298cf5ea56459a823f69d1de6
Parents: 7ecccf3
Author: Alan M. Carroll <am...@network-geographics.com>
Authored: Thu Aug 21 09:39:23 2014 -0500
Committer: Phil Sorber <so...@apache.org>
Committed: Sun Mar 29 20:18:26 2015 -0600

----------------------------------------------------------------------
 Makefile.am  | 2 +-
 configure.ac | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3f9e5b1e/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index b27c248..2f5f514 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ export CCACHE_BASEDIR
 # proxy/api/ts has to be built first, since so much of libraries and "core
 # depends on the generates ts/ts.h include file.
 
-SUBDIRS = lib/ck proxy/api/ts iocore lib proxy/hdrs proxy/shared mgmt proxy cmd plugins tools example rc doc
+SUBDIRS = proxy/api/ts iocore lib proxy/hdrs proxy/shared mgmt proxy cmd plugins tools example rc doc
 
 
 DIST_BUILD_USER=`id -nu`

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/3f9e5b1e/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 0442407..918c86a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1992,8 +1992,6 @@ AS_IF([test "x$enable_cppapi" = xyes], [
   lib/atscppapi/src/Makefile
 ])])
 
-AC_CONFIG_SUBDIRS([lib/ck])
-
 # -----------------------------------------------------------------------------
 # 7. autoheader TEMPLATES