Merge remote-tracking branch 'upstream/master' into fix-freebsd-build

1 files changed, 7 insertions, 5 deletions

diff --git a/meson.build b/meson.build
index 57b024c8..253a4e96 100644
--- a/meson.build
+++ b/meson.build
@@ -106,7 +106,7 @@ endif
 
 add_project_arguments('-DSYSCONFDIR="/@0@/@1@"'.format(prefix, sysconfdir), language : 'c')
 
-version = get_option('sway_version')
+version = get_option('sway-version')
 if version != ''
         version = '"@0@"'.format(version)
 else
@@ -120,6 +120,8 @@ else
 endif
 add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c')
 
+add_project_arguments('-D_LD_LIBRARY_PATH="@0@"'.format(get_option('ld-library-path')), language: 'c')
+
 sway_inc = include_directories('include')
 
 subdir('include')
@@ -168,7 +170,7 @@ install_data(
         install_dir: datadir + '/wayland-sessions'
 )
 
-if (get_option('default_wallpaper'))
+if (get_option('default-wallpaper'))
         wallpaper_files = files(
                 'assets/Sway_Wallpaper_Blue_768x1024.png',
                 'assets/Sway_Wallpaper_Blue_768x1024_Portrait.png',
@@ -184,7 +186,7 @@ if (get_option('default_wallpaper'))
         install_data(wallpaper_files, install_dir: wallpaper_install_dir)
 endif
 
-if (get_option('zsh_completions'))
+if (get_option('zsh-completions'))
         zsh_files = files(
                 'completions/zsh/_sway',
                 'completions/zsh/_swaylock',
@@ -195,7 +197,7 @@ if (get_option('zsh_completions'))
         install_data(zsh_files, install_dir: zsh_install_dir)
 endif
 
-if (get_option('bash_completions'))
+if (get_option('bash-completions'))
         bash_files = files(
                 'completions/bash/sway',
                 'completions/bash/swayidle',
@@ -207,7 +209,7 @@ if (get_option('bash_completions'))
         install_data(bash_files, install_dir: bash_install_dir)
 endif
 
-if (get_option('fish_completions'))
+if (get_option('fish-completions'))
         fish_files = files(
                 'completions/fish/sway.fish',
                 'completions/fish/swaylock.fish',