[patch] opendkim-2.10.3-lua-pkgconfig.patch

opendkim-2.10.3-lua-pkgconfig.patch (text/plain), 2.05 KB, created by Michael Orlitzky on 2020-01-27 04:17:47 UTC

From 7a9411debcded3e181266d96511ffb9562e89312 Mon Sep 17 00:00:00 2001
From: Michael Orlitzky <[e-mail]>
Date: Sun, 26 Jan 2020 22:29:16 -0500
Subject: [PATCH 11/11] configure.ac: check for "lua" with pkg-config in
 addition to "lua5.1".

The upstream Lua pkg-config file is named lua.pc, so unless some
distribution renames it, OpenDKIM should be looking for "lua"
and not "lua5.1" in its PKG_CHECK_MODULES call. In any case, we
should definitely be checking for "lua", so this commit appends it
to the list of modules we look for. The "lua5.1" module was left
alone, because I don't know enough of the history to be sure that
removing it is the right thing to do.

When the call to PKG_CHECK_MODULES fails, OpenDKIM falls back to
a manual search that looks in /usr/lib, and this can detect 32-bit
libraries on a 64-bit system. Therefore it is preferable that the
PKG_CHECK_MODULES call succeed.

Closes: https://github.com/trusteddomainproject/OpenDKIM/issues/62
Gentoo-bug: https://bugs.gentoo.org/704556
---
 configure.ac | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index a478bb83..be667da6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1495,12 +1495,20 @@ lua_found="no"
 
 if test \(  x"$luapath" = x"auto" -o x"$luapath" = x"yes" \) -a x"$PKG_CONFIG" != x""
 then
-        PKG_CHECK_MODULES([LIBLUA], [lua5.1],
-	                  [
-				lua_found="yes"
-				LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
-	                  ],
-			  [AC_MSG_WARN([pkg-config for Lua not found, trying manual search...])])
+  PKG_CHECK_MODULES([LIBLUA], [lua5.1], [
+      lua_found="yes"
+      LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
+    ],
+    [
+      AC_MSG_WARN([pkg-config for lua5.1 not found, trying lua...])
+      PKG_CHECK_MODULES([LIBLUA], [lua], [
+          lua_found="yes"
+          LIBLUA_INCDIRS="$LIBLUA_CFLAGS"
+        ],
+	[AC_MSG_WARN([pkg-config for lua not found, trying manual search...])]
+      )
+    ]
+  )
 fi
 
 if test \( x"$luapath" = x"yes" -o x"$luapath" = x"auto" \) -a x"$lua_found" = x"no"
-- 
2.24.1