mirror of
https://github.com/systemd/systemd.git
synced 2024-12-22 17:35:35 +03:00
meson.build: reorder tests to match order in meson_options.txt
This makes it easier to edit both files.
This commit is contained in:
parent
b66c294c4b
commit
a44fb6019f
54
meson.build
54
meson.build
@ -845,6 +845,23 @@ else
|
|||||||
libqrencode = []
|
libqrencode = []
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
want_gcrypt = get_option('gcrypt')
|
||||||
|
if want_gcrypt != 'false'
|
||||||
|
libgcrypt = cc.find_library('gcrypt', required : want_gcrypt == 'true')
|
||||||
|
libgpg_error = cc.find_library('gpg-error', required : want_gcrypt == 'true')
|
||||||
|
|
||||||
|
have_deps = libgcrypt.found() and libgpg_error.found()
|
||||||
|
conf.set('HAVE_GCRYPT', have_deps)
|
||||||
|
if not have_deps
|
||||||
|
# link to neither of the libs if one is not found
|
||||||
|
libgcrypt = []
|
||||||
|
libgpg_error = []
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
libgcrypt = []
|
||||||
|
libgpg_error = []
|
||||||
|
endif
|
||||||
|
|
||||||
want_gnutls = get_option('gnutls')
|
want_gnutls = get_option('gnutls')
|
||||||
if want_gnutls != 'false'
|
if want_gnutls != 'false'
|
||||||
libgnutls = dependency('gnutls',
|
libgnutls = dependency('gnutls',
|
||||||
@ -900,6 +917,16 @@ else
|
|||||||
liblz4 = []
|
liblz4 = []
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
want_xkbcommon = get_option('xkbcommon')
|
||||||
|
if want_xkbcommon != 'false'
|
||||||
|
libxkbcommon = dependency('xkbcommon',
|
||||||
|
version : '>= 0.3.0',
|
||||||
|
required : want_xkbcommon == 'true')
|
||||||
|
conf.set('HAVE_XKBCOMMON', libxkbcommon.found())
|
||||||
|
else
|
||||||
|
libxkbcommon = []
|
||||||
|
endif
|
||||||
|
|
||||||
want_glib = get_option('glib')
|
want_glib = get_option('glib')
|
||||||
if want_glib != 'false'
|
if want_glib != 'false'
|
||||||
libglib = dependency('glib-2.0',
|
libglib = dependency('glib-2.0',
|
||||||
@ -918,16 +945,6 @@ else
|
|||||||
libgio = []
|
libgio = []
|
||||||
endif
|
endif
|
||||||
|
|
||||||
want_xkbcommon = get_option('xkbcommon')
|
|
||||||
if want_xkbcommon != 'false'
|
|
||||||
libxkbcommon = dependency('xkbcommon',
|
|
||||||
version : '>= 0.3.0',
|
|
||||||
required : want_xkbcommon == 'true')
|
|
||||||
conf.set('HAVE_XKBCOMMON', libxkbcommon.found())
|
|
||||||
else
|
|
||||||
libxkbcommon = []
|
|
||||||
endif
|
|
||||||
|
|
||||||
want_dbus = get_option('dbus')
|
want_dbus = get_option('dbus')
|
||||||
if want_dbus != 'false'
|
if want_dbus != 'false'
|
||||||
libdbus = dependency('dbus-1',
|
libdbus = dependency('dbus-1',
|
||||||
@ -938,23 +955,6 @@ else
|
|||||||
libdbus = []
|
libdbus = []
|
||||||
endif
|
endif
|
||||||
|
|
||||||
want_gcrypt = get_option('gcrypt')
|
|
||||||
if want_gcrypt != 'false'
|
|
||||||
libgcrypt = cc.find_library('gcrypt', required : want_gcrypt == 'true')
|
|
||||||
libgpg_error = cc.find_library('gpg-error', required : want_gcrypt == 'true')
|
|
||||||
|
|
||||||
have_deps = libgcrypt.found() and libgpg_error.found()
|
|
||||||
conf.set('HAVE_GCRYPT', have_deps)
|
|
||||||
if not have_deps
|
|
||||||
# link to neither of the libs if one is not found
|
|
||||||
libgcrypt = []
|
|
||||||
libgpg_error = []
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
libgcrypt = []
|
|
||||||
libgpg_error = []
|
|
||||||
endif
|
|
||||||
|
|
||||||
default_dnssec = get_option('default-dnssec')
|
default_dnssec = get_option('default-dnssec')
|
||||||
if default_dnssec != 'no' and not conf.get('HAVE_GCRYPT', false)
|
if default_dnssec != 'no' and not conf.get('HAVE_GCRYPT', false)
|
||||||
message('default-dnssec cannot be set to yes or allow-downgrade when gcrypt is disabled. Setting default-dnssec to no.')
|
message('default-dnssec cannot be set to yes or allow-downgrade when gcrypt is disabled. Setting default-dnssec to no.')
|
||||||
|
Loading…
Reference in New Issue
Block a user