[epiphany] Rename build options

[Michael Catanzaro <mcatanzaro src gnome org>]

commit d92acde9fe4c406774677f1dc9c399adcfc7150e
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Wed Aug 30 14:02:37 2017 -0500

    Rename build options
    
    The Meson developers have recommended that we omit enable/disable
    prefixes from option names, as it's redundant with the boolean value.
    
    Note that we intentionally retain underscores, rather than hyphens.
    There doesn't seem to be a convention for Meson, but this is suggested
    by the Meson documentation, looks nicer, and matches the convention in
    CMake world, which is the only other major build system to use -D
    notation for defining options.

 embed/meson.build               |    2 +-
 embed/web-extension/meson.build |    2 +-
 meson.build                     |    4 ++--
 meson_options.txt               |    4 ++--
 tests/meson.build               |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/embed/meson.build b/embed/meson.build
index a2ce160..9562ae7 100644
--- a/embed/meson.build
+++ b/embed/meson.build
@@ -44,7 +44,7 @@ libephyembed_deps = [
   webkit2gtk_dep
 ]
 
-if get_option('enable_https_everywhere')
+if get_option('https_everywhere')
   libephyembed_deps += httpseverywhere_dep
 endif
 
diff --git a/embed/web-extension/meson.build b/embed/web-extension/meson.build
index af53a64..4928421 100644
--- a/embed/web-extension/meson.build
+++ b/embed/web-extension/meson.build
@@ -14,7 +14,7 @@ web_extension_deps = [
   webkit2gtk_web_extension_dep
 ]
 
-if get_option('enable_https_everywhere')
+if get_option('https_everywhere')
   web_extension_deps += httpseverywhere_dep
 endif
 
diff --git a/meson.build b/meson.build
index 0e385de..af4b77a 100644
--- a/meson.build
+++ b/meson.build
@@ -34,7 +34,7 @@ conf.set_quoted('SOURCE_ROOT', meson.source_root())
 conf.set_quoted('VERSION', meson.project_version())
 
 conf.set10('DEVELOPER_MODE', get_option('developer_mode'))
-conf.set10('ENABLE_HTTPS_EVERYWHERE', get_option('enable_https_everywhere'))
+conf.set10('ENABLE_HTTPS_EVERYWHERE', get_option('https_everywhere'))
 
 configure_file(
   output: 'config.h',
@@ -74,7 +74,7 @@ cc = meson.get_compiler('c')
 gmp_dep = cc.find_library('gmp')
 m_dep = cc.find_library('m', required: false)
 
-if get_option('enable_https_everywhere')
+if get_option('https_everywhere')
   httpseverywhere_dep = dependency('httpseverywhere-0.4', version: '>= 0.2.2')
 endif
 
diff --git a/meson_options.txt b/meson_options.txt
index fdc3bb6..5840586 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -10,13 +10,13 @@ option('distributor_name',
   description: 'Distributor name displayed on process crash page'
 )
 
-option('enable_https_everywhere',
+option('https_everywhere',
   type: 'boolean',
   value: false,
   description: 'Enable experimental HTTPS Everywhere support'
 )
 
-option('enable_unit_tests',
+option('unit_tests',
   type: 'boolean',
   value: true,
   description: 'Enable unit tests'
diff --git a/tests/meson.build b/tests/meson.build
index 11edde2..5526d2c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,4 +1,4 @@
-if get_option('enable_unit_tests')
+if get_option('unit_tests')
   # FIXME: The tests that need ephy-test-utils are all disabled....
   #
   # libephytestutils = static_library('ephytestutils',