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:04:52 +0200 |
| commit | 06d6102d052cc74d4110e22e190d5d18555f672e (patch) | |
| tree | 7f74e52efeedfbd357518561addcb5c79767e3f8 /configure.ac | |
| parent | 062d0e262866f8216e294acb4959a6c4e5d4d2a1 (diff) | |
| download | dleyna-server-06d6102d052cc74d4110e22e190d5d18555f672e.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>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 31393c4..e799836 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} --------------------------------------------------"]) |