@@ -11,33 +11,23 @@ MSC_CHECK_LIB([LUA], [lua54 lua5.4 lua-5.4 lua53 lua5.3 lua-5.3 lua52 lua5.2 lua
1111
1212# Post-processing: detect Lua version and add version-specific defines
1313if test "x${LUA_FOUND}" = "x1"; then
14- LUA_VERSION=""
1514
16- # First, try to get version from pkg-config modversion
17- if test -n "${PKG_CONFIG}"; then
18- _msc_lua_pkg_name=""
19- for _msc_lua_p in lua54 lua5.4 lua-5.4 lua53 lua5.3 lua-5.3 lua52 lua5.2 lua-5.2 lua51 lua5.1 lua-5.1 luajit lua; do
20- if ${PKG_CONFIG} --exists ${_msc_lua_p} 2>/dev/null; then
21- _msc_lua_pkg_name="${_msc_lua_p}"
22- break
23- fi
24- done
25- if test -n "${_msc_lua_pkg_name}"; then
26- _msc_lua_pkg_version="`${PKG_CONFIG} ${_msc_lua_pkg_name} --modversion`"
27- case $_msc_lua_pkg_version in
28- 5.1*) LUA_CFLAGS="-DWITH_LUA_5_1 ${LUA_CFLAGS}" ; LUA_VERSION="${_msc_lua_pkg_version}" ;;
29- 5.2*) LUA_CFLAGS="-DWITH_LUA_5_2 ${LUA_CFLAGS}" ; LUA_VERSION="${_msc_lua_pkg_version}" ;;
30- 5.3*) LUA_CFLAGS="-DWITH_LUA_5_3 ${LUA_CFLAGS}" ; LUA_VERSION="${_msc_lua_pkg_version}" ;;
31- 5.4*) LUA_CFLAGS="-DWITH_LUA_5_4 ${LUA_CFLAGS}" ; LUA_VERSION="${_msc_lua_pkg_version}" ;;
32- 2.0*) LUA_CFLAGS="-DWITH_LUA_5_1 ${LUA_CFLAGS}" ; LUA_VERSION="${_msc_lua_pkg_version}" ;;
33- 2.1*) LUA_CFLAGS="-DWITH_LUA_5_1 -DWITH_LUA_JIT_2_1 ${LUA_CFLAGS}" ; LUA_VERSION="${_msc_lua_pkg_version}" ;;
34- esac
35- AC_MSG_NOTICE ( [ LUA pkg-config version: ${_msc_lua_pkg_version}] )
36- fi
15+ # Use version already detected by MSC_CHECK_LIB (from pkg-config) if available
16+ if test -n "${LUA_VERSION}" && test "x${LUA_VERSION}" != "xunknown"; then
17+ case ${LUA_VERSION} in
18+ 5.1*) LUA_CFLAGS="-DWITH_LUA_5_1 ${LUA_CFLAGS}" ;;
19+ 5.2*) LUA_CFLAGS="-DWITH_LUA_5_2 ${LUA_CFLAGS}" ;;
20+ 5.3*) LUA_CFLAGS="-DWITH_LUA_5_3 ${LUA_CFLAGS}" ;;
21+ 5.4*) LUA_CFLAGS="-DWITH_LUA_5_4 ${LUA_CFLAGS}" ;;
22+ 2.0*) LUA_CFLAGS="-DWITH_LUA_5_1 ${LUA_CFLAGS}" ;;
23+ 2.1*) LUA_CFLAGS="-DWITH_LUA_5_1 -DWITH_LUA_JIT_2_1 ${LUA_CFLAGS}" ;;
24+ esac
25+ AC_MSG_NOTICE ( [ LUA version: ${LUA_VERSION}] )
3726 fi
3827
39- # If no version detected via pkg-config, try compile tests
40- if test -z "${LUA_VERSION}"; then
28+ # If no version detected yet, try compile tests
29+ if test -z "${LUA_VERSION}" || test "x${LUA_VERSION}" = "xunknown"; then
30+ LUA_VERSION=""
4131 _msc_save_CFLAGS=$CFLAGS
4232 CFLAGS="${LUA_CFLAGS} ${CFLAGS}"
4333
0 commit comments