From 1f23637cd253d18305f08217aedfd412a9a6ada6 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Thu, 20 Mar 2008 21:24:01 +0000 Subject: [PATCH] Fix auto4/auto3 (lua51/lua50) support, this removes the --with-* flags in favor of LUA_(C|LD)FLAGS and LUA50_(C|LD)FLAGS, also add the LUA LDFLAGS to LIBS like perl in order to have it bring in the symbols properly, this is a temp measure until we have modules. Originally committed to SVN as r2082. --- aegisub/Makefile.am | 4 +- auto3/Makefile.am | 2 +- configure.in | 119 ++++++++++++++++++++++++++++++-------------- 3 files changed, 84 insertions(+), 41 deletions(-) diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am index d50556b45..85b51b8b3 100644 --- a/aegisub/Makefile.am +++ b/aegisub/Makefile.am @@ -64,8 +64,8 @@ endif if HAVE_AUTO4_LUA noinst_LIBRARIES += libauto4_lua.a libauto4_lua_a_SOURCES = auto4_lua.cpp auto4_lua_assfile.cpp auto4_lua_dialog.cpp auto4_lua_scriptreader.cpp -libauto4_lua_a_CPPFLAGS = @LUA_CPPFLAGS@ -aegisub_LDFLAGS += @LUA_LDFLAGS@ +libauto4_lua_a_CPPFLAGS = @LUA_CFLAGS@ +LIBS += @LUA_LDFLAGS@ aegisub_LDADD += libauto4_lua.a endif diff --git a/auto3/Makefile.am b/auto3/Makefile.am index 3abe363da..43c1d7680 100644 --- a/auto3/Makefile.am +++ b/auto3/Makefile.am @@ -1,6 +1,6 @@ if HAVE_AUTO3_LUA -AM_CFLAGS = -DAUTO3LIB @LUA50_CPPFLAGS@ +AM_CFLAGS = -DAUTO3LIB @LUA50_CFLAGS@ AM_LDFLAGS = @LUA50_LDFLAGS@ lib_LTLIBRARIES = libaegisub-auto3.la diff --git a/configure.in b/configure.in index ef5001a11..dd2beec1c 100644 --- a/configure.in +++ b/configure.in @@ -338,78 +338,121 @@ AM_CONDITIONAL([HAVE_UNIVCHARDET], [test "$with_univchardet" != "no"]) ############ ## Auto4 LUA ############ - + +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)]) +if test -z "$LUA_LDFLAGS"; then + LUA_LDFLAGS="-llua"; +fi AC_ARG_WITH(lua, [ --without-lua build without lua 5.1 (auto4)], [lua_disabled="(disabled)"]) -AC_ARG_WITH(lua-lib, -[ --with-lua-lib=PREFIX PATH location of lua 5.1 library (auto4)], [lua_lib_dir="-L$withval"]) - -AC_ARG_WITH(lua-include, -[ --with-lua-include=PREFIX - PATH location of lua 5.1 includes], [lua_include_dir="-I$withval"]) - if test "$with_lua" != no; then - aegisub_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $lua_lib_dir" - AC_CHECK_LIB([lua], [lua_call], [LUA_LDFLAGS="$lua_lib_dir -llua"; with_lua_lib="yes"]) - LDFLAGS="$aegisub_save_LDFLAGS" aegisub_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $lua_include_dir" - AC_CHECK_HEADER([lua.h],[LUA_CPPFLAGS="$lua_include_dir"; with_lua_include="yes"]) + 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" { +#include +#include +} + +int main () { + lua_State *L = luaL_newstate(); + lua_pushstring(L, "test"); + int res = lua_objlen(L, -1) == 4; + lua_close(L); + return !res; +}], + [with_lua="yes"], + [with_lua="no"]) + ]) + CPPFLAGS="$aegisub_save_CPPFLAGS" + LDFLAGS="$aegisub_save_LDFLAGS" fi -if test "$with_lua_lib" = "yes" && test "$with_lua_include" = "yes" && test "$with_lua" != "no"; then +if test "$with_lua" != "no"; then with_auto4="yes" with_automation="yes" AC_DEFINE(WITH_AUTO4_LUA, 1, [Enable Automation (auto4), requires lua]) else with_auto4="no" + LUA_CFLAGS="" + LUA_LDFLAGS="" fi -AC_SUBST(LUA_CPPFLAGS) -AC_SUBST(LUA_LDFLAGS) AM_CONDITIONAL([HAVE_AUTO4_LUA], [test "$with_auto4" != "no"]) - +AC_SUBST(LUA50_CFLAGS) +AC_SUBST(LUA50_LDFLAGS) ################## ## Auto3 (LUA 5.0) ################## -AC_ARG_WITH(lua50-lib, -[ --with-lua50-lib=PREFIX PATH location of lua 5.0 library - (required for auto3 support)], [lua50_lib_dir="-L$withval"]) -AC_ARG_WITH(lua50-include, -[ --with-lua50-include=PREFIX - PATH location of lua 5.0 includes - (required for auto3 support)], [lua50_include_dir="-I$withval"]) -if ! test -z "$lua50_lib_dir" && ! test -z "$lua50_include_dir"; then - aegisub_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$lua50_lib_dir -llua" - AC_CHECK_LIB([lualib], [luaopen_base], [LUA50_LDFLAGS="$lua50_lib_dir -llua -llualib"; lua50_lib="yes"], [lua50_lib="no"]) - LDFLAGS="$aegisub_save_LDFLAGS" - - aegisub_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$lua50_include_dir" - AC_CHECK_HEADER([lua.h],[LUA50_CPPFLAGS="$lua50_include_dir"; lua50_include="yes"],[lua50_include="no"]) - CPPFLAGS="$aegisub_save_CPPFLAGS" +AC_ARG_VAR([LUA50_CFLAGS], [CFLAGS to use for LUA 5.0 (default: CPPFLAGS)]) +AC_ARG_VAR([LUA50_LDFLAGS], [LDFLAGS to use for LUA 5.1 (default: -llua -llualib)]) +if test -z "$LUA50_LDFLAGS"; then + LUA50_LDFLAGS="-llua -llualib"; fi -if test "$lua50_lib" = "yes" && test "$lua50_include" = "yes"; then +AC_ARG_WITH(lua50, +[ --without-lua50 build without lua 5.0 (auto3)], [lua_disabled="(disabled)"]) + +if test "$with_lua50" != no; then + + 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" { +#include "lua.h" +#include "lauxlib.h" +} +#ifdef lua_open +#error This is not Lua 5.0 +#endif +int main() { + lua_State *L = lua_open(); + if (!L) return 1; + luaL_newmetatable(L, "test"); + lua_close(L); +}], + [with_lua50="yes"], + [with_lua50="no"]) + ]) + + CPPFLAGS="$aegisub_save_CPPFLAGS" + LDFLAGS="$aegisub_save_LDFLAGS" +fi + + + +if test "$with_lua50" != "no"; then with_auto3="yes" with_automation="yes" AC_DEFINE(WITH_AUTO3, 1, [Enable Automation (auto3, DEPRECIATED!), requires lua 5.0]) else with_auto3="no" + LUA50_CFLAGS="" + LUA50_LDFLAGS="" fi - AM_CONDITIONAL([HAVE_AUTO3_LUA], [test "$with_auto3" != "no"]) -AC_SUBST(LUA50_CPPFLAGS) +AC_SUBST(LUA50_CFLAGS) AC_SUBST(LUA50_LDFLAGS)