From e00d05d03398d4643d86e6d46fc57b4581f4ba73 Mon Sep 17 00:00:00 2001
From: Mario Limonciello <mario.limonciello@dell.com>
Date: Tue, 17 Apr 2018 15:54:12 -0500
Subject: [PATCH] Only run certtool if a new enough gnutls was on system and
 pkcs7 enabled

---
 data/tests/colorhug/meson.build | 24 +++++++++++++-----------
 meson.build                     |  2 +-
 src/meson.build                 |  4 +++-
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/data/tests/colorhug/meson.build b/data/tests/colorhug/meson.build
index 22f9d9dd5..60f59fcf0 100644
--- a/data/tests/colorhug/meson.build
+++ b/data/tests/colorhug/meson.build
@@ -13,14 +13,16 @@ if gcab.found()
   )
 endif
 
-# generate self-signed detached signature
-colorhug_pkcs7_signature = custom_target('firmware.bin.p7c',
-  input: 'firmware.bin',
-  output: 'firmware.bin.p7c',
-  command: [certtool, '--p7-detached-sign',
-                      '--p7-time',
-                      '--load-privkey', pkcs7_privkey,
-                      '--load-certificate', pkcs7_certificate,
-                      '--infile', '@INPUT@',
-                      '--outfile', '@OUTPUT@'],
-)
+if get_option('pkcs7')
+  # generate self-signed detached signature
+  colorhug_pkcs7_signature = custom_target('firmware.bin.p7c',
+    input: 'firmware.bin',
+    output: 'firmware.bin.p7c',
+    command: [certtool, '--p7-detached-sign',
+                        '--p7-time',
+                        '--load-privkey', pkcs7_privkey,
+                        '--load-certificate', pkcs7_certificate,
+                        '--infile', '@INPUT@',
+                        '--outfile', '@OUTPUT@'],
+  )
+endif
diff --git a/meson.build b/meson.build
index 9a182a966..7d75c055c 100644
--- a/meson.build
+++ b/meson.build
@@ -154,7 +154,7 @@ else
 endif
 soup = dependency('libsoup-2.4', version : '>= 2.51.92')
 if get_option('pkcs7')
-  gnutls = dependency('gnutls')
+  gnutls = dependency('gnutls', version : '>= 3.4.4.1')
   conf.set('ENABLE_PKCS7', '1')
 endif
 if get_option('gpg')
diff --git a/src/meson.build b/src/meson.build
index 66c4037c7..3435ba101 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -6,6 +6,7 @@ install_data(['org.freedesktop.fwupd.xml'],
 
 keyring_deps = []
 keyring_src = []
+test_deps = []
 
 if get_option('gpg')
   keyring_src += 'fu-keyring-gpg.c'
@@ -16,6 +17,7 @@ endif
 if get_option('pkcs7')
   keyring_src += 'fu-keyring-pkcs7.c'
   keyring_deps += gnutls
+  test_deps += colorhug_pkcs7_signature
 endif
 
 libfwupdprivate = static_library(
@@ -182,10 +184,10 @@ if get_option('tests')
     'fu-self-test',
     resources_src,
     colorhug_test_firmware,
-    colorhug_pkcs7_signature,
     builder_test_firmware,
     hwid_test_firmware,
     noreqs_test_firmware,
+    test_deps,
     sources : [
       keyring_src,
       'fu-self-test.c',