Use system luajit or liblua

Gbp-Pq: Name 0004-force-use-luajit-system-proxy.patch

diff --git a/proxy/Makefile.am b/proxy/Makefile.am
index f6b70626c76e5b5a50370486cd4fe84d1ee70970..45480d76a5b517a2b1756d55de32c5cfceffa6d0 100644 (file)
--- a/proxy/Makefile.am
+++ b/proxy/Makefile.am
@@ -48,81 +48,12 @@ AM_CPPFLAGS += \
 # NOTE: it is safe to use AM_LDFLAGS here because we are only building executables. If we start
 # building libtool archives, change these to only apply to the executables.
 AM_LDFLAGS += \
-  $(LUAJIT_LDFLAGS) \
+  $(LUA_LDFLAGS) \
   @OPENSSL_LDFLAGS@
 
 noinst_HEADERS = \
   Show.h
 
-# These are currently built separate, as part of building the lib/ tree, using
-# the normal LuaJIT build system. We are using the .o's directly, instead of the
-# luajit.a to avoid the linker from optimizing symbols away. We could maybe
-# switch to using the luajit.so, but that involves making sure it installs safely
-# and cleanly.
-LUAJIT = \
-  lib_aux.o \
-  lib_base.o \
-  lib_bit.o \
-  lib_debug.o \
-  lib_ffi.o \
-  lib_init.o \
-  lib_io.o \
-  lib_jit.o \
-  lib_math.o \
-  lib_os.o \
-  lib_package.o \
-  lib_string.o \
-  lib_table.o \
-  lj_alloc.o \
-  lj_api.o \
-  lj_asm.o \
-  lj_bc.o \
-  lj_bcread.o \
-  lj_bcwrite.o \
-  lj_carith.o \
-  lj_ccall.o \
-  lj_ccallback.o \
-  lj_cconv.o \
-  lj_cdata.o \
-  lj_char.o \
-  lj_clib.o \
-  lj_cparse.o \
-  lj_crecord.o \
-  lj_ctype.o \
-  lj_debug.o \
-  lj_dispatch.o \
-  lj_err.o \
-  lj_ffrecord.o \
-  lj_func.o \
-  lj_gc.o \
-  lj_gdbjit.o \
-  lj_ir.o \
-  lj_lex.o \
-  lj_lib.o \
-  lj_load.o \
-  lj_mcode.o \
-  lj_meta.o \
-  lj_obj.o \
-  lj_opt_dce.o \
-  lj_opt_fold.o \
-  lj_opt_loop.o \
-  lj_opt_mem.o \
-  lj_opt_narrow.o \
-  lj_opt_sink.o \
-  lj_opt_split.o \
-  lj_parse.o \
-  lj_record.o \
-  lj_snap.o \
-  lj_state.o \
-  lj_str.o \
-  lj_strscan.o \
-  lj_tab.o \
-  lj_trace.o \
-  lj_udata.o \
-  lj_vm.o \
-  lj_vmevent.o \
-  lj_vmmath.o
-
 EXTRA_DIST = InkAPITestTool.cc example_alarm_bin.sh example_prep.sh
 
 traffic_server_SOURCES = \
@@ -207,7 +138,6 @@ traffic_server_LDADD = \
   $(top_builddir)/iocore/aio/libinkaio.a \
   $(top_builddir)/lib/ts/libtsutil.la \
   $(top_builddir)/lib/bindings/libbindings.la \
-  $(top_builddir)/lib/luajit/src/libluajit.a \
   $(top_builddir)/iocore/net/libinknet.a \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/lib/records/librecords_p.a \
@@ -221,9 +151,10 @@ traffic_server_LDADD = \
   @LIBLZMA@ \
   @LIBPROFILER@ \
   @OPENSSL_LIBS@ \
+  $(LUA_LIBS) \
   -lm
 
-traffic_server_LDADD += $(LUAJIT:%=$(top_builddir)/lib/luajit/src/%)
+traffic_server_LDADD += $(LUA_LDFLAGS)
 
 traffic_logcat_SOURCES = logcat.cc
 traffic_logcat_LDADD = \
@@ -235,9 +166,8 @@ traffic_logcat_LDADD = \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/lib/ts/libtsutil.la \
   $(top_builddir)/lib/bindings/libbindings.la \
-  $(top_builddir)/lib/luajit/src/libluajit.a \
   @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @HWLOC_LIBS@\
-  @LIBPROFILER@ -lm
+  @LIBPROFILER@ $(LUA_LIBS) -lm
 
 traffic_logstats_SOURCES = logstats.cc
 traffic_logstats_LDADD = \
@@ -249,9 +179,8 @@ traffic_logstats_LDADD = \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/lib/ts/libtsutil.la \
   $(top_builddir)/lib/bindings/libbindings.la \
-  $(top_builddir)/lib/luajit/src/libluajit.a \
   @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @HWLOC_LIBS@ \
-  @LIBPROFILER@ -lm
+  @LIBPROFILER@ $(LUA_LIBS) -lm
 
 versiondir = $(pkgsysconfdir)
 

diff --git a/proxy/Makefile.in b/proxy/Makefile.in
index 6965fc12d697adfa678bf0273430ee167e0609d9..d7fd8ca61184f7d0dbb88a65512daca5179fa743 100644 (file)
--- a/proxy/Makefile.in
+++ b/proxy/Makefile.in
@@ -169,8 +169,7 @@ traffic_logcat_DEPENDENCIES = logging/liblogging.a \
        $(top_builddir)/lib/records/librecords_p.a \
        $(top_builddir)/iocore/eventsystem/libinkevent.a \
        $(top_builddir)/lib/ts/libtsutil.la \
-       $(top_builddir)/lib/bindings/libbindings.la \
-       $(top_builddir)/lib/luajit/src/libluajit.a
+       $(top_builddir)/lib/bindings/libbindings.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -183,8 +182,7 @@ traffic_logstats_DEPENDENCIES = logging/liblogging.a \
        $(top_builddir)/lib/records/librecords_p.a \
        $(top_builddir)/iocore/eventsystem/libinkevent.a \
        $(top_builddir)/lib/ts/libtsutil.la \
-       $(top_builddir)/lib/bindings/libbindings.la \
-       $(top_builddir)/lib/luajit/src/libluajit.a
+       $(top_builddir)/lib/bindings/libbindings.la
 am__traffic_server_SOURCES_DIST = AbstractBuffer.cc AbstractBuffer.h \
        CacheControl.cc CacheControl.h ControlBase.cc ControlBase.h \
        ControlMatcher.cc ControlMatcher.h CoreUtils.cc CoreUtils.h \
@@ -231,12 +229,10 @@ traffic_server_DEPENDENCIES = http/libhttp.a http2/libhttp2.a \
        $(top_builddir)/iocore/aio/libinkaio.a \
        $(top_builddir)/lib/ts/libtsutil.la \
        $(top_builddir)/lib/bindings/libbindings.la \
-       $(top_builddir)/lib/luajit/src/libluajit.a \
        $(top_builddir)/iocore/net/libinknet.a \
        $(top_builddir)/iocore/eventsystem/libinkevent.a \
        $(top_builddir)/lib/records/librecords_p.a \
-       $(top_builddir)/iocore/eventsystem/libinkevent.a \
-       $(LUAJIT:%=$(top_builddir)/lib/luajit/src/%)
+       $(top_builddir)/iocore/eventsystem/libinkevent.a
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -588,7 +584,7 @@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 
 # NOTE: it is safe to use AM_LDFLAGS here because we are only building executables. If we start
 # building libtool archives, change these to only apply to the executables.
-AM_LDFLAGS = @AM_LDFLAGS@ $(LUAJIT_LDFLAGS) @OPENSSL_LDFLAGS@
+AM_LDFLAGS = @AM_LDFLAGS@ $(LUA_LDFLAGS) @OPENSSL_LDFLAGS@
 AR = @AR@
 ASCPP = @ASCPP@
 AUTOCONF = @AUTOCONF@
@@ -669,9 +665,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
@@ -964,75 +960,6 @@ noinst_HEADERS = \
   Show.h
 
 
-# These are currently built separate, as part of building the lib/ tree, using
-# the normal LuaJIT build system. We are using the .o's directly, instead of the
-# luajit.a to avoid the linker from optimizing symbols away. We could maybe
-# switch to using the luajit.so, but that involves making sure it installs safely
-# and cleanly.
-LUAJIT = \
-  lib_aux.o \
-  lib_base.o \
-  lib_bit.o \
-  lib_debug.o \
-  lib_ffi.o \
-  lib_init.o \
-  lib_io.o \
-  lib_jit.o \
-  lib_math.o \
-  lib_os.o \
-  lib_package.o \
-  lib_string.o \
-  lib_table.o \
-  lj_alloc.o \
-  lj_api.o \
-  lj_asm.o \
-  lj_bc.o \
-  lj_bcread.o \
-  lj_bcwrite.o \
-  lj_carith.o \
-  lj_ccall.o \
-  lj_ccallback.o \
-  lj_cconv.o \
-  lj_cdata.o \
-  lj_char.o \
-  lj_clib.o \
-  lj_cparse.o \
-  lj_crecord.o \
-  lj_ctype.o \
-  lj_debug.o \
-  lj_dispatch.o \
-  lj_err.o \
-  lj_ffrecord.o \
-  lj_func.o \
-  lj_gc.o \
-  lj_gdbjit.o \
-  lj_ir.o \
-  lj_lex.o \
-  lj_lib.o \
-  lj_load.o \
-  lj_mcode.o \
-  lj_meta.o \
-  lj_obj.o \
-  lj_opt_dce.o \
-  lj_opt_fold.o \
-  lj_opt_loop.o \
-  lj_opt_mem.o \
-  lj_opt_narrow.o \
-  lj_opt_sink.o \
-  lj_opt_split.o \
-  lj_parse.o \
-  lj_record.o \
-  lj_snap.o \
-  lj_state.o \
-  lj_str.o \
-  lj_strscan.o \
-  lj_tab.o \
-  lj_trace.o \
-  lj_udata.o \
-  lj_vm.o \
-  lj_vmevent.o \
-  lj_vmmath.o
-
 EXTRA_DIST = InkAPITestTool.cc example_alarm_bin.sh example_prep.sh
 traffic_server_SOURCES = AbstractBuffer.cc AbstractBuffer.h \
        CacheControl.cc CacheControl.h ControlBase.cc ControlBase.h \
@@ -1064,14 +991,12 @@ traffic_server_LDADD = http/libhttp.a http2/libhttp2.a \
        $(top_builddir)/iocore/aio/libinkaio.a \
        $(top_builddir)/lib/ts/libtsutil.la \
        $(top_builddir)/lib/bindings/libbindings.la \
-       $(top_builddir)/lib/luajit/src/libluajit.a \
        $(top_builddir)/iocore/net/libinknet.a \
        $(top_builddir)/iocore/eventsystem/libinkevent.a \
        $(top_builddir)/lib/records/librecords_p.a \
-       $(top_builddir)/iocore/eventsystem/libinkevent.a @HWLOC_LIBS@ \
+       $(top_builddir)/iocore/eventsystem/libinkevent.a $(LUA_LIBS) @HWLOC_LIBS@ \
        @LIBPCRE@ @LIBTCL@ @LIBCAP@ @LIBRESOLV@ @LIBZ@ @LIBLZMA@ \
-       @LIBPROFILER@ @OPENSSL_LIBS@ -lm \
-       $(LUAJIT:%=$(top_builddir)/lib/luajit/src/%)
+       @LIBPROFILER@ @OPENSSL_LIBS@ $(LUA_LIBS) -lm
 traffic_logcat_SOURCES = logcat.cc
 traffic_logcat_LDADD = \
   logging/liblogging.a \
@@ -1082,9 +1007,8 @@ traffic_logcat_LDADD = \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/lib/ts/libtsutil.la \
   $(top_builddir)/lib/bindings/libbindings.la \
-  $(top_builddir)/lib/luajit/src/libluajit.a \
   @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @HWLOC_LIBS@\
-  @LIBPROFILER@ -lm
+  @LIBPROFILER@ $(LUA_LIBS) -lm
 
 traffic_logstats_SOURCES = logstats.cc
 traffic_logstats_LDADD = \
@@ -1096,9 +1020,8 @@ traffic_logstats_LDADD = \
   $(top_builddir)/iocore/eventsystem/libinkevent.a \
   $(top_builddir)/lib/ts/libtsutil.la \
   $(top_builddir)/lib/bindings/libbindings.la \
-  $(top_builddir)/lib/luajit/src/libluajit.a \
   @LIBRESOLV@ @LIBPCRE@ @LIBTCL@ @HWLOC_LIBS@ \
-  @LIBPROFILER@ -lm
+  @LIBPROFILER@ $(LUA_LIBS) -lm
 
 versiondir = $(pkgsysconfdir)
 all: all-recursive

diff --git a/proxy/api/ts/Makefile.in b/proxy/api/ts/Makefile.in
index 2ccdf38722821ff790d3090ee348f1e347a8b347..b33bafa6d136291796680e2111a4829f401c8a66 100644 (file)
--- a/proxy/api/ts/Makefile.in
+++ b/proxy/api/ts/Makefile.in
@@ -293,9 +293,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/proxy/config/Makefile.in b/proxy/config/Makefile.in
index d08b8f8be73f2195c6c1f6e5a635237e6ef24755..9a1c5a7783cbc1a10857224ab1f02cd310ea21f4 100644 (file)
--- a/proxy/config/Makefile.in
+++ b/proxy/config/Makefile.in
@@ -337,9 +337,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/proxy/config/body_factory/Makefile.in b/proxy/config/body_factory/Makefile.in
index 1519287d1863bec5caca6fbc4dd3dd82318f6534..4b2ddcac21a1315787f7d459e2453829f7077354 100644 (file)
--- a/proxy/config/body_factory/Makefile.in
+++ b/proxy/config/body_factory/Makefile.in
@@ -305,9 +305,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/proxy/config/body_factory/default/Makefile.in b/proxy/config/body_factory/default/Makefile.in
index 0e7584c83a4d9f3b263d416c9f456d1fa1153abf..3ebb663b1913d61807b99fb8a188e1fc3872b2ec 100644 (file)
--- a/proxy/config/body_factory/default/Makefile.in
+++ b/proxy/config/body_factory/default/Makefile.in
@@ -275,9 +275,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/proxy/congest/Makefile.in b/proxy/congest/Makefile.in
index 27b1ffff44c1e458fa88441a366117a8cd03b4ca..f4f72533acbf5cf9582926711a0db99e8c44d0ee 100644 (file)
--- a/proxy/congest/Makefile.in
+++ b/proxy/congest/Makefile.in
@@ -330,9 +330,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/proxy/hdrs/Makefile.in b/proxy/hdrs/Makefile.in
index 7e5fdd583180cdb3c09f7d99690d7f1059f55a70..951b78453bf3f07d53a8cbaaceef9cb843a27436 100644 (file)
--- a/proxy/hdrs/Makefile.in
+++ b/proxy/hdrs/Makefile.in
@@ -568,9 +568,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/proxy/http/Makefile.in b/proxy/http/Makefile.in
index 581d787b13e7aaa0912e20373296e28c87649726..65032cc7c83ce4c283fd0ee9f1c4bd2b903d5b3d 100644 (file)
--- a/proxy/http/Makefile.in
+++ b/proxy/http/Makefile.in
@@ -415,9 +415,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/proxy/http/remap/Makefile.in b/proxy/http/remap/Makefile.in
index 716ebbc1b74b8478d4bb5fef690bb32bcae710f3..efe23bfc805c2dfec24dc74f1cdcf91a558aeab6 100644 (file)
--- a/proxy/http/remap/Makefile.in
+++ b/proxy/http/remap/Makefile.in
@@ -344,9 +344,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/proxy/http2/Makefile.in b/proxy/http2/Makefile.in
index adec99694521e52d6f43f42b4bda885455db2a63..85fa0dd533e6b515752615ee30c3e1a2ad457881 100644 (file)
--- a/proxy/http2/Makefile.in
+++ b/proxy/http2/Makefile.in
@@ -588,9 +588,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/proxy/logging/Makefile.am b/proxy/logging/Makefile.am
index f138d7c5c09a9ec607761bedb22f36bd4a84f142..a9fa56626e86cef5343a4371505034b2a5800627 100644 (file)
--- a/proxy/logging/Makefile.am
+++ b/proxy/logging/Makefile.am
@@ -21,7 +21,6 @@ include $(top_srcdir)/build/tidy.mk
 AM_CPPFLAGS += \
   $(iocore_include_dirs) \
   -I$(abs_top_srcdir)/lib \
-  -I$(abs_top_srcdir)/lib/luajit/src \
   -I$(abs_top_srcdir)/lib/records \
   -I$(abs_top_srcdir)/proxy/api/ts \
   -I$(abs_top_srcdir)/proxy \
@@ -30,7 +29,8 @@ AM_CPPFLAGS += \
   -I$(abs_top_srcdir)/proxy/hdrs \
   -I$(abs_top_srcdir)/proxy/shared \
   -I$(abs_top_srcdir)/mgmt \
-  -I$(abs_top_srcdir)/mgmt/utils
+  -I$(abs_top_srcdir)/mgmt/utils \
+  $(LUA_CPPFLAGS)
 
 EXTRA_DIST = LogStandalone.cc
 

diff --git a/proxy/logging/Makefile.in b/proxy/logging/Makefile.in
index 07690c175b29eaaceec690ed47af2132b5386b83..1061d7760665e8c051b8b0ed9ae8ca108212a531 100644 (file)
--- a/proxy/logging/Makefile.in
+++ b/proxy/logging/Makefile.in
@@ -476,14 +476,14 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
 AM_CPPFLAGS = @AM_CPPFLAGS@ $(iocore_include_dirs) \
-       -I$(abs_top_srcdir)/lib -I$(abs_top_srcdir)/lib/luajit/src \
        -I$(abs_top_srcdir)/lib/records \
        -I$(abs_top_srcdir)/proxy/api/ts -I$(abs_top_srcdir)/proxy \
        -I$(abs_top_srcdir)/proxy/http \
        -I$(abs_top_srcdir)/proxy/http/remap \
        -I$(abs_top_srcdir)/proxy/hdrs \
        -I$(abs_top_srcdir)/proxy/shared -I$(abs_top_srcdir)/mgmt \
-       -I$(abs_top_srcdir)/mgmt/utils
+       -I$(abs_top_srcdir)/mgmt/utils \
+       $(LUA_CPPFLAGS)
 AM_CXXFLAGS = @AM_CXXFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
@@ -567,9 +567,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@

diff --git a/proxy/shared/Makefile.in b/proxy/shared/Makefile.in
index 35bff5fe6256111879b53a18932d52857df42b3d..2fc29f327d9d147d323dce245354e7a4c6074c95 100644 (file)
--- a/proxy/shared/Makefile.in
+++ b/proxy/shared/Makefile.in
@@ -328,9 +328,9 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-LUAJIT_CFLAGS = @LUAJIT_CFLAGS@
-LUAJIT_CPPFLAGS = @LUAJIT_CPPFLAGS@
-LUAJIT_LDFLAGS = @LUAJIT_LDFLAGS@
+LUA_CFLAGS = @LUA_CFLAGS@
+LUA_CPPFLAGS = @LUA_CPPFLAGS@
+LUA_LDFLAGS = @LUA_LDFLAGS@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@