Updated Branches:
refs/heads/4.1.x 2b9dd003b -> 5cdf04538
TS-2172: Explicitly use subdir-objects in automake init
now it is safe to enable subdir-objects for the automake
Conflicts:
CHANGES
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/bebda9f7
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/bebda9f7
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/bebda9f7
Branch: refs/heads/4.1.x
Commit: bebda9f791e908a7bb0a1563c450e5b01f4dde2c
Parents: 2b9dd00
Author: Zhao Yongming <[email protected]>
Authored: Tue Nov 5 12:13:44 2013 +0800
Committer: Igor GaliÄ <[email protected]>
Committed: Thu Jan 23 16:55:09 2014 +0100
----------------------------------------------------------------------
CHANGES | 2 ++
configure.ac | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bebda9f7/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index f45494c..4a5d0c8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@ Changes with Apache Traffic Server 4.1.3
*) [TS-2305] Fall back to ftruncate if posix_fallocate fails.
+ *) [TS-2712] Explicitly use subdir-objects in automake init.
+
*) [TS-2497] Failed post results in tunnel buffers being returned to
freelist prematurely.
Reporter: Thomas Jackson <[email protected]>
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/bebda9f7/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 910a822..3c8838c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,7 +40,7 @@ AC_PREREQ([2.59])
AC_CONFIG_AUX_DIR([build/aux])
AC_CONFIG_SRCDIR([proxy/Main.cc])
AC_CONFIG_MACRO_DIR([build])
-AM_INIT_AUTOMAKE([-Wall -Werror tar-ustar foreign no-installinfo no-installman
1.9.2])
+AM_INIT_AUTOMAKE([-Wall -Werror tar-ustar foreign no-installinfo no-installman
subdir-objects 1.9.2])
AC_CONFIG_HEADERS([lib/ts/ink_autoconf.h])
# Configure with --disable-silent-rules to get verbose output. For more info,
see
