Updated Branches: refs/heads/master 55c791069 -> ebd4f5a20
TS-2335: getting ts_lua plugin to compile Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ebd4f5a2 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ebd4f5a2 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ebd4f5a2 Branch: refs/heads/master Commit: ebd4f5a2042ffa6eb6b855953150ccd4f2e0650c Parents: 55c7910 Author: Kit Chan <[email protected]> Authored: Wed Nov 27 01:18:37 2013 -0800 Committer: Kit Chan <[email protected]> Committed: Wed Nov 27 01:18:37 2013 -0800 ---------------------------------------------------------------------- configure.ac | 1 + plugins/experimental/Makefile.am | 1 + plugins/experimental/ts_lua/Makefile.am | 35 ++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ebd4f5a2/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 192ede8..96bb953 100644 --- a/configure.ac +++ b/configure.ac @@ -1941,6 +1941,7 @@ AC_CONFIG_FILES([ plugins/experimental/esi/Makefile plugins/experimental/geoip_acl/Makefile plugins/experimental/lua/Makefile + plugins/experimental/ts_lua/Makefile plugins/experimental/metalink/Makefile plugins/experimental/rfc5861/Makefile plugins/experimental/spdy/Makefile http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ebd4f5a2/plugins/experimental/Makefile.am ---------------------------------------------------------------------- diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am index eb807f8..b0e4d98 100644 --- a/plugins/experimental/Makefile.am +++ b/plugins/experimental/Makefile.am @@ -17,6 +17,7 @@ if BUILD_EXPERIMENTAL_PLUGINS SUBDIRS = \ lua \ + ts_lua \ buffer_upload \ esi \ rfc5861 \ http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ebd4f5a2/plugins/experimental/ts_lua/Makefile.am ---------------------------------------------------------------------- diff --git a/plugins/experimental/ts_lua/Makefile.am b/plugins/experimental/ts_lua/Makefile.am new file mode 100644 index 0000000..c7d22f1 --- /dev/null +++ b/plugins/experimental/ts_lua/Makefile.am @@ -0,0 +1,35 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +include $(top_srcdir)/build/plugins.mk + +if BUILD_LUA_SUPPORT + +# We have to use the per-target CPPFLAGS here to make sure that the Lua include +# path comes first. If we have LuaJIT (/opt/local/include/luajit-2.0) and Lua +# (/opt/local/include) headers, then we need to make sure that we don't end up +# building with the Lua headers but linking LuaJIT. +tslua_la_CPPFLAGS = \ + $(LUA_CFLAGS) \ + $(AM_CPPFLAGS) + +pkglib_LTLIBRARIES = tslua.la + +tslua_la_LIBADD = $(LUA_LIBS) +tslua_la_SOURCES = ts_lua.c ts_lua_atomic.c ts_lua_cached_response.c ts_lua_client_request.c ts_lua_client_response.c ts_lua_context.c ts_lua_hook.c ts_lua_http.c ts_lua_http_intercept.c ts_lua_log.c ts_lua_misc.c ts_lua_server_request.c ts_lua_server_response.c ts_lua_transform.c ts_lua_util.c +tslua_la_LDFLAGS = $(TS_PLUGIN_LDFLAGS) + +endif
