summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2016-02-12 15:25:15 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2016-02-12 15:25:15 +0000
commit384c924c77ecb32e5b91d737b8b51cb0e883fd7c (patch)
tree1b0c58be8008a9c974828697beb939e5ff878b40 /configure.ac
parent9843c724c6df98d353e6d627e88bdeac2d0f0d87 (diff)
downloaddbus-384c924c77ecb32e5b91d737b8b51cb0e883fd7c.tar.gz
Revert "Replace $DBUS_USE_TEST_BINARY with $DBUS_TEST_DBUS_LAUNCH"
This reverts commit 8fd2be6013e3d0ff6a6ff63ea022f9606d9a87c6. This change was intended for 1.11.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac3
1 files changed, 3 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index a734a3b6..5e883435 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1731,6 +1731,9 @@ AC_DEFINE_UNQUOTED([DBUS_TEST_EXEC], ["$DBUS_TEST_EXEC"],
AC_DEFINE_UNQUOTED([DBUS_EXEEXT], ["$EXEEXT"],
[Extension for executables, typically empty or .exe])
+AC_DEFINE_UNQUOTED(TEST_BUS_LAUNCH_BINARY, ["$DBUS_PWD/tools/dbus-launch$EXEEXT"],
+ [Full path to the dbus-launch in the builddir])
+
## Export the non-setuid external helper
TEST_LAUNCH_HELPER_BINARY="$DBUS_PWD/bus/dbus-daemon-launch-helper-test$EXEEXT"
AC_SUBST(TEST_LAUNCH_HELPER_BINARY)