dbus ChangeLog,1.1092,1.1093 configure.in,1.171,1.172
John Palmieri
johnp at kemper.freedesktop.org
Fri Aug 25 12:50:18 PDT 2006
Update of /cvs/dbus/dbus
In directory kemper:/tmp/cvs-serv26577
Modified Files:
ChangeLog configure.in
Log Message:
* configure.in, dbus/Makefile.am, test/name-test/run-test.sh,
test/name-test/Makefile.am: Fixed some issues with getting get dbus
to build with builddir != srcdir (Taken from a patch by Bernard Leak
<bernard at brenda-arkle dot demon dot co dot uk>)
Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.1092
retrieving revision 1.1093
diff -u -d -r1.1092 -r1.1093
--- ChangeLog 25 Aug 2006 19:33:39 -0000 1.1092
+++ ChangeLog 25 Aug 2006 19:50:16 -0000 1.1093
@@ -1,5 +1,12 @@
2006-08-25 John (J5) Palmieri <johnp at redhat.com>
+ * configure.in, dbus/Makefile.am, test/name-test/run-test.sh,
+ test/name-test/Makefile.am: Fixed some issues with getting get dbus
+ to build with builddir != srcdir (Taken from a patch by Bernard Leak
+ <bernard at brenda-arkle dot demon dot co dot uk>)
+
+2006-08-25 John (J5) Palmieri <johnp at redhat.com>
+
* configure.in: Fix DBUS_DAEMONDIR to use EXPANDED_BINDIR for the
default case
Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- configure.in 25 Aug 2006 19:33:39 -0000 1.171
+++ configure.in 25 Aug 2006 19:50:16 -0000 1.172
@@ -1002,10 +1002,10 @@
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`
+DBUS_PWD=`pwd`
AC_DEFUN([TEST_PATH], [
-TEST_$1=${ABSOLUTE_TOP_BUILDDIR}/test/$2
+TEST_$1=${DBUS_PWD}/test/$2
AC_DEFINE_UNQUOTED(TEST_$1, "$TEST_$1",
[Full path to test file test/$2 in builddir])
AC_SUBST(TEST_$1)
@@ -1017,7 +1017,6 @@
TEST_PATH(EXIT_BINARY, test-exit)
TEST_PATH(SEGFAULT_BINARY, test-segfault)
TEST_PATH(SLEEP_FOREVER_BINARY, test-sleep-forever)
-AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
#### Find socket directories
if ! test -z "$TMPDIR" ; then
More information about the dbus-commit
mailing list