]>
Commit | Line | Data |
---|---|---|
4174f335 SS |
1 | Original lua-detection-code is broken: |
2 | * xmoto builds with lua50 | |
3 | * xmoto doesn't build with lua51 (configure: error: liblua5.1) | |
4 | * xmoto doesn't build with installed both lua50 and lua51 (undefined reference to `luaL_newstate') | |
5 | --- xmoto-0.3.4/configure.in.orig 2007-12-25 09:59:05.569939403 +0100 | |
6 | +++ xmoto-0.3.4/configure.in 2007-12-25 10:02:46.536229609 +0100 | |
7 | @@ -77,23 +77,11 @@ | |
8 | fi | |
9 | AM_CONDITIONAL([USE_SDLGFX], test "$USE_SDLGFX" = "1") | |
10 | ||
11 | -AC_SEARCH_LIBS(lua_pushboolean,lua lua5.1 lua50, [], [AC_MSG_ERROR(liblua5.1, liblua50, or liblua required)]) | |
12 | -AC_SEARCH_LIBS(luaopen_math,lualib lualib5.1 lualib50, [], [AC_MSG_ERROR(liblualib5.1, liblualib50, or liblualib required)]) | |
13 | - | |
14 | -dnl ***** Check lua headers, as they are prone to be located random places on random systems! ***** | |
15 | -dnl The following three lines where suggested by Eric Piel, but they don't seem to work on my system | |
16 | -dnl AC_CHECK_HEADERS(lua.h lua/lua.h lua50/lua.h, [break], [AC_MSG_ERROR(Could not find lua.h)]) | |
17 | -dnl AC_CHECK_HEADERS(lauxlib.h lua/lauxlib.h lua50/lauxlib.h, [break], [AC_MSG_ERROR(Could not find luaxlib.h)]) | |
18 | -dnl AC_CHECK_HEADERS(lualib.h lua/lualib.h lua50/lualib.h, [break], [AC_MSG_ERROR(Could not find lualib.h)]) | |
19 | - | |
20 | -dnl search in this order to put in USE_LUA_VERSION the recenter version | |
21 | -dnl in .h inclusion, order is reversed to include the recenter version | |
22 | -USE_LUA_VERSION="unknown" | |
23 | -AC_CHECK_HEADER(lua.h, AC_DEFINE(HAVE_LUA_H) [USE_LUA_VERSION="unknown"]) | |
24 | -AC_CHECK_HEADER(lua/lua.h, AC_DEFINE(HAVE_LUA_LUA_H) [USE_LUA_VERSION="unknown"]) | |
25 | -AC_CHECK_HEADER(lua50/lua.h, AC_DEFINE(HAVE_LUA50_LUA_H) [USE_LUA_VERSION="5.0"]) | |
26 | -AC_CHECK_HEADER(lua51/lua.h, AC_DEFINE(HAVE_LUA51_LUA_H) [USE_LUA_VERSION="5.1"]) | |
27 | -AC_CHECK_HEADER(lua5.1/lua.h, AC_DEFINE(HAVE_LUA5_1_LUA_H)[USE_LUA_VERSION="5.1"]) | |
28 | +PKG_CHECK_MODULES(LUA, lua51) | |
29 | +CXXFLAGS="$CXXFLAGS $LUA_CFLAGS" | |
30 | +LIBS="$LIBS $LUA_LIBS" | |
31 | +USE_LUA_VERSION=5.1 | |
32 | +AC_DEFINE(HAVE_LUA_H) | |
33 | ||
34 | AC_LANG_PUSH([C++]) | |
35 |