Remove reliance on abs_top_{src,build}dir variables from automake 1.10

diff --git a/ChangeLog b/ChangeLog
index 8f53e4df9780eae8a8305f1eae488d8b881fccf5..0c7cbd68225fabbfae9cea54fc4e71427089b137 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Nov 17 13:05:33 UTC 2007 Daniel P. Berrange <berrange@redhat.com>
+
+       * tests/Makefile.am: Set abs_top_{build,src}dir based on 'pwd'
+       since older automake does not provide these vars
+
 Sat Nov 17 12:10:33 UTC 2007 Daniel P. Berrange <berrange@redhat.com>
 
        * docs/Makefile.am: Added missing news.xsl to EXTRA_DIST

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 998877a42704e301b54b88a6a88b21fdc975140e..8539779fcc92c493fb78738baca30d0ffaa016fb 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -52,9 +52,12 @@ if ENABLE_XEN_TESTS
   TESTS += reconnect
 endif
 
+# NB, automake < 1.10 does not provide the real
+# abs_top_{src/build}dir variables, so don't rely
+# on them here. Fake them with 'pwd'
 TESTS_ENVIRONMENT =                            \
-  abs_top_builddir='$(abs_top_builddir)'       \
-  abs_top_srcdir='$(abs_top_srcdir)'           \
+  abs_top_builddir=`pwd`/$(top_builddir)       \
+  abs_top_srcdir=`pwd`/$(top_srcdir)           \
   $(VG)
 
 valgrind: