mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fix Lua 5.0 (auto3) and Lua 5.1 (auto4) detection to use AC_AGI_COMPILE, Lua 5.1

Browse source 
requires LIBS= to be set to pull the Lua symbols in properly, this is a temp
solution until we move to modules.

Originally committed to SVN as r2164.
This commit is contained in:
Amar Takhar 2008-04-01 01:56:49 +00:00
parent bc0811d4f3
commit b38e6582c2
1 changed files with 21 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
configure.in
View file

@ -495,26 +495,24 @@ AM_CONDITIONAL([HAVE_UNIVCHARDET], [test "$with_univchardet" != "no"])
## Auto4 LUA ## Auto4 LUA
############ ############
AC_ARG_WITH(lua,
[ --without-lua build without lua 5.1 (auto4)], [lua_disabled="(disabled)"])
AC_ARG_VAR([LUA_CFLAGS], [CFLAGS to use for LUA 5.1 (default: CPPFLAGS)]) AC_ARG_VAR([LUA_CFLAGS], [CFLAGS to use for LUA 5.1 (default: CPPFLAGS)])
AC_ARG_VAR([LUA_LDFLAGS], [LDFLAGS to use for LUA 5.1 (default: -llua)]) AC_ARG_VAR([LUA_LDFLAGS], [LDFLAGS to use for LUA 5.1 (default: -llua)])
if test -z "$LUA_CFLAGS"; then
LUA_CFLAGS="$CPPFLAGS";
fi
if test -z "$LUA_LDFLAGS"; then if test -z "$LUA_LDFLAGS"; then
LUA_LDFLAGS="-llua"; LUA_LDFLAGS="-llua";
fi fi
AC_ARG_WITH(lua, aegisub_save_LIBS="$LIBS"
[ --without-lua build without lua 5.1 (auto4)], [lua_disabled="(disabled)"]) LIBS="$LUA_LDFLAGS"
if test "$with_lua" != no; then if test "$with_lua" != no; then
AC_AGI_COMPILE([Lua 5.1 (auto4)], [lua], [$LUA_CFLAGS], [],[
aegisub_save_CPPFLAGS="$CPPFLAGS"
aegisub_save_LDFLAGS="$LDFLAGS"
CPPFLAGS="$CPPFLAGS $LUA_CFLAGS"
LDFLAGS="$LDFLAGS $LUA_LDFLAGS"
AC_CACHE_CHECK(
[whether Lua 5.1 works], [with_lua],
[AC_COMPILE_IFELSE([
extern "C" { extern "C" {
#include <lua.h> #include <lua.h>
#include <lauxlib.h> #include <lauxlib.h>
@ -526,23 +524,16 @@ int main () {
int res = lua_objlen(L, -1) == 4; int res = lua_objlen(L, -1) == 4;
lua_close(L); lua_close(L);
return !res; return !res;
}], }])
[with_lua="yes"],
[with_lua="no"])
])
CPPFLAGS="$aegisub_save_CPPFLAGS"
LDFLAGS="$aegisub_save_LDFLAGS"
fi fi
LIBS="$aegisub_save_LIBS"
if test "$with_lua" != "no"; then if test "$agi_with_lua" = "yes"; then
with_auto4="yes" with_auto4="yes"
with_automation="yes" with_automation="yes"
AC_DEFINE(WITH_AUTO4_LUA, 1, [Enable Automation (auto4), requires lua]) AC_DEFINE(WITH_AUTO4_LUA, 1, [Enable Automation (auto4), requires lua])
else else
with_auto4="no" with_auto4="no"
LUA_CFLAGS=""
LUA_LDFLAGS=""
fi fi
AM_CONDITIONAL([HAVE_AUTO4_LUA], [test "$with_auto4" != "no"]) AM_CONDITIONAL([HAVE_AUTO4_LUA], [test "$with_auto4" != "no"])
@ -560,20 +551,15 @@ if test -z "$LUA50_LDFLAGS"; then
LUA50_LDFLAGS="-llua -llualib"; LUA50_LDFLAGS="-llua -llualib";
fi fi
if test -z "$LUA50_CFLAGS"; then
LUA50_CFLAGS="$CPPFLAGS";
fi
AC_ARG_WITH(lua50, AC_ARG_WITH(lua50,
[ --without-lua50 build without lua 5.0 (auto3)], [lua_disabled="(disabled)"]) [ --without-lua50 build without lua 5.0 (auto3)], [lua_disabled="(disabled)"])
if test "$with_lua50" != no; then if test "$with_lua50" != no; then
AC_AGI_COMPILE([Lua 5.0 (auto3)], [lua50], [$LUA50_CFLAGS], [$LUA50_LDFLAGS],[
aegisub_save_CPPFLAGS="$CPPFLAGS"
aegisub_save_LDFLAGS="$LDFLAGS"
CPPFLAGS="$CPPFLAGS $LUA50_CFLAGS"
LDFLAGS="$LDFLAGS $LUA50_LDFLAGS"
AC_CACHE_CHECK(
[whether Lua 5.0 works], [with_lua50],
[AC_COMPILE_IFELSE([
extern "C" { extern "C" {
#include "lua.h" #include "lua.h"
#include "lauxlib.h" #include "lauxlib.h"
@ -586,25 +572,15 @@ int main() {
if (!L) return 1; if (!L) return 1;
luaL_newmetatable(L, "test"); luaL_newmetatable(L, "test");
lua_close(L); lua_close(L);
}], }])
[with_lua50="yes"],
[with_lua50="no"])
])
CPPFLAGS="$aegisub_save_CPPFLAGS"
LDFLAGS="$aegisub_save_LDFLAGS"
fi fi
if test "$agi_with_lua50" = "yes"; then
if test "$with_lua50" != "no"; then
with_auto3="yes" with_auto3="yes"
with_automation="yes" with_automation="yes"
AC_DEFINE(WITH_AUTO3, 1, [Enable Automation (auto3, DEPRECIATED!), requires lua 5.0]) AC_DEFINE(WITH_AUTO3, 1, [Enable Automation (auto3, DEPRECIATED!), requires lua 5.0])
else else
with_auto3="no" with_auto3="no"
LUA50_CFLAGS=""
LUA50_LDFLAGS=""
fi fi
AM_CONDITIONAL([HAVE_AUTO3_LUA], [test "$with_auto3" != "no"]) AM_CONDITIONAL([HAVE_AUTO3_LUA], [test "$with_auto3" != "no"])