diff options
| author | John (J5) Palmieri <johnp@redhat.com> | 2006-08-08 21:30:31 +0000 |
|---|---|---|
| committer | John (J5) Palmieri <johnp@redhat.com> | 2006-08-08 21:30:31 +0000 |
| commit | aaa432b0644199418eb2ce506c87397cd379df4f (patch) | |
| tree | ab3c01fd243dbf8c74134160a7737d50cc1f1402 /configure.in | |
| parent | d33564292f0cb45c42454514797c6da1fc1de178 (diff) | |
* configure.in:
* tools/Makefile.am:
* tools/dbus-launch.c:
* bus/Makefile.am:
allow --with-dbus-daemondir switch to be used to make the
daemon install to a seperate bindir like /usr/libexec
(patch from Brian Cameron <brian dot cameron at sun dot com)
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 65570d62..b0c2849e 100644 --- a/configure.in +++ b/configure.in @@ -68,6 +68,7 @@ AC_ARG_WITH(system-socket, AS_HELP_STRING([--with-system-socket=[filename]],[UNI AC_ARG_WITH(console-auth-dir, AS_HELP_STRING([--with-console-auth-dir=[dirname]],[directory to check for console ownerhip])) AC_ARG_WITH(console-owner-file, AS_HELP_STRING([--with-console-owner-file=[filename]],[file whose owner determines current console owner])) AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)])) +AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Directory for installing the DBUS daemon])) dnl DBUS_BUILD_TESTS controls unit tests built in to .c files @@ -965,6 +966,15 @@ fi AC_SUBST(DBUS_USER) AC_DEFINE_UNQUOTED(DBUS_USER,"$DBUS_USER", [User for running the system BUS daemon]) +#### Directory to install dbus-daemon +if test -z "$with_dbus_daemondir" ; then + DBUS_DAEMONDIR="${bindir}" +else + DBUS_DAEMONDIR=$with_dbus_daemondir +fi +AC_SUBST(DBUS_DAEMONDIR) +AC_DEFINE_UNQUOTED(DBUS_DAEMONDIR,"$DBUS_DAEMONDIR", [Directory for installing the DBUS daemon]) + #### Tell tests where to find certain stuff in builddir ABSOLUTE_TOP_BUILDDIR=`cd ${ac_top_builddir}. && pwd` |