From bd70e8053165bdee620356cdff02c3979d7138e7 Mon Sep 17 00:00:00 2001
From: "Diego E. 'Flameeyes' Pettenò" <flameeyes@gmail.com>
Date: Tue, 20 Jan 2009 00:55:39 +0100
Subject: Allow to opt-out from building tests.

Since the tests are only useful either if you're hacking at pulseaudio as
a developer, or when running "make check", allow users to opt-out from
their build.

This for instance allows for Gentoo users not to build the tests when
installing the ebuild with tests disabled, and also allow for skipping over
eventually broken tests when trying to get the basic build going on a port.
---
 src/Makefile.am | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index e8f0a820..fbe9e914 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -253,7 +253,7 @@ TESTS = \
 		lock-autospawn-test \
 		prioq-test
 
-noinst_PROGRAMS = \
+TESTS_BINARIES = \
 		mainloop-test \
 		mcalign-test \
 		pacat-simple \
@@ -293,7 +293,7 @@ if HAVE_SIGXCPU
 #TESTS += \
 #		cpulimit-test \
 #		cpulimit-test2
-noinst_PROGRAMS += \
+TESTS_BINARIES += \
 		cpulimit-test \
 		cpulimit-test2
 endif
@@ -301,10 +301,16 @@ endif
 if HAVE_GLIB20
 TESTS += \
 		mainloop-test-glib
-noinst_PROGRAMS += \
+TESTS_BINARIES += \
 		mainloop-test-glib
 endif
 
+if BUILD_TESTS_DEFAULT
+noinst_PROGRAMS = $(TESTS_BINARIES)
+else
+check_PROGRAMS = $(TESTS_BINARIES)
+endif
+
 mainloop_test_SOURCES = tests/mainloop-test.c
 mainloop_test_CFLAGS = $(AM_CFLAGS)
 mainloop_test_LDADD = $(AM_LDADD) libpulse.la
-- 
cgit 


From bc41fdb20d04ad7f42d5ff28f32a9b3ff3ca52f3 Mon Sep 17 00:00:00 2001
From: "Diego E. 'Flameeyes' Pettenò" <flameeyes@gmail.com>
Date: Tue, 20 Jan 2009 00:55:42 +0100
Subject: Include the alsa/ subdirectory for modules in the search path.

Without this, out of tree builds fails.
---
 src/Makefile.am | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/Makefile.am b/src/Makefile.am
index fbe9e914..17e14be8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,6 +56,8 @@ AM_CFLAGS = \
 	-I$(top_builddir)/src/modules/gconf \
 	-I$(top_srcdir)/src/modules/bluetooth \
 	-I$(top_builddir)/src/modules/bluetooth \
+	-I$(top_srcdir)/src/modules/alsa \
+	-I$(top_builddir)/src/modules/alsa \
 	-I$(top_srcdir)/src/modules/raop \
 	$(PTHREAD_CFLAGS) -D_POSIX_PTHREAD_SEMANTICS \
 	$(LTDLINCL) \
-- 
cgit