* 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>)

diff --git a/ChangeLog b/ChangeLog
index 1f70b09..86d0bf7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-08-25  John (J5) Palmieri  <johnp@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@redhat.com>
+
        * configure.in: Fix DBUS_DAEMONDIR to use EXPANDED_BINDIR for the
        default case
 

diff --git a/configure.in b/configure.in
index 5a24636..9b7fe59 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1002,10 +1002,10 @@ AC_SUBST(DBUS_DAEMONDIR)
 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(SHELL_SERVICE_BINARY, test-shell-service)
 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

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 088b6e3..c3aab81 100644 (file)
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION
+INCLUDES=-I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) -DDBUS_COMPILATION
 
 dbusincludedir=$(includedir)/dbus-1.0/dbus
 dbusarchincludedir=$(libdir)/dbus-1.0/include/dbus

diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am
index 41bb24b..f4dc534 100644 (file)
--- a/test/name-test/Makefile.am
+++ b/test/name-test/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) -DDBUS_COMPIL
 ## so if adding tests not to be run in make check, don't add them to 
 ## TESTS
 if DBUS_BUILD_TESTS
-TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=$(ABSOLUTE_TOP_BUILDDIR)
+TESTS_ENVIRONMENT=DBUS_TOP_BUILDDIR=@abs_top_builddir@ DBUS_TOP_SRCDIR=@abs_top_srcdir@
 TESTS=run-test.sh
 else
 TESTS=

diff --git a/test/name-test/run-test.sh b/test/name-test/run-test.sh
index 81e2e84..bad5ca2 100755 (executable)
--- a/test/name-test/run-test.sh
+++ b/test/name-test/run-test.sh
@@ -8,8 +8,6 @@ ie()
     fi
     echo $SCRIPTNAME: $* >&2
 
-    rm $DBUS_TOP_BUILDDIR/python/dbus
- 
     exit 1
 }
 
@@ -24,7 +22,7 @@ export DBUS_TEST_NAME_RUN_TEST_SCRIPT=1
 if test -z "$DBUS_TEST_NAME_IN_RUN_TEST"; then
   DBUS_TEST_NAME_IN_RUN_TEST=1
   export DBUS_TEST_NAME_IN_RUN_TEST
-  exec $DBUS_TOP_BUILDDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
+  exec $DBUS_TOP_SRCDIR/tools/run-with-tmp-session-bus.sh $SCRIPTNAME $MODE
 fi 
 echo "running test-names"
 libtool --mode=execute $DEBUG $DBUS_TOP_BUILDDIR/test/name-test/test-names || die "test-client failed"