Repository: trafficserver Updated Branches: refs/heads/master a292af956 -> d86023d0d
TS-2885 Rename automake variable to BUILD_LUAJIT Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d86023d0 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d86023d0 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d86023d0 Branch: refs/heads/master Commit: d86023d0d892584bbf854236465528d05710d8a6 Parents: a292af9 Author: Leif Hedstrom <[email protected]> Authored: Thu Jun 12 10:10:03 2014 -0600 Committer: Leif Hedstrom <[email protected]> Committed: Thu Jun 12 10:10:03 2014 -0600 ---------------------------------------------------------------------- configure.ac | 4 +--- lib/Makefile.am | 2 +- plugins/experimental/Makefile.am | 2 +- proxy/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d86023d0/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index f256650..5f0e1f1 100644 --- a/configure.ac +++ b/configure.ac @@ -496,9 +496,7 @@ AC_ARG_ENABLE([luajit], [enable_luajit="yes"] ) AC_MSG_RESULT([$enable_luajit]) -TS_ARG_ENABLE_VAR([use], [luajit]) -AC_SUBST(use_luajit) -AM_CONDITIONAL([ENABLE_LUAJIT], [ test "x${enable_luajit}" = "xyes" ]) +AM_CONDITIONAL([BUILD_LUAJIT], [ test "x${enable_luajit}" = "xyes" ]) # # Installation directories http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d86023d0/lib/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/Makefile.am b/lib/Makefile.am index 48da294..d054f44 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -39,7 +39,7 @@ endif # Note: The LUA_LDFLAGS is a bit of a hack, since LuaJIT on OmniOS needs # the -m64 flag. See configure.ac. # -if ENABLE_LUAJIT +if BUILD_LUAJIT LUA_CFLAGS=$(CFLAGS) -DLUA_COMPAT_ALL -DLUA_USE_POSIX -DLUA_USE_DLOPEN all-local: http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d86023d0/plugins/experimental/Makefile.am ---------------------------------------------------------------------- diff --git a/plugins/experimental/Makefile.am b/plugins/experimental/Makefile.am index 249c435..225feea 100644 --- a/plugins/experimental/Makefile.am +++ b/plugins/experimental/Makefile.am @@ -35,6 +35,6 @@ SUBDIRS = \ url_sig \ xdebug -if ENABLE_LUAJIT +if BUILD_LUAJIT SUBDIRS += ts_lua endif http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d86023d0/proxy/Makefile.am ---------------------------------------------------------------------- diff --git a/proxy/Makefile.am b/proxy/Makefile.am index f714fbf..6a52102 100644 --- a/proxy/Makefile.am +++ b/proxy/Makefile.am @@ -231,7 +231,7 @@ traffic_server_LDADD = \ @SPDYLAY_LIBS@ \ -lm -if ENABLE_LUAJIT +if BUILD_LUAJIT traffic_server_LDADD += $(LUAJIT:%=$(top_builddir)/lib/luajit/src/%) endif
