summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2013-06-28 10:41:40 +0000
committerJonathan Maw <jonathan.maw@codethink.co.uk>2013-06-28 10:41:40 +0000
commit6fde5fc47fbb0e9204a1c2233688238d97998841 (patch)
tree61b3022a9cea05458634e5107a10478fda9ba037
parentdaba2f7416861898b2c01926ae6a2ef19fecfaab (diff)
downloadsystemd-6fde5fc47fbb0e9204a1c2233688238d97998841.tar.gz
Revert "build-sys: be more tolerant if dbus directories do not exist"
This reverts commit 03c149144d374cffd40a17ffb067837e3e220933. Baserock uses busybox readlink, which does not support '-m'
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index e1278e8504..0e5d90c066 100644
--- a/configure.ac
+++ b/configure.ac
@@ -832,12 +832,12 @@ AC_ARG_WITH([dbussessionservicedir],
AC_ARG_WITH([dbussystemservicedir],
AS_HELP_STRING([--with-dbussystemservicedir=DIR], [D-Bus system service directory]),
[],
- [with_dbussystemservicedir=$(readlink -m $($PKG_CONFIG --variable=session_bus_services_dir dbus-1)/../system-services)])
+ [with_dbussystemservicedir=$(readlink -f $($PKG_CONFIG --variable=session_bus_services_dir dbus-1)/../system-services)])
AC_ARG_WITH([dbusinterfacedir],
AS_HELP_STRING([--with-dbusinterfacedir=DIR], [D-Bus interface directory]),
[],
- [with_dbusinterfacedir=$(readlink -m $($PKG_CONFIG --variable=session_bus_services_dir dbus-1)/../interfaces)])
+ [with_dbusinterfacedir=$(readlink -f $($PKG_CONFIG --variable=session_bus_services_dir dbus-1)/../interfaces)])
AC_ARG_WITH([bashcompletiondir],
AS_HELP_STRING([--with-bashcompletiondir=DIR], [Bash completions directory]),