From ad905a195e21a6093b3b1be89972b5decd622b38 Mon Sep 17 00:00:00 2001
From: Jamie Strandboge <jamie@canonical.com>
Date: Mon, 14 Dec 2009 13:40:42 +0100
Subject: [PATCH] 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.
---
 Makefile.am                   | 2 +-
 configure.in                  | 1 +
 examples/apparmor/Makefile.am | 5 +++++
 tests/Makefile.am             | 3 +++
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 examples/apparmor/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 32cd96a0f8..a02cd26181 100644
--- 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 fe9834d64e..49814e200a 100644
--- 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
index 0000000000..b72bbe116e
--- /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 d04ebd64c2..335b0e52f6 100644
--- 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 \