--- configure.ac +++ configure.ac @@ -47,30 +47,13 @@ # LUA ---------------------------------------------------- -AC_LANG_PUSH(C) -AC_ARG_WITH(lua, -[ --with-lua[[=DIR]] specify the path to the Lua 5.1 include files [[autodetect]]], -[ - if test "x$withval" != "x"; then - lua_dir="$withval" - fi -],[ - lua_dir= -]) - -FUNGU_SEARCH_HEADER( [lua.h], [$lua_dir /usr/local /usr], [ include/lua5.1 include/lua / ] ) -if test "x$FUNGU_FOUND_HEADER" = "xno"; then - PKG_CHECK_MODULES(LUA, [lua >= 5.1],[],[ - PKG_CHECK_MODULES(LUA, [lua5.1 >= 5.1],[],[ - AC_MSG_ERROR(Lua 5.1 not found. You can specify its location with [[--with-lua=/path/to/include/lua51]]) +PKG_CHECK_MODULES(LUA, [lua >= 5.1, lua < 5.2],[],[ + PKG_CHECK_MODULES(LUA, [lua5.1 >= 5.1],[],[ + PKG_CHECK_MODULES(LUA, [lua51 >= 5.1, lua51 < 5.2],[],[ + AC_MSG_ERROR(Lua 5.1 not found) ]) ]) -else - CFLAGS="$CFLAGS $FUNGU_FOUND_HEADER" - CPPFLAGS="$CPPFLAGS $FUNGU_FOUND_HEADER" - LDFLAGS="$LDFLAGS -llua5.1" -fi -AC_LANG_POP +]) AC_SUBST(LUA_CFLAGS) AC_SUBST(LUA_LIBS)