diff options
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | server/Makefile.am | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 623b9a8..4b09da3 100644 --- a/configure.ac +++ b/configure.ac @@ -185,6 +185,11 @@ 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 +199,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]) ]) diff --git a/server/Makefile.am b/server/Makefile.am index df7ea7b..72ef477 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -14,14 +14,12 @@ dleyna_renderer_service_LDADD = $(GLIB_LIBS) \ $(GIO_LIBS) \ $(DLEYNA_CORE_LIBS) \ $(top_builddir)/libdleyna/renderer/libdleyna-renderer-1.0.la - - -dbussessiondir = @DBUS_SESSION_DIR@ -dbussession_DATA = com.intel.dleyna-renderer.service + +dbusservicedir = $(DBUS_SERVICE_DIR) +dbusservice_DATA = com.intel.dleyna-renderer.service pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = dleyna-renderer-service-1.0.pc -CLEANFILES = $(dbussession_DATA) $(pkgconfig_DATA) -DISTCLEANFILES = $(dbussession_DATA) $(pkgconfig_DATA) - +CLEANFILES = $(dbusservice_DATA) $(pkgconfig_DATA) +DISTCLEANFILES = $(dbusservice_DATA) $(pkgconfig_DATA) |