xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-23 11:39:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

configure, meson: Migrate openssl check to meson

Browse Source
This commit is contained in:
Matt Borgerson 2023-01-23 00:30:40 -07:00
parent 6cc30513ac
commit ed042c141f
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure vendored
View File

@ -1562,15 +1562,6 @@ if test "$opengl" != "no" ; then
QEMU_CFLAGS="$QEMU_CFLAGS $opengl_cflags"
fi # test "$opengl" != "no"
##########################################
# openssl probe
if $pkg_config --exists openssl; then
openssl_cflags=$($pkg_config --cflags openssl)
openssl_libs=$($pkg_config --libs openssl)
else
feature_not_found "openssl" "Install openssl-dev"
fi
##########################################
# libpcap probe
if test "$mingw32" = "yes"; then
@ -2435,9 +2426,6 @@ if test "$have_tsan" = "yes" && test "$have_tsan_iface_fiber" = "yes" ; then
echo "CONFIG_TSAN=y" >> $config_host_mak
fi
echo "OPENSSL_CFLAGS=$openssl_cflags" >> $config_host_mak
echo "OPENSSL_LIBS=$openssl_libs" >> $config_host_mak
echo "LIBPCAP_CFLAGS=$libpcap_cflags" >> $config_host_mak
echo "LIBPCAP_LIBS=$libpcap_libs" >> $config_host_mak

6
meson.build
View File

@ -1181,8 +1181,10 @@ toml = declare_dependency(compile_args: ['-DTOML_HEADER_ONLY=0'],
genconfig = declare_dependency(include_directories: 'genconfig')
openssl = declare_dependency(compile_args: config_host['OPENSSL_CFLAGS'].split(),
link_args: config_host['OPENSSL_LIBS'].split())
openssl = dependency('openssl',
method: 'pkg-config',
required: true,
kwargs: static_kwargs)
libpcap = declare_dependency(compile_args: config_host['LIBPCAP_CFLAGS'].split(),
link_args: config_host['LIBPCAP_LIBS'].split())