From 42d039cc995f8b895dc3294e8888a45863e35c10 Mon Sep 17 00:00:00 2001
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Fri, 3 Jul 2020 04:32:32 +0430
Subject: [PATCH] [meson] minor

---
 meson.build     | 13 ++++---------
 src/meson.build |  6 ++----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/meson.build b/meson.build
index bb1fa6751..87dd857a2 100644
--- a/meson.build
+++ b/meson.build
@@ -69,6 +69,7 @@ check_funcs = [
 
 m_dep = cpp.find_library('m', required: false)
 
+freetype_dep = null_dep
 if not get_option('freetype').disabled()
   freetype_dep = dependency('freetype2', required: false)
 
@@ -89,8 +90,6 @@ if not get_option('freetype').disabled()
                               fallback: ['freetype2', 'freetype_dep'],
                               default_options: ['harfbuzz=disabled'])
   endif
-else
-  freetype_dep = null_dep
 endif
 
 glib_dep = dependency('glib-2.0', required: get_option('glib'),
@@ -101,6 +100,7 @@ fontconfig_dep = dependency('fontconfig', required: get_option('fontconfig'),
                             fallback: ['fontconfig', 'fontconfig_dep'])
 graphite2_dep = dependency('graphite2', required: get_option('graphite'))
 
+icu_dep = null_dep
 if not get_option('icu').disabled()
   icu_dep = dependency('icu-uc', required: false)
 
@@ -126,10 +126,10 @@ if not get_option('icu').disabled()
       endif
     endif
   endif
-else
-  icu_dep = null_dep
 endif
 
+cairo_dep = null_dep
+cairo_ft_dep = null_dep
 if not get_option('cairo').disabled()
   cairo_dep = dependency('cairo', required: false)
 
@@ -160,12 +160,7 @@ if not get_option('cairo').disabled()
     else # including the most important type for us, 'pkgconfig'
       cairo_ft_dep = dependency('cairo-ft', required: get_option('cairo'))
     endif
-  else
-    cairo_ft_dep = null_dep
   endif
-else
-  cairo_dep = null_dep
-  cairo_ft_dep = null_dep
 endif
 
 conf = configuration_data()
diff --git a/src/meson.build b/src/meson.build
index 8399ffeb6..f26d7a6c1 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -505,6 +505,7 @@ pkgmod.generate(libharfbuzz_subset,
   version: meson.project_version(),
 )
 
+libharfbuzz_icu_dep = null_dep
 if have_icu and not have_icu_builtin
   harfbuzz_icu_def = custom_target('harfbuzz-icu.def',
     command: [gen_def, '@OUTPUT@', '@INPUT@'],
@@ -536,8 +537,6 @@ if have_icu and not have_icu_builtin
   )
 
   install_headers(hb_icu_headers, subdir: meson.project_name())
-else
-  libharfbuzz_icu_dep = null_dep
 endif
 
 have_gobject = conf.get('HAVE_GOBJECT', 0) == 1
@@ -552,6 +551,7 @@ configure_file(input: 'harfbuzz-config.cmake.in',
   configuration: cmake_config,
   install_dir: get_option('libdir') / 'cmake' / 'harfbuzz')
 
+libharfbuzz_gobject_dep = null_dep
 if have_gobject
   gnome = import('gnome')
 
@@ -653,8 +653,6 @@ else
   if get_option('introspection').enabled()
     error('introspection requires gobject to be enabled')
   endif
-
-  libharfbuzz_gobject_dep = null_dep
 endif
 
 if get_option('tests').enabled()