From f2a80ab2c2ee2631ac4d12f10e2dd591e6cfb8c9 Mon Sep 17 00:00:00 2001
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Fri, 3 Jul 2020 04:28:08 +0430
Subject: [PATCH] [meson] use null_dep idiom

---
 meson.build     | 15 ++++++++-------
 src/meson.build |  4 ++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/meson.build b/meson.build
index c5614b496..bb1fa6751 100644
--- a/meson.build
+++ b/meson.build
@@ -16,6 +16,7 @@ hb_libtool_version_info = '@0@:0:@0@'.format(hb_version_int)
 
 pkgmod = import('pkgconfig')
 cpp = meson.get_compiler('cpp')
+null_dep = dependency('', required: false)
 
 if cpp.get_id() == 'msvc'
   # Ignore several spurious warnings for things HarfBuzz does very commonly.
@@ -89,7 +90,7 @@ if not get_option('freetype').disabled()
                               default_options: ['harfbuzz=disabled'])
   endif
 else
-  freetype_dep = dependency('', required: false)
+  freetype_dep = null_dep
 endif
 
 glib_dep = dependency('glib-2.0', required: get_option('glib'),
@@ -126,7 +127,7 @@ if not get_option('icu').disabled()
     endif
   endif
 else
-  icu_dep = dependency('', required: false)
+  icu_dep = null_dep
 endif
 
 if not get_option('cairo').disabled()
@@ -160,11 +161,11 @@ if not get_option('cairo').disabled()
       cairo_ft_dep = dependency('cairo-ft', required: get_option('cairo'))
     endif
   else
-    cairo_ft_dep = dependency('', required: false)
+    cairo_ft_dep = null_dep
   endif
 else
-  cairo_dep = dependency('', required: false)
-  cairo_ft_dep = dependency('', required: false)
+  cairo_dep = null_dep
+  cairo_ft_dep = null_dep
 endif
 
 conf = configuration_data()
@@ -248,7 +249,7 @@ if host_machine.system() == 'windows' and not get_option('gdi').disabled()
 endif
 
 # DirectWrite (windows)
-directwrite_dep = dependency('', required: false)
+directwrite_dep = null_dep
 if host_machine.system() == 'windows' and not get_option('directwrite').disabled()
   if cpp.has_header('dwrite_1.h')
     directwrite_dep = cpp.find_library('dwrite', required: true)
@@ -281,7 +282,7 @@ if host_machine.system() == 'darwin' and not get_option('coretext').disabled()
 endif
 
 # threads
-thread_dep = dependency('', required: false)
+thread_dep = null_dep
 if host_machine.system() != 'windows'
   thread_dep = dependency('threads', required: false)
 
diff --git a/src/meson.build b/src/meson.build
index 36df8cb13..8399ffeb6 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -537,7 +537,7 @@ if have_icu and not have_icu_builtin
 
   install_headers(hb_icu_headers, subdir: meson.project_name())
 else
-  libharfbuzz_icu_dep = dependency('', required: false)
+  libharfbuzz_icu_dep = null_dep
 endif
 
 have_gobject = conf.get('HAVE_GOBJECT', 0) == 1
@@ -654,7 +654,7 @@ else
     error('introspection requires gobject to be enabled')
   endif
 
-  libharfbuzz_gobject_dep = dependency('', required: false)
+  libharfbuzz_gobject_dep = null_dep
 endif
 
 if get_option('tests').enabled()