fix build issues and use BUILD_LUA option

Signed-off-by: Ricardo Dias <[email protected]>

Author: rjd15372

deps/Makefile

@@ -76,7 +76,7 @@ hdr_histogram: .make-prerequisites
 
 fpconv: .make-prerequisites
 	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
-	cd fpconv && $(MAKE) CFLAGS="-fPIC"
+	cd fpconv && $(MAKE) CFLAGS="-fPIC $(CFLAGS)"
 
 .PHONY: fpconv
 
@@ -90,7 +90,7 @@ LUA_LDFLAGS+= $(LDFLAGS)
 ifeq ($(LUA_DEBUG),yes)
 	LUA_CFLAGS+= -O0 -g -DLUA_USE_APICHECK
 else
-	LUA_CFLAGS+= -O2 
+	LUA_CFLAGS+= -O2
 endif
 ifeq ($(LUA_COVERAGE),yes)
 	LUA_CFLAGS += -fprofile-arcs -ftest-coverage

src/Makefile

@@ -258,7 +258,7 @@ LUA_MODULE=
 LUA_MODULE_INSTALL=
 LUA_MODULE_NAME:=modules/lua/libluaengine.so
 
-ifneq ($(WITHOUT_LUA),yes)
+ifneq ($(BUILD_LUA),no)
 	LUA_MODULE=$(LUA_MODULE_NAME)
 endif
 
@@ -490,7 +490,7 @@ persist-settings: distclean
 	echo BUILD_TLS=$(BUILD_TLS) >> .make-settings
 	echo BUILD_RDMA=$(BUILD_RDMA) >> .make-settings
 	echo USE_SYSTEMD=$(USE_SYSTEMD) >> .make-settings
-	echo WITHOUT_LUA=$(WITHOUT_LUA) >> .make-settings
+	echo BUILD_LUA=$(BUILD_LUA) >> .make-settings
 	echo CFLAGS=$(CFLAGS) >> .make-settings
 	echo LDFLAGS=$(LDFLAGS) >> .make-settings
 	echo SERVER_CFLAGS=$(SERVER_CFLAGS) >> .make-settings