From b8a33cd35b66d788b12848f25486a23821657c0d Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Fri, 1 Feb 2019 16:43:40 +0000
Subject: [PATCH] shim: Add a minimal fallback version of PKG_CHECK_VAR

We can't just drop in an updated version of pkg.m4, because older
versions of pkg.m4 didn't have a serial number, so an older system copy
would overwrite our local copy.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 data/shim-configure.ac.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/data/shim-configure.ac.in b/data/shim-configure.ac.in
index 9d1f418bf..ef685b3fe 100644
--- a/data/shim-configure.ac.in
+++ b/data/shim-configure.ac.in
@@ -18,6 +18,10 @@ AC_SYS_LARGEFILE
 LT_INIT([disable-static])
 
 PKG_CHECK_MODULES([CAPSULE], [libcapsule])
+m4_ifndef([PKG_CHECK_VAR],
+          [AC_DEFUN([PKG_CHECK_VAR],
+                    [AC_ARG_VAR([$1])
+                     : ${$1:=$PKG_CONFIG --variable="$3" "$2"}])])
 PKG_CHECK_VAR([CAPSULE_MKINC], [libcapsule-tools], [makeinc])
 PKG_CHECK_VAR([CAPSULE_MKSTUBLIB_TOOL], [libcapsule-tools], [CAPSULE_MKSTUBLIB_TOOL])
 PKG_CHECK_VAR([CAPSULE_SYMBOLS_TOOL], [libcapsule-tools], [CAPSULE_SYMBOLS_TOOL])
-- 
GitLab