mirror of
https://git.jami.net/savoirfairelinux/jami-daemon.git
synced 2025-08-12 22:09:25 +08:00
build: disable SHM if DBUS is not used
As libwrap is used by default, HAVE_SHM should only be true if directrenderer is not used to avoid useless work Change-Id: I9f819a7c06c667ccf08066f70104dcd3667f8546
This commit is contained in:
4
README
4
README
@ -79,8 +79,8 @@ ninja install
|
||||
|
||||
Done !
|
||||
|
||||
More details available here:
|
||||
https://git.jami.net/savoirfairelinux/ring-project/wikis/technical/Build-instructions
|
||||
Note:
|
||||
If you don't want SHM to be used, you can build with `--without-dbus`
|
||||
|
||||
How to compile on Linux for Android
|
||||
-----------------------------------
|
||||
|
@ -606,9 +606,11 @@ AC_DEFINE_UNQUOTED([HAVE_LIBNATPMP],
|
||||
[Define if you have libnatpmp])
|
||||
AM_CONDITIONAL([BUILD_NATPMP], test "x$with_natpmp" = "xyes")
|
||||
|
||||
# SHM
|
||||
dnl check for shm
|
||||
|
||||
AC_DEFINE_UNQUOTED([HAVE_SHM],
|
||||
`if test -z "${HAVE_LINUX_TRUE}" && \
|
||||
test -z "${HAVE_ANDROID_FALSE}"; then echo 1; else echo 0; fi`,
|
||||
`if test "x$with_dbus" == xyes; then echo 1; else echo 0; fi`,
|
||||
[Define if you have shared memory support])
|
||||
|
||||
# DOXYGEN
|
||||
|
@ -147,7 +147,7 @@ else
|
||||
endif
|
||||
|
||||
conf.set10('HAVE_COREAUDIO', host_machine.system() == 'darwin')
|
||||
conf.set10('HAVE_SHM', host_machine.system() == 'linux' and meson.get_compiler('cpp').get_define('__ANDROID__') != '1')
|
||||
conf.set10('HAVE_SHM', get_option('interfaces').contains('dbus'))
|
||||
|
||||
configure_file(
|
||||
output: 'config.h',
|
||||
|
Reference in New Issue
Block a user