From: Josef 'Jeff' Sipek <jeff.sipek@open-xchange.com>
Date: Tue, 9 Mar 2021 15:53:50 +0000 (-0500)
Subject: m4: Allow explict override of lua version
X-Git-Tag: 2.3.15~226
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62a94d2270744725d76a70d29c65e2395f2205dc;p=thirdparty%2Fdovecot%2Fcore.git

m4: Allow explict override of lua version

It is possible that the system has several different versions of Lua
installed.  This change allows one to force a specific version of Lua during
./configure.  For example:

	LUA_CFLAGS="`pkg-config lua51 --cflags`" \
	LUA_LIBS="`pkg-config lua51 --libs`" \
		./configure \
			--with-lua
---

diff --git a/m4/want_lua.m4 b/m4/want_lua.m4
index b7bb89945b..4415500d00 100644
--- a/m4/want_lua.m4
+++ b/m4/want_lua.m4
@@ -12,23 +12,27 @@ AC_DEFUN([DOVECOT_WANT_LUA],[
   ])
   AC_MSG_RESULT([$with_lua])
 
-  AS_IF([test "x$with_lua" != "xno"],
-    [for LUAPC in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua; do
-       PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1, [
-         AC_DEFINE([HAVE_LUA], [1], [Define to 1 if you have lua])
-         with_lua=yes
-       ], [LUAPC=""]) # otherwise pkg_check will fail
-       if test "x$LUA_LIBS" != "x"; then break; fi
-     done
+  AS_IF([test "x$with_lua" != "xno"], [
+    AS_IF([test -n "$LUA_CFLAGS" -o -n "$LUA_LIBS"], [
+      with_lua=yes
+    ], [
+      for LUAPC in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua; do
+         PKG_CHECK_MODULES([LUA], $LUAPC >= 5.1 , [
+           with_lua=yes
+         ], [LUAPC=""]) # otherwise pkg_check will fail
+         if test "x$LUA_LIBS" != "x"; then break; fi
+       done
+    ])
   ])
 
   AS_IF([test "x$with_lua" = "xyes"], [
     AC_MSG_CHECKING([for chosen LUA])
-    AS_IF([test "x$LUAPC" = "x"], [
-        AC_MSG_ERROR([cannot find lua])
-      ],[
-        AC_MSG_RESULT([$LUAPC])
-      ])
+    AC_DEFINE([HAVE_LUA], [1], [Define to 1 if you have lua])
+    AS_IF([test "x$LUAPC" != "x"], [
+      AC_MSG_RESULT([$LUAPC])
+    ],[
+      AC_MSG_RESULT([specified via LUA_CFLAGS and LUA_LIBS])
+    ])
   ])
 
   AS_IF([test "x$with_lua" = "xyes"],