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

dbus: don't mess with DBus service paths

Browse Source 
Refs #60503

Change-Id: Id92ab9bd40508e3aa97f4129090961491ea845ed
This commit is contained in:
Tristan Matthews
2014-11-18 14:40:10 -05:00
parent 1bf29bdd11
commit 0dbaee6c92
4 changed files with 52 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
daemon/bin/dbus/Makefile.am
View File

@ -59,15 +59,9 @@ libclient_dbus_la_CXXFLAGS = -I../ \
# Dbus service file
servicedir = $(datadir)/dbus-1/services
service_in_files = org.sflphone.SFLphone.service.in
service_DATA = $(service_in_files:.service.in=.service)
service_DATA = org.sflphone.SFLphone.service
# Rule to make the service file with bindir expanded
$(service_DATA): $(service_in_files) Makefile
sed -e "s|libexec|$(libdir)/sflphone|" $<> $@
EXTRA_DIST = $(service_in_files) \
callmanager-introspec.xml \
EXTRA_DIST = callmanager-introspec.xml \
configurationmanager-introspec.xml \
instance-introspec.xml

2
daemon/bin/dbus/org.sflphone.SFLphone.service.in
View File

@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.sflphone.SFLphone
Exec=libexec/sflphoned
Exec=@LIBEXECDIR@/sflphoned

7
daemon/configure.ac
View File

@ -318,7 +318,12 @@ AC_ARG_WITH([dbus],
[with_dbus=yes])
AS_IF([test "x$with_dbus" = "xyes"], [
PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1,, AC_MSG_WARN([Missing dbus development files]))
AC_CONFIG_FILES([bin/dbus/Makefile])
AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
AC_SUBST(LIBEXECDIR)
AC_CONFIG_FILES([bin/dbus/Makefile
bin/dbus/org.sflphone.SFLphone.service])
AC_CHECK_PROG(HAVE_DBUSXML2CPP, dbusxx-xml2cpp, true, false)
if test "x$HAVE_DBUSXML2CPP" = "xfalse"; then

43
daemon/m4/as-ac-expand.m4 Normal file
View File

@ -0,0 +1,43 @@
dnl as-ac-expand.m4 0.2.0
dnl autostars m4 macro for expanding directories using configure's prefix
dnl thomas@apestaart.org
dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
dnl example
dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
AC_DEFUN([AS_AC_EXPAND],
[
EXP_VAR=[$1]
FROM_VAR=[$2]
dnl first expand prefix and exec_prefix if necessary
prefix_save=$prefix
exec_prefix_save=$exec_prefix
dnl if no prefix given, then use /usr/local, the default prefix
if test "x$prefix" = "xNONE"; then
prefix="$ac_default_prefix"
fi
dnl if no exec_prefix given, then use prefix
if test "x$exec_prefix" = "xNONE"; then
exec_prefix=$prefix
fi
full_var="$FROM_VAR"
dnl loop until it doesn't change anymore
while true; do
new_full_var="`eval echo $full_var`"
if test "x$new_full_var" = "x$full_var"; then break; fi
full_var=$new_full_var
done
dnl clean up
full_var=$new_full_var
AC_SUBST([$1], "$full_var")
dnl restore prefix and exec_prefix
prefix=$prefix_save
exec_prefix=$exec_prefix_save
])