From 51dbeb20ebfa9f9d1e1a65eaa8251d712b21c9ba Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Wed, 1 Jan 2025 00:42:00 -0800 Subject: [PATCH] m4/lua.m4: make detection work again with pkgconf It seems that `break` isn't allowed in else blocks with m4 macros. Change the logic to flow in a manner that works with the `PKG_CHECK_MODULES` macro. This unbreaks the build on FreeBSD with ports. Fixes: 02a2b33f7beff0a014e2373454239e3bebf2d7b5 Signed-off-by: Enji Cooper --- m4/lua.m4 | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/m4/lua.m4 b/m4/lua.m4 index 2cd0d2d..3f1aed0 100644 --- a/m4/lua.m4 +++ b/m4/lua.m4 @@ -34,18 +34,16 @@ dnl AC_DEFUN([KYUA_LUA], [ lua_found=no for lua_release in ${LUA_VERSION:-5.4 5.3}; do - AS_IF([test "${lua_found}" = no],[ - PKG_CHECK_MODULES([LUA], [lua${lua_release} >= ${lua_release}], - [lua_found="lua${lua_release}"; break],[]) - ]) - AS_IF([test "${lua_found}" = no],[ - PKG_CHECK_MODULES([LUA], [lua-${lua_release} >= ${lua_release}], - [lua_found="lua-${lua_release}"; break],[]) - ]) - AS_IF([test "${lua_found}" = no],[ - PKG_CHECK_MODULES([LUA], [lua >= ${lua_release}], - [lua_found=lua; break],[]) - ]) + PKG_CHECK_MODULES([LUA], [lua-${lua_release} >= ${lua_release}], + [lua_found="lua-${lua_release}"],[ + PKG_CHECK_MODULES([LUA], [lua${lua_release} >= ${lua_release}], + [lua_found="lua${lua_release}"],[ + PKG_CHECK_MODULES([LUA], [lua >= ${lua_release}], + [lua_found="lua"],[]) + ])]) + if test "${lua_found}" != no; then + break + fi done AS_IF([test "${lua_found}" = no],[],[