[neovim] 05/06: Build against Lua when LuaJIT is not available

[James McCoy]

This is an automated email from the git hooks/post-receive script.

jamessan pushed a commit to branch debian/sid
in repository neovim.

commit 718002583ac14d7dd8435220747861aeefcc8068
Author: James McCoy <jamessan at debian.org>
Date:   Wed Nov 8 22:43:48 2017 -0500

    Build against Lua when LuaJIT is not available
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/rules | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 5127e56..ac1deec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,7 @@ CXXFLAGS += $(CPPFLAGS)
 
 export CFLAGS CXXFLAGS LDFLAGS
 
+PREFER_LUA = ON
 FUNCTIONALTEST =
 UNITTEST =
 ifneq (,$(findstring ok installed,$(shell dpkg-query -W -f '$${Status}' lua-nvim)))
@@ -17,6 +18,7 @@ ifneq (,$(findstring ok installed,$(shell dpkg-query -W -f '$${Status}' lua-nvim
 endif
 
 ifneq (,$(findstring ok installed,$(shell dpkg-query -W -f '$${Status}' luajit)))
+  PREFER_LUA = OFF
   UNITTEST = unittest
 endif
 
@@ -32,7 +34,7 @@ BUILD = ninja -v -C build
 	dh $@ --buildsystem=cmake --builddirectory=build
 
 override_dh_auto_configure:
-	dh_auto_configure -- -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUSTED_OUTPUT_TYPE=nvim
+	dh_auto_configure -- -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUSTED_OUTPUT_TYPE=nvim -DPREFER_LUA=$(PREFER_LUA)
 
 override_dh_auto_build:
 	$(BUILD)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vim/neovim.git