X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fmeson.build;h=e37c2db0d4c38f648cf298ffdac9e232ec2bed26;hb=373b0c12d9d0e8a3b449fd18be704e28dd6403e1;hp=92f42fa5c3810e3bbceebf9ba8067d754daa90a4;hpb=cfc9fee931c70554353ce6c4acc3407baac08745;p=tinc diff --git a/src/meson.build b/src/meson.build index 92f42fa5..e37c2db0 100644 --- a/src/meson.build +++ b/src/meson.build @@ -159,7 +159,7 @@ elif os_name.endswith('bsd') or os_name in ['dragonfly', 'darwin'] elif os_name == 'sunos' subdir('solaris') elif os_name == 'windows' - subdir('mingw') + subdir('windows') endif foreach h : check_headers @@ -228,9 +228,7 @@ if not opt_miniupnpc.disabled() endif endif -if opt_curses.auto() and os_name == 'windows' - message('curses does not link under MinGW') -else +if not opt_curses.disabled() # The meta-dependency covers more alternatives, but is only available in 0.54+ curses_name = meson_version.version_compare('>=0.54') ? 'curses' : 'ncurses' dep_curses = dependency(curses_name, required: opt_curses, static: static) @@ -242,7 +240,7 @@ endif # Some distributions do not supply pkg-config files for readline if opt_readline.auto() and os_name == 'windows' - message('readline does not link under MinGW') + message('readline not available on Windows') else dep_readline = dependency('readline', required: opt_readline, static: static) if not dep_readline.found()