add AppArmor test and examples to dist

tests/virt-aa-helper-test and examples/apparmor are not included in
official tarballs, but should be. Attached is a patch to fix that
which works when apparmor is and is not available.

diff --git a/Makefile.am b/Makefile.am
index 32cd96a0f82b9453efedd475027855be2dd50240..a02cd26181c4796462de6a2baf02a6c92613e7eb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ GENHTML = genhtml
 
 SUBDIRS = gnulib/lib include src daemon tools proxy docs gnulib/tests \
   python tests po examples/domain-events/events-c examples/hellolibvirt \
-  examples/dominfo examples/domsuspend examples/python
+  examples/dominfo examples/domsuspend examples/python examples/apparmor
 
 ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
 

diff --git a/configure.in b/configure.in
index fe9834d64e032f706a9f4ce85664a1ced05d13ed..49814e200a781cee028227134345b9a3ddfad014 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1813,6 +1813,7 @@ AC_OUTPUT(Makefile src/Makefile include/Makefile docs/Makefile \
           tests/xmconfigdata/Makefile \
           tests/xencapsdata/Makefile \
           tests/confdata/Makefile \
+          examples/apparmor/Makefile \
           examples/domain-events/events-c/Makefile \
           examples/domsuspend/Makefile \
           examples/dominfo/Makefile \

diff --git a/examples/apparmor/Makefile.am b/examples/apparmor/Makefile.am
new file mode 100644 (file)
index 0000000..b72bbe1
--- /dev/null
+++ b/examples/apparmor/Makefile.am
@@ -0,0 +1,5 @@
+EXTRA_DIST=                            \
+       TEMPLATE                        \
+       libvirt-qemu                    \
+       usr.lib.libvirt.virt-aa-helper  \
+       usr.sbin.libvirtd

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d04ebd64c23d5984488e1e73b3eedccc411098a7..335b0e52f68b9c8721c5b90769c2582b928fa824 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -135,7 +135,10 @@ endif
 
 if WITH_SECDRIVER_APPARMOR
 test_scripts += virt-aa-helper-test
+else
+EXTRA_DIST += virt-aa-helper-test
 endif
+
 EXTRA_DIST += $(test_scripts)
 
 TESTS = virshtest \