From bac8bad995dacff22edaef7e57eaa96ac063d907 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Mon, 10 Dec 2012 14:00:36 -0800 Subject: [PATCH] Make the configure check for lua more specific Move the generic lua check to after the checks for lua 5.1 and check for lua < 5.2. Closes #1559. --- aegisub/configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/aegisub/configure.ac b/aegisub/configure.ac index 709b55171..d961bd6a2 100644 --- a/aegisub/configure.ac +++ b/aegisub/configure.ac @@ -371,9 +371,9 @@ AC_ARG_WITH(lua, AS_IF([test x$with_lua = xno], [$with_auto4_lua="no"; lua_disabled="(disabled)"], [ # First try pkg-config with several names - PKG_CHECK_MODULES(LUA, lua >= 5.1, [with_auto4_lua="yes"], [ - PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, [with_auto4_lua="yes"], [ - PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1, [with_auto4_lua="yes"], [ + PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1 lua5.1 < 5.2, [with_auto4_lua="yes"], [ + PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1 lua-5.1 < 5.2, [with_auto4_lua="yes"], [ + PKG_CHECK_MODULES(LUA, lua >= 5.1 lua < 5.2, [with_auto4_lua="yes"], [ # Still not found so try to autodetect AS_IF([test -z "$LUA_CFLAGS"], [AGI_FIND_HEADER([LUA], [lua.hpp], @@ -393,7 +393,7 @@ int main () { return !res; }]) AS_IF([test x$agi_cv_with_lua = xno && test x$with_lua = xyes], - [AC_MSG_FAILURE([--with-lua was specified, but lua could not be found. Try setting LUA_CLFAGS and LUA_LIBS manually])]) + [AC_MSG_FAILURE([--with-lua was specified, but lua 5.1 could not be found. Try setting LUA_CLFAGS and LUA_LIBS manually])]) with_auto4_lua=$agi_cv_with_lua ])])]) ])