[balsa] meson.build: Use dependency()'s capabilities

[Peter Bloomfield <peterb src gnome org>]

commit 46d67b2fda12507008d305be5b0cf38ce3787616
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Wed Nov 13 18:02:27 2019 -0500

    meson.build: Use dependency()'s capabilities
    
    * meson.build: dependency() can find gpgme's configuration, (it's
      not limited to pkg-config) so we do not need the custom code.

 ChangeLog   |  7 +++++++
 meson.build | 30 ++----------------------------
 2 files changed, 9 insertions(+), 28 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5d0321612..ca175abbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-11-13  Peter Bloomfield  <pbloomfield bellsouth net>
+
+       meson.build: Use dependency()'s capabilities
+
+       * meson.build: dependency() can find gpgme's configuration, (it's
+         not limited to pkg-config) so we do not need the custom code.
+
 2019-11-13  Peter Bloomfield  <pbloomfield bellsouth net>
 
        meson.build: Use meson's "optimization" option
diff --git a/meson.build b/meson.build
index 014c418dc..bd571a6bd 100644
--- a/meson.build
+++ b/meson.build
@@ -134,6 +134,7 @@ gmime_dep   = dependency('gmime-2.6')
 gio_dep     = dependency('gio-2.0')
 gthread_dep = dependency('gthread-2.0')
 gnutls_dep  = dependency('gnutls', version : '>= 3.0')
+gpgme_dep   = dependency('gpgme', version : '>= 1.6.0')
 fribidi_dep = dependency('fribidi')
 
 # Dependencies for balsa
@@ -143,6 +144,7 @@ balsa_deps = [glib_dep,
               gio_dep,
               gthread_dep,
               gnutls_dep,
+              gpgme_dep,
               fribidi_dep]
 
 # Dependencies for balsa_ab:
@@ -209,34 +211,6 @@ if html_widget == 'webkit2'
   balsa_deps += html_dep
 endif
 
-# GPGME detection.
-
-gpgmecfg_program = find_program('gpgme-config', required : true)
-gpgmecfg = gpgmecfg_program.path()
-
-gpgmever = run_command(gpgmecfg, '--version').stdout().strip()
-if gpgmever.version_compare('< 1.6.0')
-  gpgmecfg   = 'false'
-  error('Sorry, you need at least gpgme version 1.6.0')
-else
-  if gpgmever.version_compare('< 1.8.0')
-    gpgme_libs = run_command(gpgmecfg, '--thread=pthread', '--libs')
-  else
-    gpgme_libs = run_command(gpgmecfg, '--libs')
-  endif
-  if gpgme_libs.returncode() != 0
-    error('*** Your gpgme installation does not support threads.')
-  endif
-
-  gpgme_cflags = run_command(gpgmecfg, '--cflags')
-  gpgme_cflags = gpgme_cflags.stdout().strip().split()
-  gpgme_libs   = gpgme_libs.stdout().strip().split()
-
-  gpgme_dep = declare_dependency(compile_args : gpgme_cflags, link_args : gpgme_libs)
-  balsa_deps += gpgme_dep
-  gpgmecfg = 'true'
-endif
-
 # Autocrypt
 if autocrypt
   autocrypt_dep = dependency('sqlite3', required : true)