From 25f510dd92d090777ed74f989db46fd5c45d4b1b Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Fri, 29 Nov 2019 14:09:50 +0100 Subject: [PATCH] add explicit lua5.3 support --- config/ac_lua_extensions.m4 | 2 +- configure.ac | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/config/ac_lua_extensions.m4 b/config/ac_lua_extensions.m4 index 4dbfb7b1..94215887 100644 --- a/config/ac_lua_extensions.m4 +++ b/config/ac_lua_extensions.m4 @@ -17,5 +17,5 @@ AC_DEFUN([AC_LUA_EXTENSIONS], ;; esac ] ) - AC_MSG_RESULT(${ac_with_lua_extensions=yes}) + AC_MSG_RESULT(${ac_with_lua_extensions=no}) ]) diff --git a/configure.ac b/configure.ac index 73954fab..58c6684d 100644 --- a/configure.ac +++ b/configure.ac @@ -208,20 +208,23 @@ AM_CONDITIONAL(WITH_CPLUSPLUS_EXTENSIONS, [test "$ac_with_cplusplus_extensions" AC_JAVA_EXTENSIONS AM_CONDITIONAL(WITH_JAVA_EXTENSIONS, [test "$ac_with_java_extensions" = "yes"]) - +# +# Check for lua, which means create commanline conditional +# +AC_LUA_EXTENSIONS +AM_CONDITIONAL(WITH_LUA_EXTENSIONS, [test "$ac_with_lua_extensions" = "yes"]) # # expand lua # -AX_PROG_LUA +if test "x$ac_with_lua_extensions" = "xyes" ; then +# beware, the ACTION-IF-NOT-FOUND is not working +AX_PROG_LUA([5.3],,,:) +# The test of headers fail, if LUA_VERSION is empty +if test LUA_VERSION ; then AX_LUA_HEADERS AX_LUA_LIBS - -# -# Check for lua -# - -AC_LUA_EXTENSIONS -AM_CONDITIONAL(WITH_LUA_EXTENSIONS, [test "$ac_with_lua_extensions" = "yes"]) +fi +fi ## # Checks for typedefs, structures, and compiler characteristics.