diff options
| author | Regis Merlino <regis.merlino@intel.com> | 2013-06-04 11:43:28 +0200 |
|---|---|---|
| committer | Regis Merlino <regis.merlino@intel.com> | 2013-06-05 17:13:18 +0200 |
| commit | b391e62f1203a6faf70ee1bf8478472921ed96aa (patch) | |
| tree | 92cb8195b93d12b812cef100b564fadc08b59581 | |
| parent | 01507103586b4f13cb494575c120174998d02416 (diff) | |
| download | dleyna-server-b391e62f1203a6faf70ee1bf8478472921ed96aa.tar.gz | |
[Build] Install the .service file in $(datadir)/dbus-1/services
Port of commits:
https://github.com/01org/dleyna-renderer/commit/d1c84c820ce180eabb57b83da3569a4de24c3ac4
https://github.com/01org/dleyna-renderer/commit/6981acf20cadec8a9c29e0096d16c2062d19a384
Calling `pkg-config --variable=session_bus_services_dir dbus-1` under
JHBuild results in the system-installed dbus-1.pc being parsed and
our .service file will be put under the /usr prefix instead of the
JHBuild one.
To avoid that, take $(datadir) in account and install it under
$(datadir)/dbus-1/services by default like other packages do (eg.
gvfs).
For those with different needs a --with-dbus-service-dir configure flag
is provided.
Signed-off-by: Regis Merlino <regis.merlino@intel.com>
| -rw-r--r-- | README | 5 | ||||
| -rw-r--r-- | configure.ac | 32 | ||||
| -rw-r--r-- | server/Makefile.am | 8 |
3 files changed, 27 insertions, 18 deletions
@@ -94,3 +94,8 @@ This option allows a prefix to be added to the SOUP session user agent. For example, --with-ua-prefix=MyPrefix can be used to change a default user agent string from "dLeyna/0.0.1 GUPnP/0.19.4 DLNADOC/1.50" to "MyPrefix dLeyna/0.0.1 GUPnP/0.19.4 DLNADOC/1.50". + +--with-dbus-service-dir + +By default, the dbus service files are installed in $(datadir)/dbus-1/services. +This option allows to choose another installation directory. diff --git a/configure.ac b/configure.ac index a3284c5..19d336f 100644 --- a/configure.ac +++ b/configure.ac @@ -185,6 +185,12 @@ AC_ARG_WITH(ua-prefix, [with_ua_prefix = "$withval"; AC_DEFINE_UNQUOTED([UA_PREFIX], "$with_ua_prefix", [User Agent prefix])], []) +AC_ARG_WITH(dbus_service_dir, + AS_HELP_STRING([--with-dbus-service-dir=PATH],[choose directory for dbus service files, [default=PREFIX/share/dbus-1/services]]), + with_dbus_service_dir="$withval", with_dbus_service_dir=$datadir/dbus-1/services) +DBUS_SERVICE_DIR=$with_dbus_service_dir +AC_SUBST(DBUS_SERVICE_DIR) + AC_ARG_ENABLE(lib-only, AS_HELP_STRING( @@ -194,11 +200,8 @@ AC_ARG_ENABLE(lib-only, [enable_lib_only=no]) AS_IF([test "x$enable_lib_only" = "xno"], - [PKG_CHECK_MODULES([DBUS], [dbus-1], - [DBUS_SESSION_DIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`; - AC_SUBST(DBUS_SESSION_DIR) - ], - [enable_lib_only=yes]); + [ + PKG_CHECK_MODULES([DBUS], [dbus-1], [], [enable_lib_only=yes]); PKG_CHECK_MODULES([DLEYNA_CONNECTOR_DBUS], [dleyna-connector-dbus-1.0]) ]) @@ -248,14 +251,15 @@ Compiler : '${CC}' CFLAGS : '${CFLAGS}' -Package features: - - enable-werror : ${enable_werror} - - enable-debug : ${enable_debug} - - enable-never-quit : ${enable_never_quit} - - with_connector-name : ${with_connector_name} - - disable-optimization: ${disable_optimization} - - with-log-level : ${with_log_level} - - with-log-type : ${with_log_type} - - with-ua-prefix : ${with_ua_prefix} - - enable-lib-only : ${enable_lib_only} + - enable-werror : ${enable_werror} + - enable-debug : ${enable_debug} + - enable-never-quit : ${enable_never_quit} + - with_connector-name : ${with_connector_name} + - disable-optimization : ${disable_optimization} + - with-log-level : ${with_log_level} + - with-log-type : ${with_log_type} + - with-ua-prefix : ${with_ua_prefix} + - enable-lib-only : ${enable_lib_only} + - with-dbus-service-dir : ${with_dbus_service_dir} --------------------------------------------------"]) diff --git a/server/Makefile.am b/server/Makefile.am index 01821d6..9730498 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -15,11 +15,11 @@ dleyna_server_service_LDADD = $(GLIB_LIBS) \ $(DLEYNA_CORE_LIBS) \ $(top_builddir)/libdleyna/server/libdleyna-server-1.0.la -dbussessiondir = @DBUS_SESSION_DIR@ -dbussession_DATA = com.intel.dleyna-server.service +dbusservicedir = $(DBUS_SERVICE_DIR) +dbusservice_DATA = com.intel.dleyna-server.service pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = dleyna-server-service-1.0.pc -CLEANFILES = $(dbussession_DATA) $(pkgconfig_DATA) -DISTCLEANFILES = $(dbussession_DATA) $(pkgconfig_DATA) +CLEANFILES = $(dbusservice_DATA) +DISTCLEANFILES = $(pkgconfig_DATA) |