diff options
| author |   Sébastien Helleu <flashcode@flashtux.org> | 2019-03-23 21:51:59 +0100 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2019-03-23 22:00:03 +0100 |
| commit | e68754aafe30aff9d2b5d0319f715483f22acdb1 (patch) | |
| tree | b71eb8582085837c055a819fd01dd9c1e14ebd06 | |
| parent | tests: remove extra output before/after tests (diff) | |
| download | weechat-e68754aafe30aff9d2b5d0319f715483f22acdb1.tar.xz weechat-e68754aafe30aff9d2b5d0319f715483f22acdb1.zip | |
lua: add detection of Lua 5.3 with autotools
| -rw-r--r-- | ChangeLog.adoc | 1 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc index b9adba49b..5ad385f74 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -43,6 +43,7 @@ Bug fixes:: Build:: + * lua: add detection of Lua 5.3 with autotools * core: fix compilation on Mac OS (issue #1308) [[v2.4]] diff --git a/configure.ac b/configure.ac index 435929326..722fb3f31 100644 --- a/configure.ac +++ b/configure.ac @@ -623,7 +623,7 @@ if test "x$enable_lua" = "xyes" ; then if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then AC_MSG_CHECKING(for Lua headers and libraries with pkg-config) echo - for l in "$lua_suffix" "" "52" "5.2" "51" "5.1" "50" "5.0" ; do + for l in "53" "5.3" "52" "5.2" "51" "5.1" "50" "5.0" "$lua_suffix" "" ; do pkgconfig_lua_found=`$PKGCONFIG --exists lua$l 2>/dev/null` if test "x$?" = "x0" ; then LUA_VERSION=`$PKGCONFIG --modversion lua$l` @@ -642,7 +642,7 @@ if test "x$enable_lua" = "xyes" ; then if test "x$LUA_CFLAGS" = "x" -o "x$LUA_LFLAGS" = "x" ; then LUACONFIG="" - AC_CHECK_PROGS(LUACONFIG, lua-config lua-config52 lua-config5.2 lua-config51 lua-config5.1 lua-config50 lua-config5.0) + AC_CHECK_PROGS(LUACONFIG, lua-config53 lua-config5.3 lua-config52 lua-config5.2 lua-config51 lua-config5.1 lua-config50 lua-config5.0 lua-config) if test "x$LUACONFIG" != "x" ; then AC_MSG_CHECKING(for Lua headers and libraries with lua-config) echo @@ -660,7 +660,7 @@ if test "x$enable_lua" = "xyes" ; then if test "x$ac_found_lua_header" = "xyes" -a "x$ac_found_liblua_header" = "xyes"; then LUA_CFLAGS="$CFLAGS" fi - for l in "$lua_suffix" "" "52" "5.2" "51" "5.1" "50" "5.0" ; do + for l in "53" "5.3" "52" "5.2" "51" "5.1" "50" "5.0" "$lua_suffix" "" ; do AC_CHECK_LIB(lua$l,lua_call,ac_found_lua_lib="yes",ac_found_lua_lib="no") if test "x$ac_found_lua_lib" = "xyes" ; then LUA_VERSION=">=5.1.0" |