Updated Branches: refs/heads/master 28f2c7690 -> 7c40179e7
TS-1242 Make it build with some more recent automake versions. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7c40179e Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7c40179e Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7c40179e Branch: refs/heads/master Commit: 7c40179e7e8ad30bc2b7650da7c6bb0da9a5cc6d Parents: 28f2c76 Author: Leif Hedstrom <[email protected]> Authored: Wed May 2 20:52:58 2012 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Wed May 2 20:52:58 2012 -0600 ---------------------------------------------------------------------- CHANGES | 2 ++ configure.ac | 5 +++++ example/add-header/Makefile.am | 2 +- example/app-template/Makefile.am | 3 --- example/append-transform/Makefile.am | 2 +- example/basic-auth/Makefile.am | 2 +- example/blacklist-0/Makefile.am | 2 +- example/blacklist-1/Makefile.am | 2 +- example/bnull-transform/Makefile.am | 2 +- example/cache_scan/Makefile.am | 2 +- example/file-1/Makefile.am | 2 +- example/hello/Makefile.am | 2 +- example/null-transform/Makefile.am | 2 +- example/output-header/Makefile.am | 2 +- example/prefetch/Makefile.am | 2 +- example/protocol/Makefile.am | 2 +- example/query_remap/Makefile.am | 2 +- example/redirect-1/Makefile.am | 2 +- example/remap/Makefile.am | 2 +- example/replace-header/Makefile.am | 2 +- example/response-header-1/Makefile.am | 2 +- example/server-transform/Makefile.am | 2 +- example/session-1/Makefile.am | 2 +- example/thread-1/Makefile.am | 2 +- example/thread-pool/Makefile.am | 2 +- example/thread-pool/include/Makefile.am | 2 -- plugins/conf_remap/Makefile.am | 3 +-- plugins/header_filter/Makefile.am | 2 +- plugins/regex_remap/Makefile.am | 2 +- plugins/stats_over_http/Makefile.am | 2 +- 30 files changed, 33 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index c73f2c4..c5bd3f6 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 3.1.4 + *) [TS-1242] Make it build with some more recent automake versions. + *) [TS-1241] Memory leaks when using TSHttpSchedule(). Author: Aidan McGurn http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 9247075..ea57666 100644 --- a/configure.ac +++ b/configure.ac @@ -492,6 +492,11 @@ ifdef([AC_PROG_SED], [AC_PROG_SED], [AC_CHECK_PROG(SED, sed, sed)]) +dnl Same with AM_PROG_AR, but it doesn't seem to be needed in older versions. +ifdef([AM_PROG_AR], + [AM_PROG_AR]) + + AC_PROG_CPP AC_PROG_CXXCPP AM_PROG_AS http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/add-header/Makefile.am ---------------------------------------------------------------------- diff --git a/example/add-header/Makefile.am b/example/add-header/Makefile.am index b1e1a90..b2e2b8f 100644 --- a/example/add-header/Makefile.am +++ b/example/add-header/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = add-header.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/app-template/Makefile.am ---------------------------------------------------------------------- diff --git a/example/app-template/Makefile.am b/example/app-template/Makefile.am index 9d0cdfd..0f3d520 100644 --- a/example/app-template/Makefile.am +++ b/example/app-template/Makefile.am @@ -17,9 +17,6 @@ AM_CPPFLAGS = -I$(iocore_include_dirs) \ -I$(top_srcdir)/lib/records \ -I$(top_srcdir)/proxy -# -I$(top_srcdir)/proxy/hdrs -# I$(top_srcdir)/proxy/logging - DEFS += @IOCORE_MODULARIZED_DEFS@ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/append-transform/Makefile.am ---------------------------------------------------------------------- diff --git a/example/append-transform/Makefile.am b/example/append-transform/Makefile.am index 049bad0..31c6e0f 100644 --- a/example/append-transform/Makefile.am +++ b/example/append-transform/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = append-transform.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/basic-auth/Makefile.am ---------------------------------------------------------------------- diff --git a/example/basic-auth/Makefile.am b/example/basic-auth/Makefile.am index 83a8460..9743385 100644 --- a/example/basic-auth/Makefile.am +++ b/example/basic-auth/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = basic-auth.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/blacklist-0/Makefile.am ---------------------------------------------------------------------- diff --git a/example/blacklist-0/Makefile.am b/example/blacklist-0/Makefile.am index 127ba8a..2424d5d 100644 --- a/example/blacklist-0/Makefile.am +++ b/example/blacklist-0/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = blacklist-0.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/blacklist-1/Makefile.am ---------------------------------------------------------------------- diff --git a/example/blacklist-1/Makefile.am b/example/blacklist-1/Makefile.am index 1b0a5c5..a00dff2 100644 --- a/example/blacklist-1/Makefile.am +++ b/example/blacklist-1/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = blacklist-1.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/bnull-transform/Makefile.am ---------------------------------------------------------------------- diff --git a/example/bnull-transform/Makefile.am b/example/bnull-transform/Makefile.am index 0f30c3e..7a5929b 100644 --- a/example/bnull-transform/Makefile.am +++ b/example/bnull-transform/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = bnull-transform.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/cache_scan/Makefile.am ---------------------------------------------------------------------- diff --git a/example/cache_scan/Makefile.am b/example/cache_scan/Makefile.am index 4828f92..5b86a8a 100644 --- a/example/cache_scan/Makefile.am +++ b/example/cache_scan/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CXXFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = cache_scan.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/file-1/Makefile.am ---------------------------------------------------------------------- diff --git a/example/file-1/Makefile.am b/example/file-1/Makefile.am index ab546c1..1cc11e7 100644 --- a/example/file-1/Makefile.am +++ b/example/file-1/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = file-1.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/hello/Makefile.am ---------------------------------------------------------------------- diff --git a/example/hello/Makefile.am b/example/hello/Makefile.am index ea0294f..7ac2302 100644 --- a/example/hello/Makefile.am +++ b/example/hello/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = hello.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/null-transform/Makefile.am ---------------------------------------------------------------------- diff --git a/example/null-transform/Makefile.am b/example/null-transform/Makefile.am index 56bb338..e9c19f3 100644 --- a/example/null-transform/Makefile.am +++ b/example/null-transform/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = null-transform.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/output-header/Makefile.am ---------------------------------------------------------------------- diff --git a/example/output-header/Makefile.am b/example/output-header/Makefile.am index a942164..d015b3f 100644 --- a/example/output-header/Makefile.am +++ b/example/output-header/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = output-header.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/prefetch/Makefile.am ---------------------------------------------------------------------- diff --git a/example/prefetch/Makefile.am b/example/prefetch/Makefile.am index 143e2bb..3d2f110 100644 --- a/example/prefetch/Makefile.am +++ b/example/prefetch/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = prefetch.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/protocol/Makefile.am ---------------------------------------------------------------------- diff --git a/example/protocol/Makefile.am b/example/protocol/Makefile.am index b5df01c..cebee66 100644 --- a/example/protocol/Makefile.am +++ b/example/protocol/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = protocol.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/query_remap/Makefile.am ---------------------------------------------------------------------- diff --git a/example/query_remap/Makefile.am b/example/query_remap/Makefile.am index a4b233a..34073af 100644 --- a/example/query_remap/Makefile.am +++ b/example/query_remap/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = query_remap.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/redirect-1/Makefile.am ---------------------------------------------------------------------- diff --git a/example/redirect-1/Makefile.am b/example/redirect-1/Makefile.am index 804fb05..9ba722f 100644 --- a/example/redirect-1/Makefile.am +++ b/example/redirect-1/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = redirect-1.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/remap/Makefile.am ---------------------------------------------------------------------- diff --git a/example/remap/Makefile.am b/example/remap/Makefile.am index 038684d..e1f95f6 100644 --- a/example/remap/Makefile.am +++ b/example/remap/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CXXFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = remap.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/replace-header/Makefile.am ---------------------------------------------------------------------- diff --git a/example/replace-header/Makefile.am b/example/replace-header/Makefile.am index 5927009..b785eef 100644 --- a/example/replace-header/Makefile.am +++ b/example/replace-header/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = replace-header.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/response-header-1/Makefile.am ---------------------------------------------------------------------- diff --git a/example/response-header-1/Makefile.am b/example/response-header-1/Makefile.am index ed65022..a28819a 100644 --- a/example/response-header-1/Makefile.am +++ b/example/response-header-1/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = response-header-1.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/server-transform/Makefile.am ---------------------------------------------------------------------- diff --git a/example/server-transform/Makefile.am b/example/server-transform/Makefile.am index 0696107..a2a873d 100644 --- a/example/server-transform/Makefile.am +++ b/example/server-transform/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = server-transform.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/session-1/Makefile.am ---------------------------------------------------------------------- diff --git a/example/session-1/Makefile.am b/example/session-1/Makefile.am index 8c91d7f..68ac03a 100644 --- a/example/session-1/Makefile.am +++ b/example/session-1/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = session-1.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/thread-1/Makefile.am ---------------------------------------------------------------------- diff --git a/example/thread-1/Makefile.am b/example/thread-1/Makefile.am index ac5fd5e..65630a7 100644 --- a/example/thread-1/Makefile.am +++ b/example/thread-1/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = thread-1.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/thread-pool/Makefile.am ---------------------------------------------------------------------- diff --git a/example/thread-pool/Makefile.am b/example/thread-pool/Makefile.am index fcc30e2..1e5af1c 100644 --- a/example/thread-pool/Makefile.am +++ b/example/thread-pool/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = psi.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/example/thread-pool/include/Makefile.am ---------------------------------------------------------------------- diff --git a/example/thread-pool/include/Makefile.am b/example/thread-pool/include/Makefile.am index 9badaf2..1be7856 100644 --- a/example/thread-pool/include/Makefile.am +++ b/example/thread-pool/include/Makefile.am @@ -14,8 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -CC=cc - all: gen gen: gen.c http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/plugins/conf_remap/Makefile.am ---------------------------------------------------------------------- diff --git a/plugins/conf_remap/Makefile.am b/plugins/conf_remap/Makefile.am index 33722cf..d05bb0b 100644 --- a/plugins/conf_remap/Makefile.am +++ b/plugins/conf_remap/Makefile.am @@ -14,8 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -AM_CXXFLAGS = -I$(top_builddir)/proxy/api \ - -I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_builddir)/proxy/api -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = conf_remap.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/plugins/header_filter/Makefile.am ---------------------------------------------------------------------- diff --git a/plugins/header_filter/Makefile.am b/plugins/header_filter/Makefile.am index cbaa81c..e7e6a87 100644 --- a/plugins/header_filter/Makefile.am +++ b/plugins/header_filter/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CXXFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = header_filter.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/plugins/regex_remap/Makefile.am ---------------------------------------------------------------------- diff --git a/plugins/regex_remap/Makefile.am b/plugins/regex_remap/Makefile.am index e016d1d..ae27d53 100644 --- a/plugins/regex_remap/Makefile.am +++ b/plugins/regex_remap/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CXXFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = regex_remap.la http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7c40179e/plugins/stats_over_http/Makefile.am ---------------------------------------------------------------------- diff --git a/plugins/stats_over_http/Makefile.am b/plugins/stats_over_http/Makefile.am index 972d7c3..09a96cd 100644 --- a/plugins/stats_over_http/Makefile.am +++ b/plugins/stats_over_http/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -CFLAGS+=-I$(top_srcdir)/proxy/api +AM_CPPFLAGS = -I$(top_srcdir)/proxy/api pkglibdir = ${pkglibexecdir} pkglib_LTLIBRARIES = stats_over_http.la
