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 67c549aa49cb4e345e538722ccc395110a01d386..4dcf77eeff662cc8c21c071c47a04c1ab2f25b5b 100644 (file)
--- a/proxy/Makefile.in
+++ b/proxy/Makefile.in
@@ -168,8 +168,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
@@ -182,8 +181,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 \
@@ -230,12 +228,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
@@ -587,7 +583,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@
@@ -667,9 +663,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@
@@ -961,75 +957,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 \
@@ -1061,14 +988,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 \
@@ -1079,9 +1004,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 = \
@@ -1093,9 +1017,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 1e7e962bb6d94af2c74c7b61851b0c60b7fff6ae..0e3e1dfc5b37533d6c088e0b6c9b33c2aeeb547c 100644 (file)
--- a/proxy/api/ts/Makefile.in
+++ b/proxy/api/ts/Makefile.in
@@ -291,9 +291,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 5748ac6f32201fd6043ed243e15e9496124bc40b..843dcfac0e22d418eb81ea0c8d128229bb80a414 100644 (file)
--- a/proxy/config/Makefile.in
+++ b/proxy/config/Makefile.in
@@ -335,9 +335,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 1e8fb97bb89510de7b1ec31c6443633d98e6ba67..d1d8c1d9f0756b6d69f53dc93cafb932e240d2a6 100644 (file)
--- a/proxy/config/body_factory/Makefile.in
+++ b/proxy/config/body_factory/Makefile.in
@@ -303,9 +303,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 16010a2ad66d7c9fd944af8ab7d3a48960b1fad3..7d2bb4ba6923fd4fee0c138c2f8b9d284bea9d51 100644 (file)
--- a/proxy/config/body_factory/default/Makefile.in
+++ b/proxy/config/body_factory/default/Makefile.in
@@ -273,9 +273,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 4f3cd8a2eaf39b3f45c0ae9e3153663c1f4b16a7..4cb4170e763e5ce5c04d75f05e349ffb6e61d128 100644 (file)
--- a/proxy/congest/Makefile.in
+++ b/proxy/congest/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@

diff --git a/proxy/hdrs/Makefile.in b/proxy/hdrs/Makefile.in
index 792593590d0c41139df08be3ae002045afb10b1d..dda01e7c91fd677309693b092ea890c35f764262 100644 (file)
--- a/proxy/hdrs/Makefile.in
+++ b/proxy/hdrs/Makefile.in
@@ -566,9 +566,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 5baa743639611673c834c36d00613deb94987ed6..e2c15f8df1401c9c071bada16cd8a60acb917af0 100644 (file)
--- a/proxy/http/Makefile.in
+++ b/proxy/http/Makefile.in
@@ -413,9 +413,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 cb784e7b6dc1440cd6ba6c23dbd93e5e153ffbfd..4f9a00e95ae5f62dbdaceb46c8bbadf79b78b306 100644 (file)
--- a/proxy/http/remap/Makefile.in
+++ b/proxy/http/remap/Makefile.in
@@ -342,9 +342,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 aa5ecc6f5ec5ba883b0d6f06f7c2d23add35ec63..5886a28b4870aeda6bd99d3570f4d299626c17ba 100644 (file)
--- a/proxy/http2/Makefile.in
+++ b/proxy/http2/Makefile.in
@@ -586,9 +586,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 0e2aaf59abf811e3714cf0316d79e7069e8d1968..9081fea51c8f50a0350a3152640762eea4002bc2 100644 (file)
--- a/proxy/logging/Makefile.in
+++ b/proxy/logging/Makefile.in
@@ -475,14 +475,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@
@@ -565,9 +565,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 0927b1ef053e987ac75ddb2ea62976cd724a1f14..a289af91f14c27784068507bf18c7cb0bfefb016 100644 (file)
--- a/proxy/shared/Makefile.in
+++ b/proxy/shared/Makefile.in
@@ -326,9 +326,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@