You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by bc...@apache.org on 2014/06/13 23:59:38 UTC
[3/4] git commit: TS-2885 Rename automake variable to BUILD_LUAJIT
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/b1d0ffa5
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b1d0ffa5
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b1d0ffa5
Branch: refs/heads/5.0.x
Commit: b1d0ffa51bed3f6ae4187b579de13374f405c1a7
Parents: 4a0b979
Author: Leif Hedstrom <zw...@apache.org>
Authored: Thu Jun 12 10:10:03 2014 -0600
Committer: Bryan Call <bc...@apache.org>
Committed: Fri Jun 13 14:57:14 2014 -0700
----------------------------------------------------------------------
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/b1d0ffa5/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index bd20b70..d149568 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/b1d0ffa5/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/b1d0ffa5/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/b1d0ffa5/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