[xserver] meson: s/secure-rpc/secure_rpc/ for consistency

Submitted by Adam Jackson on March 20, 2018, 6:04 p.m.

Details

Message ID 20180320180429.17766-1-ajax@redhat.com
State New
Headers show
Series "meson: s/secure-rpc/secure_rpc/ for consistency" ( rev: 1 ) in X.org

Not browsing as part of any series.

Commit Message

Adam Jackson March 20, 2018, 6:04 p.m.
Signed-off-by: Adam Jackson <ajax@redhat.com>
---
 include/meson.build | 2 +-
 meson_options.txt   | 2 +-
 os/meson.build      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/include/meson.build b/include/meson.build
index e6abf22f8..24dc69a7e 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -97,7 +97,7 @@  conf_data.set_quoted('SYSCONFDIR', join_paths(get_option('prefix'), get_option('
 conf_data.set('XORG_VERSION_CURRENT', release)
 
 conf_data.set('HASXDMAUTH', get_option('xdm-auth-1'))
-conf_data.set('SECURE_RPC', get_option('secure-rpc'))
+conf_data.set('SECURE_RPC', get_option('secure_rpc'))
 
 conf_data.set('HAVE_DLFCN_H', cc.has_header('dlfcn.h'))
 conf_data.set('HAVE_EXECINFO_H', cc.has_header('execinfo.h'))
diff --git a/meson_options.txt b/meson_options.txt
index d7af87d73..b4eb00a1e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -25,7 +25,7 @@  option('module_dir', type: 'string',
 option('glx', type: 'boolean', value: true)
 option('xdmcp', type: 'boolean', value: true)
 option('xdm-auth-1', type: 'boolean', value: true)
-option('secure-rpc', type: 'boolean', value: true)
+option('secure_rpc', type: 'boolean', value: true)
 option('ipv6', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto')
 
 option('xkb_dir', type: 'string')
diff --git a/os/meson.build b/os/meson.build
index ff3a4615b..ab674f5c8 100644
--- a/os/meson.build
+++ b/os/meson.build
@@ -55,7 +55,7 @@  if get_option('xdmcp')
 endif
 
 rpc_dep = []
-if get_option('secure-rpc')
+if get_option('secure_rpc')
     # prefer libtirpc (if available), otherwise assume RPC functions are
     # provided by libc.
     rpc_dep = dependency('libtirpc', required: false)