From cc53fd158c09451a83cef7fda7371a84d906be20 Mon Sep 17 00:00:00 2001
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Thu, 21 May 2020 19:33:18 +0430
Subject: [PATCH] [meson] Normalize options names

As https://github.com/harfbuzz/harfbuzz/pull/2412#discussion_r426275027
---
 .circleci/config.yml    |  4 ++--
 meson.build             |  4 ++--
 meson_options.txt       | 10 +++++-----
 src/meson.build         |  6 +++---
 test/subset/meson.build |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 745eb8781..77f6e227f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,7 +41,7 @@ jobs:
       - run: export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:/usr/local/opt/libffi/lib/pkgconfig" && ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-coretext --with-graphite2
       - run: make -j4
       - run: make check || .ci/fail.sh
-      - run: make clean && meson build -Damalgam=true && ninja -Cbuild test
+      - run: make clean && meson build -Dcoretext=enabled -Damalgam=true && ninja -Cbuild test
 
   distcheck:
     docker:
@@ -235,7 +235,7 @@ jobs:
       # test meson's own unity feature also
       - run: meson build --unity on && ninja -Cbuild && rm -rf build
       # test experimental APIs
-      - run: meson build -Dexperimental-api=true && ninja -Cbuild test && rm -rf build
+      - run: meson build -Dexperimental_api=true && ninja -Cbuild test && rm -rf build
 
   crosscompile-notest-djgpp:
     docker:
diff --git a/meson.build b/meson.build
index fc4c16f6e..fa2792920 100644
--- a/meson.build
+++ b/meson.build
@@ -189,11 +189,11 @@ if icu_dep.found()
   conf.set('HAVE_ICU', 1)
 endif
 
-if get_option('icu-builtin')
+if get_option('icu_builtin')
   conf.set('HAVE_ICU_BUILTIN', 1)
 endif
 
-if get_option('experimental-api')
+if get_option('experimental_api')
   conf.set('HB_EXPERIMENTAL_API', 1)
 endif
 
diff --git a/meson_options.txt b/meson_options.txt
index 38b1a32a6..07023fdb9 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -28,11 +28,11 @@ option('introspection', type : 'feature', value : 'disabled', yield : true,
 option('gtk_doc',  type : 'feature', value : 'auto', yield : true,
   description : 'Generate documentation with gtk-doc')
 
-option('icu-builtin', type: 'boolean', value: false,
+option('icu_builtin', type: 'boolean', value: false,
   description: 'Don\'t separate ICU support as harfbuzz-icu module')
-option('with-libstdcxx', type: 'boolean', value: false,
-   description: 'Allow linking with libstdc++ (ignored and always enabled in Windows)')
-option('experimental-api', type: 'boolean', value: false,
+option('with_libstdcxx', type: 'boolean', value: false,
+   description: 'Allow linking with libstdc++ (always enabled in Windows)')
+option('experimental_api', type: 'boolean', value: false,
   description: 'Enable experimental APIs')
-option('amalgam', type : 'boolean', value : false,
+option('amalgam', type: 'boolean', value: false,
   description : 'Enable amalgam builds')
diff --git a/src/meson.build b/src/meson.build
index c81156051..b150d66ba 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -364,7 +364,7 @@ if have_icu and have_icu_builtin
   deps += [icu_dep]
 endif
 
-if host_machine.system() == 'windows' or get_option('with-libstdcxx')
+if host_machine.system() == 'windows' or get_option('with_libstdcxx')
   chosen_linker = 'cpp'
 else
   # our autotools port was limiting this to HAVE_GCC as https://github.com/harfbuzz/harfbuzz/commit/e784632
@@ -378,7 +378,7 @@ endif
 gen_def = find_program('gen-def.py')
 
 harfbuzz_def_command_args = [gen_def, '@OUTPUT@', '@INPUT@']
-if get_option('experimental-api')
+if get_option('experimental_api')
   harfbuzz_def_command_args += '--experimental-api'
 endif
 
@@ -512,7 +512,7 @@ if get_option('tests').enabled()
     if not get_option('amalgam')
       dist_check_script += 'check-includes.sh'
     endif
-    if false and not get_option('with-libstdcxx')
+    if false and not get_option('with_libstdcxx')
       # enable this once https://github.com/mesonbuild/meson/pull/6838 hits a release
       # and make that version (i.e. 0.55) our minimum build requirement
       dist_check_script += 'check-libstdc++.sh' # See https://github.com/harfbuzz/harfbuzz/issues/2276
diff --git a/test/subset/meson.build b/test/subset/meson.build
index 71e149e68..46786e7eb 100644
--- a/test/subset/meson.build
+++ b/test/subset/meson.build
@@ -26,7 +26,7 @@ foreach t : tests
   fname = '@0@.tests'.format(t)
 
   # layout test are enabled only under experimental API flag for now
-  if t.contains('layout') and not get_option('experimental-api')
+  if t.contains('layout') and not get_option('experimental_api')
     continue
   endif