1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
|
From 7be89493082b76813282e60360c11408aa2e181d Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@hadrons.org>
Date: Sat, 26 May 2012 03:04:54 +0200
Subject: [PATCH] Switch to Lua 5.1
diff --git a/configure.in b/configure.in
index cc94356..9b196bf 100644
--- a/configure.in
+++ b/configure.in
@@ -36,31 +36,9 @@ if test "x$LUAPFX" != x ; then
LUA_CFLAGS="-I$LUAPFX"
LUA_LIBS="-L$LUAPFX -llua -llualib"
else
-dnl Debian, and possibly other systems, include this script...
- AC_CHECK_PROGS(LUACONFIG, [lua-config lua-config50 lua-config5.0], "")
- if test "x$LUACONFIG" != x; then
- LUA_CFLAGS="`[$LUACONFIG --include]`"
- LUA_LIBS="`[$LUACONFIG --static]`"
- else dnl ...otherwise, attempt to guess
- PKG_CHECK_MODULES(LUA, lua, [], [
- LUA_CFLAGS=""
- LUA_LIBS=""
- AC_CHECK_LIB(lua, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua",
- [AC_CHECK_LIB(lua50, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua50",
- [AC_CHECK_LIB(lua5.0, lua_setfenv, LUA_LIBS="$LUA_LIBS -llua5.0",
- [AC_MSG_ERROR([*** Lua5 is required.
- Try --with-lua=PREFIX
- You can download lua from http://www.lua.org])],
- $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS)
-
- AC_CHECK_LIB(lualib, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib",
- [AC_CHECK_LIB(lualib50, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib50",
- [AC_CHECK_LIB(lualib5.0, luaopen_base, LUA_LIBS="$LUA_LIBS -llualib5.0",
- [AC_MSG_ERROR([*** Lualib5 is required.
- You can download lua from http://www.lua.org])],
- $LUA_LIBS)], $LUA_LIBS)], $LUA_LIBS)
- ])
- fi
+ PKG_CHECK_MODULES(LUA, [lua5.1], [], [
+ AC_MSG_ERROR([*** Lualib5.1 is required.
+ You can download lua from http://www.lua.org])])
fi
AC_SUBST(LUA_CFLAGS)
AC_SUBST(LUA_LIBS)
|