jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

build: Enable the use of the dbusxx-xml2cpp tool built from contrib.

Browse Source 
Previously, the build machine would need to provide dbusxx-xml2cpp
itself, while the library would be used from the contribs (always
forced, as dbusxx-xml2cpp is unmaintained and slightly broken on newer
GCCs).  This change removes the requirement to have the dbus-c++
package installed on the build machine.

Change-Id: I25ad2ee3e80afc33b320de9256b724a3c254f4fb
This commit is contained in:
Maxim Cournoyer
2021-03-09 23:23:57 -05:00
parent d3bf0b387f
commit ad8909f0cb
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/dbus/Makefile.am
View File

@ -9,31 +9,31 @@ BUILT_SOURCES= \
BUILT_SOURCES+=dbuspresencemanager.adaptor.h
dbuspresencemanager.adaptor.h: cx.ring.Ring.PresenceManager.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
$(DBUSXX_XML2CPP) $< --adaptor=$@
if ENABLE_VIDEO
BUILT_SOURCES+=dbusvideomanager.adaptor.h
dbusvideomanager.adaptor.h: cx.ring.Ring.VideoManager.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
$(DBUSXX_XML2CPP) $< --adaptor=$@
endif
# Rule to generate the binding headers
dbuscallmanager.adaptor.h: cx.ring.Ring.CallManager.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
$(DBUSXX_XML2CPP) $< --adaptor=$@
# Rule to generate the binding headers
dbusconfigurationmanager.adaptor.h: cx.ring.Ring.ConfigurationManager.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
$(DBUSXX_XML2CPP) $< --adaptor=$@
# Rule to generate the binding headers
dbusinstance.adaptor.h: cx.ring.Ring.Instance.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
$(DBUSXX_XML2CPP) $< --adaptor=$@
if ENABLE_PLUGIN
BUILT_SOURCES+=dbuspluginmanagerinterface.adaptor.h
# Rule to generate the binding headers
dbuspluginmanagerinterface.adaptor.h: cx.ring.Ring.PluginManagerInterface.xml Makefile.am
dbusxx-xml2cpp $< --adaptor=$@
$(DBUSXX_XML2CPP) $< --adaptor=$@
endif
libclient_dbus_la_SOURCES = \

10
configure.ac
View File

@ -2,9 +2,9 @@ dnl Jami - configure.ac for automake 1.9 and autoconf 2.59
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.65])
AC_INIT([Jami Daemon],[9.10.0],[ring@gnu.org],[jami])
AC_INIT([Jami Daemon],[9.10.0],[jami@gnu.org],[jami])
AC_COPYRIGHT([[Copyright (c) Savoir-faire Linux 2004-2020]])
AC_COPYRIGHT([[Copyright (c) Savoir-faire Linux 2004-2021]])
AC_REVISION([$Revision$])
dnl Where to find configure files
@ -403,10 +403,8 @@ AS_IF([test "x$with_dbus" = "xyes"], [
AC_CONFIG_FILES([bin/dbus/Makefile
bin/dbus/cx.ring.Ring.service])
AC_CHECK_PROG(HAVE_DBUSXML2CPP, dbusxx-xml2cpp, true, false)
if test "x$HAVE_DBUSXML2CPP" = "xfalse"; then
AC_MSG_ERROR([dbusxx-xml2cpp not found])
fi
AC_PATH_PROG([DBUSXX_XML2CPP], dbusxx-xml2cpp,
[AC_MSG_ERROR([dbusxx-xml2cpp not found])])
AS_IF([test "x$CLANG" = "xyes"], [
AC_MSG_ERROR([dbus does not compile when clang is used, rerun with --without-dbus])