From 5cfa0506c250b018c4aefd35bc49221ce7b4ad26 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Tue, 24 Jul 2007 12:48:45 +0000 Subject: 2007-07-24 Richard Hughes * configure.in: * test/Makefile.am: * test/data/invalid-service-files-system/org.freedesktop.DBus.TestS uiteNoExec.service.in: * test/data/invalid-service-files-system/org.freedesktop.DBus.TestS uiteNoService.service.in: * test/data/invalid-service-files-system/org.freedesktop.DBus.TestS uiteNoUser.service.in: * test/data/valid-config-files-system/debug-allow-all-fail.conf.in: * test/data/valid-config-files-system/debug-allow-all-pass.conf.in: * test/data/valid-config-files/debug-allow-all-sha1.conf.in: * test/data/valid-config-files/debug-allow-all.conf.in: * test/data/valid-service-files-system/org.freedesktop.DBus.TestSui teEchoService.service.in: * test/data/valid-service-files-system/org.freedesktop.DBus.TestSui teSegfaultService.service.in: * test/data/valid-service-files-system/org.freedesktop.DBus.TestSui teShellEchoServiceFail.service.in: * test/data/valid-service-files-system/org.freedesktop.DBus.TestSui teShellEchoServiceSuccess.service.in: * test/data/valid-service-files/debug-echo.service.in: * test/data/valid-service-files/debug-segfault.service.in: * test/data/valid-service-files/debug-shell-echo-fail.service.in: * test/data/valid-service-files/debug-shell-echo-success.service.in: * test/data/valid-service-files/org.freedesktop.DBus.TestSuiteEchoS ervice.service.in: * test/data/valid-service-files/org.freedesktop.DBus.TestSuiteSegfa ultService.service.in: * test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShell EchoServiceFail.service.in: * test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShell EchoServiceSuccess.service.in: Add the data files needed by the system activation unit checks. --- configure.in | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'configure.in') diff --git a/configure.in b/configure.in index eccfc76e..7e353016 100644 --- a/configure.in +++ b/configure.in @@ -1190,7 +1190,10 @@ AC_DEFINE_UNQUOTED(TEST_$1, "$TEST_$1", AC_SUBST(TEST_$1) ]) -TEST_PATH(SERVICE_DIR, data/valid-service-files) +TEST_PATH(VALID_SERVICE_DIR, data/valid-service-files) +TEST_PATH(INVALID_SERVICE_DIR, data/invalid-service-files) +TEST_PATH(VALID_SERVICE_SYSTEM_DIR, data/valid-service-files-system) +TEST_PATH(INVALID_SERVICE_SYSTEM_DIR, data/invalid-service-files-system) TEST_PATH(SERVICE_BINARY, test-service) TEST_PATH(SHELL_SERVICE_BINARY, test-shell-service) TEST_PATH(EXIT_BINARY, test-exit) @@ -1254,10 +1257,19 @@ doc/Makefile dbus-1.pc test/data/valid-config-files/debug-allow-all.conf test/data/valid-config-files/debug-allow-all-sha1.conf -test/data/valid-service-files/debug-echo.service -test/data/valid-service-files/debug-segfault.service -test/data/valid-service-files/debug-shell-echo-success.service -test/data/valid-service-files/debug-shell-echo-fail.service +test/data/valid-config-files-system/debug-allow-all-pass.conf +test/data/valid-config-files-system/debug-allow-all-fail.conf +test/data/valid-service-files/org.freedesktop.DBus.TestSuiteEchoService.service +test/data/valid-service-files/org.freedesktop.DBus.TestSuiteSegfaultService.service +test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service +test/data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service +test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteEchoService.service +test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteSegfaultService.service +test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service +test/data/valid-service-files-system/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service +test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoExec.service +test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoUser.service +test/data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoService.service ]) dnl ========================================================================== @@ -1268,6 +1280,7 @@ echo " prefix: ${prefix} exec_prefix: ${exec_prefix} libdir: ${EXPANDED_LIBDIR} + libexecdir: ${EXPANDED_LIBEXECDIR} bindir: ${EXPANDED_BINDIR} sysconfdir: ${EXPANDED_SYSCONFDIR} localstatedir: ${EXPANDED_LOCALSTATEDIR} -- cgit