[geary: 1/2] build: obtain iso-codes prefix from pkg-config

[Michael Gratton <mjog src gnome org>]

commit beec7ff0fe602ccb362be69e8ca64a20abc227e9
Author: Jan Tojnar <jtojnar gmail com>
Date:   Wed Aug 8 20:12:53 2018 +0200

    build: obtain iso-codes prefix from pkg-config

 .gitlab-ci.yml | 4 ++--
 INSTALL        | 6 +++---
 debian/control | 2 ++
 meson.build    | 3 ++-
 4 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7afc8c74..76a0257f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ variables:
                meson desktop-file-utils libcanberra-devel libgee-devel
                glib2-devel gmime-devel gtk3-devel libnotify-devel sqlite-devel
                webkitgtk4-devel libsecret-devel libxml2-devel vala-tools
-               gcr-devel enchant-devel libunwind-devel
+               gcr-devel enchant-devel libunwind-devel iso-codes-devel
                gnome-online-accounts-devel itstool
   FEDORA_TEST_DEPS: Xvfb tar xz
   UBUNTU_DEPS: valac libgirepository1.0-dev
@@ -23,7 +23,7 @@ variables:
                libgee-0.8-dev libglib2.0-dev libgmime-2.6-dev libgtk-3-dev
                libsecret-1-dev libxml2-dev libnotify-dev libsqlite3-dev
                libwebkit2gtk-4.0-dev libgcr-3-dev libenchant-dev
-               libunwind-dev libgoa-1.0-dev itstool gettext
+               libunwind-dev iso-codes libgoa-1.0-dev itstool gettext
                libmessaging-menu-dev libunity-dev
   UBUNTU_TEST_DEPS: xauth xvfb
 
diff --git a/INSTALL b/INSTALL
index 5992fb59..7d6b426b 100644
--- a/INSTALL
+++ b/INSTALL
@@ -41,8 +41,8 @@ Installing dependencies on Fedora
 Fedora 25 and later ships with the correct versions of the required
 libraries. Install them by running this command:
 
-    sudo yum install vala gobject-introspection-devel \
-        meson desktop-file-utils libcanberra-devel libgee-devel \
+    sudo yum install vala gobject-introspection-devel meson \
+        desktop-file-utils iso-codes-devel libcanberra-devel libgee-devel \
         glib2-devel gmime-devel gtk3-devel libnotify-devel sqlite-devel \
         webkitgtk4-devel libsecret-devel libxml2-devel vala-tools \
         gcr-devel enchant-devel libunwind-devel \
@@ -63,7 +63,7 @@ required libraries.
 Install them by running this command:
 
     sudo apt-get install valac libgirepository1.0-dev \
-        meson desktop-file-utils libcanberra-dev \
+        meson desktop-file-utils iso-codes libcanberra-dev \
         libgee-0.8-dev libglib2.0-dev libgmime-2.6-dev libgtk-3-dev \
         libsecret-1-dev libxml2-dev libnotify-dev libsqlite3-dev \
         libwebkit2gtk-4.0-dev libgcr-3-dev libenchant-dev \
diff --git a/debian/control b/debian/control
index e6c0d32a..70244c30 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: Michael Gratton <mike vee net>
 Build-Depends: debhelper (>= 8),
  desktop-file-utils,
+ iso-codes,
  itstool,
  libcanberra-dev,
  libenchant-dev,
@@ -31,6 +32,7 @@ Homepage: https://wiki.gnome.org/Apps/Geary
 Package: geary
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
+ iso-codes,
  libcanberra0,
  libenchant1c2a,
  libgcr-base-3-1,
diff --git a/meson.build b/meson.build
index 07d36c14..f1166c83 100644
--- a/meson.build
+++ b/meson.build
@@ -59,6 +59,7 @@ gio = dependency('gio-2.0', version: '>=' + target_glib)
 goa = dependency('goa-1.0')
 gobject_introspection = dependency('gobject-introspection-1.0')
 gthread = dependency('gthread-2.0', version: '>=' + target_glib)
+iso_codes = dependency('iso-codes')
 javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit)
 libcanberra = dependency('libcanberra', version: '>= 0.28')
 libmath = cc.find_library('m')
@@ -104,7 +105,7 @@ if enable_valadoc
 endif
 
 # Language detection
-iso_codes_dir = join_paths('/', 'usr', 'share', 'xml', 'iso-codes')
+iso_codes_dir = join_paths(iso_codes.get_pkgconfig_variable('prefix'), 'share', 'xml', 'iso-codes')
 if iso_639_xml == ''
   iso_639_xml = join_paths(iso_codes_dir, 'iso_639.xml')
 endif