Merge branch 'master' of git://git.et.redhat.com/libguestfs

diff --combined capitests/Makefile.am
index b52d2ed,dd2e556..ab91755
--- 1/capitests/Makefile.am
--- 2/capitests/Makefile.am
+++ b/capitests/Makefile.am
@@@ -24,8 -24,7 +24,7 @@@ EXTRA_DIST = 
  check_PROGRAMS = tests test-command
  
  tests_SOURCES = tests.c
- tests_CFLAGS = \
-       -I$(top_builddir)/src -Wall
+ tests_CFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -Wall
  tests_LDADD = $(top_builddir)/src/libguestfs.la
  
  TESTS = tests
@@@ -34,7 -33,6 +33,7 @@@ TESTS_ENVIRONMENT = 
        SKIP_TEST_COMMAND_LINES=$(shell ldd test-command | grep -sq 'not a dynamic executable' || echo 1) \
        SKIP_TEST_ZEROFREE=$(shell test -x ../initramfs/usr/sbin/zerofree || echo 1) \
        SKIP_TEST_NTFS_3G_PROBE=$(shell test -x ../initramfs/bin/ntfs-3g.probe || echo 1) \
 +      SKIP_TEST_CHECKSUM_8=$(shell if test `find ../initramfs -name squashfs.ko | wc -l` -eq 0; then echo 1; fi) \
        $(VG)
  
  # Run the tests under valgrind.