X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=5a4b5e2dc883259f0826c3c8b025762e56051393;hp=dd3f152f9087fbcaf0c54f9080aaf27a8ee5c6ad;hb=b1a954eace84207225e09f318728e90eae03fe97;hpb=8c4a3079a7f358c179430d1aec59de8b670b5f6e

diff --git a/configure.ac b/configure.ac
index dd3f152f9..5a4b5e2dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -263,6 +263,18 @@ AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware)
 AC_DEFINE_UNQUOTED(SPECIAL_DBUS_SERVICE, ["$SPECIAL_DBUS_SERVICE"], [D-Bus service name])
 AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"], [Syslog service name])
 
+dbuspolicydir=`pkg-config --variable=sysconfdir dbus-1`/dbus-1/system.d
+AC_SUBST([dbuspolicydir], [$dbuspolicydir])
+
+dbussessionservicedir=`pkg-config --variable=session_bus_services_dir dbus-1`
+AC_SUBST([dbussessionservicedir], [$dbussessionservicedir])
+
+dbussystemservicedir=`pkg-config --variable=session_bus_services_dir dbus-1`/../system-services
+AC_SUBST([dbussystemservicedir], [$dbussystemservicedir])
+
+dbusinterfacedir=`pkg-config --variable=session_bus_services_dir dbus-1`/../interfaces
+AC_SUBST([dbusinterfacedir], [$dbusinterfacedir])
+
 AC_ARG_WITH([udevrulesdir],
         AS_HELP_STRING([--with-udevrulesdir=DIR], [Diectory for udev rules]),
         [],
@@ -272,10 +284,11 @@ AC_SUBST([udevrulesdir], [$with_udevrulesdir])
 AC_ARG_WITH([rootdir],
         AS_HELP_STRING([--with-rootdir=DIR], [Root directory for files necessary for boot]),
         [],
-        [with_rootdir=/])
+        [with_rootdir=${ac_default_prefix}])
 AC_SUBST([rootdir], [$with_rootdir])
 
-AC_OUTPUT([Makefile])
+AC_CONFIG_FILES([Makefile])
+AC_OUTPUT
 
 echo "
         $PACKAGE_NAME $VERSION
@@ -289,4 +302,8 @@ echo "
         prefix:                  ${prefix}
         root dir:                ${with_rootdir}
         udev rules dir:          ${with_udevrulesdir}
+        dbus policy dir:         ${dbuspolicydir}
+        dbus session dir:        ${dbussessionservicedir}
+        dbus system dir:         ${dbussystemservicedir}
+        dbus interfaces dir:     ${dbusinterfacedir}
 "