[libgit2-glib] meson: do not use enable prefix for the options



commit ff73bd42d82bdcf03796bd75cc8300ea0ed44eb1
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Thu Nov 30 20:23:21 2017 +0100

    meson: do not use enable prefix for the options

 meson.build       |    8 ++++----
 meson_options.txt |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/meson.build b/meson.build
index cf099c0..4ceefc6 100644
--- a/meson.build
+++ b/meson.build
@@ -100,7 +100,7 @@ endforeach
 have_termios = cc.has_header('termios.h')
 
 # Debugging
-enable_debug = get_option('enable-debug')
+enable_debug = get_option('debug')
 if enable_debug == 'auto'
   if libgit2_glib_minor_version.is_odd()
     enable_debug = 'yes'
@@ -148,7 +148,7 @@ build_gobject = gobject.found()
 libgit2 = dependency('libgit2', version: '>=' + git2_req)
 
 build_gir = build_gobject
-if get_option('enable-introspection')
+if get_option('introspection')
   # XXX: Not nice, but probably our best option
   gir = find_program('g-ir-scanner', required: false)
   build_gir = gir.found() and not meson.is_cross_build()
@@ -158,7 +158,7 @@ ggit_h_data = configuration_data()
 ggit_h_data.set('GGIT_SSH_INCLUDES', '')
 
 # Check for libgit2 ssh support
-enable_ssh_opt = get_option('enable-ssh')
+enable_ssh_opt = get_option('ssh')
 enable_ssh = false
 if enable_ssh_opt != 'no'
   have_libgit2_ssh = cc.compiles('''
@@ -200,6 +200,6 @@ subdir('libgit2-glib')
 subdir('examples')
 subdir('tests')
 
-if get_option('enable-gtk-doc')
+if get_option('gtk-doc')
   subdir('docs')
 endif
diff --git a/meson_options.txt b/meson_options.txt
index 3c66085..599b943 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,4 @@
-option('enable-gtk-doc', type: 'boolean', value: false, description: 'Enable generating the API reference 
(depends on GTK-Doc)')
-option('enable-introspection', type: 'boolean', value: true, description: 'Enable GObject Introspection')
-option('enable-debug', type: 'combo', choices: [ 'auto', 'yes', 'minimum', 'no' ], value: 'yes', 
description: 'Enable debugging level')
-option('enable-ssh', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Build 
with libgit2 ssh support')
+option('gtk-doc', type: 'boolean', value: false, description: 'Enable generating the API reference (depends 
on GTK-Doc)')
+option('introspection', type: 'boolean', value: true, description: 'Enable GObject Introspection')
+option('debug', type: 'combo', choices: [ 'auto', 'yes', 'minimum', 'no' ], value: 'yes', description: 
'Enable debugging level')
+option('ssh', type: 'combo', choices: [ 'auto', 'yes', 'no' ], value: 'auto', description: 'Build with 
libgit2 ssh support')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]